bug fixes on android & iOS

Patrick Jackson · Patrick Jackson · commit 53fccbf2839b · 2019-08-21T15:43:21.000-04:00
diff --git a/android/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt b/android/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt
@@ -19,9 +19,12 @@ import nl.dionsegijn.konfetti.models.Size
 import android.widget.Button
 import androidx.core.content.res.ResourcesCompat
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
+import com.willowtreeapps.common.Actions
 import com.willowtreeapps.common.Logger
 import com.willowtreeapps.common.middleware.UiActions
 import com.willowtreeapps.namegame.*
+import org.reduxkotlin.ClearView
+import org.reduxkotlin.DetachView
 import java.util.*
 
 
@@ -93,6 +96,7 @@ class QuestionFragment : BaseNameGameViewFragment<QuestionView>(), QuestionView,
     private var lastSelectedBtn: Button? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
         speechRecognizer = SpeechRecognizer.createSpeechRecognizer(activity!!)
         return inflater.inflate(R.layout.fragment_question, container, false)
     }
@@ -114,7 +118,10 @@ class QuestionFragment : BaseNameGameViewFragment<QuestionView>(), QuestionView,
 
     override fun onBackPressed(): Boolean {
         //TODO revisit this - is needed with presenter middleware
-//        NameGameApp.gameEngine().detachView(this)
+//        dispatch(DetachView(this))
+//        dispatch(ClearView(this))
+        dispatch(UiActions.BackPressOnQuestions())
+        closeMic()
 //        presenter.onBackPressed()
         return false
     }
diff --git a/android/src/main/java/com/willowtreeapps/namegame/store/StartFragment.kt b/android/src/main/java/com/willowtreeapps/namegame/store/StartFragment.kt
@@ -4,19 +4,19 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import com.willowtreeapps.common.middleware.UiActions
 import com.willowtreeapps.common.ui.StartView
 import com.willowtreeapps.namegame.*
 import kotlinx.android.synthetic.main.fragment_start.*
 
