#991 feat: consolidate volume stream actions

Author: sds100

base/src/main/java/io/github/sds100/keymapper/base/actions/ConfigActionsViewModel.kt

@@ -82,6 +82,8 @@ class ConfigActionsViewModel @Inject constructor(
         combine(config.keyMap, actionOptionsUid, transform = ::buildOptionsState)
             .stateIn(viewModelScope, SharingStarted.Lazily, null)
 
+    private var editedActionUid: String? = null
+
     private val actionErrorSnapshot: StateFlow<ActionErrorSnapshot?> =
         displayAction.actionErrorSnapshot.stateIn(viewModelScope, SharingStarted.Lazily, null)
 
@@ -99,7 +101,7 @@ class ConfigActionsViewModel @Inject constructor(
 
         viewModelScope.launch {
             createActionDelegate.actionResult.filterNotNull().collect { action ->
-                val actionUid = actionOptionsUid.value ?: return@collect
+                val actionUid = editedActionUid ?: return@collect
                 config.setActionData(actionUid, action)
                 actionOptionsUid.update { null }
             }
@@ -186,6 +188,7 @@ class ConfigActionsViewModel @Inject constructor(
         viewModelScope.launch {
             // Clear the bottom sheet so navigating back with predicted-back works
             actionOptionsUid.update { null }
+            editedActionUid = actionUid
 
             val keyMap = config.keyMap.first().dataOrNull() ?: return@launch
 

base/src/main/java/io/github/sds100/keymapper/base/actions/CreateActionDelegate.kt

@@ -11,7 +11,6 @@ import io.github.sds100.keymapper.base.actions.tapscreen.PickCoordinateResult
 import io.github.sds100.keymapper.base.system.intents.ConfigIntentResult
 import io.github.sds100.keymapper.base.utils.DndModeStrings
 import io.github.sds100.keymapper.base.utils.RingerModeStrings
-import io.github.sds100.keymapper.base.utils.VolumeStreamStrings
 import io.github.sds100.keymapper.base.utils.navigation.NavDestination
 import io.github.sds100.keymapper.base.utils.navigation.NavigationProvider
 import io.github.sds100.keymapper.base.utils.navigation.navigate

base/src/main/java/io/github/sds100/keymapper/base/actions/VolumeActionBottomSheet.kt

@@ -1,7 +1,6 @@
 package io.github.sds100.keymapper.base.actions
 
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -45,6 +44,12 @@ import io.github.sds100.keymapper.base.utils.ui.compose.RadioButtonText
 import io.github.sds100.keymapper.system.volume.VolumeStream
 import kotlinx.coroutines.launch
 
+data class VolumeActionBottomSheetState(
+    val actionId: ActionId,
+    val volumeStream: VolumeStream?,
+    val showVolumeUi: Boolean,
+)
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun VolumeActionBottomSheet(delegate: CreateActionDelegate) {
@@ -196,12 +201,6 @@ private fun VolumeActionBottomSheet(
     }
 }
 
-data class VolumeActionBottomSheetState(
-    val actionId: ActionId,
-    val volumeStream: VolumeStream?,
-    val showVolumeUi: Boolean,
-)
-
 @OptIn(ExperimentalMaterial3Api::class)
 @Preview
 @Composable