fix: Rollback of map delegate code and navigation SDK integration. (#689)

* fix: Rollback of map delegate code and navigation SDK integration.

* fix: removed sarif old app

* fix: fix usage of maps-app

---------

Co-authored-by: Enrique López Mañas <[email protected]>

Author: dkhawk

.github/workflows/lint-report.yml

@@ -41,7 +41,7 @@ jobs:
 
       - name: Merge SARIF files
         run: |
-          jq -s '{ "$schema": "https://json.schemastore.org/sarif-2.1.0", "version": "2.1.0", "runs": map(.runs) | add }'  maps-compose/build/reports/lint-results.sarif  maps-compose-utils/build/reports/lint-results.sarif  maps-compose-widgets/build/reports/lint-results.sarif  maps-app/build/reports/lint-results.sarif navigation-app/build/reports/lint-results.sarif > merged.sarif
+          jq -s '{ "$schema": "https://json.schemastore.org/sarif-2.1.0", "version": "2.1.0", "runs": map(.runs) | add }'  maps-compose/build/reports/lint-results.sarif  maps-compose-utils/build/reports/lint-results.sarif  maps-compose-widgets/build/reports/lint-results.sarif  maps-app/build/reports/lint-results.sarif > merged.sarif
 
       - name: Upload SARIF file
         uses: github/codeql-action/upload-sarif@v3

README.md

@@ -42,21 +42,15 @@ dependencies {
 
 ## Sample App
 
-Currently, there are two sample apps in the repository: [maps-app](maps-app) and [navigation-app](navigation-app). Each of them run a different version of the Android Maps Compose SDK, where either the maps or the navigation SDK are run, respectively.
+This repository includes a [sample app](maps-app).
 
-To run the maps demo app, ensure you've met the requirements above then:
+To run the demo app, ensure you've met the requirements above then:
 
 1. Open the `secrets.properties` file in your top-level directory, and then add the following code. Replace YOUR_API_KEY with your API key. Store your key in this file because secrets.properties is excluded from being checked into a version control system.
    If the `secrets.properties` file does not exist, create it in the same folder as the `local.default.properties` file.
    ```
    MAPS_API_KEY=YOUR_API_KEY
    ```
-   
-   If you want to use also the Navigation SDK, make sure the PLACES_API_KEY also contains an entry.
-   ```
-   PLACES_API_KEY=DEFAULT_API_KEY
-   ```
-   
 1. Build and run
 
 ## Documentation
@@ -397,18 +391,6 @@ GoogleMap(
 }
 ```
 
-## Using the Navigation SDK
-
-In order to use the Navigation SDK, make sure to include the Composable `NavigationScreen` as follows:
-
-```kotlin
-NavigationScreen(
-   modifier = Modifier.padding(innerPadding),
-   deviceLocation = location
-)
-```
-
-
 </details>
 
 ## Maps Compose Utility Library
@@ -444,7 +426,7 @@ The `fetchStreetViewData` method provides functionality to check whether a locat
 > Be sure to [enable Street View Static API](https://goo.gle/enable-sv-static-api) on the project associated with your API key.
 
 You can see example usage
-in the [`StreetViewActivity`](maps-app/src/main/java/com/google/maps/android/compose/StreetViewActivity.kt) of the demo app:
+in the [`StreetViewActivity`](https://github.com/googlemaps/android-maps-compose/blob/main/maps-app/src/main/java/com/google/maps/android/compose/StreetViewActivity.kt) of the demo app:
 
 ```kotlin
  streetViewResult =
@@ -507,7 +489,7 @@ This library is not a Google Maps Platform Core Service. Therefore, the Google M
 
 ## Support
 
-This library is offered via an open source [license]. It is not governed by the Google Maps Platform Support [Technical Support Services Guidelines], the [SLA], or the [Deprecation Policy]. However, any Google Maps Platform services used by the library remain subject to the Google Maps Platform Terms of Service.
+This library is offered via an open source [license]. It is not governed by the Google Maps Platform Support [Technical Support Services Guidelines, the SLA, or the [Deprecation Policy]. However, any Google Maps Platform services used by the library remain subject to the Google Maps Platform Terms of Service.
 
 This library adheres to [semantic versioning] to indicate when backwards-incompatible changes are introduced. Accordingly, while the library is in version 0.x, backwards-incompatible changes may be introduced at any time.
 

maps-compose/src/main/java/com/google/maps/android/compose/ComposeInfoWindowAdapter.kt

@@ -17,6 +17,7 @@ package com.google.maps.android.compose
 import android.view.View
 import androidx.compose.ui.platform.ComposeView
 import com.google.android.gms.maps.GoogleMap
+import com.google.android.gms.maps.MapView
 import com.google.android.gms.maps.model.Marker
 
 /**
@@ -35,7 +36,7 @@ import com.google.android.gms.maps.model.Marker
  * implementation should be updated.
  */
 internal class ComposeInfoWindowAdapter(
-    private val mapViewDelegate: AbstractMapViewDelegate<*>,
+    private val mapView: MapView,
     private val markerNodeFinder: (Marker) -> MarkerNode?
 ) : GoogleMap.InfoWindowAdapter {
 
@@ -45,10 +46,10 @@ internal class ComposeInfoWindowAdapter(
         if (content == null) {
             return null
         }
-        val view = ComposeView(mapViewDelegate.mapView.context).apply {
+        val view = ComposeView(mapView.context).apply {
             setContent { content(marker) }
         }
-        mapViewDelegate.renderComposeViewOnce(view, parentContext = markerNode.compositionContext)
+        mapView.renderComposeViewOnce(view, parentContext = markerNode.compositionContext)
         return view
     }
 
@@ -58,10 +59,11 @@ internal class ComposeInfoWindowAdapter(
         if (infoWindow == null) {
             return null
         }
-        val view = ComposeView(mapViewDelegate.mapView.context).apply {
+        val view = ComposeView(mapView.context).apply {
             setContent { infoWindow(marker) }
         }
-        mapViewDelegate.renderComposeViewOnce(view, parentContext = markerNode.compositionContext)
+        mapView.renderComposeViewOnce(view, parentContext = markerNode.compositionContext)
         return view
     }
+
 }

maps-compose/src/main/java/com/google/maps/android/compose/GoogleMap.kt

@@ -16,10 +16,10 @@ package com.google.maps.android.compose
 
 import android.content.ComponentCallbacks
 import android.content.ComponentCallbacks2
-import android.content.Context
 import android.content.res.Configuration
 import android.location.Location
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -36,15 +36,12 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.AbstractComposeView
-import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.findViewTreeLifecycleOwner
-import com.google.android.gms.maps.GoogleMap
 import com.google.android.gms.maps.GoogleMapOptions
 import com.google.android.gms.maps.LocationSource
 import com.google.android.gms.maps.MapView
@@ -102,7 +99,6 @@ public fun GoogleMap(
     onPOIClick: ((PointOfInterest) -> Unit)? = null,
     contentPadding: PaddingValues = DefaultMapContentPadding,
     mapColorScheme: ComposeMapColorScheme? = null,
-    mapViewCreator: ((Context, GoogleMapOptions) -> AbstractMapViewDelegate<*>)? = null,
     content: @Composable @GoogleMapComposable () -> Unit = {},
 ) {
     // When in preview, early return a Box with the received modifier preserving layout
@@ -150,30 +146,19 @@ public fun GoogleMap(
     var subcompositionJob by remember { mutableStateOf<Job?>(null) }
     val parentCompositionScope = rememberCoroutineScope()
 
-    var delegate by remember {
-        mutableStateOf<AbstractMapViewDelegate<*>?>(null)
-    }
-
     AndroidView(
         modifier = modifier,
         factory = { context ->
-            if (mapViewCreator != null) {
-                mapViewCreator(context, googleMapOptionsFactory())
-            } else {
-                MapViewDelegate(MapView(context, googleMapOptionsFactory()))
-            }.also { mapViewDelegate: AbstractMapViewDelegate<*> ->
-                delegate = mapViewDelegate
-                val mapView = mapViewDelegate.mapView
-
+            MapView(context, googleMapOptionsFactory()).also { mapView ->
                 val componentCallbacks = object : ComponentCallbacks2 {
                     override fun onConfigurationChanged(newConfig: Configuration) {}
                     @Deprecated("Deprecated in Java", ReplaceWith("onTrimMemory(level)"))
-                    override fun onLowMemory() { mapViewDelegate.onLowMemory() }
-                    override fun onTrimMemory(level: Int) { mapViewDelegate.onLowMemory() }
+                    override fun onLowMemory() { mapView.onLowMemory() }
+                    override fun onTrimMemory(level: Int) { mapView.onLowMemory() }
                 }
                 context.registerComponentCallbacks(componentCallbacks)
 
-                val lifecycleObserver = MapLifecycleEventObserver(mapViewDelegate)
+                val lifecycleObserver = MapLifecycleEventObserver(mapView)
 
                 mapView.tag = MapTagData(componentCallbacks, lifecycleObserver)
 
@@ -195,21 +180,22 @@ public fun GoogleMap(
                 }
 
                 mapView.addOnAttachStateChangeListener(onAttachStateListener)
-            }.mapView
+            }
         },
         onReset = { /* View is detached. */ },
         onRelease = { mapView ->
-            val (componentCallbacks, lifecycleObserver) = delegate!!.tagData
+            val (componentCallbacks, lifecycleObserver) = mapView.tagData
             mapView.context.unregisterComponentCallbacks(componentCallbacks)
             lifecycleObserver.moveToDestroyedState()
             mapView.tag = null
         },
         update = { mapView ->
             if (subcompositionJob == null) {
+                Log.d("Gollum", "subcomposition running")
                 subcompositionJob = parentCompositionScope.launchSubcomposition(
                     mapUpdaterState,
                     parentComposition,
-                    delegate!!,
+                    mapView,
                     mapClickListeners,
                     currentContent,
                 )
@@ -225,15 +211,15 @@ public fun GoogleMap(
 private fun CoroutineScope.launchSubcomposition(
     mapUpdaterState: MapUpdaterState,
     parentComposition: CompositionContext,
-    mapViewDelegate: AbstractMapViewDelegate<*>,
+    mapView: MapView,
     mapClickListeners: MapClickListeners,
     content: @Composable @GoogleMapComposable () -> Unit,
 ): Job {
     // Use [CoroutineStart.UNDISPATCHED] to kick off GoogleMap loading immediately
     return launch(start = CoroutineStart.UNDISPATCHED) {
-        val map = mapViewDelegate.awaitMap()
+        val map = mapView.awaitMap()
         val composition = Composition(
-            applier = MapApplier(map, mapViewDelegate, mapClickListeners),
+            applier = MapApplier(map, mapView, mapClickListeners),
             parent = parentComposition
         )
 
@@ -324,65 +310,7 @@ public fun googleMapFactory(
     }
 }
 
-public interface AbstractMapViewDelegate<T : View> {
-    public fun onCreate(savedInstanceState: Bundle?)
-    public fun onStart()
-    public fun onResume()
-    public fun onPause()
-    public fun onStop()
-    public fun onLowMemory()
-    public fun onDestroy()
-    public suspend fun awaitMap(): GoogleMap
-    public fun renderComposeViewOnce(
-        view: AbstractComposeView,
-        parentContext: CompositionContext,
-        onAddedToWindow: ((View) -> Unit)? = null,
-    )
-
-    public fun startRenderingComposeView(
-        view: AbstractComposeView,
-        parentContext: CompositionContext,
-    ): ComposeUiViewRenderer.RenderHandle
-
-    public val mapView: T
-}
-
-private val <T : View> AbstractMapViewDelegate<T>.tagData: MapTagData
-    get() = mapView.tag as MapTagData
-
-public class MapViewDelegate(override val mapView: MapView) : AbstractMapViewDelegate<MapView> {
-    override fun onCreate(savedInstanceState: Bundle?): Unit = mapView.onCreate(savedInstanceState)
-    override fun onStart(): Unit = mapView.onStart()
-    override fun onResume(): Unit = mapView.onResume()
-    override fun onPause(): Unit = mapView.onPause()
-    override fun onStop(): Unit = mapView.onStop()
-    override fun onLowMemory(): Unit = mapView.onLowMemory()
-    override fun onDestroy(): Unit = mapView.onDestroy()
-    override suspend fun awaitMap(): GoogleMap = mapView.awaitMap()
-    override fun renderComposeViewOnce(
-        view: AbstractComposeView,
-        parentContext: CompositionContext,
-        onAddedToWindow: ((View) -> Unit)?
-    ) {
-        mapView.renderComposeViewOnce(
-            view = view,
-            parentContext = parentContext,
-            onAddedToWindow = onAddedToWindow
-        )
-    }
-
-    override fun startRenderingComposeView(
-        view: AbstractComposeView,
-        parentContext: CompositionContext
-    ): ComposeUiViewRenderer.RenderHandle {
-        return mapView.startRenderingComposeView(
-            view = view,
-            parentContext = parentContext,
-        )
-    }
-}
-
-private class MapLifecycleEventObserver(private val mapView: AbstractMapViewDelegate<*>) : LifecycleEventObserver {
+private class MapLifecycleEventObserver(private val mapView: MapView) : LifecycleEventObserver {
     private var currentLifecycleState: Lifecycle.State = Lifecycle.State.INITIALIZED
 
     override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {

maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt

@@ -16,6 +16,7 @@ package com.google.maps.android.compose
 
 import androidx.compose.runtime.AbstractApplier
 import com.google.android.gms.maps.GoogleMap
+import com.google.android.gms.maps.MapView
 import com.google.android.gms.maps.model.Circle
 import com.google.android.gms.maps.model.GroundOverlay
 import com.google.android.gms.maps.model.Marker
@@ -37,7 +38,7 @@ private object MapNodeRoot : MapNode
 // for that particular listener; yet MapClickListeners never actually changes.
 internal class MapApplier(
     val map: GoogleMap,
-    internal val mapViewDelegate: AbstractMapViewDelegate<*>,
+    internal val mapView: MapView,
     val mapClickListeners: MapClickListeners,
 ) : AbstractApplier<MapNode>(MapNodeRoot) {
 
@@ -210,7 +211,7 @@ internal class MapApplier(
         })
         map.setInfoWindowAdapter(
             ComposeInfoWindowAdapter(
-                mapViewDelegate,
+                mapView,
                 markerNodeFinder = { marker ->
                     decorations.firstOrNull { it is MarkerNode && it.marker == marker }
                             as MarkerNode?

maps-compose/src/main/java/com/google/maps/android/compose/MapComposeViewRender.kt

@@ -22,7 +22,7 @@ import java.io.Closeable
  * to a window. [onAddedToWindow] is called in place, and then [view] is removed from the window
  * before returning.
  */
-public fun MapView.renderComposeViewOnce(
+internal fun MapView.renderComposeViewOnce(
     view: AbstractComposeView,
     onAddedToWindow: ((View) -> Unit)? = null,
     parentContext: CompositionContext,
@@ -38,7 +38,7 @@ public fun MapView.renderComposeViewOnce(
  * to a window. A [ComposeUiViewRenderer.RenderHandle] is returned, which must be disposed after
  * this view no longer needs to render. Disposing removes [view] from the [MapView].
  */
-public fun MapView.startRenderingComposeView(
+internal fun MapView.startRenderingComposeView(
     view: AbstractComposeView,
     parentContext: CompositionContext,
 ): ComposeUiViewRenderer.RenderHandle {
@@ -69,7 +69,7 @@ private fun MapView.ensureContainerView(): NoDrawContainerView {
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 @Composable
 public fun rememberComposeUiViewRenderer(): ComposeUiViewRenderer {
-    val mapView = (currentComposer.applier as MapApplier).mapViewDelegate
+    val mapView = (currentComposer.applier as MapApplier).mapView
     val compositionContext = rememberCompositionContext()
 
     return remember(compositionContext) {

maps-compose/src/main/java/com/google/maps/android/compose/MapUpdater.kt

@@ -100,7 +100,7 @@ public val DefaultMapContentPadding: PaddingValues = PaddingValues()
 @Composable
 internal inline fun MapUpdater(mapUpdaterState: MapUpdaterState) = with(mapUpdaterState) {
     val map = (currentComposer.applier as MapApplier).map
-    val mapView = (currentComposer.applier as MapApplier).mapViewDelegate.mapView
+    val mapView = (currentComposer.applier as MapApplier).mapView
     if (mergeDescendants) {
         mapView.importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
     }