Merge pull request #17 from patjackson52/feature/store-state

tweaks

Author: patjackson52

common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt

@@ -9,7 +9,7 @@ data class AppState(val isLoadingProfiles: Boolean = false,
                     val currentQuestionIndex: Int = 0,
                     val waitingForNextQuestion: Boolean = false,
                     val waitingForResultsTap: Boolean = false,
-                    val questionClock: Int = 0,
+                    val questionClock: Int = -1,
                     val questions: List<Question> = listOf(),
                     val settings: UserSettings = UserSettings.defaults()) {
     companion object {
@@ -19,7 +19,7 @@ data class AppState(val isLoadingProfiles: Boolean = false,
     fun Question.profile(): Profile = profiles.find { ProfileId(it.id) == this.profileId }!!
 
     val timerText: String
-        get() = if (questionClock >= 0) questionClock.toString() else "TIME'S UP!!"
+        get() = if (questionClock < 0) "" else if (questionClock >= 0) questionClock.toString() else "TIME'S UP!!"
 
     val currentQuestion: Question?
         get() = if (questions.size > currentQuestionIndex)

common/src/commonMain/kotlin/com/willowtreeapps/common/GameEngine.kt

@@ -20,7 +20,7 @@ class GameEngine(navigator: Navigator,
     private val viewEffectsMiddleware = ViewEffectsMiddleware()
     private val presenterFactory by lazy { PresenterFactory(this, networkContext) }
     val vibrateUtil = VibrateUtil(application)
-    private val settingsMiddleware by lazy {  SettingsMiddleware(LocalStorageSettingsRepository(userSettings(application))) }
+    private val settingsMiddleware by lazy {  SettingsMiddleware(LocalStorageSettingsRepository(userSettings(application)), networkContext) }
 
     val appStore by lazy {
         SimpleStore(AppState.INITIAL_STATE, ::reducer)

common/src/commonMain/kotlin/com/willowtreeapps/common/TimerThunks.kt

@@ -6,8 +6,8 @@ import com.beyondeye.reduks.ThunkImpl
 import kotlinx.coroutines.*
 import kotlin.coroutines.CoroutineContext
 
-class TimerThunks(private val networkContext: CoroutineContext, val store: Store<AppState>) : CoroutineScope {
-    override val coroutineContext = networkContext + Job()
+class TimerThunks(private val backgroundContext: CoroutineContext, val store: Store<AppState>) : CoroutineScope {
+    override val coroutineContext = backgroundContext + Job()
     private var timerJob: Job? = null
 
     /**
@@ -16,17 +16,16 @@ class TimerThunks(private val networkContext: CoroutineContext, val store: Store
      * the timer and start the new one.
      */
     fun startCountDownTimer(initialValue: Int): ThunkImpl<AppState> = ThunkFn { dispatcher, state ->
-        store.dispatch(Actions.StartQuestionTimerAction(initialValue))
-        if (timerJob != null) {
-            timerJob?.cancel()
-        }
-        timerJob = launchTimer(1000, CoroutineScope(coroutineContext)) {
+        if (timerJob == null || timerJob?.isActive == false) {
+            store.dispatch(Actions.StartQuestionTimerAction(initialValue))
+            timerJob = launchTimer(1000, CoroutineScope(coroutineContext)) {
 
-            if (store.state.questionClock > 0) {
-                store.dispatch(Actions.DecrementCountDownAction())
-            } else {
-                store.dispatch(Actions.TimesUpAction())
-                timerJob?.cancel()
+                if (store.state.questionClock > 0) {
+                    store.dispatch(Actions.DecrementCountDownAction())
+                } else {
+                    store.dispatch(Actions.TimesUpAction())
+                    timerJob?.cancel()
+                }
             }
         }
         Any()

common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/SettingsMiddleware.kt

@@ -5,18 +5,28 @@ import com.willowtreeapps.common.Actions
 import com.willowtreeapps.common.Actions.ChangeNumQuestionsSettingsAction
 import com.willowtreeapps.common.AppState
 import com.willowtreeapps.common.repo.LocalStorageSettingsRepository
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlin.coroutines.CoroutineContext
 
 /**
  * Save and Loads user settings from local storage
  */
-class SettingsMiddleware(private val settings: LocalStorageSettingsRepository) {
+class SettingsMiddleware(private val settings: LocalStorageSettingsRepository,
+                         private val backgroundContext: CoroutineContext): CoroutineScope {
+    override val coroutineContext: CoroutineContext
+        get() = backgroundContext + Job()
+
 
     fun dispatch(store: Store<AppState>, nextDispatcher: (Any) -> Any, action: Any): Any {
-        when (action) {
-            is ChangeNumQuestionsSettingsAction -> settings.saveNumRounds(action.num)
+        launch {
+            when (action) {
+                is ChangeNumQuestionsSettingsAction -> settings.saveNumRounds(action.num)
 
-            is Actions.LoadAllSettingsAction -> {
-                store.dispatch(ChangeNumQuestionsSettingsAction(settings.loadNumRounds()))
+                is Actions.LoadAllSettingsAction -> {
+                    store.dispatch(ChangeNumQuestionsSettingsAction(settings.loadNumRounds()))
+                }
             }
         }
         return nextDispatcher(action)