Use zoom overlay instead of FABs

afarber · afarber · commit 1e16b61d8451 · 2025-10-29T17:20:20.000+01:00
diff --git a/examples/Example01Pan/src/main/AndroidManifest.xml b/examples/Example01Pan/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@android:drawable/sym_def_app_icon"
+        android:icon="@android:drawable/ic_dialog_map"
         android:label="Example01Pan"
         android:theme="@android:style/Theme.Material.Light.NoActionBar">
         <activity
diff --git a/examples/Example02Zoom/screenshot.gif b/examples/Example02Zoom/screenshot.gif
diff --git a/examples/Example02Zoom/src/main/AndroidManifest.xml b/examples/Example02Zoom/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@android:drawable/sym_def_app_icon"
+        android:icon="@android:drawable/ic_dialog_map"
         android:label="Example02Zoom"
         android:theme="@android:style/Theme.Material.Light.NoActionBar">
         <activity
diff --git a/examples/Example02Zoom/src/main/kotlin/de/afarber/openmapview/example02zoom/MainActivity.kt b/examples/Example02Zoom/src/main/kotlin/de/afarber/openmapview/example02zoom/MainActivity.kt
@@ -15,7 +15,6 @@ import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -67,6 +66,9 @@ fun MapViewScreen() {
                     setZoom(14.0)
                     mapView = this
 
+                    // Enable built-in zoom controls
+                    getUiSettings().isZoomControlsEnabled = true
+
                     // Set attribution click listener to open OSM copyright page
                     setOnAttributionClickListener {
                         val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://www.openstreetmap.org/copyright"))
@@ -91,37 +93,5 @@ fun MapViewScreen() {
                 style = MaterialTheme.typography.titleMedium,
             )
         }
-
-        // Zoom in button
-        FloatingActionButton(
-            onClick = {
-                mapView?.let {
-                    val newZoom = (it.getZoom() + 1.0).coerceAtMost(19.0)
-                    it.setZoom(newZoom)
-                    zoomLevel = newZoom
-                }
-            },
-            modifier = Modifier
-                .align(Alignment.BottomEnd)
-                .padding(end = 16.dp, bottom = 88.dp),
-        ) {
-            Text("+", style = MaterialTheme.typography.headlineMedium)
-        }
-
-        // Zoom out button
-        FloatingActionButton(
-            onClick = {
-                mapView?.let {
-                    val newZoom = (it.getZoom() - 1.0).coerceAtLeast(2.0)
-                    it.setZoom(newZoom)
-                    zoomLevel = newZoom
-                }
-            },
-            modifier = Modifier
-                .align(Alignment.BottomEnd)
-                .padding(end = 16.dp, bottom = 16.dp),
-        ) {
-            Text("-", style = MaterialTheme.typography.headlineMedium)
-        }
     }
 }
diff --git a/examples/Example03Markers/src/main/AndroidManifest.xml b/examples/Example03Markers/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@android:drawable/sym_def_app_icon"
+        android:icon="@android:drawable/ic_dialog_map"
         android:label="Example03Markers"
         android:theme="@android:style/Theme.Material.Light.NoActionBar">
         <activity
diff --git a/examples/Example04Polylines/src/main/AndroidManifest.xml b/examples/Example04Polylines/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@android:drawable/sym_def_app_icon"
+        android:icon="@android:drawable/ic_dialog_map"
         android:label="Example04Polylines"
         android:theme="@android:style/Theme.Material.Light.NoActionBar">
         <activity
diff --git a/examples/Example05Camera/src/main/AndroidManifest.xml b/examples/Example05Camera/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@android:drawable/sym_def_app_icon"
+        android:icon="@android:drawable/ic_dialog_map"
         android:label="Example05Camera"
         android:theme="@android:style/Theme.Material.Light.NoActionBar">
         <activity
diff --git a/examples/Example05Camera/src/main/kotlin/de/afarber/openmapview/example05camera/MainActivity.kt b/examples/Example05Camera/src/main/kotlin/de/afarber/openmapview/example05camera/MainActivity.kt
@@ -20,7 +20,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
@@ -76,6 +75,9 @@ fun MapViewScreen() {
                     setCenter(LatLng(51.4620, 7.2480))
                     setZoom(13.0)
 
+                    // Enable built-in zoom controls
+                    getUiSettings().isZoomControlsEnabled = true
+
                     addMarker(
                         Marker(
                             position = location1,
@@ -170,32 +172,6 @@ fun MapViewScreen() {
                 modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.Center,
             ) {
-                FloatingActionButton(
-                    onClick = {
-                        mapView?.animateCamera(
-                            CameraUpdateFactory.zoomIn(),
-                            500,
-                        )
-                    },
-                ) {
-                    Text("+", style = MaterialTheme.typography.headlineMedium)
-                }
-
-                Spacer(modifier = Modifier.width(8.dp))
-
-                FloatingActionButton(
-                    onClick = {
-                        mapView?.animateCamera(
-                            CameraUpdateFactory.zoomOut(),
-                            500,
-                        )
-                    },
-                ) {
-                    Text("-", style = MaterialTheme.typography.headlineMedium)
-                }
-
-                Spacer(modifier = Modifier.width(8.dp))
-
                 FloatingActionButton(
                     onClick = {
                         mapView?.stopAnimation()
diff --git a/examples/Example11MapTypes/src/main/AndroidManifest.xml b/examples/Example11MapTypes/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@android:drawable/ic_menu_mapmode"
+        android:icon="@android:drawable/ic_dialog_map"
         android:label="Example11 Map Types"
         android:theme="@android:style/Theme.Material.Light.DarkActionBar"
         android:supportsRtl="true">
diff --git a/examples/Example12Toolbar/screenshot.gif b/examples/Example12Toolbar/screenshot.gif
diff --git a/examples/Example12Toolbar/src/main/AndroidManifest.xml b/examples/Example12Toolbar/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@android:drawable/ic_menu_mapmode"
+        android:icon="@android:drawable/ic_dialog_map"
         android:label="Example12 Toolbar"
         android:supportsRtl="true">
 
