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 app crash when switching theme #367

Merged
merged 2 commits into from
May 31, 2024
Merged

Fix app crash when switching theme #367

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb6ba3b
Fix app crash when switching theme
octogradiste May 30, 2024
44bd437
Make requested changes
octogradiste May 31, 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
44 changes: 26 additions & 18 deletions app/src/main/java/com/github/swent/echo/compose/map/MapLibreMapViewProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,16 @@ import com.mapbox.mapboxsdk.maps.Style

class MapLibreMapViewProvider : IMapViewProvider<MapView> {

private var mapView: MapView? = null
// Stores the last camera position so we can restore it when the map is recreated (i.e. when the
// user switches between the list and map mode or when the user switches between the light and
// dark theme).
private var lastCameraPosition =
CameraPosition.Builder()
.target(MAP_CENTER.toLatLng())
.zoom(DEFAULT_ZOOM)
.bearing(0.0)
.build()

private var locationComponent: LocationComponent? = null
private var firstRecenter = true

Expand Down Expand Up @@ -79,36 +88,35 @@ class MapLibreMapViewProvider : IMapViewProvider<MapView> {
val styleUrl =
context.getString(R.string.maptiler_base_style_url) +
context.getString(R.string.maptiler_api_key)
val isInit = (mapView == null)
if (isInit) {
// Creating the map for the first time
mapView = MapView(context)
}
mapView?.onCreate(null)
mapView?.getMapAsync { map ->

val mapView = MapView(context)
mapView.onCreate(null)
mapView.getMapAsync { map ->
// Set the style after mapView was loaded
map.setStyle(styleUrl) {
map.uiSettings.apply {
setAttributionMargins(15, 0, 0, 15)
isRotateGesturesEnabled = true
}
// Set the map view center if we're creating the view
if (isInit) {
map.cameraPosition =
CameraPosition.Builder()
.target(MAP_CENTER.toLatLng())
.zoom(DEFAULT_ZOOM)
.bearing(0.0)
.build()
}

// Restore the last camera position
map.cameraPosition = lastCameraPosition

// Add listener to handle long press events
map.addOnMapLongClickListener {
onLongPress(it)
true
}

// Add listener to update the last camera position so we can restore it later
map.addOnCameraMoveListener { lastCameraPosition = map.cameraPosition }

// Call the on create callback once the map is configured
onCreate()
}
}
return mapView!!

return mapView
}

override fun update(
Expand Down