Feature branches/geo compose

gradle.properties

@@ -54,6 +54,4 @@ ignoreBuildNumber=false
 # these versions define the dependency of the ArcGIS Maps SDK for Kotlin dependency
 # and are generally not overridden at the command line unless a special build is requested.
 sdkVersionNumber=200.4.0
-sdkBuildNumber=4085
-
-
+sdkBuildNumber=4122

microapps/AuthenticationApp/app/build.gradle.kts

@@ -76,7 +76,6 @@ android {
 
 dependencies {
     implementation(project(":authentication"))
-    implementation(project(":composable-map"))
     implementation(arcgis.mapsSdk)
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.bundles.composeCore)

microapps/CompassApp/app/build.gradle.kts

@@ -79,7 +79,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class).all {
 
 dependencies {
     implementation(project(":compass"))
-    implementation(project(":composable-map"))
+    implementation(project(":geo-compose"))
     implementation(arcgis.mapsSdk)
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.bundles.composeCore)

microapps/CompassApp/app/src/main/java/com/arcgismaps/toolkit/compassapp/screens/MainScreen.kt

@@ -18,6 +18,7 @@
 
 package com.arcgismaps.toolkit.compassapp.screens
 
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
@@ -26,40 +27,58 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableDoubleStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.arcgismaps.mapping.ArcGISMap
 import com.arcgismaps.mapping.BasemapStyle
 import com.arcgismaps.mapping.Viewpoint
 import com.arcgismaps.toolkit.compass.Compass
-import com.arcgismaps.toolkit.composablemap.ComposableMap
-import com.arcgismaps.toolkit.composablemap.DuplexFlow
+import com.arcgismaps.toolkit.geocompose.MapView
+import com.arcgismaps.toolkit.geocompose.MapViewProxy
+import kotlinx.coroutines.launch
 
 @Composable
 fun MainScreen() {
     // create an ArcGISMap with a Topographic basemap style
-    val map = ArcGISMap(BasemapStyle.ArcGISTopographic)
-    // instantiate a MapViewModel using the factory
-    val mapViewModel = viewModel<MapViewModel>(factory = MapViewModelFactory(map))
-    // hoist the mapRotation state
-    val mapRotation by mapViewModel.mapRotation.collectAsState(DuplexFlow.Type.Read)
-    // show a composable map using the mapViewModel
-    ComposableMap(
-        modifier = Modifier.fillMaxSize(),
-        mapInterface = mapViewModel
+    val arcGISMap by remember {
+        mutableStateOf(
+            ArcGISMap(BasemapStyle.ArcGISTopographic).apply {
+                // set the map's viewpoint to North America
+                initialViewpoint = Viewpoint(39.8, -98.6, 10e7)
+            }
+        )
+    }
+    var mapRotation by remember { mutableDoubleStateOf(0.0) }
+    val mapViewProxy = remember { MapViewProxy() }
+    // show composable MapView with compass
+    Box(
+        modifier = Modifier.fillMaxSize()
     ) {
-        Row(modifier = Modifier
-            .height(IntrinsicSize.Max)
-            .fillMaxWidth()
-            .padding(25.dp)) {
+        MapView(
+            arcGISMap,
+            modifier = Modifier.fillMaxSize(),
+            mapViewProxy = mapViewProxy,
+            onMapRotationChanged = { rotation -> mapRotation = rotation }
+        )
+        Row(
+            modifier = Modifier
+                .height(IntrinsicSize.Max)
+                .fillMaxWidth()
+                .padding(25.dp)
+        ) {
+            val coroutineScope = rememberCoroutineScope()
             // show the compass and pass the mapRotation state data
             Compass(rotation = mapRotation) {
-                // reset the ComposableMap viewpoint rotation to point north using the mapViewModel
-                mapViewModel.setViewpointRotation(0.0)
+                // reset the Composable MapView viewpoint rotation to point north
+                coroutineScope.launch {
+                    mapViewProxy.setViewpointRotation(0.0)
+                }
             }
         }
     }
-    // set the composable map's viewpoint to North America
-    mapViewModel.setViewpoint(Viewpoint(39.8, -98.6, 10e7))
 }

microapps/FloorFilterApp/app/build.gradle.kts

@@ -63,7 +63,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class).all {
 
 dependencies {
     implementation(project(":indoors"))
-    implementation(project(":composable-map"))
+    implementation(project(":geo-compose"))
     implementation(arcgis.mapsSdk)
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.bundles.composeCore)

microapps/FloorFilterApp/app/src/main/java/com/arcgismaps/toolkit/floorfilterapp/screens/MainScreen.kt

@@ -21,33 +21,90 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
+import com.arcgismaps.geometry.Envelope
+import com.arcgismaps.geometry.Geometry
 import com.arcgismaps.mapping.ArcGISMap
 import com.arcgismaps.mapping.PortalItem
+import com.arcgismaps.mapping.Viewpoint
 import com.arcgismaps.portal.Portal
-import com.arcgismaps.toolkit.composablemap.ComposableMap
+import com.arcgismaps.toolkit.geocompose.MapView
+import com.arcgismaps.toolkit.geocompose.MapViewProxy
 import com.arcgismaps.toolkit.indoors.FloorFilter
+import com.arcgismaps.toolkit.indoors.FloorFilterSelection
+import com.arcgismaps.toolkit.indoors.FloorFilterState
 
 @Composable
 fun MainScreen() {
-    val portal = Portal("https://arcgis.com/")
-    val portalItem = PortalItem(portal, "b4b599a43a474d33946cf0df526426f5")
-    val floorAwareWebMap = ArcGISMap(portalItem)
+    val floorAwareWebMap by remember {
+        mutableStateOf(
+            ArcGISMap(
+                PortalItem(
+                    Portal("https://arcgis.com/"),
+                    "b4b599a43a474d33946cf0df526426f5"
+                )
+            )
+        )
+    }
+
+    val mapViewProxy = remember { MapViewProxy() }
+
+    val coroutineScope = rememberCoroutineScope()
+
+    // use default UI properties
+    val floorFilterState: FloorFilterState by remember {
+        mutableStateOf(FloorFilterState(
+            geoModel = floorAwareWebMap,
+            coroutineScope = coroutineScope
+        ) { floorFilterSelection ->
+            when (floorFilterSelection.type) {
+                is FloorFilterSelection.Type.FloorSite -> {
+                    val floorFilterSelectionType =
+                        floorFilterSelection.type as FloorFilterSelection.Type.FloorSite
+                    floorFilterSelectionType.site.geometry?.let {
+                        mapViewProxy.setViewpoint(Viewpoint(getEnvelopeWithBuffer(it)))
+                    }
+                }
+
+                is FloorFilterSelection.Type.FloorFacility -> {
+                    val floorFilterSelectionType =
+                        floorFilterSelection.type as FloorFilterSelection.Type.FloorFacility
+                    floorFilterSelectionType.facility.geometry?.let {
+                        mapViewProxy.setViewpoint(Viewpoint(getEnvelopeWithBuffer(it)))
+                    }
+                }
 
-    val mapViewModel = viewModel<MapViewModel>(factory = MapViewModelFactory(floorAwareWebMap))
+                else -> {}
+            }
+        })
+    }
 
-    ComposableMap(
+    MapView(
+        floorAwareWebMap,
         modifier = Modifier.fillMaxSize(),
-        mapInterface = mapViewModel
+        mapViewProxy = mapViewProxy
+    )
+    Box(
+        modifier = Modifier.fillMaxSize().padding(horizontal = 20.dp, vertical = 40.dp),
+        contentAlignment = Alignment.BottomStart
     ) {
-        Box(
-            modifier = Modifier.fillMaxSize().padding(horizontal = 20.dp, vertical = 40.dp),
-            contentAlignment = Alignment.BottomStart
-        ) {
-            FloorFilter(floorFilterState = mapViewModel.floorFilterState)
-        }
+        FloorFilter(floorFilterState = floorFilterState)
     }
 }
+
+/**
+ * Returns the envelope with an added buffer factor applied to the given Geometry's extent.
+ *
+ * @since 200.2.0
+ */
+private fun getEnvelopeWithBuffer(geometry: Geometry): Envelope {
+    val bufferFactor = 1.25
+    val envelope = geometry.extent
+    return Envelope(envelope.center, envelope.width * bufferFactor, envelope.height * bufferFactor)
+}

microapps/MapViewGeometryEditorApp/.gitignore

@@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties

microapps/MapViewGeometryEditorApp/README.md

@@ -0,0 +1,12 @@
+# MapView Geometry Editor Micro-app
+
+This micro-app demonstrates the use of `GeometryEditor` and `GraphicsOverlay` with a composable `MapView`.
+
+![Screenshot](screenshot.png)
+
+## Usage
+
+The application starts with a `GeometryEditor` set up and not enabled. Use the switch in the app bar to start/stop the geometry editor session.
+Use the overflow action button in the app bar to choose between different options to undo, redo, or clear all `Graphics` from the `GraphicsOverlay`.
+
+For more information on the composable `MapView` component and how it works, see it's [Readme](../../toolkit/geo-compose/README.md).

microapps/MapViewGeometryEditorApp/app/.gitignore

@@ -0,0 +1 @@
+/build