Simplify example attribution handling and add overlay attribution tracking (#8)

afarber · web-flow · commit 715fe75d082f · 2025-11-30T18:25:24.000+01:00
diff --git a/examples/Example01Pan/src/main/kotlin/de/afarber/openmapview/example01pan/MainActivity.kt b/examples/Example01Pan/src/main/kotlin/de/afarber/openmapview/example01pan/MainActivity.kt
@@ -7,7 +7,6 @@
 
 package de.afarber.openmapview.example01pan
 
-import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -18,7 +17,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.net.toUri
 import de.afarber.openmapview.LatLng
 import de.afarber.openmapview.OpenMapView
 
@@ -51,15 +49,6 @@ fun MapViewScreen() {
 
                 setCenter(LatLng(51.4661, 7.2491)) // Bochum, Germany
                 setZoom(14.0f)
-
-                // Set attribution click listener to open OSM copyright page
-                setOnAttributionClickListener {
-                    val intent = Intent(
-                        Intent.ACTION_VIEW,
-                        "https://www.openstreetmap.org/copyright".toUri(),
-                    )
-                    context.startActivity(intent)
-                }
             }
         },
         modifier = Modifier.fillMaxSize(),
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
@@ -7,7 +7,6 @@
 
 package de.afarber.openmapview.example02zoom
 
-import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -27,7 +26,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.net.toUri
 import de.afarber.openmapview.LatLng
 import de.afarber.openmapview.OpenMapView
 import kotlin.math.roundToInt
@@ -73,15 +71,6 @@ fun MapViewScreen() {
                     setOnCameraMoveListener {
                         zoomLevel = getZoom()
                     }
-
-                    // Set attribution click listener to open OSM copyright page
-                    setOnAttributionClickListener {
-                        val intent = Intent(
-                            Intent.ACTION_VIEW,
-                            "https://www.openstreetmap.org/copyright".toUri(),
-                        )
-                        context.startActivity(intent)
-                    }
                 }
             },
             modifier = Modifier.fillMaxSize(),
diff --git a/examples/Example03Markers/src/main/kotlin/de/afarber/openmapview/example03markers/MainActivity.kt b/examples/Example03Markers/src/main/kotlin/de/afarber/openmapview/example03markers/MainActivity.kt
@@ -7,7 +7,6 @@
 
 package de.afarber.openmapview.example03markers
 
-import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -19,7 +18,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.net.toUri
 import de.afarber.openmapview.BitmapDescriptorFactory
 import de.afarber.openmapview.LatLng
 import de.afarber.openmapview.Marker
@@ -124,15 +122,6 @@ fun MapViewScreen() {
                 setOnInfoWindowClickListener { marker ->
                     Toast.makeText(context, "Clicked: ${marker.title}", Toast.LENGTH_SHORT).show()
                 }
-
-                // Set attribution click listener to open OSM copyright page
-                setOnAttributionClickListener {
-                    val intent = Intent(
-                        Intent.ACTION_VIEW,
-                        "https://www.openstreetmap.org/copyright".toUri(),
-                    )
-                    context.startActivity(intent)
-                }
             }
         },
         modifier = Modifier.fillMaxSize(),
diff --git a/examples/Example04Polylines/src/main/kotlin/de/afarber/openmapview/example04polylines/MainActivity.kt b/examples/Example04Polylines/src/main/kotlin/de/afarber/openmapview/example04polylines/MainActivity.kt
@@ -7,7 +7,6 @@
 
 package de.afarber.openmapview.example04polylines
 
-import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -20,7 +19,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.net.toUri
 import de.afarber.openmapview.LatLng
 import de.afarber.openmapview.OpenMapView
 import de.afarber.openmapview.Polygon
@@ -140,15 +138,6 @@ fun MapViewScreen() {
                 setOnPolygonClickListener { polygon ->
                     Toast.makeText(context, "Clicked: ${polygon.tag}", Toast.LENGTH_SHORT).show()
                 }
-
-                // Set attribution click listener to open OSM copyright page
-                setOnAttributionClickListener {
-                    val intent = Intent(
-                        Intent.ACTION_VIEW,
-                        "https://www.openstreetmap.org/copyright".toUri(),
-                    )
-                    context.startActivity(intent)
-                }
             }
         },
         modifier = Modifier.fillMaxSize(),
