tweaks to speech. working on iOS

Patrick Jackson · Patrick Jackson · commit 06499de2245b · 2019-04-23T14:03:59.000-04:00
diff --git a/android/src/main/java/com/willowtreeapps/namegame/AndroidNavigator.kt b/android/src/main/java/com/willowtreeapps/namegame/AndroidNavigator.kt
@@ -29,8 +29,8 @@ class AndroidNavigator : Navigator, Application.ActivityLifecycleCallbacks {
             when (screen) {
                 Screen.QUESTION -> navController.navigate(R.id.action_startScreen_to_questionScreen)
                 Screen.GAME_COMPLETE -> navController.navigate(R.id.action_questionScreen_to_resultsFragment)
-//            Screen.START -> navController.navigate(R.id.startScreen)
-                Screen.START -> navController.navigate(R.id.action_resultsFragment_to_startScreen)
+            Screen.START -> navController.navigate(R.id.startScreen)
+//                Screen.START -> navController.navigate(R.id.action_resultsFragment_to_startScreen)
                 Screen.SETTINGS -> {
                     val dialog = SettingsDialogFragment.newInstance()
                     dialog.show(currentActivity!!.supportFragmentManager, "SettingsFragment")
diff --git a/android/src/main/java/com/willowtreeapps/namegame/MainActivity.kt b/android/src/main/java/com/willowtreeapps/namegame/MainActivity.kt
@@ -34,11 +34,11 @@ class MainActivity : AppCompatActivity() {
     override fun onSupportNavigateUp(): Boolean = Navigation.findNavController(this, R.id.nav_host_fragment).navigateUp()
 
     override fun onBackPressed() {
-//        val navHostFragment =
-//                this.supportFragmentManager.findFragmentById(R.id.nav_host_fragment)
-//        val currentFragment = navHostFragment?.childFragmentManager?.fragments?.get(0)
-//        if (currentFragment is IOnBackPressed)
-//            (currentFragment as IOnBackPressed).onBackPressed()
+        val navHostFragment =
+                this.supportFragmentManager.findFragmentById(R.id.nav_host_fragment)
+        val currentFragment = navHostFragment?.childFragmentManager?.fragments?.get(0)
+        if (currentFragment is IOnBackPressed)
+            (currentFragment as IOnBackPressed).onBackPressed()
         super.onBackPressed()
     }
 
diff --git a/android/src/main/java/com/willowtreeapps/namegame/Utils.kt b/android/src/main/java/com/willowtreeapps/namegame/Utils.kt
@@ -4,11 +4,13 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.animation.AnimatorSet
 import android.content.res.Resources
-import android.graphics.drawable.Drawable
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
+import com.willowtreeapps.common.util.TimeUtil
+import kotlin.math.abs
+import kotlin.random.Random
 
 val Int.dp: Int
     get() = (this / Resources.getSystem().displayMetrics.density).toInt()
@@ -40,4 +42,7 @@ fun <T: Any> GlideRequest<T>.onComplete(after: () -> Unit): GlideRequest<T> {
         }
 
     })
-}
+}
+
+
+
diff --git a/android/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt b/android/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt
@@ -66,6 +66,7 @@ class QuestionFragment : BaseNameGameViewFragment<QuestionPresenter>(), Question
             }
 
             override fun onError(error: Int) {
+                Logger.d("Error with speech recognizer: code =$error")
             }
 
             override fun onResults(results: Bundle) {
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt
@@ -30,8 +30,6 @@ data class AppState(val isLoadingItems: Boolean = false,
         else
             null
 
-    fun getItem(id: ItemId?) = items.find { it.id == id }
-
     fun currentQuestionItem() = currentQuestion!!.choices.find { it.id == currentQuestion!!.itemId }!!
 
     fun isGameComplete(): Boolean = currentQuestionIndex >= questions.size || (currentQuestionIndex == questions.size - 1 && questions[currentQuestionIndex].status != Question.Status.UNANSWERED)
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/GameEngine.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/GameEngine.kt
@@ -37,7 +37,9 @@ class GameEngine(navigator: Navigator,
     }
 
     init {
-        appStore.dispatch(Actions.LoadAllSettingsAction())
+        CoroutineScope(uiContext).launch {
+            appStore.dispatch(Actions.LoadAllSettingsAction())
+        }
     }
 
     fun dispatch(action: Any) {
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/NetworkThunks.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/NetworkThunks.kt
@@ -10,7 +10,7 @@ import kotlin.coroutines.CoroutineContext
  * actions.  This allows dispatching a loading, success, and failure state.
  */
 class NetworkThunks(private val networkContext: CoroutineContext,
-                    val store: Store<AppState>) : CoroutineScope {
+                    val engine: GameEngine) : CoroutineScope {
     private val job = Job()
     override val coroutineContext: CoroutineContext
         get() = networkContext + job
@@ -26,14 +26,14 @@ class NetworkThunks(private val networkContext: CoroutineContext,
         val repo = repoForCategory(categoryId)
         Logger.d("Fetching StoreInfo and Feed")
         launch {
-            store.dispatch(Actions.FetchingItemsStartedAction())
-            val result = repo.fetchItems()
+            engine.dispatch(Actions.FetchingItemsStartedAction())
+            val result = repo.fetchItems(state.settings.numQuestions)
             if (result.isSuccessful) {
                 Logger.d("Success")
-                store.dispatch(Actions.FetchingItemsSuccessAction(result.response!!))
+                engine.dispatch(Actions.FetchingItemsSuccessAction(result.response!!))
             } else {
                 Logger.d("Failure")
-                store.dispatch(Actions.FetchingItemsFailedAction(result.message!!))
+                engine.dispatch(Actions.FetchingItemsFailedAction(result.message!!))
             }
         }
     }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt
@@ -2,12 +2,7 @@ package com.willowtreeapps.common
 
 import com.willowtreeapps.common.Actions.*
 import com.willowtreeapps.common.util.NO_MATCH
-import com.willowtreeapps.common.util.TimeUtil
 import com.willowtreeapps.common.util.match
-import kotlin.math.abs
-import kotlin.random.Random
-import kotlin.reflect.KProperty0
-import kotlin.reflect.KProperty1
 
 /**
  * Reducers and functions used by reducers are in this file.  Functions must be pure functions without
@@ -17,11 +12,10 @@ fun reducer(state: AppState, action: Any): AppState =
         when (action) {
             is FetchingItemsStartedAction -> state.copy(isLoadingItems = true)
             is FetchingItemsSuccessAction -> {
-                val questions = generateQuestions(action.itemsHolder.items, state.settings.numQuestions)
                 state.copy(isLoadingItems = false,
                         items = action.itemsHolder.items,
                         questionTitle = action.itemsHolder.questionTitle,
-                        questions = questions)
+                        questions = action.itemsHolder.questions)
             }
             is FetchingItemsFailedAction -> state.copy(isLoadingItems = false, errorLoadingItems = true, errorMsg = action.message)
             is NamePickedAction -> {
@@ -74,43 +68,3 @@ fun reducer(state: AppState, action: Any): AppState =
             else -> throw AssertionError("Action ${action::class.simpleName} not handled")
         }
 
-fun generateQuestions(items: List<Item>, n: Int): List<Question> =
-        items.filter { it.imageUrl != "" }
-                .takeRandomDistinct(n)
-                .map { item ->
-                    val choiceList = items.takeRandomDistinct(3).toMutableList()
-                    choiceList.add(abs(random.nextInt() % 4), item)
-
-                    Question(itemId = item.id, choices = choiceList
-                            .map { it })
-                }
-
-private val random = Random(TimeUtil.systemTimeMs())
-
-/**
- * Take N distict elements from the list.  Distinct is determined by a comparision of objects in the
- * list.
- * @throws IllegalStateException when n > number of distinct elements.
- * @return New immutable list containing N random elements from the given List.
- */
-fun <T> List<T>.takeRandomDistinct(n: Int): List<T> {
-    val newList = mutableListOf<T>()
-    val uniqueItems = this.distinctBy { it }
-    if (uniqueItems.size < n) {
-        throw IllegalStateException("Unable to get $n unique random elements from given list.")
-    }
-    while (newList.size < n) {
-        val randomIndex = abs(random.nextInt() % uniqueItems.size)
-        val next = uniqueItems[randomIndex]
-        if (newList.contains(next)) {
-            continue
-        } else {
-            newList.add(next)
-        }
-    }
-    return newList.toList()
-}
-
-
-fun <T> List<T>.takeRandom(): T =
-        this[random.nextInt(this.size - 1)]
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/ItemRepository.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/ItemRepository.kt
@@ -1,28 +1,39 @@
 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
+import com.willowtreeapps.common.*
+import com.willowtreeapps.common.util.random
+import com.willowtreeapps.common.util.takeRandom
+import com.willowtreeapps.common.util.takeRandomDistinct
+import kotlin.math.abs
 
 /**
  * interface for providing list of items for the game.  Items are generic representation.
  * This may be used for any data source to generate questions.
  */
 interface ItemRepository {
-    suspend fun fetchItems(): GatewayResponse<ItemsHolder, GenericError>
+    suspend fun fetchItems(numQuestions: Int): GatewayResponse<ItemsHolder, GenericError>
 }
 
 data class ItemsHolder(val questionTitle: String,
                        val items: List<Item>,
+                       val questions: List<Question>,
                        val gameResultResponses: GameResultResponses = GameResultResponses())
 
 class ProfileItemRepository(val repo: ProfilesRepository = KtorProfilesRepository()) : ItemRepository {
-    override suspend fun fetchItems(): GatewayResponse<ItemsHolder, GenericError> {
+
+    override suspend fun fetchItems(numQuestions: Int): GatewayResponse<ItemsHolder, GenericError> {
         val results = repo.profiles()
         return if (results.isSuccessful) {
+            val items = results.response?.map {
+                Item(id = ItemId(it.id),
+                        firstName = it.firstName,
+                        lastName = it.lastName,
+                        imageUrl = "https:${it.headshot.url}")
+            }!!
+
             val itemHolder = ItemsHolder(questionTitle = "Who is this?",
-                    items = results.response?.map { Item(id = ItemId(it.id), firstName = it.firstName, lastName = it.lastName, imageUrl = "https:${it.headshot.url}") }!!)
+                    items = items,
+                    questions = generateQuestions(items, numQuestions))
             GatewayResponse.createSuccess(itemHolder, 200, "")
         } else {
             GatewayResponse.createError(GenericError("Error"), 500, "")
@@ -32,15 +43,24 @@ class ProfileItemRepository(val repo: ProfilesRepository = KtorProfilesRepositor
 }
 
 class DogItemRepository(val repo: KtorDogsRepository = KtorDogsRepository(PlatformDispatcher)) : ItemRepository {
-    override suspend fun fetchItems(): GatewayResponse<ItemsHolder, GenericError> {
+
+    override suspend fun fetchItems(numQuestions: Int): GatewayResponse<ItemsHolder, GenericError> {
         val results = repo.dogs()
         return if (results.isSuccessful) {
+            val items = results.response?.map {
+                if (it.subBreed != null && it.subBreed.isNotEmpty()) {
+                    Item(id = ItemId(it.breed + "_" + it.subBreed),
+                            firstName = it.subBreed, lastName = it.breed,
+                            imageUrl = it.imageUrl)
+                } else {
+                    Item(id = ItemId(it.breed + "_" + it.subBreed),
+                            firstName = it.breed, lastName = it.subBreed ?: "",
+                            imageUrl = it.imageUrl)
+                }
+            }!!
             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)
-                    }!!)
+                    items = items,
+                    questions = generateQuestions(items, numQuestions))
             GatewayResponse.createSuccess(itemsHolder, 200, "")
         } else {
             GatewayResponse.createError(GenericError("Error"), 500, "")
@@ -50,14 +70,17 @@ class DogItemRepository(val repo: KtorDogsRepository = KtorDogsRepository(Platfo
 }
 
 class CatItemRepository(val repo: KtorCatsRepository = KtorCatsRepository(PlatformDispatcher)) : ItemRepository {
-    override suspend fun fetchItems(): GatewayResponse<ItemsHolder, GenericError> {
+
+    override suspend fun fetchItems(numQuestions: Int): GatewayResponse<ItemsHolder, GenericError> {
         val results = repo.allBreeds()
+        val items = results.response?.map {
+            Item(id = ItemId(it.id),
+                    firstName = it.breed, lastName = "",
+                    imageUrl = it.imageUrl)
+        }!!
         val itemsHolder = ItemsHolder(questionTitle = "Name the breed",
-                items = results.response?.map {
-                    Item(id = ItemId(it.id),
-                            firstName = it.breed, lastName = "",
-                            imageUrl = it.imageUrl)
-                }!!)
+                items = items,
+                questions = generateQuestions(items, numQuestions))
         return if (results.isSuccessful) {
             GatewayResponse.createSuccess(itemsHolder, 200, "")
         } else {
@@ -102,3 +125,15 @@ val zeroScoreResponses = listOf(
         "Did you even try??",
         "Not even one correct??  \nWow...want to try again?",
         "Even my cat gets a few right....")
+
+fun generateQuestions(items: List<Item>, n: Int): List<Question> =
+        items.filter { it.imageUrl != "" }
+                .takeRandomDistinct(n)
+                .map { item ->
+                    val choiceList = items.takeRandomDistinct(3).toMutableList()
+                    choiceList.add(abs(random.nextInt() % 4), item)
+
+                    Question(itemId = item.id, choices = choiceList
+                            .map { it })
+                }
+
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/PresenterFactory.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/PresenterFactory.kt
@@ -13,7 +13,7 @@ import kotlin.coroutines.CoroutineContext
 internal class PresenterFactory(private val gameEngine: GameEngine, networkContext: CoroutineContext) : StoreSubscriber<AppState> {
 
     private val timerThunks = TimerThunks(networkContext, gameEngine)
-    private val networkThunks = NetworkThunks(networkContext, gameEngine.appStore)
+    private val networkThunks = NetworkThunks(networkContext, gameEngine)
     //    private val presenters = mutableSetOf<Presenter>()
     private var subscription: StoreSubscription? = null
 
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/QuestionPresenter.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/QuestionPresenter.kt
@@ -90,6 +90,8 @@ class QuestionPresenter(
     fun onBackPressed() {
         engine.dispatch(Actions.StartOverAction())
         engine.dispatch(timerThunks.stopTimer())
+        engine.dispatch(timerThunks.cancelDelayed())
+        view?.closeMic()
     }
 
 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/util/CollectionUtils.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/util/CollectionUtils.kt
@@ -0,0 +1,35 @@
+package com.willowtreeapps.common.util
+
+import kotlin.math.abs
+import kotlin.random.Random
+
+
+val random = Random(TimeUtil.systemTimeMs())
+
+/**
+ * Take N distict elements from the list.  Distinct is determined by a comparision of objects in the
+ * list.
+ * @throws IllegalStateException when n > number of distinct elements.
+ * @return New immutable list containing N random elements from the given List.
+ */
+fun <T> List<T>.takeRandomDistinct(n: Int): List<T> {
+    val newList = mutableListOf<T>()
+    val uniqueItems = this.distinctBy { it }
+    if (uniqueItems.size < n) {
+        throw IllegalStateException("Unable to get $n unique random elements from given list.")
+    }
+    while (newList.size < n) {
+        val randomIndex = abs(random.nextInt() % uniqueItems.size)
+        val next = uniqueItems[randomIndex]
+        if (newList.contains(next)) {
+            continue
+        } else {
+            newList.add(next)
+        }
+    }
+    return newList.toList()
+}
+
+
+fun <T> List<T>.takeRandom(): T =
+        this[random.nextInt(this.size - 1)]
diff --git a/iOS/NameGame/NameGame.xcodeproj/project.pbxproj b/iOS/NameGame/NameGame.xcodeproj/project.pbxproj
@@ -641,8 +641,8 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
-				DEVELOPMENT_TEAM = "";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = 9W3M6638YZ;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SRCROOT)/../../common/build/xcode-frameworks/**",
@@ -659,7 +659,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = willowtree.NameGame;
+				PRODUCT_BUNDLE_IDENTIFIER = com.willowtreeapps.jackson.NameGame;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 4.2;
@@ -673,8 +673,8 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
-				DEVELOPMENT_TEAM = "";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = 9W3M6638YZ;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SRCROOT)/../../common/build/bin/ios/mainDebugFramework",
@@ -685,7 +685,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = willowtree.NameGame;
+				PRODUCT_BUNDLE_IDENTIFIER = com.willowtreeapps.jackson.NameGame;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 4.2;
diff --git a/iOS/NameGame/NameGame/Info.plist b/iOS/NameGame/NameGame/Info.plist
diff --git a/iOS/NameGame/NameGame/QuestionViewController.swift b/iOS/NameGame/NameGame/QuestionViewController.swift

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ class QuestionFragment : BaseNameGameViewFragment<QuestionPresenter>(), Question`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`override fun onError(error: Int) {`
	`69`	`+ Logger.d("Error with speech recognizer: code =$error")`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`override fun onResults(results: Bundle) {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,9 @@ class GameEngine(navigator: Navigator,`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`init {`
`40`		`- appStore.dispatch(Actions.LoadAllSettingsAction())`
	`40`	`+ CoroutineScope(uiContext).launch {`
	`41`	`+ appStore.dispatch(Actions.LoadAllSettingsAction())`
	`42`	`+ }`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`fun dispatch(action: Any) {`