From 8dbef14b8f1f507dda837eb0cf9f430fe121efa3 Mon Sep 17 00:00:00 2001 From: motorro Date: Fri, 27 Oct 2023 15:46:23 +0200 Subject: [PATCH 1/5] Variance on base interfaces Refs: #7 --- .../com/motorro/commonstatemachine/CommonStateMachine.kt | 7 +++---- .../com/motorro/commonstatemachine/multi/MachineKey.kt | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/CommonStateMachine.kt b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/CommonStateMachine.kt index 7ba27f3..f097e6b 100644 --- a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/CommonStateMachine.kt +++ b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/CommonStateMachine.kt @@ -17,7 +17,7 @@ package com.motorro.commonstatemachine * Common state machine input - from the outside world to the current state * @param G UI gesture */ -interface MachineInput { +interface MachineInput { /** * Updates state with UI gesture * @param gesture UI gesture to proceed @@ -51,7 +51,7 @@ interface MachineOutput { /** * Current public machine status */ -interface MachineStatus { +interface MachineStatus { /** * Checks if machine is started */ @@ -136,5 +136,4 @@ interface CommonStateMachine : MachineInput, MachineOutput(val tag: String? = null) { +abstract class MachineKey(val tag: String? = null) { override fun equals(other: Any?): Boolean { if (this === other) return true From 6ed0b94b5c38f2633b6ae32f011033a64e769666 Mon Sep 17 00:00:00 2001 From: motorro Date: Sat, 4 Nov 2023 09:38:27 +0100 Subject: [PATCH 2/5] Generic machine map Refs: #7 --- .../commonstatemachine/CommonStateMachine.kt | 9 +- .../multi/ActiveStateMachine.kt | 7 +- .../commonstatemachine/multi/MachineAccess.kt | 54 +++-- .../commonstatemachine/multi/MachineKey.kt | 2 +- .../commonstatemachine/multi/MachineMap.kt | 21 -- .../multi/MultiMachineState.kt | 30 ++- .../multi/ProxyMachineContainer.kt | 215 ++++++++++++------ .../com/motorro/commonstatemachine/mocks.kt | 7 +- .../multi/ActiveStateMachineTest.kt | 1 + .../multi/MultiMachineStateTest.kt | 10 +- .../multi/SomeActiveMachineContainerTest.kt | 2 +- .../commonstatemachine/coroutines/mocks.kt | 7 +- .../navbar/model/state/NavbarState.kt | 8 +- .../parallel/model/state/ParallelState.kt | 11 +- .../motorro/statemachine/timer/state/mocks.kt | 7 +- .../motorro/statemachine/register/mocks.kt | 5 + 16 files changed, 246 insertions(+), 150 deletions(-) delete mode 100644 commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineMap.kt diff --git a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/CommonStateMachine.kt b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/CommonStateMachine.kt index f097e6b..b9b1a4b 100644 --- a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/CommonStateMachine.kt +++ b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/CommonStateMachine.kt @@ -71,6 +71,11 @@ interface MachineStatus { */ interface CommonStateMachine : MachineInput, MachineOutput, MachineStatus { + /** + * Starts the machine + */ + fun start() + /** * Base state-machine implementation * @param G UI gesture @@ -104,9 +109,9 @@ interface CommonStateMachine : MachineInput, MachineOutput( init: MachineInit, - onUiChanged: (MachineKey<*, *>, Any) -> Unit + onUiChanged: (MachineKey, U) -> Unit ) : CommonStateMachine, Activated { /** * Machine lifecycle @@ -41,7 +41,10 @@ internal class ActiveStateMachine( { onUiChanged(init.key, it.child) } ) - init { + /** + * Starts the machine + */ + override fun start() { machine.start() } diff --git a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineAccess.kt b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineAccess.kt index a2f6889..6404e00 100644 --- a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineAccess.kt +++ b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineAccess.kt @@ -13,24 +13,51 @@ package com.motorro.commonstatemachine.multi -import com.motorro.commonstatemachine.CommonStateMachine +/** + * Provides access to the state-machine + * @param CG Child gesture system + * @param CU Child UI-state system + */ +interface MachineAccess { + /** + * Keys collection + */ + val keys: Set> + + /** + * Retrieves UI state. + * [MachineInit] and [key] bind types securely. + * @param U Concrete UI state bound with the [key], subtype of CU + * @param key Machine key + */ + fun getState(key: MachineKey): U? + + /** + * Processes machine gesture. + * [MachineInit] and [key] bind types securely. + * @param G Concrete gesture, subtype of th [CG] + * @param key Machine key + * @param gesture Gesture to process + */ + fun process(key: MachineKey, gesture: G) +} /** * Retrieves a ui-state given the [MachineKey] */ -interface UiStateProvider { +interface UiStateProvider { /** * Retrieves all running machine keys */ - fun getMachineKeys(): Set> + fun getMachineKeys(): Set> /** * Gets a concrete UI-state * @param key Machine key your state is bound to * @throws IllegalStateException if state is not found in common state */ - fun getValue(key: MachineKey<*, U>): U = checkNotNull(get(key)) { + fun getValue(key: MachineKey): U = checkNotNull(get(key)) { "Key $key not found in machine map" } @@ -38,30 +65,19 @@ interface UiStateProvider { * Gets a concrete UI-state * @param key Machine key your state is bound to */ - operator fun get(key: MachineKey<*, U>): U? + operator fun get(key: MachineKey): U? } /** * Redirects your gesture to be processed with a child machine * identified by [MachineKey] */ -interface GestureProcessor { +interface GestureProcessor { /** * Redirects your gesture to be processed by child machine * if machine identified by [key] is found * @param key Machine key * @param gesture Gesture to process */ - fun process(key: MachineKey, gesture: G) -} - -/** - * Runs [block] with machine stored in [machineMap] under this key - */ -@Suppress("UNCHECKED_CAST") -internal inline fun withMachine( - key: MachineKey, - machineMap: MachineMap, - block: CommonStateMachine.() -> R -): R? = (machineMap[key] as? CommonStateMachine)?.block() - + fun process(key: MachineKey, gesture: G) +} \ No newline at end of file diff --git a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineKey.kt b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineKey.kt index 6e9a59d..eca847d 100644 --- a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineKey.kt +++ b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineKey.kt @@ -20,7 +20,7 @@ package com.motorro.commonstatemachine.multi * @param U UI-state type * @param tag An extra string to distinguish one key from the other */ -abstract class MachineKey(val tag: String? = null) { +abstract class MachineKey(val tag: String? = null) { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineMap.kt b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineMap.kt deleted file mode 100644 index 9c26a7a..0000000 --- a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineMap.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2023 Nikolai Kotchetkov. - * 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.motorro.commonstatemachine.multi - -import com.motorro.commonstatemachine.CommonStateMachine - -/** - * A map of state machines - */ -internal typealias MachineMap = Map, CommonStateMachine<*, *>> diff --git a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MultiMachineState.kt b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MultiMachineState.kt index 9baff18..09dd4d0 100644 --- a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MultiMachineState.kt +++ b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MultiMachineState.kt @@ -21,11 +21,11 @@ import com.motorro.commonstatemachine.CommonMachineState * - Override [mapUiState] to build a combined UI state af all the machines * - Override [container] with a [ProxyMachineContainer] of your choice */ -abstract class MultiMachineState : CommonMachineState() { +abstract class MultiMachineState : CommonMachineState() { /** * Proxy machines container */ - protected abstract val container: ProxyMachineContainer + protected abstract val container: ProxyMachineContainer /** * A part of [start] template to initialize state @@ -45,20 +45,18 @@ abstract class MultiMachineState : CommonMachineState( * Updates machine view-state */ @Suppress("UNUSED_PARAMETER") - private fun onUiStateChange(key: MachineKey<*, *>, uiState: Any) { + private fun onUiStateChange(key: MachineKey, uiState: CU) { setUiState(buildUiState(key)) } /** * Builds common UI state */ - private fun buildUiState(changedKey: MachineKey<*, *>?): PU { - val machineMap = container.getMachines() - val uiStateProvider = object : UiStateProvider { - override fun getMachineKeys(): Set> = machineMap.keys - override fun get(key: MachineKey<*, U>): U? { - return withMachine(key, machineMap) { getUiState() } - } + private fun buildUiState(changedKey: MachineKey?): PU { + val access = container.machineAccess + val uiStateProvider = object : UiStateProvider { + override fun getMachineKeys(): Set> = access.keys + override fun get(key: MachineKey): U? = access.getState(key) } return mapUiState(uiStateProvider, changedKey) } @@ -74,10 +72,10 @@ abstract class MultiMachineState : CommonMachineState( * A part of [process] template to process UI gesture */ override fun doProcess(gesture: PG) { - val machineMap = container.getMachines() - val processor = object : GestureProcessor { - override fun process(key: MachineKey, gesture: G) { - withMachine(key, machineMap) { process(gesture) } + val access = container.machineAccess + val processor = object : GestureProcessor { + override fun process(key: MachineKey, gesture: G) { + access.process(key, gesture) } } mapGesture(gesture, processor) @@ -88,7 +86,7 @@ abstract class MultiMachineState : CommonMachineState( * @param parent Parent gesture * @param processor Use it to send child gesture to the relevant child machine */ - protected abstract fun mapGesture(parent: PG, processor: GestureProcessor) + protected abstract fun mapGesture(parent: PG, processor: GestureProcessor) /** * Maps combined child UI state to parent @@ -96,5 +94,5 @@ abstract class MultiMachineState : CommonMachineState( * @param changedKey Key of machine that changed the UI state. Null if called explicitly via [updateUi] * @see updateUi */ - protected abstract fun mapUiState(provider: UiStateProvider, changedKey: MachineKey<*, *>?): PU + protected abstract fun mapUiState(provider: UiStateProvider, changedKey: MachineKey?): PU } \ No newline at end of file diff --git a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/ProxyMachineContainer.kt b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/ProxyMachineContainer.kt index f20feb7..5eb763f 100644 --- a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/ProxyMachineContainer.kt +++ b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/ProxyMachineContainer.kt @@ -13,25 +13,32 @@ package com.motorro.commonstatemachine.multi +import com.motorro.commonstatemachine.CommonStateMachine import com.motorro.commonstatemachine.ProxyStateMachine import com.motorro.commonstatemachine.lifecycle.MachineLifecycle /** - * Holds proxy-machines + * A machine container. Holds proxied machines. + * The [CG] and [CU] type binding are done via explicit cast to be able + * to host heterogeneous machines + * [MachineInit] binds the key with correct machine type + * @param CG Child gesture system + * @param CU Child UI-state system */ -interface ProxyMachineContainer { +interface ProxyMachineContainer { /** - * Starts machines + * Machine access */ - fun start(onUiChanged: (key: MachineKey<*, *>, uiState: Any) -> Unit) + val machineAccess: MachineAccess /** - * Returns a map of proxy machines + * Starts machines in the container + * @param onUiChanged UI change handler from hosting state */ - fun getMachines(): MachineMap + fun start(onUiChanged: (key: MachineKey, uiState: CU) -> Unit) /** - * Clears machines + * Clears contained machines */ fun clear() @@ -41,7 +48,9 @@ interface ProxyMachineContainer { * always [MachineLifecycle.State.ACTIVE] * @param init Machine init */ - fun allTogether(init: Collection>): ProxyMachineContainer = AllTogetherMachineContainer(init) + fun allTogether( + init: Collection> + ): ProxyMachineContainer = AllTogetherMachineContainer(init) /** * Creates a container where machines may be activated and deactivated @@ -52,45 +61,130 @@ interface ProxyMachineContainer { * @param init Machine init * @param initiallyActive Machines that are initially active. Defaults to first machine in [init] */ - fun some( - init: Collection>, - initiallyActive: Set> = setOf(init.first().key) - ): ActiveMachineContainer = SomeActiveMachineContainer(init, initiallyActive) + fun some( + init: Collection>, + initiallyActive: Set> = setOf(init.first().key) + ): ActiveMachineContainer = SomeActiveMachineContainer(init, initiallyActive) + } + + /** + * Base machine container that binds gesture/ui type system with machines + * The [CG] and [CU] type binding are done via explicit cast to be able + * to host heterogeneous machines + * [MachineInit] binds the key with correct machine type + * @param CG Common gesture type + * @param CU Common UI type + * @param M Concrete machine type + * @param init Initialisation structures to create machines + */ + abstract class Base>( + private val init: Collection> + ) : ProxyMachineContainer { + /** + * Creates a specific machine for this container + * @param init Initialization structure + * @param onUiChanged UI change handler from hosting state + */ + abstract fun create( + init: MachineInit, + onUiChanged: (key: MachineKey, uiState: CU) -> Unit + ): M + + /** + * Machines bound with keys + */ + protected var machines: Map, M> = emptyMap() + + /** + * Machine access + */ + override val machineAccess: MachineAccess = object : MachineAccess { + /** + * Keys collection + */ + override val keys: Set> get() = machines.keys + + /** + * Processes machine gesture. + * [MachineInit] and [key] bind types securely. + * @param G Concrete gesture, subtype of th [CG] + * @param key Machine key + * @param gesture Gesture to process + */ + @Suppress("UNCHECKED_CAST") + override fun process(key: MachineKey, gesture: G) { + (machines[key] as? CommonStateMachine)?.process(gesture) + } + + /** + * Retrieves UI state. + * [MachineInit] and [key] bind types securely. + * @param U Concrete UI state bound with the [key], subtype of CU + * @param key Machine key + */ + @Suppress("UNCHECKED_CAST") + override fun getState(key: MachineKey): U? { + return machines[key]?.getUiState() as? U + } + } + + /** + * Starts machines in the container + * @param onUiChanged UI change handler from hosting state + */ + override fun start(onUiChanged: (key: MachineKey, uiState: CU) -> Unit) { + machines = init.associate { i -> i.key to create(i, onUiChanged) } + machines.forEach { (_, machine) -> machine.start() } + doStart() + } + + /** + * A part of [start] template called after initial startup + * Machines are created at this point + */ + open fun doStart() = Unit + + /** + * Clears contained machines + */ + override fun clear() { + machines.forEach { (_, machine) -> machine.clear() } + } } } /** * Container that activates machine */ -interface ActiveMachineContainer : ProxyMachineContainer { +interface ActiveMachineContainer : ProxyMachineContainer { /** * Retrieves currently active machine key */ - fun getActive(): Set> + fun getActive(): Set> /** * Sets active machine given the keys */ - fun setActive(keys: Set>) + fun setActive(keys: Set>) /** * Sets active machine given the key */ - fun setActive(vararg key: MachineKey<*, *>) = setActive(key.toSet()) + fun setActive(vararg key: MachineKey) = setActive(key.toSet()) /** * Disposes machines. All machines by [keys] are deactivated disposed and dereferenced. * When activating again - a new machine is created using the same init. * Use to cleanup memory for example on low memory alert from system */ - fun dispose(keys: Set>) + fun dispose(keys: Set>) /** * Disposes machines. All machines by [key] are deactivated disposed and dereferenced. * When activating again - a new machine is created using the same init. * Use to cleanup memory for example on low memory alert from system */ - fun dispose(vararg key: MachineKey<*, *>) = dispose(key.toSet()) + fun dispose(vararg key: MachineKey) = dispose(key.toSet()) /** * Disposes all inactive machines @@ -103,13 +197,9 @@ interface ActiveMachineContainer : ProxyMachineContainer { * All machines run in parallel without any lifecycle management * @param init Machine init */ -internal class AllTogetherMachineContainer(private val init: Collection>) : ProxyMachineContainer { - - /** - * Proxy machines - */ - private var machines: Map, ProxyStateMachine<*, *>> = emptyMap() - +internal class AllTogetherMachineContainer( + init: Collection> +) : ProxyMachineContainer.Base>(init) { /** * Machine lifecycle that is always started */ @@ -121,34 +211,23 @@ internal class AllTogetherMachineContainer(private val init: Collection MachineInit.machine(onUiChanged: (key: MachineKey<*, *>, uiState: Any) -> Unit) = ProxyStateMachine( + private fun MachineInit.machine(onUiChanged: (MachineKey, U) -> Unit) = ProxyStateMachine( initialUiState, { init(lifecycle) }, { onUiChanged(key, it) } ) /** - * Starts machines - */ - override fun start(onUiChanged: (key: MachineKey<*, *>, uiState: Any) -> Unit) { - machines = init.associate { i -> i.key to i.machine(onUiChanged) } - machines.forEach { it.value.start() } - } - - /** - * Returns a map of proxy machines - */ - override fun getMachines(): MachineMap = machines - - /** - * Clears machines + * Creates a specific machine for this container + * @param init Initialization structure + * @param onUiChanged UI change handler from hosting state */ - override fun clear() { - machines.forEach { it.value.clear() } - } + override fun create( + init: MachineInit, + onUiChanged: (key: MachineKey, uiState: CU) -> Unit + ): CommonStateMachine = init.machine(onUiChanged) } /** @@ -157,47 +236,39 @@ internal class AllTogetherMachineContainer(private val init: Collection>, - private val initiallyActive: Set> -) : ActiveMachineContainer { - +internal class SomeActiveMachineContainer( + private val init: Collection>, + private val initiallyActive: Set> +) : ProxyMachineContainer.Base>(init), ActiveMachineContainer { /** - * Proxy machines + * Creates a specific machine for this container + * @param init Initialization structure + * @param onUiChanged UI change handler from hosting state */ - private var machines: Map, ActiveStateMachine<*, *>> = emptyMap() + override fun create( + init: MachineInit, + onUiChanged: (key: MachineKey, uiState: CU) -> Unit + ): ActiveStateMachine = ActiveStateMachine(init, onUiChanged) /** - * Starts machines + * A part of [start] template called after initial startup + * Machines are created at this point */ - override fun start(onUiChanged: (key: MachineKey<*, *>, uiState: Any) -> Unit) { - machines = init.associate { i -> i.key to ActiveStateMachine(i, onUiChanged) } + override fun doStart() { setActive(initiallyActive) } - /** - * Returns a map of proxy machines - */ - override fun getMachines(): MachineMap = machines - - /** - * Clears machines - */ - override fun clear() { - machines.forEach { it.value.clear() } - } - /** * Retrieves currently active machine key */ - override fun getActive(): Set> { - return machines.entries.filter { (_, machine) -> machine.isActive() }.map { it.key }.toSet() - } + override fun getActive(): Set> = machines.entries + .filter { (_, machine) -> machine.isActive() } + .map { it.key }.toSet() /** * Sets active machine given the key */ - override fun setActive(keys: Set>) { + override fun setActive(keys: Set>) { val active = getActive() val toDeactivate = active.minus(keys) val toActivate = keys.minus(active) @@ -215,7 +286,7 @@ internal class SomeActiveMachineContainer( * When activating again - a new machine is created using the same init. * Use to cleanup memory for example on low memory alert from system */ - override fun dispose(keys: Set>) { + override fun dispose(keys: Set>) { machines.forEach { (key, machine) -> if (keys.contains(key)) { machine.dispose() diff --git a/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/mocks.kt b/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/mocks.kt index c8a9269..f31c535 100644 --- a/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/mocks.kt +++ b/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/mocks.kt @@ -40,8 +40,13 @@ class MachineMock(uiState: U) : CommonStateMachine { val processed = mutableListOf() val uiStates = mutableListOf(uiState) var cleared = false + var started = false + + override fun start() { + started = true + } - override fun isStarted(): Boolean = true + override fun isStarted(): Boolean = started override fun getUiState(): U = uiStates.last() diff --git a/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/ActiveStateMachineTest.kt b/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/ActiveStateMachineTest.kt index 88482e2..d8384d6 100644 --- a/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/ActiveStateMachineTest.kt +++ b/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/ActiveStateMachineTest.kt @@ -47,6 +47,7 @@ class ActiveStateMachineTest { } } machine = ActiveStateMachine(init) { _, u -> uiState.add(u) } + machine.start() } @Test diff --git a/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/MultiMachineStateTest.kt b/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/MultiMachineStateTest.kt index ab59e39..28e2f5d 100644 --- a/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/MultiMachineStateTest.kt +++ b/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/MultiMachineStateTest.kt @@ -44,8 +44,8 @@ class MultiMachineStateTest { data class StringGesture(val data: String) : MultiGesture() } - private open class TestState : MultiMachineState() { - override val container: ProxyMachineContainer = AllTogetherMachineContainer( + private open class TestState : MultiMachineState() { + override val container: ProxyMachineContainer = AllTogetherMachineContainer( listOf( object : MachineInit { override val key: MachineKey = IntKey @@ -64,7 +64,7 @@ class MultiMachineStateTest { ) ) - override fun mapGesture(parent: MultiGesture, processor: GestureProcessor) = when(parent) { + override fun mapGesture(parent: MultiGesture, processor: GestureProcessor) = when(parent) { is MultiGesture.IntGesture -> { processor.process(IntKey, parent.data) } @@ -73,7 +73,7 @@ class MultiMachineStateTest { } } - override fun mapUiState(provider: UiStateProvider, changedKey: MachineKey<*, *>?): String { + override fun mapUiState(provider: UiStateProvider, changedKey: MachineKey<*, *>?): String { val i: Int = provider.getValue(IntKey) val s: String = provider.getValue(StringKey) return "$i - $s" @@ -110,7 +110,7 @@ class MultiMachineStateTest { fun providesActiveMachinesKeys() { var tested = false val state = object : TestState() { - override fun mapUiState(provider: UiStateProvider, changedKey: MachineKey<*, *>?): String { + override fun mapUiState(provider: UiStateProvider, changedKey: MachineKey<*, *>?): String { assertEquals( setOf(IntKey, StringKey), provider.getMachineKeys() diff --git a/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/SomeActiveMachineContainerTest.kt b/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/SomeActiveMachineContainerTest.kt index dd0218f..3f13f8b 100644 --- a/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/SomeActiveMachineContainerTest.kt +++ b/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/SomeActiveMachineContainerTest.kt @@ -26,7 +26,7 @@ class SomeActiveMachineContainerTest { private lateinit var intState: StateMock private lateinit var stringState: StateMock - private lateinit var container: SomeActiveMachineContainer + private lateinit var container: SomeActiveMachineContainer private val intKey = object : MachineKey() { } private val stringKey = object : MachineKey() { } diff --git a/coroutines/src/commonTest/kotlin/com/motorro/commonstatemachine/coroutines/mocks.kt b/coroutines/src/commonTest/kotlin/com/motorro/commonstatemachine/coroutines/mocks.kt index 9211f40..70090fb 100644 --- a/coroutines/src/commonTest/kotlin/com/motorro/commonstatemachine/coroutines/mocks.kt +++ b/coroutines/src/commonTest/kotlin/com/motorro/commonstatemachine/coroutines/mocks.kt @@ -43,8 +43,13 @@ class MachineMock(uiState: U) : CommonStateMachine { val processed = mutableListOf() val uiStates = mutableListOf(uiState) var cleared = false + var started = false + + override fun start() { + started = true + } - override fun isStarted(): Boolean = true + override fun isStarted(): Boolean = started override fun getUiState(): U = uiStates.last() diff --git a/examples/multi/navbar/src/main/java/com/motorro/statemachine/navbar/model/state/NavbarState.kt b/examples/multi/navbar/src/main/java/com/motorro/statemachine/navbar/model/state/NavbarState.kt index 486550e..e916964 100644 --- a/examples/multi/navbar/src/main/java/com/motorro/statemachine/navbar/model/state/NavbarState.kt +++ b/examples/multi/navbar/src/main/java/com/motorro/statemachine/navbar/model/state/NavbarState.kt @@ -21,7 +21,7 @@ import kotlin.time.Duration /** * Machines are lazily created and paused when not active */ -internal class NavbarState : MultiMachineState() { +internal class NavbarState : MultiMachineState() { private val keys = listOf( TimerKey("one"), @@ -33,7 +33,7 @@ internal class NavbarState : MultiMachineState() { /** * Machines are lazily created and paused when not active */ - override val container: ActiveMachineContainer = ProxyMachineContainer.some( + override val container: ActiveMachineContainer = ProxyMachineContainer.some( keys.map { key -> object : MachineInit { override val key: TimerKey = key @@ -52,7 +52,7 @@ internal class NavbarState : MultiMachineState() { * @param parent Parent gesture * @param processor Use it to send child gesture to the relevant child machine */ - override fun mapGesture(parent: NavbarGesture, processor: GestureProcessor) = when(parent) { + override fun mapGesture(parent: NavbarGesture, processor: GestureProcessor) = when(parent) { is NavbarGesture.ActiveSelected -> { Logger.i("Activating: ${parent.key}") container.setActive(parent.key) @@ -74,7 +74,7 @@ internal class NavbarState : MultiMachineState() { * @param changedKey Key of machine that changed the UI state. Null if called explicitly via [updateUi] * @see updateUi */ - override fun mapUiState(provider: UiStateProvider, changedKey: MachineKey<*, *>?): NavbarUiState { + override fun mapUiState(provider: UiStateProvider, changedKey: MachineKey?): NavbarUiState { return NavbarUiState( keys.map { key -> key to provider.getValue(key) diff --git a/examples/multi/parallel/src/main/java/com/motorro/statemachine/parallel/model/state/ParallelState.kt b/examples/multi/parallel/src/main/java/com/motorro/statemachine/parallel/model/state/ParallelState.kt index 7310631..9bee15a 100644 --- a/examples/multi/parallel/src/main/java/com/motorro/statemachine/parallel/model/state/ParallelState.kt +++ b/examples/multi/parallel/src/main/java/com/motorro/statemachine/parallel/model/state/ParallelState.kt @@ -20,14 +20,14 @@ import kotlin.time.Duration /** * Machines run in parallel. All machines are active */ -internal class ParallelState : MultiMachineState() { +internal class ParallelState : MultiMachineState() { private val topKey = TimerKey("top") private val bottomKey = TimerKey("bottom") /** * Machines run in parallel and always active */ - override val container: ProxyMachineContainer = ProxyMachineContainer.allTogether( + override val container: ProxyMachineContainer = ProxyMachineContainer.allTogether( listOf( object : MachineInit { override val key: TimerKey = topKey @@ -55,7 +55,7 @@ internal class ParallelState : MultiMachineState) = when(parent) { is ParallelGesture.Top -> { Logger.i("Top gesture: $parent") processor.process(topKey, parent.gesture) @@ -72,7 +72,10 @@ internal class ParallelState : MultiMachineState?): ParallelUiState = ParallelUiState( + override fun mapUiState( + provider: UiStateProvider, + changedKey: MachineKey? + ): ParallelUiState = ParallelUiState( top = provider.getValue(topKey), bottom = provider.getValue(bottomKey) ) diff --git a/examples/timer/src/commonTest/kotlin/com/motorro/statemachine/timer/state/mocks.kt b/examples/timer/src/commonTest/kotlin/com/motorro/statemachine/timer/state/mocks.kt index b25ebd0..5f53c98 100644 --- a/examples/timer/src/commonTest/kotlin/com/motorro/statemachine/timer/state/mocks.kt +++ b/examples/timer/src/commonTest/kotlin/com/motorro/statemachine/timer/state/mocks.kt @@ -21,8 +21,13 @@ class MachineMock(uiState: U) : CommonStateMachine { val processed = mutableListOf() val uiStates = mutableListOf(uiState) var cleared = false + var started = false - override fun isStarted(): Boolean = true + override fun start() { + started = true + } + + override fun isStarted(): Boolean = started override fun getUiState(): U = uiStates.last() diff --git a/examples/welcome/commonregister/src/commonTest/kotlin/com/motorro/statemachine/register/mocks.kt b/examples/welcome/commonregister/src/commonTest/kotlin/com/motorro/statemachine/register/mocks.kt index 63e27f9..0eeeb1e 100644 --- a/examples/welcome/commonregister/src/commonTest/kotlin/com/motorro/statemachine/register/mocks.kt +++ b/examples/welcome/commonregister/src/commonTest/kotlin/com/motorro/statemachine/register/mocks.kt @@ -53,6 +53,11 @@ class MachineMock : CommonStateMachine { val processed = mutableListOf() val uiStates = mutableListOf() var cleared = false + var started = false + + override fun start() { + started = true + } override fun isStarted(): Boolean = true From b6ba64df07cfda50cde8047441d1a891f26a9dd9 Mon Sep 17 00:00:00 2001 From: motorro Date: Tue, 7 Nov 2023 14:35:24 +0100 Subject: [PATCH 3/5] Generic machine map (starred input) Refs: #7 --- .../commonstatemachine/multi/MachineAccess.kt | 14 +++--- .../multi/MultiMachineState.kt | 12 ++--- .../multi/ProxyMachineContainer.kt | 50 +++++++++---------- .../multi/MultiMachineStateTest.kt | 4 +- .../navbar/model/state/NavbarState.kt | 2 +- .../parallel/model/state/ParallelState.kt | 4 +- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineAccess.kt b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineAccess.kt index 6404e00..0cd36cc 100644 --- a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineAccess.kt +++ b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MachineAccess.kt @@ -18,11 +18,11 @@ package com.motorro.commonstatemachine.multi * @param CG Child gesture system * @param CU Child UI-state system */ -interface MachineAccess { +interface MachineAccess { /** * Keys collection */ - val keys: Set> + val keys: Set> /** * Retrieves UI state. @@ -30,7 +30,7 @@ interface MachineAccess { * @param U Concrete UI state bound with the [key], subtype of CU * @param key Machine key */ - fun getState(key: MachineKey): U? + fun getState(key: MachineKey<*, U>): U? /** * Processes machine gesture. @@ -45,19 +45,19 @@ interface MachineAccess { /** * Retrieves a ui-state given the [MachineKey] */ -interface UiStateProvider { +interface UiStateProvider { /** * Retrieves all running machine keys */ - fun getMachineKeys(): Set> + fun getMachineKeys(): Set> /** * Gets a concrete UI-state * @param key Machine key your state is bound to * @throws IllegalStateException if state is not found in common state */ - fun getValue(key: MachineKey): U = checkNotNull(get(key)) { + fun getValue(key: MachineKey<*, out U>): U = checkNotNull(get(key)) { "Key $key not found in machine map" } @@ -65,7 +65,7 @@ interface UiStateProvider { * Gets a concrete UI-state * @param key Machine key your state is bound to */ - operator fun get(key: MachineKey): U? + operator fun get(key: MachineKey<*, U>): U? } /** diff --git a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MultiMachineState.kt b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MultiMachineState.kt index 09dd4d0..7c2eba2 100644 --- a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MultiMachineState.kt +++ b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/MultiMachineState.kt @@ -45,18 +45,18 @@ abstract class MultiMachineState : CommonMac * Updates machine view-state */ @Suppress("UNUSED_PARAMETER") - private fun onUiStateChange(key: MachineKey, uiState: CU) { + private fun onUiStateChange(key: MachineKey<*, out CU>, uiState: CU) { setUiState(buildUiState(key)) } /** * Builds common UI state */ - private fun buildUiState(changedKey: MachineKey?): PU { + private fun buildUiState(changedKey: MachineKey<*, out CU>?): PU { val access = container.machineAccess - val uiStateProvider = object : UiStateProvider { - override fun getMachineKeys(): Set> = access.keys - override fun get(key: MachineKey): U? = access.getState(key) + val uiStateProvider = object : UiStateProvider { + override fun getMachineKeys(): Set> = access.keys + override fun get(key: MachineKey<*, U>): U? = access.getState(key) } return mapUiState(uiStateProvider, changedKey) } @@ -94,5 +94,5 @@ abstract class MultiMachineState : CommonMac * @param changedKey Key of machine that changed the UI state. Null if called explicitly via [updateUi] * @see updateUi */ - protected abstract fun mapUiState(provider: UiStateProvider, changedKey: MachineKey?): PU + protected abstract fun mapUiState(provider: UiStateProvider, changedKey: MachineKey<*, out CU>?): PU } \ No newline at end of file diff --git a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/ProxyMachineContainer.kt b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/ProxyMachineContainer.kt index 5eb763f..dc55f0c 100644 --- a/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/ProxyMachineContainer.kt +++ b/commonstatemachine/src/commonMain/kotlin/com/motorro/commonstatemachine/multi/ProxyMachineContainer.kt @@ -35,7 +35,7 @@ interface ProxyMachineContainer { * Starts machines in the container * @param onUiChanged UI change handler from hosting state */ - fun start(onUiChanged: (key: MachineKey, uiState: CU) -> Unit) + fun start(onUiChanged: (key: MachineKey<*, out CU>, uiState: CU) -> Unit) /** * Clears contained machines @@ -78,7 +78,7 @@ interface ProxyMachineContainer { * @param init Initialisation structures to create machines */ abstract class Base>( - private val init: Collection> + private val init: Collection> ) : ProxyMachineContainer { /** * Creates a specific machine for this container @@ -86,14 +86,14 @@ interface ProxyMachineContainer { * @param onUiChanged UI change handler from hosting state */ abstract fun create( - init: MachineInit, - onUiChanged: (key: MachineKey, uiState: CU) -> Unit + init: MachineInit<*, out CU>, + onUiChanged: (key: MachineKey<*, out CU>, uiState: CU) -> Unit ): M /** * Machines bound with keys */ - protected var machines: Map, M> = emptyMap() + protected var machines: Map, M> = emptyMap() /** * Machine access @@ -102,7 +102,7 @@ interface ProxyMachineContainer { /** * Keys collection */ - override val keys: Set> get() = machines.keys + override val keys: Set> get() = machines.keys /** * Processes machine gesture. @@ -123,7 +123,7 @@ interface ProxyMachineContainer { * @param key Machine key */ @Suppress("UNCHECKED_CAST") - override fun getState(key: MachineKey): U? { + override fun getState(key: MachineKey<*, U>): U? { return machines[key]?.getUiState() as? U } } @@ -132,7 +132,7 @@ interface ProxyMachineContainer { * Starts machines in the container * @param onUiChanged UI change handler from hosting state */ - override fun start(onUiChanged: (key: MachineKey, uiState: CU) -> Unit) { + override fun start(onUiChanged: (key: MachineKey<*, out CU>, uiState: CU) -> Unit) { machines = init.associate { i -> i.key to create(i, onUiChanged) } machines.forEach { (_, machine) -> machine.start() } doStart() @@ -160,31 +160,31 @@ interface ActiveMachineContainer : ProxyMachineContainer> + fun getActive(): Set> /** * Sets active machine given the keys */ - fun setActive(keys: Set>) + fun setActive(keys: Set>) /** * Sets active machine given the key */ - fun setActive(vararg key: MachineKey) = setActive(key.toSet()) + fun setActive(vararg key: MachineKey<*, out CU>) = setActive(key.toSet()) /** * Disposes machines. All machines by [keys] are deactivated disposed and dereferenced. * When activating again - a new machine is created using the same init. * Use to cleanup memory for example on low memory alert from system */ - fun dispose(keys: Set>) + fun dispose(keys: Set>) /** * Disposes machines. All machines by [key] are deactivated disposed and dereferenced. * When activating again - a new machine is created using the same init. * Use to cleanup memory for example on low memory alert from system */ - fun dispose(vararg key: MachineKey) = dispose(key.toSet()) + fun dispose(vararg key: MachineKey<*, out CU>) = dispose(key.toSet()) /** * Disposes all inactive machines @@ -199,7 +199,7 @@ interface ActiveMachineContainer : ProxyMachineContainer( init: Collection> -) : ProxyMachineContainer.Base>(init) { +) : ProxyMachineContainer.Base>(init) { /** * Machine lifecycle that is always started */ @@ -213,7 +213,7 @@ internal class AllTogetherMachineContainer( /** * Creates a proxy */ - private fun MachineInit.machine(onUiChanged: (MachineKey, U) -> Unit) = ProxyStateMachine( + private fun MachineInit<*, U>.machine(onUiChanged: (MachineKey<*, U>, U) -> Unit) = ProxyStateMachine( initialUiState, { init(lifecycle) }, { onUiChanged(key, it) } @@ -225,9 +225,9 @@ internal class AllTogetherMachineContainer( * @param onUiChanged UI change handler from hosting state */ override fun create( - init: MachineInit, - onUiChanged: (key: MachineKey, uiState: CU) -> Unit - ): CommonStateMachine = init.machine(onUiChanged) + init: MachineInit<*, out CU>, + onUiChanged: (key: MachineKey<*, out CU>, uiState: CU) -> Unit + ): CommonStateMachine<*, out CU> = init.machine(onUiChanged) } /** @@ -239,16 +239,16 @@ internal class AllTogetherMachineContainer( internal class SomeActiveMachineContainer( private val init: Collection>, private val initiallyActive: Set> -) : ProxyMachineContainer.Base>(init), ActiveMachineContainer { +) : ProxyMachineContainer.Base>(init), ActiveMachineContainer { /** * Creates a specific machine for this container * @param init Initialization structure * @param onUiChanged UI change handler from hosting state */ override fun create( - init: MachineInit, - onUiChanged: (key: MachineKey, uiState: CU) -> Unit - ): ActiveStateMachine = ActiveStateMachine(init, onUiChanged) + init: MachineInit<*, out CU>, + onUiChanged: (key: MachineKey<*, out CU>, uiState: CU) -> Unit + ): ActiveStateMachine<*, out CU> = ActiveStateMachine(init, onUiChanged) /** * A part of [start] template called after initial startup @@ -261,14 +261,14 @@ internal class SomeActiveMachineContainer( /** * Retrieves currently active machine key */ - override fun getActive(): Set> = machines.entries + override fun getActive(): Set> = machines.entries .filter { (_, machine) -> machine.isActive() } .map { it.key }.toSet() /** * Sets active machine given the key */ - override fun setActive(keys: Set>) { + override fun setActive(keys: Set>) { val active = getActive() val toDeactivate = active.minus(keys) val toActivate = keys.minus(active) @@ -286,7 +286,7 @@ internal class SomeActiveMachineContainer( * When activating again - a new machine is created using the same init. * Use to cleanup memory for example on low memory alert from system */ - override fun dispose(keys: Set>) { + override fun dispose(keys: Set>) { machines.forEach { (key, machine) -> if (keys.contains(key)) { machine.dispose() diff --git a/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/MultiMachineStateTest.kt b/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/MultiMachineStateTest.kt index 28e2f5d..e97d70a 100644 --- a/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/MultiMachineStateTest.kt +++ b/commonstatemachine/src/commonTest/kotlin/com/motorro/commonstatemachine/multi/MultiMachineStateTest.kt @@ -73,7 +73,7 @@ class MultiMachineStateTest { } } - override fun mapUiState(provider: UiStateProvider, changedKey: MachineKey<*, *>?): String { + override fun mapUiState(provider: UiStateProvider, changedKey: MachineKey<*, out Any>?): String { val i: Int = provider.getValue(IntKey) val s: String = provider.getValue(StringKey) return "$i - $s" @@ -110,7 +110,7 @@ class MultiMachineStateTest { fun providesActiveMachinesKeys() { var tested = false val state = object : TestState() { - override fun mapUiState(provider: UiStateProvider, changedKey: MachineKey<*, *>?): String { + override fun mapUiState(provider: UiStateProvider, changedKey: MachineKey<*, out Any>?): String { assertEquals( setOf(IntKey, StringKey), provider.getMachineKeys() diff --git a/examples/multi/navbar/src/main/java/com/motorro/statemachine/navbar/model/state/NavbarState.kt b/examples/multi/navbar/src/main/java/com/motorro/statemachine/navbar/model/state/NavbarState.kt index e916964..82b5ed7 100644 --- a/examples/multi/navbar/src/main/java/com/motorro/statemachine/navbar/model/state/NavbarState.kt +++ b/examples/multi/navbar/src/main/java/com/motorro/statemachine/navbar/model/state/NavbarState.kt @@ -74,7 +74,7 @@ internal class NavbarState : MultiMachineState, changedKey: MachineKey?): NavbarUiState { + override fun mapUiState(provider: UiStateProvider, changedKey: MachineKey<*, out TimerUiState>?): NavbarUiState { return NavbarUiState( keys.map { key -> key to provider.getValue(key) diff --git a/examples/multi/parallel/src/main/java/com/motorro/statemachine/parallel/model/state/ParallelState.kt b/examples/multi/parallel/src/main/java/com/motorro/statemachine/parallel/model/state/ParallelState.kt index 9bee15a..574fd0a 100644 --- a/examples/multi/parallel/src/main/java/com/motorro/statemachine/parallel/model/state/ParallelState.kt +++ b/examples/multi/parallel/src/main/java/com/motorro/statemachine/parallel/model/state/ParallelState.kt @@ -73,8 +73,8 @@ internal class ParallelState : MultiMachineState, - changedKey: MachineKey? + provider: UiStateProvider, + changedKey: MachineKey<*, out TimerUiState>? ): ParallelUiState = ParallelUiState( top = provider.getValue(topKey), bottom = provider.getValue(bottomKey) From f4f7c7898b581cfb0160c2d94233f00313078368 Mon Sep 17 00:00:00 2001 From: motorro Date: Wed, 8 Nov 2023 10:10:27 +0100 Subject: [PATCH 4/5] Mixed multi-machine example Refs: #7 --- .idea/copyright/Apache.xml | 6 + .idea/copyright/profiles_settings.xml | 7 + examples/multi/mixed/.gitignore | 1 + examples/multi/mixed/build.gradle.kts | 101 ++++++++++ examples/multi/mixed/proguard-rules.pro | 21 ++ .../multi/mixed/src/main/AndroidManifest.xml | 40 ++++ .../com/motorro/statemachine/mixed/App.kt | 28 +++ .../statemachine/mixed/MainActivity.kt | 105 ++++++++++ .../statemachine/mixed/model/MainViewModel.kt | 38 ++++ .../mixed/model/data/MixedGesture.kt | 31 +++ .../mixed/model/data/MixedUiState.kt | 26 +++ .../mixed/model/data/SomeGesture.kt | 24 +++ .../mixed/model/data/SomeUiState.kt | 29 +++ .../mixed/model/state/MixedState.kt | 95 +++++++++ .../mixed/model/state/SomeState.kt | 39 ++++ .../res/drawable/ic_launcher_background.xml | 183 ++++++++++++++++++ .../res/drawable/ic_launcher_foreground.xml | 43 ++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 19 ++ .../mipmap-anydpi-v26/ic_launcher_round.xml | 19 ++ .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../mixed/src/main/res/values/colors.xml | 23 +++ .../mixed/src/main/res/values/strings.xml | 16 ++ .../mixed/src/main/res/values/themes.xml | 18 ++ .../com/motorro/statemachine/navbar/App.kt | 2 +- .../navbar/model/MainViewModel.kt | 13 ++ .../navbar/model/data/NavbarGesture.kt | 13 ++ .../navbar/model/data/NavbarUiState.kt | 13 ++ .../navbar/model/state/NavbarState.kt | 13 ++ .../com/motorro/statemachine/parallel/App.kt | 2 +- .../statemachine/parallel/MainActivity.kt | 13 ++ .../parallel/model/MainViewModel.kt | 13 ++ .../parallel/model/data/ParallelGesture.kt | 13 ++ .../parallel/model/data/ParallelUiState.kt | 13 ++ .../parallel/model/state/ParallelState.kt | 13 ++ examples/timer/build.gradle.kts | 2 +- .../statemachine/timer/ui/TimerScreen.kt | 13 ++ .../statemachine/timer/state/TimerState.kt | 13 ++ .../statemachine/timer/state/RunningTest.kt | 13 ++ .../motorro/statemachine/timer/state/mocks.kt | 2 +- 48 files changed, 1072 insertions(+), 4 deletions(-) create mode 100644 .idea/copyright/Apache.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 examples/multi/mixed/.gitignore create mode 100644 examples/multi/mixed/build.gradle.kts create mode 100644 examples/multi/mixed/proguard-rules.pro create mode 100644 examples/multi/mixed/src/main/AndroidManifest.xml create mode 100644 examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/App.kt create mode 100644 examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/MainActivity.kt create mode 100644 examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/MainViewModel.kt create mode 100644 examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/MixedGesture.kt create mode 100644 examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/MixedUiState.kt create mode 100644 examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/SomeGesture.kt create mode 100644 examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/SomeUiState.kt create mode 100644 examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/state/MixedState.kt create mode 100644 examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/state/SomeState.kt create mode 100644 examples/multi/mixed/src/main/res/drawable/ic_launcher_background.xml create mode 100644 examples/multi/mixed/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 examples/multi/mixed/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 examples/multi/mixed/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 examples/multi/mixed/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 examples/multi/mixed/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 examples/multi/mixed/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 examples/multi/mixed/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 examples/multi/mixed/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 examples/multi/mixed/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 examples/multi/mixed/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 examples/multi/mixed/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 examples/multi/mixed/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 examples/multi/mixed/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 examples/multi/mixed/src/main/res/values/colors.xml create mode 100644 examples/multi/mixed/src/main/res/values/strings.xml create mode 100644 examples/multi/mixed/src/main/res/values/themes.xml diff --git a/.idea/copyright/Apache.xml b/.idea/copyright/Apache.xml new file mode 100644 index 0000000..e7e1510 --- /dev/null +++ b/.idea/copyright/Apache.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..2102cda --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/examples/multi/mixed/.gitignore b/examples/multi/mixed/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/examples/multi/mixed/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/examples/multi/mixed/build.gradle.kts b/examples/multi/mixed/build.gradle.kts new file mode 100644 index 0000000..862f4d5 --- /dev/null +++ b/examples/multi/mixed/build.gradle.kts @@ -0,0 +1,101 @@ +/* + * Copyright 2023 Nikolai Kotchetkov. + * 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. + */ + +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +plugins { + alias(libs.plugins.android.app) + alias(libs.plugins.kotlin.android) +} + +val versionCode: String by project.extra +val versionName: String by project.extra +val androidMinSdkVersion: Int by project.extra +val androidTargetSdkVersion: Int by project.extra +val androidCompileSdkVersion: Int by project.extra + +android { + namespace = "com.motorro.statemachine.multi.mixed" + compileSdk = androidCompileSdkVersion + + defaultConfig { + applicationId = "com.motorro.statemachine.multi.mixed" + minSdk = androidMinSdkVersion + targetSdk = androidTargetSdkVersion + versionCode = versionCode + versionName = versionName + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + isCoreLibraryDesugaringEnabled = true + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = "17" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + implementation(project(":commonstatemachine")) + implementation(project(":coroutines")) + implementation(project(":examples:commoncore")) + implementation(project(":examples:androidcore")) + implementation(project(":examples:timer")) + + coreLibraryDesugaring(libs.desugaring) + + implementation(libs.androidx.core) + implementation(libs.androidx.lifecycle.runtime) + implementation(libs.androidx.lifecycle.livedata) + implementation(libs.androidx.lifecycle.viewmodel) + + implementation(libs.kotlin.coroutines.core) + implementation(libs.kotlin.coroutines.android) + + implementation(libs.bundles.compose.core) + implementation(libs.compose.activity) + implementation(libs.compose.viewmodel) + implementation(libs.compose.foundation) + implementation(libs.compose.foundation.layouts) + + debugImplementation(libs.compose.tooling) + + testImplementation(libs.bundles.test.core) + testImplementation(libs.test.androidx.arch) + testImplementation(libs.test.kotlin.coroutines) +} \ No newline at end of file diff --git a/examples/multi/mixed/proguard-rules.pro b/examples/multi/mixed/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/examples/multi/mixed/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/examples/multi/mixed/src/main/AndroidManifest.xml b/examples/multi/mixed/src/main/AndroidManifest.xml new file mode 100644 index 0000000..dff16cc --- /dev/null +++ b/examples/multi/mixed/src/main/AndroidManifest.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/App.kt b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/App.kt new file mode 100644 index 0000000..7809c87 --- /dev/null +++ b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/App.kt @@ -0,0 +1,28 @@ +/* + * Copyright 2023 Nikolai Kotchetkov. + * 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.motorro.statemachine.mixed + +import android.app.Application +import timber.log.Timber + +class App : Application() { + override fun onCreate() { + super.onCreate() + setupLogger() + } + + private fun setupLogger() { + Timber.plant(Timber.DebugTree()) + } +} \ No newline at end of file diff --git a/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/MainActivity.kt b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/MainActivity.kt new file mode 100644 index 0000000..080b13c --- /dev/null +++ b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/MainActivity.kt @@ -0,0 +1,105 @@ +/* + * Copyright 2023 Nikolai Kotchetkov. + * 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.motorro.statemachine.mixed + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import androidx.lifecycle.viewmodel.compose.viewModel +import com.motorro.statemachine.androidcore.ui.theme.CommonStateMachineTheme +import com.motorro.statemachine.mixed.model.MainViewModel +import com.motorro.statemachine.mixed.model.data.MixedGesture +import com.motorro.statemachine.mixed.model.data.SomeGesture +import com.motorro.statemachine.mixed.model.data.SomeUiState +import com.motorro.statemachine.timer.ui.TimerScreen + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + val model: MainViewModel = viewModel() + val state by model.uiState.collectAsState() + + CommonStateMachineTheme { + Scaffold { padding -> + Column( + Modifier + .fillMaxSize() + .padding(padding), + verticalArrangement = Arrangement.SpaceEvenly + ) { + Box( + modifier = Modifier + .fillMaxWidth() + .weight(1f) + .padding(8.dp) + .border(1.dp, Color.Black), + contentAlignment = Alignment.Center + ) { + Button( + colors = ButtonDefaults.buttonColors( + containerColor = when(state.some) { + SomeUiState.Off -> Color.Red + SomeUiState.On -> Color.Green + } + ), + onClick = { model.update(MixedGesture.Some(SomeGesture.StateToggled)) } + ) { + Text( + text = when(state.some) { + SomeUiState.Off -> "Off" + SomeUiState.On -> "On" + } + ) + } + } + Box( + modifier = Modifier + .fillMaxWidth() + .weight(1f) + .padding(8.dp) + .border(1.dp, Color.Black) + ) { + TimerScreen( + modifier = Modifier.padding(padding), + title = "Bottom", + state = state.timer + ) { + model.update(MixedGesture.Timer(it)) + } + } + } + } + } + } + } +} + diff --git a/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/MainViewModel.kt b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/MainViewModel.kt new file mode 100644 index 0000000..978851f --- /dev/null +++ b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/MainViewModel.kt @@ -0,0 +1,38 @@ +/* + * Copyright 2023 Nikolai Kotchetkov. + * 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.motorro.statemachine.mixed.model + +import androidx.lifecycle.ViewModel +import com.motorro.commonstatemachine.coroutines.FlowStateMachine +import com.motorro.statemachine.mixed.model.data.MixedGesture +import com.motorro.statemachine.mixed.model.data.MixedUiState +import com.motorro.statemachine.mixed.model.data.SomeUiState +import com.motorro.statemachine.mixed.model.state.MixedState +import com.motorro.statemachine.timer.data.TimerUiState +import kotlinx.coroutines.flow.StateFlow +import kotlin.time.Duration + +class MainViewModel : ViewModel() { + private val machine = FlowStateMachine(MixedUiState(SomeUiState.Off, TimerUiState.Stopped(Duration.ZERO))) { + MixedState() + } + + val uiState: StateFlow get() = machine.uiState + + fun update(gesture: MixedGesture) = machine.process(gesture) + + override fun onCleared() { + machine.clear() + } +} \ No newline at end of file diff --git a/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/MixedGesture.kt b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/MixedGesture.kt new file mode 100644 index 0000000..60cee14 --- /dev/null +++ b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/MixedGesture.kt @@ -0,0 +1,31 @@ +/* + * Copyright 2023 Nikolai Kotchetkov. + * 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.motorro.statemachine.mixed.model.data + +import com.motorro.statemachine.timer.data.TimerGesture + +/** + * Application gestures + */ +sealed class MixedGesture { + /** + * Some gesture + */ + data class Some(val gesture: SomeGesture) : MixedGesture() + + /** + * Timer gesture + */ + data class Timer(val gesture: TimerGesture) : MixedGesture() +} \ No newline at end of file diff --git a/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/MixedUiState.kt b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/MixedUiState.kt new file mode 100644 index 0000000..296ad07 --- /dev/null +++ b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/MixedUiState.kt @@ -0,0 +1,26 @@ +/* + * Copyright 2023 Nikolai Kotchetkov. + * 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.motorro.statemachine.mixed.model.data + +import androidx.compose.runtime.Immutable +import com.motorro.statemachine.timer.data.TimerUiState + +/** + * Common state for both active machines + */ +@Immutable +data class MixedUiState( + val some: SomeUiState, + val timer: TimerUiState +) \ No newline at end of file diff --git a/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/SomeGesture.kt b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/SomeGesture.kt new file mode 100644 index 0000000..193d9ab --- /dev/null +++ b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/SomeGesture.kt @@ -0,0 +1,24 @@ +/* + * Copyright 2023 Nikolai Kotchetkov. + * 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.motorro.statemachine.mixed.model.data + +/** + * Some gesture + */ +sealed class SomeGesture { + /** + * State toggled + */ + data object StateToggled : SomeGesture() +} \ No newline at end of file diff --git a/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/SomeUiState.kt b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/SomeUiState.kt new file mode 100644 index 0000000..22053fa --- /dev/null +++ b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/data/SomeUiState.kt @@ -0,0 +1,29 @@ +/* + * Copyright 2023 Nikolai Kotchetkov. + * 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.motorro.statemachine.mixed.model.data + +/** + * Some UI state + */ +sealed class SomeUiState { + /** + * Something is ON + */ + data object On : SomeUiState() + + /** + * Something is off + */ + data object Off : SomeUiState() +} \ No newline at end of file diff --git a/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/state/MixedState.kt b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/state/MixedState.kt new file mode 100644 index 0000000..ae82198 --- /dev/null +++ b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/state/MixedState.kt @@ -0,0 +1,95 @@ +/* + * Copyright 2023 Nikolai Kotchetkov. + * 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.motorro.statemachine.mixed.model.state + +import com.motorro.commonstatemachine.CommonMachineState +import com.motorro.commonstatemachine.lifecycle.MachineLifecycle +import com.motorro.commonstatemachine.multi.GestureProcessor +import com.motorro.commonstatemachine.multi.MachineInit +import com.motorro.commonstatemachine.multi.MachineKey +import com.motorro.commonstatemachine.multi.MultiMachineState +import com.motorro.commonstatemachine.multi.ProxyMachineContainer +import com.motorro.commonstatemachine.multi.UiStateProvider +import com.motorro.statemachine.commoncore.log.Logger +import com.motorro.statemachine.mixed.model.data.MixedGesture +import com.motorro.statemachine.mixed.model.data.MixedUiState +import com.motorro.statemachine.mixed.model.data.SomeGesture +import com.motorro.statemachine.mixed.model.data.SomeUiState +import com.motorro.statemachine.timer.data.TimerGesture +import com.motorro.statemachine.timer.data.TimerKey +import com.motorro.statemachine.timer.data.TimerUiState +import com.motorro.statemachine.timer.state.TimerState +import kotlin.time.Duration + +/** + * Machines run in parallel. All machines are active + */ +internal class MixedState : MultiMachineState() { + private val someKey = object : MachineKey("some") { } + private val timerKey = TimerKey("bottom") + + /** + * Machines run in parallel and always active + */ + override val container: ProxyMachineContainer = ProxyMachineContainer.allTogether( + listOf( + object : MachineInit { + override val key: MachineKey = someKey + override val initialUiState: SomeUiState = SomeUiState.Off + override val init: (MachineLifecycle) -> CommonMachineState = { + SomeState() + } + }, + object : MachineInit { + override val key: TimerKey = timerKey + override val initialUiState: TimerUiState = TimerUiState.Stopped(Duration.ZERO) + override val init: (MachineLifecycle) -> CommonMachineState = { + val tag = requireNotNull(key.tag) + Logger.i("Creating machine for $tag") + TimerState.init(tag, it) + } + } + ) + ) + + /** + * Updates child machines with gestures if relevant + * @param parent Parent gesture + * @param processor Use it to send child gesture to the relevant child machine + */ + override fun mapGesture(parent: MixedGesture, processor: GestureProcessor) = when(parent) { + is MixedGesture.Some -> { + Logger.i("Top gesture: $parent") + processor.process(someKey, parent.gesture) + } + is MixedGesture.Timer -> { + Logger.i("Bottom gesture: $parent") + processor.process(timerKey, parent.gesture) + } + } + + /** + * Maps combined child UI state to parent + * @param provider Provides child UI states + * @param changedKey Key of machine that changed the UI state. Null if called explicitly via [updateUi] + * @see updateUi + */ + override fun mapUiState( + provider: UiStateProvider, + changedKey: MachineKey<*, out Any>? + ): MixedUiState = MixedUiState( + some = provider.getValue(someKey), + timer = provider.getValue(timerKey) + ) +} \ No newline at end of file diff --git a/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/state/SomeState.kt b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/state/SomeState.kt new file mode 100644 index 0000000..b0ed608 --- /dev/null +++ b/examples/multi/mixed/src/main/java/com/motorro/statemachine/mixed/model/state/SomeState.kt @@ -0,0 +1,39 @@ +/* + * Copyright 2023 Nikolai Kotchetkov. + * 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.motorro.statemachine.mixed.model.state + +import com.motorro.commonstatemachine.CommonMachineState +import com.motorro.statemachine.mixed.model.data.SomeGesture +import com.motorro.statemachine.mixed.model.data.SomeUiState + +/** + * Some machine state with internal data + */ +class SomeState : CommonMachineState() { + + private var isOn = false + + override fun doStart() { + render() + } + + override fun doProcess(gesture: SomeGesture) { + isOn = isOn.not() + render() + } + + private fun render() { + setUiState(if (isOn) SomeUiState.On else SomeUiState.Off) + } +} \ No newline at end of file diff --git a/examples/multi/mixed/src/main/res/drawable/ic_launcher_background.xml b/examples/multi/mixed/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..7469e64 --- /dev/null +++ b/examples/multi/mixed/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/multi/mixed/src/main/res/drawable/ic_launcher_foreground.xml b/examples/multi/mixed/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..c499cdf --- /dev/null +++ b/examples/multi/mixed/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/multi/mixed/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/examples/multi/mixed/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..d18dad9 --- /dev/null +++ b/examples/multi/mixed/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,19 @@ + + + + + + + + \ No newline at end of file diff --git a/examples/multi/mixed/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/examples/multi/mixed/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..d18dad9 --- /dev/null +++ b/examples/multi/mixed/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,19 @@ + + + + + + + + \ No newline at end of file diff --git a/examples/multi/mixed/src/main/res/mipmap-hdpi/ic_launcher.webp b/examples/multi/mixed/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/examples/multi/mixed/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/examples/multi/mixed/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/examples/multi/mixed/src/main/res/mipmap-mdpi/ic_launcher.webp b/examples/multi/mixed/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/examples/multi/mixed/src/main/res/mipmap-xhdpi/ic_launcher.webp b/examples/multi/mixed/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/examples/multi/mixed/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/examples/multi/mixed/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/examples/multi/mixed/src/main/res/values/colors.xml b/examples/multi/mixed/src/main/res/values/colors.xml new file mode 100644 index 0000000..4ccd21c --- /dev/null +++ b/examples/multi/mixed/src/main/res/values/colors.xml @@ -0,0 +1,23 @@ + + + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/examples/multi/mixed/src/main/res/values/strings.xml b/examples/multi/mixed/src/main/res/values/strings.xml new file mode 100644 index 0000000..e81002c --- /dev/null +++ b/examples/multi/mixed/src/main/res/values/strings.xml @@ -0,0 +1,16 @@ + + + + Parallel + \ No newline at end of file diff --git a/examples/multi/mixed/src/main/res/values/themes.xml b/examples/multi/mixed/src/main/res/values/themes.xml new file mode 100644 index 0000000..fe0d9c1 --- /dev/null +++ b/examples/multi/mixed/src/main/res/values/themes.xml @@ -0,0 +1,18 @@ + + + + + +