Merge pull request #3827 from CruGlobal/GT-2314-Only-Save-Languages-w…

…hen-launched-from-favorites GT-2314 only store language setting changes when launched from favorite tools
CruGlobal · Dec 20, 2024 · b3e8958 · b3e8958
2 parents f048868 + 37db8ac
commit b3e8958
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 26 deletions.
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/AllFavoritesPresenter.kt b/app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/AllFavoritesPresenter.kt
@@ -64,6 +64,7 @@ class AllFavoritesPresenter @AssistedInject constructor(
                                         tool.primaryLocale ?: state.translation?.languageCode,
                                         tool.parallelLocale
                                     ),
+                                    saveLanguageSettings = true
                                 )
 
                                 if (intent != null) {

diff --git a/app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/HomePresenter.kt b/app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/HomePresenter.kt
@@ -124,6 +124,7 @@ class HomePresenter @AssistedInject constructor(
                                     tool.primaryLocale ?: state.translation?.languageCode,
                                     tool.parallelLocale
                                 ),
+                                saveLanguageSettings = true
                             )
 
                             if (intent != null) {

diff --git a/app/src/main/kotlin/org/cru/godtools/util/ActivityUtils.kt b/app/src/main/kotlin/org/cru/godtools/util/ActivityUtils.kt
@@ -28,16 +28,22 @@ fun Tool.createToolIntent(
     languages: List<Locale>,
     activeLocale: Locale? = null,
     showTips: Boolean = false,
+    saveLanguageSettings: Boolean = false,
 ) = code?.let { code ->
     when (type) {
         Type.TRACT -> context.createTractActivityIntent(
             code,
             *languages.toTypedArray(),
             activeLocale = activeLocale,
-            showTips = showTips
+            showTips = showTips,
+            saveLanguageSettings = saveLanguageSettings,
         )
         Type.ARTICLE -> context.createArticlesIntent(code, languages[0])
-        Type.CYOA -> context.createCyoaActivityIntent(code, *languages.toTypedArray())
+        Type.CYOA -> context.createCyoaActivityIntent(
+            code,
+            *languages.toTypedArray(),
+            saveLanguageSettings = saveLanguageSettings
+        )
         Type.LESSON -> context.createLessonActivityIntent(code, languages[0])
         Type.META, Type.UNKNOWN -> null
     }

diff --git a/app/src/testDebug/kotlin/org/cru/godtools/ui/dashboard/home/AllFavoritesPresenterTest.kt b/app/src/testDebug/kotlin/org/cru/godtools/ui/dashboard/home/AllFavoritesPresenterTest.kt
@@ -157,10 +157,12 @@ class AllFavoritesPresenterTest {
         presenter.test {
             expectMostRecentItem().tools[0].eventSink(ToolCard.Event.Click)
 
-            assertTrue {
-                assertIs<IntentScreen>(navigator.awaitNextScreen()).intent
-                    .equalsIntent(tool.createToolIntent(context, languages = listOf(Locale.ENGLISH)))
-            }
+            val expected = tool.createToolIntent(
+                context,
+                languages = listOf(Locale.ENGLISH),
+                saveLanguageSettings = true
+            )
+            assertTrue(assertIs<IntentScreen>(navigator.awaitNextScreen()).intent equalsIntent expected)
         }
 
         verifyAll { eventBus.post(OpenAnalyticsActionEvent(ACTION_OPEN_TOOL, tool.code, SOURCE_FAVORITE)) }
@@ -181,10 +183,12 @@ class AllFavoritesPresenterTest {
         presenter.test {
             expectMostRecentItem().tools[0].eventSink(ToolCard.Event.Click)
 
-            assertTrue {
-                assertIs<IntentScreen>(navigator.awaitNextScreen()).intent
-                    .equalsIntent(tool.createToolIntent(context, languages = listOf(Locale.FRENCH, Locale.GERMAN)))
-            }
+            val expected = tool.createToolIntent(
+                context,
+                languages = listOf(Locale.FRENCH, Locale.GERMAN),
+                saveLanguageSettings = true
+            )
+            assertTrue(assertIs<IntentScreen>(navigator.awaitNextScreen()).intent equalsIntent expected)
         }
 
         verifyAll { eventBus.post(OpenAnalyticsActionEvent(ACTION_OPEN_TOOL, tool.code, SOURCE_FAVORITE)) }

diff --git a/app/src/testDebug/kotlin/org/cru/godtools/ui/dashboard/home/HomePresenterTest.kt b/app/src/testDebug/kotlin/org/cru/godtools/ui/dashboard/home/HomePresenterTest.kt
@@ -215,10 +215,12 @@ class HomePresenterTest {
             assertNotNull(expectMostRecentItem().favoriteTools[0]) { toolState ->
                 toolState.eventSink(ToolCard.Event.Click)
 
-                assertIs<IntentScreen>(navigator.awaitNextScreen()).let { screen ->
-                    val expected = tool.createToolIntent(context, listOf(toolState.translation!!.languageCode))
-                    assertTrue(expected equalsIntent screen.intent)
-                }
+                val expected = tool.createToolIntent(
+                    context,
+                    listOf(toolState.translation!!.languageCode),
+                    saveLanguageSettings = true
+                )
+                assertTrue(assertIs<IntentScreen>(navigator.awaitNextScreen()).intent equalsIntent expected)
             }
         }
     }
@@ -232,10 +234,12 @@ class HomePresenterTest {
             assertNotNull(expectMostRecentItem().favoriteTools[0]) { toolState ->
                 toolState.eventSink(ToolCard.Event.OpenTool)
 
-                assertIs<IntentScreen>(navigator.awaitNextScreen()).let { screen ->
-                    val expected = tool.createToolIntent(context, listOf(toolState.translation!!.languageCode))
-                    assertTrue(expected equalsIntent screen.intent)
-                }
+                val expected = tool.createToolIntent(
+                    context,
+                    listOf(toolState.translation!!.languageCode),
+                    saveLanguageSettings = true
+                )
+                assertTrue(assertIs<IntentScreen>(navigator.awaitNextScreen()).intent equalsIntent expected)
             }
         }
     }
@@ -249,10 +253,12 @@ class HomePresenterTest {
             assertNotNull(expectMostRecentItem().favoriteTools[0]) { toolState ->
                 toolState.eventSink(ToolCard.Event.OpenTool)
 
-                assertIs<IntentScreen>(navigator.awaitNextScreen()).let { screen ->
-                    val expected = tool.createToolIntent(context, listOf(Locale.GERMAN, Locale.FRENCH))
-                    assertTrue(expected equalsIntent screen.intent)
-                }
+                val expected = tool.createToolIntent(
+                    context,
+                    listOf(Locale.GERMAN, Locale.FRENCH),
+                    saveLanguageSettings = true
+                )
+                assertTrue(assertIs<IntentScreen>(navigator.awaitNextScreen()).intent equalsIntent expected)
             }
         }
     }

diff --git a/...ase-tool/src/main/kotlin/org/cru/godtools/base/tool/activity/MultiLanguageToolActivity.kt b/...ase-tool/src/main/kotlin/org/cru/godtools/base/tool/activity/MultiLanguageToolActivity.kt
@@ -24,6 +24,7 @@ import org.cru.godtools.base.tool.analytics.model.ToolAnalyticsActionEvent
 import org.cru.godtools.base.tool.ui.settings.SettingsBottomSheetDialogFragment
 import org.cru.godtools.base.tool.ui.settings.ShareLinkSettingsAction
 import org.cru.godtools.base.tool.viewmodel.ToolStateHolder
+import org.cru.godtools.base.ui.EXTRA_SAVE_LANGUAGE_SETTINGS
 import org.cru.godtools.shared.tool.analytics.ToolAnalyticsActionNames.ACTION_SETTINGS
 import org.cru.godtools.shared.tool.parser.model.Manifest
 import org.cru.godtools.shared.tool.parser.model.navBarColor
@@ -162,7 +163,9 @@ abstract class MultiLanguageToolActivity<B : ViewDataBinding>(
 
     private fun showSettingsDialog() {
         eventBus.post(ToolAnalyticsActionEvent(null, ACTION_SETTINGS))
-        SettingsBottomSheetDialogFragment().show(supportFragmentManager, null)
+        SettingsBottomSheetDialogFragment(
+            saveLanguageSettings = intent?.getBooleanExtra(EXTRA_SAVE_LANGUAGE_SETTINGS, false) ?: false,
+        ).show(supportFragmentManager, null)
     }
 
     protected fun dismissSettingsDialog() {

diff --git a/...c/main/kotlin/org/cru/godtools/base/tool/ui/settings/SettingsBottomSheetDialogFragment.kt b/...c/main/kotlin/org/cru/godtools/base/tool/ui/settings/SettingsBottomSheetDialogFragment.kt
@@ -27,11 +27,17 @@ import org.cru.godtools.model.Language
 import org.cru.godtools.shared.tool.parser.model.shareable.ShareableImage
 import org.cru.godtools.tool.R
 import org.cru.godtools.tool.databinding.ToolSettingsSheetBinding
+import splitties.fragmentargs.argOrDefault
 
 @AndroidEntryPoint
-class SettingsBottomSheetDialogFragment :
+class SettingsBottomSheetDialogFragment() :
     BindingBottomSheetDialogFragment<ToolSettingsSheetBinding>(R.layout.tool_settings_sheet),
     ToolSettingsSheetCallbacks {
+    constructor(saveLanguageSettings: Boolean) : this() {
+        isSaveLanguageSettings = saveLanguageSettings
+    }
+
+    private var isSaveLanguageSettings by argOrDefault(false)
 
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -159,7 +165,7 @@ class SettingsBottomSheetDialogFragment :
         primaryLocale: Locale? = activityDataModel.primaryLocales.value?.firstOrNull(),
         parallelLocale: Locale? = activityDataModel.parallelLocales.value?.firstOrNull(),
     ) {
-        if (tool != null) {
+        if (isSaveLanguageSettings && tool != null) {
             lifecycleScope.launch {
                 toolsRepository.updateToolLocales(tool, primaryLocale, parallelLocale)
             }

diff --git a/ui/base/src/main/kotlin/org/cru/godtools/base/ui/Activities.kt b/ui/base/src/main/kotlin/org/cru/godtools/base/ui/Activities.kt
@@ -16,6 +16,8 @@ import org.cru.godtools.base.ui.activity.BaseActivity
 import org.cru.godtools.base.ui.dashboard.Page
 
 const val EXTRA_SHOW_TIPS = "org.cru.godtools.base.tool.activity.MultiLanguageToolActivity.SHOW_TIPS"
+const val EXTRA_SAVE_LANGUAGE_SETTINGS =
+    "org.cru.godtools.base.tool.activity.MultiLanguageToolActivity.SAVE_LANGUAGE_SETTINGS"
 
 // region DashboardActivity
 private const val ACTIVITY_CLASS_DASHBOARD = "org.cru.godtools.ui.dashboard.DashboardActivity"
@@ -58,11 +60,13 @@ fun Context.createCyoaActivityIntent(
     vararg languages: Locale?,
     pageId: String? = null,
     showTips: Boolean = false,
+    saveLanguageSettings: Boolean = false,
 ) = Intent().setClassName(this, ACTIVITY_CLASS_CYOA)
     .putExtra(EXTRA_TOOL, toolCode)
     .putLanguagesExtra(*languages)
     .putExtra(EXTRA_PAGE, pageId)
     .putExtra(EXTRA_SHOW_TIPS, showTips)
+    .putExtra(EXTRA_SAVE_LANGUAGE_SETTINGS, saveLanguageSettings)
 // endregion CyoaActivity
 
 // region TractActivity
@@ -76,13 +80,15 @@ fun Context.createTractActivityIntent(
     vararg languages: Locale?,
     activeLocale: Locale? = null,
     page: Int = 0,
-    showTips: Boolean = false
+    showTips: Boolean = false,
+    saveLanguageSettings: Boolean = false,
 ) = Intent().setClassName(this, ACTIVITY_CLASS_TRACT)
     .putExtra(EXTRA_TOOL, toolCode)
     .putLanguagesExtra(*languages)
     .putExtra(EXTRA_ACTIVE_LOCALE, activeLocale)
     .putExtra(EXTRA_PAGE, page)
     .putExtra(EXTRA_SHOW_TIPS, showTips)
+    .putExtra(EXTRA_SAVE_LANGUAGE_SETTINGS, saveLanguageSettings)
 // endregion TractActivity
 
 fun Context.buildToolExtras(toolCode: String, language: Locale) = BaseActivity.buildExtras(this).apply {