update sample

Esri · Dec 21, 2023 · 0182084 · 0182084
1 parent ec31807
commit 0182084
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 112 deletions.
diff --git a/add-dynamic-entity-layer/README.md b/add-dynamic-entity-layer/README.md
@@ -40,6 +40,10 @@ This sample uses a [stream service](https://realtimegis2016.esri.com:6443/arcgis
 
 More information about dynamic entities can be found in the [guide documentation](https://developers.arcgis.com/kotlin/real-time/work-with-dynamic-entities/).
 
+## Additional information
+
+This sample uses the GeoCompose Toolkit module to be able to implement a Composable MapView.
+
 ## Tags
 
-data, dynamic, entity, live, purge, real-time, service, stream, track
+data, dynamic, entity, geocompose, live, purge, real-time, service, stream, toolkit, track
diff --git a/add-dynamic-entity-layer/README.metadata.json b/add-dynamic-entity-layer/README.metadata.json
@@ -10,11 +10,13 @@
         "data",
         "dynamic",
         "entity",
+        "geocompose",
         "live",
         "purge",
         "real-time",
         "service",
         "stream",
+        "toolkit",
         "track",
         "ArcGISStreamService",
         "DynamicEntity",
@@ -36,7 +38,6 @@
     "snippets": [
         "src/main/java/com/esri/arcgismaps/sample/adddynamicentitylayer/MainActivity.kt",
         "src/main/java/com/esri/arcgismaps/sample/adddynamicentitylayer/components/BottomSheetContent.kt",
-        "src/main/java/com/esri/arcgismaps/sample/adddynamicentitylayer/components/ComposeMapView.kt",
         "src/main/java/com/esri/arcgismaps/sample/adddynamicentitylayer/components/MapViewModel.kt",
         "src/main/java/com/esri/arcgismaps/sample/adddynamicentitylayer/screens/MainScreen.kt"
     ],

diff --git a/add-dynamic-entity-layer/build.gradle b/add-dynamic-entity-layer/build.gradle
@@ -45,4 +45,7 @@ dependencies {
     implementation "androidx.compose.ui:ui-tooling"
     implementation "androidx.compose.ui:ui-tooling-preview"
     implementation project(path: ':samples-lib')
+    // Toolkit dependencies
+    implementation(platform("com.esri:arcgis-maps-kotlin-toolkit-bom:$arcgisToolkitVersion"))
+    implementation('com.esri:arcgis-maps-kotlin-toolkit-geo-compose')
 }
diff --git a/...tity-layer/src/main/java/com/esri/arcgismaps/sample/adddynamicentitylayer/MainActivity.kt b/...tity-layer/src/main/java/com/esri/arcgismaps/sample/adddynamicentitylayer/MainActivity.kt
@@ -47,8 +47,7 @@ class MainActivity : ComponentActivity() {
             color = MaterialTheme.colorScheme.background
         ) {
             MainScreen(
-                sampleName = getString(R.string.app_name),
-                application = application
+                sampleName = getString(R.string.app_name)
             )
         }
     }

diff --git a/...c/main/java/com/esri/arcgismaps/sample/adddynamicentitylayer/components/ComposeMapView.kt b/...c/main/java/com/esri/arcgismaps/sample/adddynamicentitylayer/components/ComposeMapView.kt
diff --git a/...src/main/java/com/esri/arcgismaps/sample/adddynamicentitylayer/components/MapViewModel.kt b/...src/main/java/com/esri/arcgismaps/sample/adddynamicentitylayer/components/MapViewModel.kt
@@ -17,17 +17,16 @@
 package com.esri.arcgismaps.sample.adddynamicentitylayer.components
 
 import android.app.Application
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.AndroidViewModel
 import com.arcgismaps.mapping.ArcGISMap
 import com.arcgismaps.mapping.BasemapStyle
-import com.arcgismaps.mapping.Viewpoint
 import com.arcgismaps.mapping.layers.DynamicEntityLayer
 import com.arcgismaps.realtime.ArcGISStreamService
 import com.arcgismaps.realtime.ArcGISStreamServiceFilter
 import com.esri.arcgismaps.sample.adddynamicentitylayer.R
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 
 class MapViewModel(
@@ -38,14 +37,11 @@ class MapViewModel(
     // set the state of the switches and slider
     val trackLineCheckedState = mutableStateOf(false)
     val prevObservationCheckedState = mutableStateOf(false)
-    val trackSliderValue = mutableStateOf(5f)
+    val trackSliderValue = mutableFloatStateOf(5f)
 
     // flag to show or dismiss the bottom sheet
     val isBottomSheetVisible = mutableStateOf(false)
 
-    // set the MapView mutable stateflow
-    val mapViewState = MutableStateFlow(MapViewState())
-
     // create ArcGIS Stream Service
     private val streamService =
         ArcGISStreamService(application.getString(R.string.stream_service_url))
@@ -56,6 +52,9 @@ class MapViewModel(
     // layer displaying the dynamic entities on the map
     private val dynamicEntityLayer: DynamicEntityLayer
 
+    // define ArcGIS map using Streets basemap
+    val map = ArcGISMap(BasemapStyle.ArcGISStreets)
+
     /**
      * set the data source for the dynamic entity layer.
      */
@@ -70,7 +69,7 @@ class MapViewModel(
         dynamicEntityLayer = DynamicEntityLayer(streamService)
 
         // add the dynamic entity layer to the map's operational layers
-        mapViewState.value.arcGISMap.operationalLayers.add(dynamicEntityLayer)
+        map.operationalLayers.add(dynamicEntityLayer)
     }
 
     // disconnects the stream service
@@ -125,10 +124,3 @@ class MapViewModel(
     }
 }
 
-/**
- * Data class that represents the MapView state
- */
-data class MapViewState(
-    var arcGISMap: ArcGISMap = ArcGISMap(BasemapStyle.ArcGISStreets),
-    var viewpoint: Viewpoint = Viewpoint(40.559691, -111.869001, 150000.0)
-)
diff --git a/...ayer/src/main/java/com/esri/arcgismaps/sample/adddynamicentitylayer/screens/MainScreen.kt b/...ayer/src/main/java/com/esri/arcgismaps/sample/adddynamicentitylayer/screens/MainScreen.kt
@@ -34,8 +34,11 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import com.esri.arcgismaps.sample.adddynamicentitylayer.components.ComposeMapView
+import com.arcgismaps.mapping.Viewpoint
+import com.arcgismaps.toolkit.geocompose.MapView
+import com.arcgismaps.toolkit.geocompose.MapViewpointOperation
 import com.esri.arcgismaps.sample.adddynamicentitylayer.components.DynamicEntityLayerProperties
 import com.esri.arcgismaps.sample.adddynamicentitylayer.components.MapViewModel
 import com.esri.arcgismaps.sample.sampleslib.components.BottomSheet
@@ -45,9 +48,11 @@ import com.esri.arcgismaps.sample.sampleslib.components.SampleTopAppBar
  * Main screen layout for the sample app
  */
 @Composable
-fun MainScreen(sampleName: String, application: Application) {
+fun MainScreen(sampleName: String) {
     /// coroutineScope that will be cancelled when this call leaves the composition
     val sampleCoroutineScope = rememberCoroutineScope()
+    // get the application context
+    val application = LocalContext.current.applicationContext as Application
 
     // create a ViewModel to handle MapView interactions
     val mapViewModel = remember { MapViewModel(application, sampleCoroutineScope) }
@@ -64,11 +69,12 @@ fun MainScreen(sampleName: String, application: Application) {
                     .padding(it)
             ) {
                 // composable function that wraps the MapView
-                ComposeMapView(
+                MapView(
                     modifier = Modifier
                         .fillMaxSize()
                         .weight(1f),
-                    mapViewModel = mapViewModel
+                    arcGISMap = mapViewModel.map,
+                    viewpointOperation = MapViewpointOperation.Set(viewpoint = Viewpoint(40.559691, -111.869001, 150000.0))
                 )
                 Row(
                     modifier = Modifier