diff --git a/examples/Example06Clicks/src/main/kotlin/de/afarber/openmapview/example06clicks/MainActivity.kt b/examples/Example06Clicks/src/main/kotlin/de/afarber/openmapview/example06clicks/MainActivity.kt
@@ -7,7 +7,6 @@
 
 package de.afarber.openmapview.example06clicks
 
-import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -20,7 +19,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.net.toUri
 import de.afarber.openmapview.LatLng
 import de.afarber.openmapview.OnMapClickListener
 import de.afarber.openmapview.OnMapLongClickListener
@@ -88,15 +86,6 @@ fun MapViewScreen() {
                         ).show()
                     },
                 )
-
-                // Set attribution click listener to open OSM copyright page
-                setOnAttributionClickListener {
-                    val intent = Intent(
-                        Intent.ACTION_VIEW,
-                        "https://www.openstreetmap.org/copyright".toUri(),
-                    )
-                    context.startActivity(intent)
-                }
             }
         },
         modifier = Modifier.fillMaxSize(),
diff --git a/examples/Example07DraggableMarkers/src/main/kotlin/de/afarber/openmapview/example07draggablemarkers/MainActivity.kt b/examples/Example07DraggableMarkers/src/main/kotlin/de/afarber/openmapview/example07draggablemarkers/MainActivity.kt
@@ -7,7 +7,6 @@
 
 package de.afarber.openmapview.example07draggablemarkers
 
-import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -34,7 +33,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.net.toUri
 import de.afarber.openmapview.LatLng
 import de.afarber.openmapview.Marker
 import de.afarber.openmapview.OnMarkerDragListener
@@ -138,15 +136,6 @@ fun MapViewScreen() {
                         ).show()
                         true
                     }
-
-                    // Set attribution click listener
-                    setOnAttributionClickListener {
-                        val intent = Intent(
-                            Intent.ACTION_VIEW,
-                            "https://www.openstreetmap.org/copyright".toUri(),
-                        )
-                        context.startActivity(intent)
-                    }
                 }
             },
             modifier = Modifier.fillMaxSize(),
diff --git a/examples/Example08Circles/src/main/kotlin/de/afarber/openmapview/example08circles/MainActivity.kt b/examples/Example08Circles/src/main/kotlin/de/afarber/openmapview/example08circles/MainActivity.kt
@@ -7,7 +7,6 @@
 
 package de.afarber.openmapview.example08circles
 
-import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -35,7 +34,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.net.toUri
 import de.afarber.openmapview.Circle
 import de.afarber.openmapview.CircleOptions
 import de.afarber.openmapview.LatLng
@@ -189,15 +187,6 @@ fun MapViewScreen() {
                             Toast.LENGTH_SHORT,
                         ).show()
                     }
-
-                    // Set attribution click listener
-                    setOnAttributionClickListener {
-                        val intent = Intent(
-                            Intent.ACTION_VIEW,
-                            "https://www.openstreetmap.org/copyright".toUri(),
-                        )
-                        context.startActivity(intent)
-                    }
                 }
             },
             modifier = Modifier.fillMaxSize(),
diff --git a/examples/Example09Overlays/src/main/kotlin/de/afarber/openmapview/example09overlays/MainActivity.kt b/examples/Example09Overlays/src/main/kotlin/de/afarber/openmapview/example09overlays/MainActivity.kt
@@ -70,6 +70,7 @@ class MainActivity : ComponentActivity() {
 data class OverlayState(
     val name: String,
     val overlay: TileOverlay,
+    val attribution: String,
     var isVisible: Boolean = false,
     var transparency: Float = 0.5f,
 )
@@ -91,6 +92,7 @@ fun MapViewScreen() {
                         zIndex = 1f,
                         visible = false,
                     ),
+                    "© OpenSeaMap",
                 ),
                 OverlayState(
                     "OpenRailwayMap",
@@ -99,6 +101,7 @@ fun MapViewScreen() {
                         zIndex = 2f,
                         visible = false,
                     ),
+                    "© OpenRailwayMap",
                 ),
                 OverlayState(
                     "Hiking Trails",
@@ -107,6 +110,7 @@ fun MapViewScreen() {
                         zIndex = 3f,
                         visible = false,
                     ),
+                    "© Waymarked Trails",
                 ),
                 OverlayState(
                     "OpenSnowMap",
@@ -115,6 +119,7 @@ fun MapViewScreen() {
                         zIndex = 4f,
                         visible = false,
                     ),
+                    "© OpenSnowMap",
                 ),
             ),
         )
