From e1e7c264eddd0433b2bdb5b7eaa8c21f457a4602 Mon Sep 17 00:00:00 2001 From: ganfra Date: Thu, 26 Feb 2026 19:03:28 +0100 Subject: [PATCH] Raname UserLocation to UserLocationPuck --- .../impl/common/ui/{UserLocation.kt => UserLocationPuck.kt} | 2 +- .../features/location/impl/share/ShareLocationView.kt | 4 ++-- .../android/features/location/impl/show/ShowLocationView.kt | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) rename features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/{UserLocation.kt => UserLocationPuck.kt} (98%) diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/UserLocation.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/UserLocationPuck.kt similarity index 98% rename from features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/UserLocation.kt rename to features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/UserLocationPuck.kt index 9a5b6121b0..9d073f8942 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/UserLocation.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/UserLocationPuck.kt @@ -18,7 +18,7 @@ import org.maplibre.compose.location.LocationTrackingEffect import org.maplibre.compose.location.UserLocationState @Composable -fun UserLocation( +fun UserLocationPuck( cameraState: CameraState, locationState: UserLocationState, trackUserLocation: Boolean, diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationView.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationView.kt index 84829d4bf9..03638f8f90 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationView.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationView.kt @@ -41,7 +41,7 @@ import io.element.android.features.location.impl.common.PermissionDeniedDialog import io.element.android.features.location.impl.common.PermissionRationaleDialog import io.element.android.features.location.impl.common.ui.LocationFloatingActionButton import io.element.android.features.location.impl.common.ui.MapBottomSheetScaffold -import io.element.android.features.location.impl.common.ui.UserLocation +import io.element.android.features.location.impl.common.ui.UserLocationPuck import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.components.dialogs.ListDialog import io.element.android.libraries.designsystem.components.list.ListItemContent @@ -143,7 +143,7 @@ fun ShareLocationView( ) }, mapContent = { - UserLocation( + UserLocationPuck( cameraState = cameraState, locationState = userLocationState, trackUserLocation = state.trackUserLocation diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt index f7d7a15207..d53895d273 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt @@ -8,9 +8,7 @@ package io.element.android.features.location.impl.show -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.runtime.Composable @@ -31,7 +29,7 @@ import io.element.android.features.location.impl.common.PermissionDeniedDialog import io.element.android.features.location.impl.common.PermissionRationaleDialog import io.element.android.features.location.impl.common.ui.LocationFloatingActionButton import io.element.android.features.location.impl.common.ui.MapBottomSheetScaffold -import io.element.android.features.location.impl.common.ui.UserLocation +import io.element.android.features.location.impl.common.ui.UserLocationPuck import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight @@ -137,7 +135,7 @@ fun ShowLocationView( } }, mapContent = { - UserLocation( + UserLocationPuck( cameraState = cameraState, locationState = userLocationState, trackUserLocation = state.isTrackMyLocation