changes to display a map

Author: puneet-pdx

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

@@ -18,11 +18,20 @@
 
 package com.arcgismaps.toolkit.mapcomposeapp.screens
 
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+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() {
-    // Todo implementation
-    Map()
+
+    val mapState = MapState(arcGISMap = ArcGISMap(BasemapStyle.ArcGISStreets))
+    Map(
+        modifier = Modifier.fillMaxSize(),
+        mapState = mapState,
+    )
 }

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

@@ -0,0 +1,34 @@
+/*
+ *  Copyright 2023 Esri
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.arcgismaps.toolkit.geocompose
+
+/**
+ * Represents the state for the GeoCompose.
+ *
+ * @since 200.3.0
+ */
+public sealed interface GeoComposeState {
+    // TODO add implementation
+}
+
+public fun GeoComposeState(): GeoComposeState =
+    GeoComposeStateImpl()
+
+public open class GeoComposeStateImpl() : GeoComposeState {
+}
+

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

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2023 Esri
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,16 +17,41 @@
 
 package com.arcgismaps.toolkit.geocompose
 
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.viewinterop.AndroidView
+import com.arcgismaps.mapping.view.MapView
 
 @Composable
-public fun Map() {
-    // Todo implementation...
-    Text("Implement Map here! ")
+public fun Map(modifier: Modifier = Modifier, mapState: MapState = MapState()) {
+
+    val lifecycleOwner = LocalLifecycleOwner.current
+    val context = LocalContext.current
+    val mapView = remember { MapView(context) }
+    val map by mapState.arcGISMap.collectAsState()
+
+    AndroidView(modifier = modifier, factory = { mapView })
+
+    DisposableEffect(Unit) {
+        lifecycleOwner.lifecycle.addObserver(mapView)
+        onDispose {
+            lifecycleOwner.lifecycle.removeObserver(mapView)
+            mapView.onDestroy(lifecycleOwner)
+        }
+    }
+
+    mapView.map = map
+
 }
 
+
 @Preview
 @Composable
 internal fun MapPreview() {

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

@@ -0,0 +1,52 @@
+/*
+ *  Copyright 2023 Esri
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.arcgismaps.toolkit.geocompose
+
+import com.arcgismaps.mapping.ArcGISMap
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+/**
+ * Represents the state for the Map.
+ *
+ * @since 200.3.0
+ */
+public sealed interface MapState : GeoComposeState {
+    public val arcGISMap: StateFlow<ArcGISMap?>
+
+    public fun setArcGISMap(arcGISMap: ArcGISMap)
+}
+
+public fun MapState(arcGISMap: ArcGISMap? = null): MapState = MapStateImpl(arcGISMap)
+
+private class MapStateImpl(
+    arcGISMap: ArcGISMap?
+) : MapState {
+
+    private val _arcGISMap: MutableStateFlow<ArcGISMap?> = MutableStateFlow(null)
+    override val arcGISMap: StateFlow<ArcGISMap?> = _arcGISMap.asStateFlow()
+
+    override fun setArcGISMap(arcGISMap: ArcGISMap){
+        _arcGISMap.value = arcGISMap
+    }
+
+    init {
+        _arcGISMap.value = arcGISMap
+    }
+}

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

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2023 Esri
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");