For mozilla-mobile#8800: clear menu highlights on use

severinrudie · Feb 27, 2020 · e6c2317 · e6c2317
1 parent 1ede724
commit e6c2317
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 6 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
@@ -43,6 +43,7 @@ import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.getRootView
 import org.mozilla.fenix.ext.nav
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.lib.Do
 import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
 
@@ -157,6 +158,7 @@ class DefaultBrowserToolbarController(
                 }
             }
             ToolbarMenu.Item.AddToHomeScreen -> {
+                activity.settings().installPwaOpened = true
                 MainScope().launch {
                     with(activity.components.useCases.webAppUseCases) {
                         if (isInstallable()) {
@@ -265,6 +267,8 @@ class DefaultBrowserToolbarController(
                 deleteAndQuit(activity, scope, snackbar)
             }
             is ToolbarMenu.Item.ReaderMode -> {
+                activity.settings().readerModeOpened = true
+
                 val enabled = currentSession?.readerMode
                     ?: activity.components.core.sessionManager.selectedSession?.readerMode
                     ?: false
@@ -279,6 +283,8 @@ class DefaultBrowserToolbarController(
                 readerModeController.showControls()
             }
             ToolbarMenu.Item.OpenInApp -> {
+                activity.settings().openInAppOpened = true
+
                 val appLinksUseCases =
                     activity.components.useCases.appLinksUseCases
                 val getRedirect = appLinksUseCases.appLinkRedirect

diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@@ -29,6 +29,7 @@ import org.mozilla.fenix.ReleaseChannel
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.ext.asActivity
 import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.theme.ThemeManager
 import org.mozilla.fenix.utils.Settings
 
@@ -157,17 +158,26 @@ class DefaultToolbarMenu(
             library,
             desktopMode,
             addToTopSites,
-            addToHomescreen.apply { visible = ::shouldShowAddToHomescreen },
+            addToHomescreen.apply {
+//                if (shouldShowAddToHomescreen()) Settings.getInstance(context).installPwaViewed
+                visible = ::shouldShowAddToHomescreen
+            },
             addons,
             findInPage,
             privateTab,
             newTab,
             if (shouldShowWebcompatReporter) reportIssue else null,
             if (shouldShowSaveToCollection) saveToCollection else null,
             if (shouldDeleteDataOnQuit) deleteDataOnQuit else null,
-            readerMode.apply { visible = ::shouldShowReaderMode },
+            readerMode.apply {
+//                if (shouldShowReaderMode()) Settings.getInstance(context).readerModeViewed
+                visible = ::shouldShowReaderMode
+            },
             readerAppearance.apply { visible = ::shouldShowReaderAppearance },
-            openInApp.apply { visible = ::shouldShowOpenInApp },
+            openInApp.apply {
+//                if (shouldShowOpenInApp()) Settings.getInstance(context).openInAppViewed
+                visible = ::shouldShowOpenInApp
+            },
             BrowserMenuDivider(),
             menuToolbar
         )
@@ -245,7 +255,9 @@ class DefaultToolbarMenu(
         ),
         isHighlighted = {
             val webAppUseCases = context.components.useCases.webAppUseCases
-            webAppUseCases.isPinningSupported() && webAppUseCases.isInstallable()
+            webAppUseCases.isPinningSupported() &&
+                    webAppUseCases.isInstallable() &&
+                    !context.settings().installPwaOpened
         }
     ) {
         onItemTapped.invoke(ToolbarMenu.Item.AddToHomeScreen)
@@ -309,7 +321,7 @@ class DefaultToolbarMenu(
             label = context.getString(R.string.browser_menu_read),
             notificationTint = getColor(context, R.color.whats_new_notification_color)
         ),
-        isHighlighted = { true }
+        isHighlighted = { !context.settings().readerModeOpened }
     ) { checked ->
         onItemTapped.invoke(ToolbarMenu.Item.ReaderMode(checked))
     }
@@ -330,7 +342,7 @@ class DefaultToolbarMenu(
             label = context.getString(R.string.browser_menu_open_app_link),
             notificationTint = getColor(context, R.color.whats_new_notification_color)
         ),
-        isHighlighted = { true }
+        isHighlighted = { !context.settings().openInAppOpened }
     ) {
         onItemTapped.invoke(ToolbarMenu.Item.OpenInApp)
     }

diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -133,6 +133,21 @@ class Settings private constructor(
         default = ""
     )
 
+    var readerModeOpened by booleanPreference(
+        appContext.getPreferenceKey(R.string.pref_key_reader_mode_opened),
+        default = false
+    )
+
+    var openInAppOpened by booleanPreference(
+        appContext.getPreferenceKey(R.string.pref_key_open_in_app_opened),
+        default = false
+    )
+
+    var installPwaOpened by booleanPreference(
+        appContext.getPreferenceKey(R.string.pref_key_install_pwa_opened),
+        default = false
+    )
+
     val isCrashReportingEnabled: Boolean
         get() = isCrashReportEnabledInBuild &&
             preferences.getBoolean(

diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
@@ -47,6 +47,12 @@
     <string name="pref_key_experimentation" translatable="false">pref_key_experimentation</string>
     <string name="pref_key_showed_private_mode_cfr" translatable="false">pref_key_showed_private_mode_cfr</string>
     <string name="pref_key_private_mode_opened" translatable="false">pref_key_private_mode_opened</string>
+    <string name="pref_key_reader_mode_opened" translatable="false">pref_key_reader_mode_opened</string>
+    <string name="pref_key_open_in_app_opened" translatable="false">pref_key_open_in_app_opened</string>
+    <string name="pref_key_install_pwa_opened" translatable="false">pref_key_install_pwa_opened</string>
+    <string name="pref_key_reader_mode_closed" translatable="false">pref_key_reader_mode_closed</string>
+    <string name="pref_key_open_in_app_closed" translatable="false">pref_key_open_in_app_closed</string>
+    <string name="pref_key_install_pwa_closed" translatable="false">pref_key_install_pwa_closed</string>
 
     <!-- Data Choices -->
     <string name="pref_key_telemetry" translatable="false">pref_key_telemetry</string>