@@ -132,6 +137,19 @@ fun MapViewScreen() {
         ).show()
     }
 
+    fun updateAttributions() {
+        mapView?.let { map ->
+            val activeAttributions: List<String> = overlays.filter { it.isVisible }.map { it.attribution }
+            if (activeAttributions.isNotEmpty()) {
+                val combinedAttribution = "© OpenStreetMap contributors | ${activeAttributions.joinToString(" | ")}"
+                map.setAttributionText(combinedAttribution)
+            } else {
+                // Reset to default when no overlays active
+                map.setAttributionText("© OpenStreetMap contributors")
+            }
+        }
+    }
+
     fun toggleOverlay(
         index: Int,
         enabled: Boolean,
@@ -154,6 +172,7 @@ fun MapViewScreen() {
             }
 
             overlays = updated
+            updateAttributions()
         }
     }
 
@@ -218,6 +237,7 @@ fun MapViewScreen() {
                         mapView?.clearTileOverlays()
                         overlays = overlays.map { state -> state.copy(isVisible = false) }
                         transparency = 0.5f
+                        updateAttributions()
                         Toast.makeText(context, "All overlays cleared", Toast.LENGTH_SHORT).show()
                     },
                     modifier = Modifier.padding(16.dp),
@@ -258,6 +278,7 @@ fun MapViewScreen() {
                         mapView?.clearTileOverlays()
                         overlays = overlays.map { state -> state.copy(isVisible = false) }
                         transparency = 0.5f
+                        updateAttributions()
                         Toast.makeText(context, "All overlays cleared", Toast.LENGTH_SHORT).show()
                     },
                     modifier = Modifier.padding(16.dp),
diff --git a/examples/Example11MapTypes/src/main/kotlin/de/afarber/openmapview/example11maptypes/MainActivity.kt b/examples/Example11MapTypes/src/main/kotlin/de/afarber/openmapview/example11maptypes/MainActivity.kt
@@ -7,7 +7,6 @@
 
 package de.afarber.openmapview.example11maptypes
 
-import android.content.Intent
 import android.content.res.Configuration
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -36,7 +35,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.net.toUri
 import de.afarber.openmapview.LatLng
 import de.afarber.openmapview.MapType
 import de.afarber.openmapview.OpenMapView
@@ -76,14 +74,6 @@ fun MapViewScreen() {
                         setCenter(LatLng(46.8182, 8.2275))
                         setZoom(12.0f)
                         mapView = this
-                        setOnAttributionClickListener {
-                            val intent =
-                                Intent(
-                                    Intent.ACTION_VIEW,
-                                    getAttributionUrl().toUri(),
-                                )
-                            context.startActivity(intent)
-                        }
                     }
                 },
                 modifier = Modifier.weight(0.67f),
@@ -112,14 +102,6 @@ fun MapViewScreen() {
                         setCenter(LatLng(46.8182, 8.2275))
                         setZoom(12.0f)
                         mapView = this
-                        setOnAttributionClickListener {
-                            val intent =
-                                Intent(
-                                    Intent.ACTION_VIEW,
-                                    getAttributionUrl().toUri(),
-                                )
-                            context.startActivity(intent)
-                        }
                     }
                 },
                 modifier = Modifier.weight(0.67f),
diff --git a/openmapview/src/main/kotlin/de/afarber/openmapview/OpenMapView.kt b/openmapview/src/main/kotlin/de/afarber/openmapview/OpenMapView.kt
@@ -1474,6 +1474,16 @@ class OpenMapView
          */
         fun getAttributionUrl(): String = attributionOverlay.getAttributionUrl()
 
+        /**
+         * Sets custom attribution text to be displayed.
+         *
+         * @param text The attribution text to display
+         */
+        fun setAttributionText(text: String) {
+            attributionOverlay.setAttributionText(text)
+            invalidate()
+        }
+
         override fun onResume(owner: LifecycleOwner) {
             controller.onResume()
         }
