Result Screen - Advanced options

toolkit/utilitynetworks/src/main/java/com/arcgismaps/toolkit/utilitynetworks/TraceState.kt

@@ -135,9 +135,6 @@ public class TraceState(
 
     private val currentTraceGeometryResultsGraphics: MutableList<Graphic> = mutableListOf()
 
-    private val _currentScreen: MutableState<TraceNavRoute> = mutableStateOf(TraceNavRoute.TraceOptions)
-    internal var currentScreen: State<TraceNavRoute> = _currentScreen
-
     private val _completedTraces: SnapshotStateList<TraceRun> = mutableStateListOf()
     internal val completedTraces: List<TraceRun> = _completedTraces
 
@@ -164,27 +161,6 @@ public class TraceState(
     private var _currentTraceZoomToResults: MutableState<Boolean> = mutableStateOf(true)
     internal var currentTraceZoomToResults: State<Boolean> = _currentTraceZoomToResults
 
-    private val currentTraceResultGeometriesExtent: Envelope?
-        get() {
-            val utilityGeometryTraceResult = currentTraceRun?.geometryTraceResult ?: return null
-
-            val geometries = listOf(
-                utilityGeometryTraceResult.polygon,
-                utilityGeometryTraceResult.polyline,
-                utilityGeometryTraceResult.multipoint
-            ).mapNotNull { geometry ->
-                if (geometry != null && !geometry.isEmpty) {
-                    geometry
-                } else {
-                    null
-                }
-            }
-            val combinedExtents = GeometryEngine.combineExtentsOrNull(geometries) ?: return null
-            val expandedEnvelope = GeometryEngine.bufferOrNull(combinedExtents, 200.0) ?: return null
-
-            return expandedEnvelope.extent
-        }
-
     private var navigateToRoute: ((TraceNavRoute) -> Unit)? = null
 
     internal fun setNavigationCallback(navigateToRoute: (TraceNavRoute) -> Unit) {
@@ -360,11 +336,18 @@ public class TraceState(
                 }
             }
         }
+
+        val currentTraceResultGeometriesExtent = currentTraceGeometryResults?.let {
+            getResultGeometriesExtent(it)
+        }
+
         currentTraceRun = TraceRun(
             name = _currentTraceName.value,
             configuration = traceConfiguration,
             startingPoints = _currentTraceStartingPoints.toList(),
             geometryResultsGraphics = currentTraceGeometryResultsGraphics.toList(),
+            resultsGraphicExtent = currentTraceResultGeometriesExtent,
+            resultGraphicColor = currentTraceGraphicsColorAsComposeColor,
             featureResults = currentTraceElementResults,
             functionResults = currentTraceFunctionResults,
             geometryTraceResult = currentTraceGeometryResults
@@ -393,6 +376,24 @@ public class TraceState(
         _currentTraceZoomToResults.value = true
     }
 
+    private fun getResultGeometriesExtent(utilityGeometryTraceResult: UtilityGeometryTraceResult): Envelope? {
+        val geometries = listOf(
+            utilityGeometryTraceResult.polygon,
+            utilityGeometryTraceResult.polyline,
+            utilityGeometryTraceResult.multipoint
+        ).mapNotNull { geometry ->
+            if (geometry != null && !geometry.isEmpty) {
+                geometry
+            } else {
+                null
+            }
+        }
+        val combinedExtents = GeometryEngine.combineExtentsOrNull(geometries) ?: return null
+        val expandedEnvelope = GeometryEngine.bufferOrNull(combinedExtents, 200.0) ?: return null
+
+        return expandedEnvelope.extent
+    }
+
     private fun createGraphicForSimpleLineSymbol(geometry: Geometry, style: SimpleLineSymbolStyle, color: Color) =
         Graphic(
             geometry = geometry,
@@ -572,6 +573,30 @@ public class TraceState(
         }
     }
 
+    internal fun setGraphicsColorForSelectedTraceRun(color: androidx.compose.ui.graphics.Color) {
+        val arcgisColor = Color.fromRgba(
+            color.red.toInt() * 255,
+            color.green.toInt() * 255,
+            color.blue.toInt() * 255,
+            color.alpha.toInt() * 255
+        )
+        val selectedTraceRun = completedTraces[_selectedCompletedTraceIndex.value]
+        selectedTraceRun.resultGraphicColor = color
+
+        // update the color of the starting points
+        selectedTraceRun.startingPoints.forEach { startingPoint ->
+            val symbol = startingPoint.graphic.symbol as SimpleMarkerSymbol
+            symbol.color = arcgisColor
+        }
+        // update the color of the trace results graphics
+        selectedTraceRun.geometryResultsGraphics.forEach { graphic ->
+            if (graphic.symbol is SimpleLineSymbol) {
+                val symbol = graphic.symbol as SimpleLineSymbol
+                symbol.color = arcgisColor
+            }
+        }
+    }
+
     /**
      * Set whether to zoom to the results.
      *
@@ -596,6 +621,35 @@ public class TraceState(
         return completedTraces[_selectedCompletedTraceIndex.value].featureResults.filter { it.assetGroup.name == selectedAssetGroupName }
     }
 
+    internal fun clearAllResults() {
+        _completedTraces.clear()
+        _selectedCompletedTraceIndex.value = 0
+        currentTraceGeometryResultsGraphics.clear()
+        _currentTraceStartingPoints.clear()
+        graphicsOverlay.graphics.clear()
+    }
+
+    internal fun clearSelectedTraceResult() {
+        val selectedTrace = _completedTraces[_selectedCompletedTraceIndex.value]
+        selectedTrace.geometryResultsGraphics.forEach { graphicsOverlay.graphics.remove(it) }
+        selectedTrace.startingPoints.forEach { it.graphic.isSelected = false }
+        _completedTraces.removeAt(_selectedCompletedTraceIndex.value)
+        if (_selectedCompletedTraceIndex.value - 1 >= 0) {
+            _selectedCompletedTraceIndex.value -= 1
+            updateSelectedStateForTraceResultsGraphics(_selectedCompletedTraceIndex.value, true)
+        }
+    }
+
+    internal suspend fun zoomToSelectedTrace() {
+        val currentTrace = completedTraces[_selectedCompletedTraceIndex.value]
+        val extent = currentTrace.resultsGraphicExtent ?: return
+        mapViewProxy.setViewpointAnimated(
+            Viewpoint(extent.extent),
+            1.0.seconds,
+            AnimationCurve.EaseInOutCubic
+        )
+    }
+
     /**
      * Set the [error] that occurred during the trace.
      *
@@ -680,7 +734,8 @@ internal enum class TraceNavRoute {
     TraceResults,
     FeatureResultsDetails,
     StartingPointDetails,
-    TraceError
+    TraceError,
+    ClearResults
 }
 
 @Immutable
@@ -702,6 +757,8 @@ internal data class TraceRun(
     val configuration: UtilityNamedTraceConfiguration,
     val startingPoints: List<StartingPoint>,
     val geometryResultsGraphics: List<Graphic>,
+    val resultsGraphicExtent: Envelope? = null,
+    var resultGraphicColor: androidx.compose.ui.graphics.Color,
     val featureResults: List<UtilityElement>,
     val functionResults: List<UtilityTraceFunctionOutput>,
     val geometryTraceResult: UtilityGeometryTraceResult?

toolkit/utilitynetworks/src/main/java/com/arcgismaps/toolkit/utilitynetworks/internal/util/AdvancedOptionsRow.kt

@@ -0,0 +1,173 @@
+/*
+ * Copyright 2024 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.utilitynetworks.internal.util
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Switch
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.Saver
+import androidx.compose.runtime.saveable.listSaver
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.DpOffset
+import androidx.compose.ui.unit.dp
+import com.arcgismaps.toolkit.utilitynetworks.R
+import com.arcgismaps.toolkit.utilitynetworks.ui.ReadOnlyTextField
+import com.arcgismaps.toolkit.utilitynetworks.ui.TraceColors
+
+@Composable
+internal fun AdvancedOptionsRow(name: String, modifier: Modifier = Modifier, trailingTool: @Composable () -> Unit) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .height(80.dp)
+            .padding(10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween
+    ) {
+        ReadOnlyTextField(
+            text = name,
+            modifier = Modifier
+                .padding(horizontal = 2.dp)
+                .weight(1f)
+                .align(Alignment.CenterVertically),
+        )
+
+        trailingTool()
+    }
+}
+
+/**
+ * A simple ColorPicker which spans the colors defined in [TraceColors.colors].
+ *
+ * @since 200.6.0
+ */
+@Composable
+internal fun ColorPicker(selectedColor: Color, onColorChanged: (Color) -> Unit = {}) {
+    var currentSelectedColor by rememberSaveable(saver = ColorSaver.Saver()) { mutableStateOf(selectedColor) }
+    LaunchedEffect(selectedColor) {
+        currentSelectedColor = selectedColor
+    }
+    var displayPicker by rememberSaveable { mutableStateOf(false) }
+    Box {
+        TraceColors.SpectralRing(
+            currentSelectedColor,
+            modifier = Modifier
+                .padding(4.dp)
+                .size(36.dp)
+                .clip(CircleShape)
+                .clickable {
+                    displayPicker = true
+                }
+        )
+
+        MaterialTheme(shapes = MaterialTheme.shapes.copy(extraSmall = RoundedCornerShape(16.dp))) {
+            DropdownMenu(
+                expanded = displayPicker,
+                offset = DpOffset.Zero,
+                onDismissRequest = { displayPicker = false },
+            ) {
+                DropdownMenuItem(
+                    text = {
+                        Row(
+                            verticalAlignment = Alignment.CenterVertically,
+                            horizontalArrangement = Arrangement.SpaceBetween
+                        ) {
+                            TraceColors.colors.forEach {
+                                Box(modifier = Modifier
+                                    .size(40.dp)
+                                    .padding(8.dp)
+                                    .clip(CircleShape)
+                                    .background(it)
+                                    .clickable {
+                                        currentSelectedColor = it
+                                        displayPicker = false
+                                        onColorChanged(currentSelectedColor)
+                                    }
+                                )
+                            }
+
+                        }
+                    },
+                    onClick = { /* No action needed here */ },
+                    contentPadding = PaddingValues(vertical = 0.dp, horizontal = 10.dp)
+                )
+            }
+        }
+    }
+}
+
+private object ColorSaver {
+    fun Saver(): Saver<MutableState<Color>, Any> = listSaver(
+        save = {
+            listOf(
+                it.value.component1(),
+                it.value.component2(),
+                it.value.component3(),
+                it.value.component4()
+            )
+        },
+        restore = {
+            mutableStateOf(Color(red = it[0], green = it[1], blue = it[2], alpha = it[3]))
+        }
+    )
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun AdvancedOptionsRowPreview() {
+    var isEnabled by remember { mutableStateOf(false) }
+    AdvancedOptionsRow(name = stringResource(id = R.string.zoom_to_result)) {
+        Switch(
+            checked = isEnabled,
+            onCheckedChange = { newState ->
+                isEnabled = newState
+            },
+            modifier = Modifier
+                .semantics { contentDescription = "switch" }
+                .padding(horizontal = 4.dp),
+            enabled = isEnabled
+        )
+    }
+}

toolkit/utilitynetworks/src/main/java/com/arcgismaps/toolkit/utilitynetworks/internal/util/TitleRow.kt

@@ -44,7 +44,12 @@ import androidx.compose.ui.unit.dp
 import com.arcgismaps.toolkit.utilitynetworks.R
 
 @Composable
-internal fun Title(name: String, onZoomTo: () -> Unit, onDelete: () -> Unit) {
+internal fun Title(
+    name: String,
+    onZoomTo: () -> Unit,
+    onDelete: () -> Unit,
+    showZoomToOption: Boolean = true,
+) {
     var expanded by rememberSaveable { mutableStateOf(false) }
     Row(
         modifier = Modifier
@@ -83,20 +88,22 @@ internal fun Title(name: String, onZoomTo: () -> Unit, onDelete: () -> Unit) {
                 onDismissRequest = {
                     expanded = false
                 }) {
-                DropdownMenuItem(
-                    text = { Text(stringResource(R.string.zoom_to)) },
-                    onClick = {
-                        expanded = false
-                        onZoomTo()
-                    },
-                    leadingIcon = {
-                        Icon(
-                            Icons.Outlined.LocationOn, contentDescription = stringResource(
-                                R.string.zoom_to
+                if (showZoomToOption) {
+                    DropdownMenuItem(
+                        text = { Text(stringResource(R.string.zoom_to)) },
+                        onClick = {
+                            expanded = false
+                            onZoomTo()
+                        },
+                        leadingIcon = {
+                            Icon(
+                                Icons.Outlined.LocationOn, contentDescription = stringResource(
+                                    R.string.zoom_to
+                                )
                             )
-                        )
-                    }
-                )
+                        }
+                    )
+                }
                 DropdownMenuItem(
                     text = { Text(stringResource(R.string.delete)) },
                     onClick = {