Merge pull request #154 from Esri/gunther/clean_up_feature_branch

Clean up feature branch

Author: gunt0001

microapps/MapComposeApp/app/src/main/java/com/arcgismaps/toolkit/mapcomposeapp/screens/MainScreen.kt

@@ -20,19 +20,19 @@ package com.arcgismaps.toolkit.mapcomposeapp.screens
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import com.arcgismaps.mapping.ArcGISMap
 import com.arcgismaps.mapping.BasemapStyle
 import com.arcgismaps.toolkit.geocompose.Map
-import com.arcgismaps.toolkit.geocompose.MapState
 
 @Composable
 fun MainScreen() {
-
-    val mapState = remember { MapState(arcGISMap = ArcGISMap(BasemapStyle.ArcGISStreets)) }
+    val arcGISMap by remember { mutableStateOf(ArcGISMap(BasemapStyle.ArcGISStreets)) }
     Map(
         modifier = Modifier.fillMaxSize(),
-        mapState = mapState,
+        arcGISMap = arcGISMap,
     )
 }

toolkit/geo-compose/src/main/java/com/arcgismaps/toolkit/geocompose/GeoComposeState.kt

@@ -20,7 +20,6 @@ package com.arcgismaps.toolkit.geocompose
 import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -29,27 +28,28 @@ import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.viewinterop.AndroidView
+import com.arcgismaps.mapping.ArcGISMap
 import com.arcgismaps.mapping.view.MapView
-import kotlinx.coroutines.launch
 
 /**
  * A compose equivalent of the [MapView].
  *
  * @param modifier Modifier to be applied to the Map
- * @param mapState the state of the Map
+ * @param arcGISMap the [ArcGISMap] to be rendered by this composable
  * @param overlay the composable overlays to display on top of the Map. Example, a compass, floorfilter etc.
  * @since 200.3.0
  */
 @Composable
 public fun Map(
     modifier: Modifier = Modifier,
-    mapState: MapState = MapState(),
+    arcGISMap: ArcGISMap? = null,
     overlay: @Composable () -> Unit = {}
 ) {
-
     val lifecycleOwner = LocalLifecycleOwner.current
     val context = LocalContext.current
-    val mapView = remember { MapView(context) }
+    val mapView = remember { MapView(context) }.apply {
+        map = arcGISMap
+    }
 
     Box(modifier = Modifier.semantics {
         contentDescription = "MapContainer"
@@ -69,14 +69,6 @@ public fun Map(
             mapView.onDestroy(lifecycleOwner)
         }
     }
-
-    LaunchedEffect(mapState) {
-        launch {
-            mapState.arcGISMap.collect {
-                mapView.map = it
-            }
-        }
-    }
 }
 
 @Preview