From 20794296dc22b6f243ea46b50ca684601b9b5c1f Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Wed, 2 Sep 2020 16:33:58 +0300
Subject: [PATCH] For #9506: Add possibility to navigate to a preference in
 settings.

---
 .../org/mozilla/fenix/settings/SettingsFragment.kt     | 10 +++++++++-
 app/src/main/res/navigation/nav_graph.xml              |  5 +++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 3bebc0fa2..33741ff92 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.settings
 
+import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.net.Uri
@@ -15,6 +16,7 @@ import android.widget.Toast
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavDirections
 import androidx.navigation.findNavController
+import androidx.navigation.fragment.navArgs
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.recyclerview.widget.RecyclerView
@@ -27,8 +29,8 @@ import mozilla.components.concept.sync.OAuthAccount
 import mozilla.components.concept.sync.Profile
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.Config
-import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.FeatureFlags
+import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.ext.application
@@ -45,6 +47,7 @@ import kotlin.system.exitProcess
 @Suppress("LargeClass", "TooManyFunctions")
 class SettingsFragment : PreferenceFragmentCompat() {
 
+    private val args by navArgs<SettingsFragmentArgs>()
     private lateinit var accountUiView: AccountUiView
 
     private val accountObserver = object : AccountObserver {
@@ -124,6 +127,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         updateMakeDefaultBrowserPreference()
     }
 
+    @SuppressLint("RestrictedApi")
     override fun onResume() {
         super.onResume()
 
@@ -136,6 +140,10 @@ class SettingsFragment : PreferenceFragmentCompat() {
         requireView().findViewById<RecyclerView>(R.id.recycler_view)
             ?.hideInitialScrollBar(viewLifecycleOwner.lifecycleScope)
 
+        if (args.preferenceToScrollTo != null) {
+            scrollToPreference(args.preferenceToScrollTo)
+        }
+
         // Consider finish of `onResume` to be the point at which we consider this fragment as 'created'.
         creatingFragment = false
     }
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index dd3963cbb..866cdf46b 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -410,6 +410,11 @@
         android:id="@+id/settingsFragment"
         android:name="org.mozilla.fenix.settings.SettingsFragment"
         android:label="@string/settings_title">
+        <argument
+            android:name="preference_to_scroll_to"
+            android:defaultValue="@null"
+            app:argType="string"
+            app:nullable="true" />
         <action
             android:id="@+id/action_settingsFragment_to_dataChoicesFragment"
             app:destination="@id/dataChoicesFragment"