mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-04 00:48:40 +00:00
Raname UserLocation to UserLocationPuck
This commit is contained in:
+1
-1
@@ -18,7 +18,7 @@ import org.maplibre.compose.location.LocationTrackingEffect
|
|||||||
import org.maplibre.compose.location.UserLocationState
|
import org.maplibre.compose.location.UserLocationState
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun UserLocation(
|
fun UserLocationPuck(
|
||||||
cameraState: CameraState,
|
cameraState: CameraState,
|
||||||
locationState: UserLocationState,
|
locationState: UserLocationState,
|
||||||
trackUserLocation: Boolean,
|
trackUserLocation: Boolean,
|
||||||
+2
-2
@@ -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.PermissionRationaleDialog
|
||||||
import io.element.android.features.location.impl.common.ui.LocationFloatingActionButton
|
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.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.button.BackButton
|
||||||
import io.element.android.libraries.designsystem.components.dialogs.ListDialog
|
import io.element.android.libraries.designsystem.components.dialogs.ListDialog
|
||||||
import io.element.android.libraries.designsystem.components.list.ListItemContent
|
import io.element.android.libraries.designsystem.components.list.ListItemContent
|
||||||
@@ -143,7 +143,7 @@ fun ShareLocationView(
|
|||||||
)
|
)
|
||||||
},
|
},
|
||||||
mapContent = {
|
mapContent = {
|
||||||
UserLocation(
|
UserLocationPuck(
|
||||||
cameraState = cameraState,
|
cameraState = cameraState,
|
||||||
locationState = userLocationState,
|
locationState = userLocationState,
|
||||||
trackUserLocation = state.trackUserLocation
|
trackUserLocation = state.trackUserLocation
|
||||||
|
|||||||
+2
-4
@@ -8,9 +8,7 @@
|
|||||||
|
|
||||||
package io.element.android.features.location.impl.show
|
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.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.navigationBarsPadding
|
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.runtime.Composable
|
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.PermissionRationaleDialog
|
||||||
import io.element.android.features.location.impl.common.ui.LocationFloatingActionButton
|
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.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.button.BackButton
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreview
|
import io.element.android.libraries.designsystem.preview.ElementPreview
|
||||||
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
||||||
@@ -137,7 +135,7 @@ fun ShowLocationView(
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
mapContent = {
|
mapContent = {
|
||||||
UserLocation(
|
UserLocationPuck(
|
||||||
cameraState = cameraState,
|
cameraState = cameraState,
|
||||||
locationState = userLocationState,
|
locationState = userLocationState,
|
||||||
trackUserLocation = state.isTrackMyLocation
|
trackUserLocation = state.isTrackMyLocation
|
||||||
|
|||||||
Reference in New Issue
Block a user