use presenter-middleware 0.2.10

Author: Patrick Jackson

android/build.gradle

@@ -56,10 +56,9 @@ dependencies {
     implementation "android.arch.navigation:navigation-fragment-ktx:$ktxVersion"
     implementation "android.arch.navigation:navigation-ui-ktx:$ktxVersion"
     implementation "org.reduxkotlin:redux-kotlin:$reduxVersion"
+    implementation "org.reduxkotlin:presenter-middleware:$reduxPresenterMiddlewareVersion"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
 
-    implementation "com.facebook.stetho:stetho:$stethoVersion"
-    implementation "com.facebook.stetho:stetho-okhttp3:$stethoVersion"
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion"
 

android/src/main/java/com/willowtreeapps/namegame/store/BaseNameGameViewFragment.kt

@@ -2,12 +2,11 @@ package com.willowtreeapps.namegame.store
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import com.willowtreeapps.common.PresenterLifecycleObserver
 import com.willowtreeapps.common.ui.GameBaseView
+import org.reduxkotlin.PresenterLifecycleObserver
 
 open class BaseNameGameViewFragment<V: GameBaseView>: Fragment(), GameBaseView {
     private val presenterObserver = PresenterLifecycleObserver(this)
-    private var viewRecreated: Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         retainInstance = true

android/src/main/java/com/willowtreeapps/namegame/store/GameResultsFragment.kt

@@ -8,7 +8,6 @@ import com.willowtreeapps.common.middleware.UiActions
 import com.willowtreeapps.common.ui.GameResultsViewState
 import com.willowtreeapps.common.ui.GameResultsView
 import com.willowtreeapps.namegame.MainActivity
-import com.willowtreeapps.namegame.NameGameApp
 import com.willowtreeapps.namegame.R
 import com.willowtreeapps.namegame.dispatch
 import kotlinx.android.synthetic.main.fragment_game_results.*

android/src/main/java/com/willowtreeapps/namegame/store/SettingsDialogFragment.kt

@@ -17,6 +17,7 @@ import com.willowtreeapps.namegame.MainActivity
 import com.willowtreeapps.namegame.R
 import com.willowtreeapps.namegame.dispatch
 import kotlinx.android.synthetic.main.fragment_settings.*
+import org.reduxkotlin.PresenterLifecycleObserver
 
 class SettingsDialogFragment : DialogFragment(), SettingsView {
 

build.gradle

@@ -47,6 +47,6 @@ ext {
     multiplatformSettingsVersion = '0.3.2'
     reduxVersion = '0.2.6'
     reduxThunkVersion = '0.2.8'
-    reduxPresenterMiddlewareVersion = '0.2.8'
+    reduxPresenterMiddlewareVersion = '0.2.10'
     reduxReselectVersion = '0.2.8'
 }

common/src/androidMain/kotlin/com/willowtreeapps/common/PresenterLifecycleObserver.kt

@@ -72,7 +72,7 @@ enum class QuestionCategoryId(val displayName: String) {
     CATS("Cats");
 
     companion object {
-        val displayNameListWithoutWT by lazy {
+        val displayNameList by lazy {
             values().map { it.displayName }
         }
 

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

@@ -1,16 +1,12 @@
 package com.willowtreeapps.common
 
-import com.willowtreeapps.common.external.presenterEnhancer
-import org.reduxkotlin.createStore
-import org.reduxkotlin.applyMiddleware
 import com.willowtreeapps.common.middleware.*
 import com.willowtreeapps.common.repo.LocalStorageSettingsRepository
 import com.willowtreeapps.common.repo.userSettings
 import com.willowtreeapps.common.util.VibrateUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import org.reduxkotlin.compose
-import org.reduxkotlin.createThunkMiddleware
+import org.reduxkotlin.*
 import kotlin.coroutines.CoroutineContext
 
 class GameEngine(navigator: Navigator,

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

@@ -12,10 +12,8 @@ import kotlin.coroutines.CoroutineContext
  * Thunks are functions that are executed by the "ThunkMiddleware".  They are asynchronous and dispatch
  * actions.  This allows dispatching a loading, success, and failure state.
  */
-class NetworkThunks(private val networkContext: CoroutineContext) : CoroutineScope {
-    private val job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = networkContext + job
+class NetworkThunks(networkContext: CoroutineContext) {
+    private val networkScope = CoroutineScope(networkContext)
 
     //TODO cache the repositories
     private fun repoForCategory(categoryId: QuestionCategoryId) = when (categoryId) {
@@ -26,7 +24,7 @@ class NetworkThunks(private val networkContext: CoroutineContext) : CoroutineSco
     fun fetchItems(categoryId: QuestionCategoryId, numQuestions: Int) = thunk { dispatch, getState, extraArgument ->
         val repo = repoForCategory(categoryId)
         Logger.d("Fetching StoreInfo and Feed")
-        launch {
+        networkScope.launch {
             dispatch(Actions.FetchingItemsStartedAction())
             val result = repo.fetchItems(numQuestions)
             if (result.isSuccessful) {

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

@@ -56,7 +56,7 @@ fun AppState.toGameResultsViewState(): GameResultsViewState {
 fun UserSettings.toViewState(): SettingsViewState = SettingsViewState(
         numQuestions = numQuestions,
         categoryId = categoryId,
-        categoryDisplayValues = QuestionCategoryId.displayNameListWithoutWT,
+        categoryDisplayValues = QuestionCategoryId.displayNameList,
         isMicModeEnabled = microphoneMode
 )