Add DebugAction

simonnorberg · Dec 27, 2024 · 01b91fa · 01b91fa
1 parent a59ac5d
commit 01b91fa
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 4 deletions.
diff --git a/app/src/main/java/net/simno/dmach/machine/state/Action.kt b/app/src/main/java/net/simno/dmach/machine/state/Action.kt
@@ -10,6 +10,10 @@ import net.simno.dmach.settings.Settings
 
 sealed class Action
 
+data class DebugAction(
+    val debug: Boolean
+) : Action()
+
 data object LoadAction : Action()
 
 data object ResumeAction : Action()

diff --git a/app/src/main/java/net/simno/dmach/machine/state/MachineProcessor.kt b/app/src/main/java/net/simno/dmach/machine/state/MachineProcessor.kt
@@ -34,6 +34,7 @@ class MachineProcessor(
 ) : (Flow<Action>) -> Flow<Result> {
 
     override fun invoke(actions: Flow<Action>): Flow<Result> = merge(
+        actions.filterIsInstance<DebugAction>().let(debug),
         actions.filterIsInstance<LoadAction>().let(load),
         actions.filterIsInstance<ResumeAction>().let(resume),
         actions.filterIsInstance<PlaybackAction>().let(playback),
@@ -56,6 +57,13 @@ class MachineProcessor(
         actions.filterIsInstance<ChangePatchAction>().let(changePatch)
     )
 
+    private val debug: (Flow<DebugAction>) -> Flow<DebugResult> = { actions ->
+        actions
+            .computeResult { action ->
+                DebugResult(debug = !action.debug)
+            }
+    }
+
     private val load: (Flow<LoadAction>) -> Flow<LoadResult> = { actions ->
         actions
             .onEach {

diff --git a/app/src/main/java/net/simno/dmach/machine/state/MachineStateReducer.kt b/app/src/main/java/net/simno/dmach/machine/state/MachineStateReducer.kt
@@ -8,6 +8,9 @@ object MachineStateReducer : (ViewState, Result) -> ViewState {
             logError("MachineStateReducer", "ErrorResult", result.error)
             previousState
         }
+        is DebugResult -> previousState.copy(
+            debug = result.debug
+        )
         is LoadResult -> previousState.copy(
             title = result.title,
             sequenceId = result.sequenceId,

diff --git a/app/src/main/java/net/simno/dmach/machine/state/Result.kt b/app/src/main/java/net/simno/dmach/machine/state/Result.kt
@@ -16,6 +16,10 @@ data class ErrorResult(
     val error: Throwable
 ) : Result()
 
+data class DebugResult(
+    val debug: Boolean
+) : Result()
+
 data class LoadResult(
     val title: String,
     val sequenceId: Int,

diff --git a/app/src/main/java/net/simno/dmach/machine/state/ViewState.kt b/app/src/main/java/net/simno/dmach/machine/state/ViewState.kt
@@ -14,6 +14,7 @@ import net.simno.dmach.data.Tempo
 import net.simno.dmach.settings.Settings
 
 data class ViewState(
+    val debug: Boolean = false,
     val title: String = "",
     val isPlaying: Boolean = false,
     val showConfig: Boolean = false,

diff --git a/app/src/main/java/net/simno/dmach/machine/ui/Machine.kt b/app/src/main/java/net/simno/dmach/machine/ui/Machine.kt
@@ -53,6 +53,7 @@ import net.simno.dmach.machine.state.ChangeStepsAction
 import net.simno.dmach.machine.state.ChangeSwingAction
 import net.simno.dmach.machine.state.ChangeTempoAction
 import net.simno.dmach.machine.state.ConfigAction
+import net.simno.dmach.machine.state.DebugAction
 import net.simno.dmach.machine.state.DismissAction
 import net.simno.dmach.machine.state.ExportAction
 import net.simno.dmach.machine.state.ExportFileAction
@@ -80,7 +81,6 @@ fun Machine(
     val paddingMedium = AppTheme.dimens.paddingMedium
     val paddingSmall = AppTheme.dimens.paddingSmall
     val currentOnAction by rememberUpdatedState(onAction)
-    var debug by remember { mutableStateOf(false) }
 
     LifecycleResumeEffect(Unit) {
         currentOnAction(ResumeAction)
@@ -145,7 +145,7 @@ fun Machine(
                 modifier = Modifier
                     .width(buttonLarge)
                     .wrapContentWidth(),
-                onLongClick = { debug = !debug },
+                onLongClick = { currentOnAction(DebugAction(state.debug)) },
                 onClick = {
                     if (state.settings.isAnyEnabled) {
                         currentOnAction(ChangePatchAction.Reset(state.settings))
@@ -277,7 +277,7 @@ fun Machine(
                             position = state.position,
                             horizontalText = state.hText,
                             verticalText = state.vText,
-                            debug = debug,
+                            debug = state.debug,
                             modifier = Modifier
                                 .weight(1f)
                                 .padding(paddingSmall),
@@ -286,7 +286,7 @@ fun Machine(
                         PanFader(
                             panId = state.panId,
                             pan = state.pan,
-                            debug = debug,
+                            debug = state.debug,
                             modifier = Modifier
                                 .padding(top = paddingSmall, end = paddingSmall, bottom = paddingSmall),
                             onPanChange = { currentOnAction(ChangePanAction(it)) }