use org.reduxkotlin artifacts for thunk & redux

Author: Patrick Jackson

common/build.gradle

@@ -34,8 +34,8 @@ kotlin {
                 implementation "io.ktor:ktor-client-logging:$ktorVersion"
                 implementation "com.russhwolf:multiplatform-settings:$multiplatformSettingsVersion"
                 implementation "com.willowtreeapps:fuzzywuzzy-kotlin:0.1.1"
-                implementation "org.reduxkotlin:redux-kotlin:0.2"
-                implementation "org.reduxkotlin:redux-kotlin-thunk:0.2"
+                implementation "org.reduxkotlin:redux-kotlin:0.2.2"
+                implementation "org.reduxkotlin:redux-kotlin-thunk:0.2.3"
 
 
                 implementation "io.ktor:ktor-client-core:$ktorVersion"

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

@@ -30,6 +30,8 @@ class GameEngine(navigator: Navigator,
     val appStore by lazy {
         createStore(reducer, AppState.INITIAL_STATE, applyMiddleware(thunk,
                 navigationMiddleware::dispatch,
+                ::logMiddleware,
+                loggerMiddleware3,
                 settingsMiddleware::dispatch))
     }
 

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

@@ -21,7 +21,7 @@ class NetworkThunks(private val networkContext: CoroutineContext) : CoroutineSco
         QuestionCategoryId.DOGS -> DogItemRepository()
     }
 
-    fun fetchItems(categoryId: QuestionCategoryId, numQuestions: Int): Thunk = { dispatch ->
+    fun fetchItems(categoryId: QuestionCategoryId, numQuestions: Int): Thunk = { dispatch, getState, extraArgument ->
         val repo = repoForCategory(categoryId)
         Logger.d("Fetching StoreInfo and Feed")
         launch {

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

@@ -14,7 +14,7 @@ class TimerThunks(private val backgroundContext: CoroutineContext) : CoroutineSc
      * Only one timer is active at a time.  If called while a timer is active, it will cancel
      * the timer and start the new one.
      */
-    fun startCountDownTimer(initialValue: Int): Thunk = { dispatch ->
+    fun startCountDownTimer(initialValue: Int): Thunk = { dispatch, _, _->
         if (countDownTimerJob == null || countDownTimerJob?.isCompleted == true) {
             var localQuestionClock = initialValue
             Logger.d("Launching new Timer")
@@ -36,12 +36,12 @@ class TimerThunks(private val backgroundContext: CoroutineContext) : CoroutineSc
         }
     }
 
-    fun stopTimer(): Thunk = { dispatch ->
+    fun stopTimer(): Thunk = { dispatch, _, _ ->
         countDownTimerJob?.cancel()
         Unit
     }
 
-    fun dispatchDelayed(delayMs: Long, action: Any): Thunk = { dispatch ->
+    fun dispatchDelayed(delayMs: Long, action: Any): Thunk = { dispatch, _, _ ->
         delayedJob?.cancel()
         delayedJob = CoroutineScope(coroutineContext).launch {
             delay(delayMs)
@@ -50,7 +50,7 @@ class TimerThunks(private val backgroundContext: CoroutineContext) : CoroutineSc
         Unit
     }
 
-    fun cancelDelayed(): Thunk = { dispatcher ->
+    fun cancelDelayed(): Thunk = { dispatcher, _, _ ->
         delayedJob?.cancel()
         Unit
     }

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

@@ -1,11 +1,8 @@
 package com.willowtreeapps.common.middleware
 
-import org.reduxkotlin.GetState
 import com.willowtreeapps.common.AppState
 import com.willowtreeapps.common.Logger
-import org.reduxkotlin.Dispatcher
-import org.reduxkotlin.Middleware
-import org.reduxkotlin.Store
+import org.reduxkotlin.*
 
 fun loggerMiddleware(getState: GetState, nextDispatcher: (Any) -> Any, action: Any): Any {
     val result = nextDispatcher(action)
@@ -26,18 +23,14 @@ val loggerMiddleware2: Middleware =
             }
         }
 
-val loggerMiddleware3 = middleWare { store, next, action ->
+fun logMiddleware(store: Store) = { next: Dispatcher ->
+    { action: Any ->
+        next(action)
+    }
+}
+
+
+val loggerMiddleware3 = middleware { store, next, action ->
     Logger.d("DISPATCH action: ${action::class.simpleName}: $action")
     next(action)
 }
-
-fun middleWare(dispatch: (Store, Dispatcher, Any) -> Any): Middleware =
-        { store ->
-            { next ->
-                { action: Any ->
-                    {
-                        dispatch(store, next, action)
-                    }
-                }
-            }
-        }