voice mode working on iOS and debounce function added;

Author: Patrick Jackson

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

@@ -3,9 +3,8 @@ package com.willowtreeapps.namegame.store
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import com.willowtreeapps.common.Logger
-import com.willowtreeapps.common.Presenter
-import com.willowtreeapps.common.View
-import com.willowtreeapps.common.ui.GameResultsPresenter
+import com.willowtreeapps.common.ui.Presenter
+import com.willowtreeapps.common.ui.View
 import com.willowtreeapps.namegame.NameGameApp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

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

@@ -30,10 +30,8 @@ class GameResultsFragment : BaseNameGameViewFragment<GameResultsPresenter>(), Ga
     }
 
     override fun showResults(viewState: GameResultsViewState) {
-        activity?.runOnUiThread {
-            txt_questionTitle.text = viewState.resultsText
-            txt_message.text = viewState.messageText
-        }
+        txt_questionTitle.text = viewState.resultsText
+        txt_message.text = viewState.messageText
     }
 
     override fun onBackPressed(): Boolean {

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

@@ -26,14 +26,10 @@ class StartFragment : Fragment(), CoroutineScope, StartView {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         btn_start.setOnClickListener {
-            activity?.runOnUiThread {
-                presenter?.startGame()
-            }
+            presenter?.startGame()
         }
         btn_settings.setOnClickListener {
-            activity?.runOnUiThread {
-                presenter?.settingsTapped()
-            }
+            presenter?.settingsTapped()
         }
     }
 
@@ -48,20 +44,14 @@ class StartFragment : Fragment(), CoroutineScope, StartView {
     }
 
     override fun hideLoading() {
-        activity?.runOnUiThread {
-            loading_spinner.visibility = View.GONE
-        }
+        loading_spinner.visibility = View.GONE
     }
 
     override fun showLoading() {
-        activity?.runOnUiThread {
-            loading_spinner.visibility = View.VISIBLE
-        }
+        loading_spinner.visibility = View.VISIBLE
     }
 
     override fun showError(msg: String) {
-        activity?.runOnUiThread {
-            txt_error.text = msg
-        }
+        txt_error.text = msg
     }
 }

android/src/test/java/com/willowtreeapps/namegame/DebouceTest.kt