-class StartFragment : Fragment(), StartView {
+class StartFragment : BaseNameGameViewFragment<StartView>(), StartView {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_start, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         btn_start.setOnClickListener { dispatch(UiActions.StartGameTapped()) }
         btn_settings.setOnClickListener { dispatch(UiActions.SettingsTapped()) }
     }
@@ -26,7 +26,9 @@ class StartFragment : Fragment(), StartView {
     }
 
     override fun showLoading() {
-        loading_spinner.visibility = View.VISIBLE
+        activity?.runOnUiThread {
+            loading_spinner.visibility = View.VISIBLE
+        }
     }
 
     override fun showError(msg: String) {
diff --git a/android/src/main/res/layout/fragment_start.xml b/android/src/main/res/layout/fragment_start.xml
@@ -68,6 +68,7 @@
         android:layout_height="wrap_content"
         android:indeterminateTint="@color/colorPrimary"
         android:visibility="gone"
+        tools:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt
@@ -24,11 +24,9 @@ data class AppState(val isLoadingItems: Boolean = false,
             else -> "TIME'S UP!!"
         }
 
-    val currentQuestion: Question?
-        get() = if (questions.size > currentQuestionIndex)
-            questions[currentQuestionIndex]
-        else
-            null
+    val currentQuestion: Question
+        get() = questions[currentQuestionIndex]
+
 
     fun currentQuestionItem() = currentQuestion!!.choices.find { it.id == currentQuestion!!.itemId }!!
 
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt
@@ -1,7 +1,6 @@
 package com.willowtreeapps.common
 
 import com.willowtreeapps.common.Actions.*
-import com.willowtreeapps.common.middleware.UiActions
 import com.willowtreeapps.common.util.NO_MATCH
 import com.willowtreeapps.common.util.match
 import org.reduxkotlin.*
@@ -29,19 +28,19 @@ val reducer: Reducer<AppState> = { state: AppState, action ->
                 answerName = action.name
                 Question.Status.CORRECT
             } else {
-                val correctIndex = state.currentQuestion?.choices?.indexOfFirst { it.id == state.currentQuestion?.itemId }
-                val matchingIndex = match(action.name, state.currentQuestion!!.choices.map { it.displayName() })
+                val correctIndex = state.currentQuestion.choices.indexOfFirst { it.id == state.currentQuestion.itemId }
+                val matchingIndex = match(action.name, state.currentQuestion.choices.map { it.displayName() })
                 when (matchingIndex) {
                     NO_MATCH -> {
                         answerName = null
                         Question.Status.INCORRECT
                     }
                     correctIndex -> {
-                        answerName = state.currentQuestion!!.choices[matchingIndex].displayName()
+                        answerName = state.currentQuestion.choices[matchingIndex].displayName()
                         Question.Status.CORRECT
                     }
                     else -> {
-                        answerName = state.currentQuestion!!.choices[matchingIndex].displayName()
+                        answerName = state.currentQuestion.choices[matchingIndex].displayName()
                         Question.Status.INCORRECT
                     }
                 }
@@ -54,7 +53,7 @@ val reducer: Reducer<AppState> = { state: AppState, action ->
             state.copy(questions = newQuestions, waitingForNextQuestion = true)
         }
         is NextQuestionAction -> state.copy(waitingForNextQuestion = false, currentQuestionIndex = state.currentQuestionIndex + 1)
-        is GameCompleteAction -> state.copy(waitingForNextQuestion = false, currentQuestionIndex = state.currentQuestionIndex + 1)
+        is GameCompleteAction -> state.copy(waitingForNextQuestion = false)
         is ResetGameStateAction -> AppState.INITIAL_STATE.copy(settings = state.settings)
         is StartQuestionTimerAction -> state.copy(questionClock = action.initialValue)
         is DecrementCountDownAction -> state.copy(questionClock = state.questionClock - 1)
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/UiMiddleware.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/UiMiddleware.kt
@@ -3,10 +3,7 @@ package com.willowtreeapps.common.middleware
 import com.willowtreeapps.common.*
 import com.willowtreeapps.common.util.debounce
 import com.willowtreeapps.common.util.isAndroid
-import org.reduxkotlin.Dispatcher
-import org.reduxkotlin.Middleware
-import org.reduxkotlin.Store
-import org.reduxkotlin.middleware
+import org.reduxkotlin.*
 import kotlin.coroutines.CoroutineContext
 
 fun uiMiddleware(networkThunks: NetworkThunks,
@@ -70,6 +67,12 @@ fun uiMiddleware(networkThunks: NetworkThunks,
         is UiActions.CategoryPicked -> dispatch(Actions.ChangeCategorySettingsAction(action.categoryId))
         is UiActions.NumQuestionsPicked -> dispatch(Actions.ChangeNumQuestionsSettingsAction(action.numQuestions))
         is UiActions.MicrophoneModeToggled -> dispatch(Actions.ChangeMicrophoneModeSettingsAction(action.enabled))
+        is UiActions.BackPressOnQuestions -> {
+            dispatch(timerThunks.stopTimer())
+            dispatch(timerThunks.cancelDelayed())
+            dispatch(Actions.ResetGameStateAction())
+//            dispatch(NavigationActions.NavigateTo(Screen.START))
+        }
         else -> next(action)
     }
 }
@@ -87,5 +90,6 @@ class UiActions {
     class EndGameTapped
     class ProfileImageDidShow
     data class NamePicked(val name: String)
+    class BackPressOnQuestions
 }
 
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/QuestionView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/QuestionView.kt
@@ -27,21 +27,19 @@ interface QuestionView : GameBaseView {
 }
 
 val questionPresenter = presenter<QuestionView> {{
-    withSingleField({ it.questionClock }, { setTimerText(state.toQuestionViewState()) })
+    +{ state.questionClock }+ { setTimerText(state.toQuestionViewState()) }
 
-    withSingleField({
-        it.currentQuestion?.itemId?.id ?: Any()
-    }, { showProfile(state.toQuestionViewState()) })
+    +{ state.currentQuestion.itemId.id } + { showProfile(state.toQuestionViewState()) }
 
-    withSingleField({ it.waitingForNextQuestion }) {
+    +{ state.waitingForNextQuestion } + {
         if (state.waitingForNextQuestion) {
             if (state.settings.microphoneMode) {
                 closeMic()
                 if (!state.isGameComplete()) {
                     store.dispatch(UiActions.NextQuestionDelayed())
                 }
             }
-            when (state.currentQuestion?.status) {
+            when (state.currentQuestion.status) {
                 Question.Status.CORRECT -> {
                     showCorrectAnswer(state.toQuestionViewState(), state.isGameComplete())
                 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/util/PresenterInjector.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/util/PresenterInjector.kt
@@ -0,0 +1,12 @@
+package com.willowtreeapps.common.util
+
+import org.reduxkotlin.AttachView
+import org.reduxkotlin.DetachView
+import org.reduxkotlin.View
+import org.reduxkotlin.rootDispatch
+
+//Here only until a solution is found for rootDispatch & AttachView class not
+//visible from swift.
+fun attachView(view: View) = rootDispatch(AttachView(view))
+fun detachView(view: View) = rootDispatch(DetachView(view))
+fun clearView(view: View) = rootDispatch(DetachView(view))
diff --git a/iOS/NameGame/NameGame.xcodeproj/project.pbxproj b/iOS/NameGame/NameGame.xcodeproj/project.pbxproj
@@ -388,7 +388,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#move to the xcode-frameworks folder\n#cd \"$SRCROOT/../../common/build/xcode-frameworks\"\ncd \"$SRCROOT/../../\"\n\n#run the gradle task\n./gradlew :common:build -PXCODE_CONFIGURATION=${CONFIGURATION}\n";
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#move to the xcode-frameworks folder\n#cd \"$SRCROOT/../../common/build/xcode-frameworks\"\ncd \"$SRCROOT/../../\"\n\n#run the gradle task\n#./gradlew :common:build -PXCODE_CONFIGURATION=${CONFIGURATION}\n./gradlew packforxcode -PXCODE_CONFIGURATION=${CONFIGURATION}\n\n";
 		};
 		277D0BB52D26BF640FE16445 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/iOS/NameGame/NameGame/BaseNameGameViewController.swift b/iOS/NameGame/NameGame/BaseNameGameViewController.swift
@@ -3,7 +3,9 @@ import UIKit
 import common
 
 
-class BaseNameViewController : UIViewController, View {
+class BaseNameViewController : UIViewController, Presenter_middlewareView {
+
+    
     required init?(coder aDecoder: NSCoder) {
         let appDelegate = UIApplication.shared.delegate as! AppDelegate
         appDelegate.initilize()
@@ -13,12 +15,12 @@ class BaseNameViewController : UIViewController, View {
     
     override func viewDidDisappear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        PresenterInjecterKt.rootDispatch(DetachView(view: self))
+        PresenterInjectorKt.detachView(view: self)
     }
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        PresenterInjecterKt.rootDispatch(AttachView(view: self))
+        PresenterInjectorKt.attachView(view: self)
     }
     
 }
diff --git a/iOS/NameGame/NameGame/GameResultsViewController.swift b/iOS/NameGame/NameGame/GameResultsViewController.swift
@@ -3,7 +3,8 @@ import common
 import UIKit
 
 class GameResultsViewController: BaseNameViewController, GameResultsView {
-    func presenter() -> (View, Kotlinx_coroutines_coreCoroutineScope) -> (LibStore) -> () -> KotlinUnit {
+    
+    func presenter() -> (Presenter_middlewareView, Kotlinx_coroutines_coreCoroutineScope) -> (LibStore) -> () -> KotlinUnit {
         return GameResultsViewKt.gameResultsPresenter
     }
     
diff --git a/iOS/NameGame/NameGame/QuestionViewController.swift b/iOS/NameGame/NameGame/QuestionViewController.swift
@@ -5,8 +5,9 @@ import Speech
 
 
 class QuestionViewController: BaseNameViewController, QuestionView {
-    func presenter() -> (View, Kotlinx_coroutines_coreCoroutineScope) -> (LibStore) -> () -> KotlinUnit {
-            return QuestionViewKt.questionPresenter
+
+    func presenter() -> (Presenter_middlewareView, Kotlinx_coroutines_coreCoroutineScope) -> (LibStore) -> () -> KotlinUnit {
+        return QuestionViewKt.questionPresenter
     }
     
     
@@ -100,13 +101,17 @@ class QuestionViewController: BaseNameViewController, QuestionView {
         confettiView?.isUserInteractionEnabled = false
         self.labelTimer.alpha = 0
         super.viewWillAppear(animated)
+        self.navigationController?.navigationBar.setBackgroundImage(UIImage(), for: .default)
+        self.navigationController?.navigationBar.shadowImage = UIImage()
+        self.navigationController?.navigationBar.isTranslucent = true
+        self.navigationController?.view.backgroundColor = .clear
+        navigationController?.setNavigationBarHidden(false, animated: true)
     }
 
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         if (isMovingFromParent) {
-            //TODO fix this
-            //getPresenter()?.onBackPressed()
+            dispatch(UiActions.BackPressOnQuestions())
         }
     }
 
@@ -233,7 +238,6 @@ class QuestionViewController: BaseNameViewController, QuestionView {
     }
 
     func setTimerText(viewState: QuestionViewState) {
-
         labelTimer.layer.anchorPoint = CGPoint(x: 0.5, y: 0.5);
 
         self.labelTimer.transform = CGAffineTransform(scaleX: 0, y: 0)
diff --git a/iOS/NameGame/NameGame/SettingsViewController.swift b/iOS/NameGame/NameGame/SettingsViewController.swift
@@ -7,7 +7,8 @@ class SettingsViewController: BaseNameViewController,
         UIPickerViewDelegate,
         UIPickerViewDataSource,
 SettingsView {
-    func presenter() -> (View, Kotlinx_coroutines_coreCoroutineScope) -> (LibStore) -> () -> KotlinUnit {
+    
+    func presenter() -> (Presenter_middlewareView, Kotlinx_coroutines_coreCoroutineScope) -> (LibStore) -> () -> KotlinUnit {
         return SettingsViewKt.settingsPresenter
     }
     
@@ -28,7 +29,7 @@ SettingsView {
     }
     
     let pickerData: [Int] = Array(1...20)
-    let categoryData: [String] = QuestionCategoryId.Companion.init().displayNameListWithoutWT
+    let categoryData: [String] = QuestionCategoryId.Companion().displayNameList
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -40,7 +41,7 @@ SettingsView {
 
     func showSettings(viewState: SettingsViewState) {
         numPicker.selectRow((Int(viewState.numQuestions - 1)), inComponent: 0, animated: true)
-        categoryPicker.selectRow(Int(QuestionCategoryId.Companion.init().displayNameListWithoutWT.firstIndex(of: viewState.categoryId.displayName)!), inComponent: 0, animated: true)
+        categoryPicker.selectRow(Int(QuestionCategoryId.Companion().displayNameList.firstIndex(of: viewState.categoryId.displayName)!), inComponent: 0, animated: true)
     }
     
     func askForMicPermissions() {
diff --git a/iOS/NameGame/NameGame/StartViewController.swift b/iOS/NameGame/NameGame/StartViewController.swift
@@ -3,29 +3,37 @@ import UIKit
 import common
 
 class StartViewController: BaseNameViewController, StartView {
-    func presenter() -> (View, Kotlinx_coroutines_coreCoroutineScope) -> (LibStore) -> () -> KotlinUnit {
+
+    func presenter() -> (Presenter_middlewareView, Kotlinx_coroutines_coreCoroutineScope) -> (LibStore) -> () -> KotlinUnit {
         return StartViewKt.startPresenter
     }
-    
 
     @IBOutlet weak var labelError: UILabel!
     @IBOutlet weak var progressView: UIProgressView!
 
     @IBAction func viewTapped(_ sender: Any) {
         dispatch(UiActions.StartGameTapped())
+        progressView.isHidden = false
         progressView.setProgress(0, animated: false)
         UIView.animate(withDuration: 3) {
             self.progressView.setProgress(1.0, animated: true)
         }
-        
     }
+    
     @IBAction func settingsTapped(_ sender: Any) {
         dispatch(UiActions.SettingsTapped())
     }
 
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        progressView.progress = 0;
+        progressView.isHidden = true
+        navigationController?.setNavigationBarHidden(true, animated: false)
+    }
     override func viewDidAppear(_ animated: Bool) {
-        super.viewDidDisappear(animated)
-        self.progressView.progress = 0;
+        super.viewDidAppear(animated)
+        progressView.progress = 0;
+        progressView.isHidden = true
     }
 
     func showLoading() {
@@ -39,6 +47,4 @@ class StartViewController: BaseNameViewController, StartView {
     func showError(msg: String) {
         labelError.text = msg
     }
-    
-    
 }

Original file line number	Diff line number	Diff line change
`@@ -27,21 +27,19 @@ interface QuestionView : GameBaseView {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`val questionPresenter = presenter<QuestionView> {{`
`30`		`- withSingleField({ it.questionClock }, { setTimerText(state.toQuestionViewState()) })`
	`30`	`+ +{ state.questionClock }+ { setTimerText(state.toQuestionViewState()) }`
`31`	`31`
`32`		`- withSingleField({`
`33`		`- it.currentQuestion?.itemId?.id ?: Any()`
`34`		`- }, { showProfile(state.toQuestionViewState()) })`
	`32`	`+ +{ state.currentQuestion.itemId.id } + { showProfile(state.toQuestionViewState()) }`
`35`	`33`
`36`		`- withSingleField({ it.waitingForNextQuestion }) {`
	`34`	`+ +{ state.waitingForNextQuestion } + {`
`37`	`35`	`if (state.waitingForNextQuestion) {`
`38`	`36`	`if (state.settings.microphoneMode) {`
`39`	`37`	`closeMic()`
`40`	`38`	`if (!state.isGameComplete()) {`
`41`	`39`	`store.dispatch(UiActions.NextQuestionDelayed())`
`42`	`40`	`}`
`43`	`41`	`}`
`44`		`- when (state.currentQuestion?.status) {`
	`42`	`+ when (state.currentQuestion.status) {`
`45`	`43`	`Question.Status.CORRECT -> {`
`46`	`44`	`showCorrectAnswer(state.toQuestionViewState(), state.isGameComplete())`
`47`	`45`	`}`