fix missing WT imagefile

Patrick Jackson · Patrick Jackson · commit eddb59c3a324 · 2019-08-27T15:21:19.000-04:00
diff --git a/android/src/main/java/org/reduxkotlin/namegame/store/BaseNameGameViewFragment.kt b/android/src/main/java/org/reduxkotlin/namegame/store/BaseNameGameViewFragment.kt
@@ -9,7 +9,6 @@ open class BaseNameGameViewFragment<V: GameBaseView>: Fragment(), GameBaseView {
     private val presenterObserver = PresenterLifecycleObserver(this)
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        retainInstance = true
         lifecycle.addObserver(presenterObserver)
         super.onCreate(savedInstanceState)
     }
diff --git a/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/GameEngine.kt b/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/GameEngine.kt
@@ -20,15 +20,13 @@ class GameEngine(navigator: Navigator,
     val vibrateUtil = VibrateUtil(application)
     private val localStorageSettingsRepository by lazy { LocalStorageSettingsRepository(userSettings(application)) }
 
-    val appStore by lazy {
-        createStore(reducer, AppState.INITIAL_STATE,
-                compose(listOf(presenterEnhancer(uiContext),
-                        applyMiddleware(createThunkMiddleware(),
-                                uiMiddleware(networkThunks, timerThunks, uiContext),
-                                navigationMiddleware(navigator),
-                                loggerMiddleware,
-                                settingsMiddleware(localStorageSettingsRepository, networkContext)))))
-    }
+    val appStore = createStore(reducer, AppState.INITIAL_STATE,
+                    compose(listOf(presenterEnhancer(uiContext),
+                            applyMiddleware(createThunkMiddleware(),
+                                    uiMiddleware(networkThunks, timerThunks, uiContext),
+                                    navigationMiddleware(navigator),
+                                    loggerMiddleware,
+                                    settingsMiddleware(localStorageSettingsRepository, networkContext)))))
 
     init {
         CoroutineScope(uiContext).launch {
diff --git a/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/ui/SettingsView.kt b/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/ui/SettingsView.kt
@@ -13,5 +13,5 @@ interface SettingsView: GameBaseView {
 }
 
 val settingsPresenter = presenter<SettingsView> {{
-    withSingleField({ it.settings }) { showSettings(state.settings.toViewState()) }
+    select { it.settings } then { showSettings(state.settings.toViewState()) }
 }}
diff --git a/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/ui/StartView.kt b/common/src/commonMain/kotlin/org/reduxkotlin/namegame/common/ui/StartView.kt
@@ -13,16 +13,16 @@ interface StartView : GameBaseView {
     override fun presenter(): Presenter<View, AppState> = startPresenter
 }
 
-val startPresenter = presenter<StartView> {{
-    withSingleField({ it.isLoadingItems }) {
-        if (state.isLoadingItems) {
-            showLoading()
-        } else {
-            hideLoading()
+val startPresenter = presenter<StartView> {
+    {
+        select { state.isLoadingItems } then {
+            if (state.isLoadingItems) {
+                showLoading()
+            } else {
+                hideLoading()
+            }
         }
-    }
 
-    withSingleField({ it.errorLoadingItems }) {
-        showError(state.errorMsg)
+        select { state.errorLoadingItems } then { showError(state.errorMsg) }
     }
-}}
+}
diff --git a/iOS/NameGame/NameGame.xcodeproj/project.pbxproj b/iOS/NameGame/NameGame.xcodeproj/project.pbxproj
@@ -80,7 +80,7 @@
 		1E9D6D3B224EA74E00F5C0B8 /* diamond.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = diamond.png; sourceTree = "<group>"; };
 		1E9D6D3C224EA74E00F5C0B8 /* confetti.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = confetti.png; sourceTree = "<group>"; };
 		1E9D6D3D224EA74E00F5C0B8 /* star.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = star.png; sourceTree = "<group>"; };
-		1E9ED1E122550E7E000D7C69 /* willowtree_banner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = willowtree_banner.png; path = ../../../android/src/main/res/drawable/willowtree_banner.png; sourceTree = "<group>"; };
+		1E9ED1E122550E7E000D7C69 /* willowtree_banner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = willowtree_banner.png; sourceTree = "<group>"; };
 		1EB9EA7B2238071A008AF004 /* NameGame.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NameGame.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		1EB9EA7E2238071A008AF004 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		1EB9EA832238071A008AF004 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
diff --git a/iOS/NameGame/NameGame/willowtree_banner.png b/iOS/NameGame/NameGame/willowtree_banner.png

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ open class BaseNameGameViewFragment<V: GameBaseView>: Fragment(), GameBaseView {`
`9`	`9`	`private val presenterObserver = PresenterLifecycleObserver(this)`
`10`	`10`
`11`	`11`	`override fun onCreate(savedInstanceState: Bundle?) {`
`12`		`- retainInstance = true`
`13`	`12`	`lifecycle.addObserver(presenterObserver)`
`14`	`13`	`super.onCreate(savedInstanceState)`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ interface SettingsView: GameBaseView {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`val settingsPresenter = presenter<SettingsView> {{`
`16`		`- withSingleField({ it.settings }) { showSettings(state.settings.toViewState()) }`
	`16`	`+ select { it.settings } then { showSettings(state.settings.toViewState()) }`
`17`	`17`	`}}`