handle navigation when app backgrounded on android

Author: patjackson52

app/src/main/java/com/willowtreeapps/namegame/AndroidNavigator.kt

@@ -5,6 +5,7 @@ import android.app.Application
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.findNavController
+import com.willowtreeapps.common.Actions
 import com.willowtreeapps.common.middleware.Navigator
 import com.willowtreeapps.common.middleware.Screen
 import com.willowtreeapps.namegame.store.SettingsDialogFragment
@@ -18,31 +19,41 @@ class AndroidNavigator : Navigator, Application.ActivityLifecycleCallbacks {
 
 
     private var currentActivity: AppCompatActivity? = null
+    private var cachedNavigationScreen: Screen? = null
 
     //TODO consider using current screen & destination screen to determine routing & animation
     override fun goto(screen: Screen) {
-        val navController = currentActivity!!.findNavController(R.id.nav_host_fragment)
-        when (screen) {
-            Screen.QUESTION -> navController.navigate(R.id.action_startScreen_to_questionScreen)
-            Screen.GAME_COMPLETE -> navController.navigate(R.id.action_questionScreen_to_resultsFragment)
+        if (currentActivity == null) {
+            cachedNavigationScreen = screen
+        } else {
+            val navController = currentActivity!!.findNavController(R.id.nav_host_fragment)
+            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.SETTINGS -> {
-                val dialog = SettingsDialogFragment.newInstance()
-                dialog.show(currentActivity!!.supportFragmentManager, "SettingsFragment")
+                Screen.START -> navController.navigate(R.id.action_resultsFragment_to_startScreen)
+                Screen.SETTINGS -> {
+                    val dialog = SettingsDialogFragment.newInstance()
+                    dialog.show(currentActivity!!.supportFragmentManager, "SettingsFragment")
+                }
+                else -> throw IllegalArgumentException("Screen $screen is not handled in AndroidNavigator")
             }
-            else -> throw IllegalArgumentException("Screen $screen is not handled in AndroidNavigator")
         }
     }
 
     override fun onActivityPaused(activity: Activity?) {
     }
 
     override fun onActivityResumed(activity: Activity?) {
+        if (cachedNavigationScreen!= null) {
+            goto(cachedNavigationScreen!!)
+            cachedNavigationScreen = null
+        }
     }
 
     override fun onActivityStarted(activity: Activity?) {
         currentActivity = activity as AppCompatActivity?
+
     }
 
     override fun onActivityDestroyed(activity: Activity?) {

app/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt

@@ -87,7 +87,9 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
     }
 
     override fun showWrongAnswer(viewState: QuestionViewState, isEndGame: Boolean) {
-        wrongShakeAnimation(viewState) { hideButtonsShowNext(viewState, isEndGame) }
+        activity?.runOnUiThread {
+            wrongShakeAnimation(viewState) { hideButtonsShowNext(viewState, isEndGame) }
+        }
     }
 
     private val showButtonsAnimatorSet by lazy {
@@ -234,7 +236,7 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
             txt_timer.scaleY = 0f
             txt_timer.text = viewState.timerText
             val restoreColor = txt_timer.currentTextColor
-            txt_timer.setTextColor(ResourcesCompat.getColor(context?.resources!!, R.color.red, null))
+            txt_timer.setTextColor(ResourcesCompat.getColor(context?.resources!!, R.color.red, activity?.theme))
             txt_timer.animate()
                     .scaleX(1f)
                     .scaleY(1f)

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

@@ -62,7 +62,7 @@ open class KtorDogsRepository(private val networkContext: CoroutineContext) : Co
                                                 com.willowtreeapps.common.Logger.d("Failure fetching image: ${e.message}")
                                                 GatewayResponse.createSuccess<DogImageResponse, GenericError>(DogImageResponse("200", ""), 200, "")
                                             }
-                                    Dog(breed = breed.key, imageUrl = dogImageResponse.response?.message!!)
+                                    Dog(breed = breed.key.capitalize(), imageUrl = dogImageResponse.response?.message!!)
                                 }
                         )
                     }