Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Android): don't request location automatically #577

Merged
merged 2 commits into from
Dec 11, 2024
Merged

fix(Android): don't request location automatically #577

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
125761c
fix(Android): don't request location automatically
boringcactus Dec 9, 2024
602d586
Merge branch 'main' into mth-android-manual-location
boringcactus Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions androidApp/src/main/java/com/mbta/tid/mbta_app/android/map/HomeMapView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.LifecycleStartEffect
import androidx.navigation.NavBackStackEntry
import com.google.accompanist.permissions.ExperimentalPermissionsApi
import com.google.accompanist.permissions.isGranted
import com.mapbox.geojson.FeatureCollection
import com.mapbox.geojson.Point
import com.mapbox.maps.MapView
Expand Down Expand Up @@ -314,11 +315,6 @@ fun HomeMapView(
}
}

LifecycleStartEffect(Unit) {
locationPermissions.launchMultiplePermissionRequest()
onStopOrDispose {}
}

LifecycleStartEffect(Unit) {
onStopOrDispose { viewportProvider.saveCurrentViewport() }
}
Expand Down Expand Up @@ -367,7 +363,13 @@ fun HomeMapView(

if (!viewportProvider.isFollowingPuck) {
RecenterButton(
onClick = { viewportProvider.follow() },
onClick = {
// don't request FINE if we already have COARSE
if (!locationPermissions.permissions.any { it.status.isGranted }) {
locationPermissions.launchMultiplePermissionRequest()
}
viewportProvider.follow()
},
Modifier.align(Alignment.TopEnd).padding(16.dp)
)
}
Expand Down
Loading