refactor view and presenters into a single file

Author: Patrick Jackson

build.gradle

@@ -48,5 +48,5 @@ ext {
     reduxVersion = '0.2.6'
     reduxThunkVersion = '0.2.8'
     reduxPresenterMiddlewareVersion = '0.2.7'
-    reduxReselectVersion = '0.2.7'
+    reduxReselectVersion = '0.2.8'
 }

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

@@ -23,7 +23,7 @@ val reducer: Reducer<AppState> = { state: AppState, action ->
                     questions = action.itemsHolder.questions)
         }
         is FetchingItemsFailedAction -> state.copy(isLoadingItems = false, errorLoadingItems = true, errorMsg = action.message)
-        is UiActions.NamePicked -> {
+        is NamePickedAction -> {
             val answerName: String?
             val status = if (state.currentQuestionItem().equalsDisplayName(action.name)) {
                 answerName = action.name

common/src/commonMain/kotlin/com/willowtreeapps/common/ui/GameResultsPresenter.kt

@@ -1,8 +1,14 @@
 package com.willowtreeapps.common.ui
 
+import com.willowtreeapps.common.boundary.toGameResultsViewState
+
 
 interface GameResultsView : GameBaseView {
     fun showResults(viewState: GameResultsViewState)
 
     override fun presenter() = gameResultsPresenter
 }
+
+val gameResultsPresenter = presenter<GameResultsView> {{
+    withAnyChange { showResults(state.toGameResultsViewState()) }
+}}

common/src/commonMain/kotlin/com/willowtreeapps/common/ui/GameResultsView.kt

@@ -1,9 +1,7 @@
 package com.willowtreeapps.common.ui
 
-import com.willowtreeapps.common.*
+import com.willowtreeapps.common.AppState
 import com.willowtreeapps.common.external.*
-import com.willowtreeapps.common.util.isAndroid
-import org.reduxkotlin.middleware
 
 
 typealias GameBaseView = ViewWithProvider<AppState>
@@ -16,17 +14,3 @@ fun <V: GameBaseView> presenter(actions: PresenterBuilder<AppState, V>): Present
 fun <V: GameBaseView> presenterWithViewArg(actions: PresenterBuilderWithViewArg<AppState, V>): Presenter<View, AppState> {
     return createGenericPresenter(actions) as Presenter<View, AppState>
 }
-
-val startPresenter = presenter<StartView> {{
-    withSingleField({ it.isLoadingItems }) {
-        if (state.isLoadingItems) {
-            showLoading()
-        } else {
-            hideLoading()
-        }
-    }
-
-    withSingleField({ it.errorLoadingItems }) {
-        showError(state.errorMsg)
-    }
-}}

common/src/commonMain/kotlin/com/willowtreeapps/common/ui/StartPresenter.kt renamed to common/src/commonMain/kotlin/com/willowtreeapps/common/ui/Presenter.kt

@@ -1,5 +1,9 @@
 package com.willowtreeapps.common.ui
 
+import com.willowtreeapps.common.Question
+import com.willowtreeapps.common.boundary.toQuestionViewState
+import com.willowtreeapps.common.middleware.UiActions
+
 interface QuestionView : GameBaseView {
     override fun presenter() = questionPresenter
 
@@ -21,3 +25,37 @@ interface QuestionView : GameBaseView {
 
     fun closeMic()
 }
+
+val questionPresenter = presenter<QuestionView> {{
+    withSingleField({ it.questionClock }, { setTimerText(state.toQuestionViewState()) })
+
+    withSingleField({
+        it.currentQuestion?.itemId?.id ?: Any()
+    }, { showProfile(state.toQuestionViewState()) })
+
+    withSingleField({ it.waitingForNextQuestion }) {
+        if (state.waitingForNextQuestion) {
+            if (state.settings.microphoneMode) {
+                closeMic()
+                if (!state.isGameComplete()) {
+                    store.dispatch(UiActions.NextQuestionDelayed())
+                }
+            }
+            when (state.currentQuestion?.status) {
+                Question.Status.CORRECT -> {
+                    showCorrectAnswer(state.toQuestionViewState(), state.isGameComplete())
+                }
+                Question.Status.INCORRECT -> {
+                    store.dispatch(UiActions.VibrateAction())
+                    showWrongAnswer(state.toQuestionViewState(), state.isGameComplete())
+                }
+                Question.Status.TIMES_UP -> {
+                    store.dispatch(UiActions.VibrateAction())
+                    showTimesUp(state.toQuestionViewState(), state.isGameComplete())
+                }
+                Question.Status.UNANSWERED -> throw IllegalStateException("Question status cannot be Unanswered when waiting for next round == true")
+            }
+        }
+    }
+}}
+

common/src/commonMain/kotlin/com/willowtreeapps/common/ui/QuestionPresenter.kt

@@ -1,6 +1,7 @@
 package com.willowtreeapps.common.ui
 
 import com.willowtreeapps.common.AppState
+import com.willowtreeapps.common.boundary.toViewState
 import com.willowtreeapps.common.external.Presenter
 import com.willowtreeapps.common.external.View
 
@@ -9,4 +10,8 @@ interface SettingsView: GameBaseView {
     fun askForMicPermissions()
 
     override fun presenter(): Presenter<View, AppState> = settingsPresenter
-}
+}
+
+val settingsPresenter = presenter<SettingsView> {{
+    withSingleField({ it.settings }) { showSettings(state.settings.toViewState()) }
+}}

common/src/commonMain/kotlin/com/willowtreeapps/common/ui/QuestionView.kt

@@ -12,3 +12,17 @@ interface StartView : GameBaseView {
 
     override fun presenter(): Presenter<View, AppState> = startPresenter
 }
+
+val startPresenter = presenter<StartView> {{
+    withSingleField({ it.isLoadingItems }) {
+        if (state.isLoadingItems) {
+            showLoading()
+        } else {
+            hideLoading()
+        }
+    }
+
+    withSingleField({ it.errorLoadingItems }) {
+        showError(state.errorMsg)
+    }
+}}