@@ -1,19 +1,25 @@
 package com.willowtreeapps.namegame
 
 import com.willowtreeapps.common.util.debounce
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
 class DebounceTest {
     @Test
     fun `does not call if within delay time`() {
         var ct = 0
-        val f: ()-> Unit = { ct++ }
-        val debounceFun = debounce( f = f)
-        debounceFun()
-        debounceFun()
+        runBlocking {
+            val f: (Unit) -> Unit = { ct++ }
+            val debounceFun = debounce(coroutineContext = this.coroutineContext, f = f)
+            debounceFun(Unit)
+            debounceFun(Unit)
+            debounceFun(Unit)
+            debounceFun(Unit)
+            debounceFun(Unit)
+            debounceFun(Unit)
+        }
         assertEquals(1, ct)
-
     }
 
 //    @Test

common/src/androidMain/kotlin/com/willowtreeapps/common/util/isAndroid.kt

@@ -0,0 +1,3 @@
+package com.willowtreeapps.common.util
+
+actual fun isAndroid(): Boolean = true

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

@@ -1,5 +1,7 @@
 package com.willowtreeapps.common
 
+import com.willowtreeapps.common.repo.GameResultResponses
+
 data class AppState(val isLoadingItems: Boolean = false,
                     val items: List<Item> = listOf(),
                     val errorLoadingItems: Boolean = false,
@@ -8,6 +10,7 @@ data class AppState(val isLoadingItems: Boolean = false,
                     val waitingForNextQuestion: Boolean = false,
                     val questionClock: Int = -1,
                     val questionTitle: String = "",
+                    val gameResultResponses: GameResultResponses = GameResultResponses(),
                     val questions: List<Question> = listOf(),
                     val settings: UserSettings = UserSettings.defaults()) {
     companion object {

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

@@ -9,6 +9,9 @@ import com.willowtreeapps.common.middleware.SettingsMiddleware
 import com.willowtreeapps.common.middleware.ViewEffectsMiddleware
 import com.willowtreeapps.common.repo.LocalStorageSettingsRepository
 import com.willowtreeapps.common.repo.userSettings
+import com.willowtreeapps.common.ui.Presenter
+import com.willowtreeapps.common.ui.PresenterFactory
+import com.willowtreeapps.common.ui.View
 import com.willowtreeapps.common.util.VibrateUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -17,7 +20,7 @@ import kotlin.coroutines.CoroutineContext
 class GameEngine(navigator: Navigator,
                  application: Any = Any(),
                  networkContext: CoroutineContext,
-                 private val uiContext: CoroutineContext) {
+                 val uiContext: CoroutineContext) {
     private val navigationMiddleware = NavigationMiddleware(navigator)
     private val viewEffectsMiddleware = ViewEffectsMiddleware()
     private val presenterFactory by lazy { PresenterFactory(this, networkContext) }

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

@@ -49,7 +49,9 @@ fun reducer(state: AppState, action: Any): AppState =
                 }
 
                 val newQuestions = state.questions.toMutableList()
-                newQuestions[state.currentQuestionIndex] = newQuestions[state.currentQuestionIndex].copy(answerName = answerName, status = status, answerNameInterpretedAs = action.name)
+                newQuestions[state.currentQuestionIndex] = newQuestions[state.currentQuestionIndex].copy(answerName = answerName,
+                        status = status,
+                        answerNameInterpretedAs = action.name)
                 state.copy(questions = newQuestions, waitingForNextQuestion = true)
             }
             is NextQuestionAction -> state.copy(waitingForNextQuestion = false, currentQuestionIndex = state.currentQuestionIndex + 1)

common/src/commonMain/kotlin/com/willowtreeapps/common/boundary/TransformFunctions.kt

@@ -13,7 +13,9 @@ fun AppState.toQuestionViewState(): QuestionViewState {
     val choice3 = currentQuestion?.choices?.get(2)!!.displayName()
     val choice4 = currentQuestion?.choices?.get(3)!!.displayName()
     val correctBtnNum = currentQuestion?.choices?.indexOfFirst { it.id == item.id }!! + 1
-    var selectedBtnNum = currentQuestion?.choices?.indexOfFirst { it.equalsDisplayName(currentQuestion?.answerName ?: "") }
+    var selectedBtnNum = currentQuestion?.choices?.indexOfFirst {
+        it.equalsDisplayName(currentQuestion?.answerName ?: "")
+    }
     if (selectedBtnNum != null) {
         selectedBtnNum += 1
     }
@@ -29,18 +31,20 @@ fun AppState.toQuestionViewState(): QuestionViewState {
             nextButtonVisible = this.waitingForNextQuestion && !isGameComplete(),
             endButtonVisible = isGameComplete(),
             timerText = timerText,
-            selectedBtnNum =  selectedBtnNum ?: -1)
+            selectedBtnNum = selectedBtnNum ?: -1)
 }
 
 fun AppState.toGameResultsViewState(): GameResultsViewState {
     val percentage = ((numCorrect.toFloat() / questions.size) * 100).toInt()
-    val messageText = when (percentage) {
-        100 -> perfectScoreResponses.takeRandom()
-        in 80..99 -> goodScoreResponses.takeRandom()
-        in 50..79 -> okScoreResponses.takeRandom()
-        in 10..49 -> badScoreResponses.takeRandom()
-        0 -> zeroScoreResponses.takeRandom()
-        else -> throw IllegalStateException("Error in toGameResultsViewState when statement or invalid game state")
+    val messageText = with(gameResultResponses) {
+        when (percentage) {
+            100 -> perfect
+            in 80..99 -> good
+            in 50..79 -> ok
+            in 10..49 -> bad
+            0 -> zero
+            else -> throw IllegalStateException("Error in toGameResultsViewState when statement or invalid game state")
+        }
     }
     return GameResultsViewState(resultsText = gameTotals(),
             messageText = messageText)

common/src/commonMain/kotlin/com/willowtreeapps/common/repo/ItemRepository.kt

@@ -3,6 +3,7 @@ package com.willowtreeapps.common.repo
 import com.willowtreeapps.common.Item
 import com.willowtreeapps.common.PlatformDispatcher
 import com.willowtreeapps.common.ItemId
+import com.willowtreeapps.common.takeRandom
 
 /**
  * interface for providing list of items for the game.  Items are generic representation.
@@ -13,7 +14,8 @@ interface ItemRepository {
 }
 
 data class ItemsHolder(val questionTitle: String,
-                       val items: List<Item>)
+                       val items: List<Item>,
+                       val gameResultResponses: GameResultResponses = GameResultResponses())
 
 class ProfileItemRepository(val repo: ProfilesRepository = KtorProfilesRepository()) : ItemRepository {
     override suspend fun fetchItems(): GatewayResponse<ItemsHolder, GenericError> {
@@ -35,10 +37,10 @@ class DogItemRepository(val repo: KtorDogsRepository = KtorDogsRepository(Platfo
         return if (results.isSuccessful) {
             val itemsHolder = ItemsHolder(questionTitle = "Name the breed",
                     items = results.response?.map {
-                Item(id = ItemId(it.breed + "_" + it.subBreed),
-                        firstName = it.breed, lastName = it.subBreed ?: "",
-                        imageUrl = it.imageUrl)
-            }!!)
+                        Item(id = ItemId(it.breed + "_" + it.subBreed),
+                                firstName = it.breed, lastName = it.subBreed ?: "",
+                                imageUrl = it.imageUrl)
+                    }!!)
             GatewayResponse.createSuccess(itemsHolder, 200, "")
         } else {
             GatewayResponse.createError(GenericError("Error"), 500, "")
@@ -52,10 +54,10 @@ class CatItemRepository(val repo: KtorCatsRepository = KtorCatsRepository(Platfo
         val results = repo.allBreeds()
         val itemsHolder = ItemsHolder(questionTitle = "Name the breed",
                 items = results.response?.map {
-                Item(id = ItemId(it.id),
-                        firstName = it.breed, lastName = "",
-                        imageUrl = it.imageUrl)
-            }!!)
+                    Item(id = ItemId(it.id),
+                            firstName = it.breed, lastName = "",
+                            imageUrl = it.imageUrl)
+                }!!)
         return if (results.isSuccessful) {
             GatewayResponse.createSuccess(itemsHolder, 200, "")
         } else {
@@ -64,3 +66,39 @@ class CatItemRepository(val repo: KtorCatsRepository = KtorCatsRepository(Platfo
     }
 }
 
+data class GameResultResponses(
+        val perfect: String = perfectScoreResponses.takeRandom(),
+        val good: String = goodScoreResponses.takeRandom(),
+        val ok: String = okScoreResponses.takeRandom(),
+        val bad: String = badScoreResponses.takeRandom(),
+        val zero: String = zeroScoreResponses.takeRandom()
+)
+
+val perfectScoreResponses = listOf(
+        "Perfect!!",
+        "Wow, perfection!",
+        "Great Job - 100% !!!",
+        "Ok, you've worked here a while.")
+
+val goodScoreResponses = listOf(
+        "Nice!!",
+        "Pretty Good!",
+        "Good, but you still meet a few folks!!!",
+        "Good Job!")
+
+val okScoreResponses = listOf(
+        "Not bad, but you can do better!!",
+        "Still meeting people?",
+        "Not that great \nYou could stand some practice.",
+        "A few more times are I think you'll learn more names.")
+
+val badScoreResponses = listOf(
+        "Ok, do you even work here??",
+        "Practice, Practice, Practice. \nYou'll get it!",
+        "Wow, that is not good.  \nNew to the company?",
+        "No worries, try again!")
+
+val zeroScoreResponses = listOf(
+        "Did you even try??",
+        "Not even one correct??  \nWow...want to try again?",
+        "Even my cat gets a few right....")