X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyCell.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacycell%2Ffragments%2FSettingsFragment.kt;fp=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacycell%2Ffragments%2FSettingsFragment.kt;h=dc8545ffb0abcfa96225bc19f86dcb6f29b250b9;hp=9adae226fc76d8e34ae1016da741c705b01af433;hb=81346128a1dcde5b65d83f24c1af507cd80802d3;hpb=bad17a63b18ff3c8b5ae24ab467f423bbfbddd98

diff --git a/app/src/main/java/com/stoutner/privacycell/fragments/SettingsFragment.kt b/app/src/main/java/com/stoutner/privacycell/fragments/SettingsFragment.kt
index 9adae22..dc8545f 100644
--- a/app/src/main/java/com/stoutner/privacycell/fragments/SettingsFragment.kt
+++ b/app/src/main/java/com/stoutner/privacycell/fragments/SettingsFragment.kt
@@ -40,6 +40,9 @@ import com.stoutner.privacycell.activities.PrivacyCellActivity
 import com.stoutner.privacycell.dialogs.NotificationPermissionDialog
 import com.stoutner.privacycell.services.RealtimeMonitoringService
 
+// Define the class constants.
+private const val SCROLL_Y = "scroll_y"
+
 class SettingsFragment : PreferenceFragmentCompat() {
     // Declare the class variables.
     private lateinit var sharedPreferenceChangeListener: OnSharedPreferenceChangeListener
@@ -52,6 +55,12 @@ class SettingsFragment : PreferenceFragmentCompat() {
     private lateinit var consider3gAntiquatedPreference: Preference
     private lateinit var bottomAppBarPreference: Preference
 
+    companion object {
+        // Declare the private static class variables.  Otherwise, onRestart will not pull the same values that are populated from the saved instance state.
+        private var fragmentRestarted: Boolean = false
+        private var scrollY: Int = 0
+    }
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         // Load the preferences from the XML file.
         setPreferencesFromResource(R.xml.preferences, rootKey)
@@ -128,36 +137,15 @@ class SettingsFragment : PreferenceFragmentCompat() {
         } else {
             bottomAppBarPreference.setIcon(R.drawable.bottom_app_bar_disabled)
         }
-    }
-
-    // The listener should be unregistered when the app is paused.
-    override fun onPause() {
-        // Run the default commands.
-        super.onPause()
 
-        // Get a handle for the shared preferences.
-        val sharedPreferences = preferenceScreen.sharedPreferences!!
+        // Check if the fragment has been restarted.
+        if (savedInstanceState != null) {
+            // Set the fragment restored flag.
+            fragmentRestarted = true
 
-        // Unregister the shared preference listener.
-        sharedPreferences.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener)
-    }
-
-    // The listener should be re-registered when the app is resumed.
-    override fun onResume() {
-        // Run the default commands.
-        super.onResume()
-
-        // Get a new shared preference change listener.
-        sharedPreferenceChangeListener = getSharedPreferenceChangeListener()
-
-        // Get a handle for the shared preferences.
-        val sharedPreferences = preferenceScreen.sharedPreferences!!
-
-        // Re-register the shared preference listener.
-        sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener)
-
-        // Update the realtime monitoring preference summary.
-        updateRealtimeMonitoringSummary()
+            // Save the scroll Y.
+            scrollY = savedInstanceState.getInt(SCROLL_Y)
+        }
     }
 
     private fun getSharedPreferenceChangeListener(): OnSharedPreferenceChangeListener {
@@ -244,6 +232,53 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
     }
 
+    // The listener should be unregistered when the app is paused.
+    override fun onPause() {
+        // Run the default commands.
+        super.onPause()
+
+        // Get a handle for the shared preferences.
+        val sharedPreferences = preferenceScreen.sharedPreferences!!
+
+        // Unregister the shared preference listener.
+        sharedPreferences.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener)
+    }
+
+    // The listener should be re-registered when the app is resumed.
+    override fun onResume() {
+        // Run the default commands.
+        super.onResume()
+
+        // Get a new shared preference change listener.
+        sharedPreferenceChangeListener = getSharedPreferenceChangeListener()
+
+        // Get a handle for the shared preferences.
+        val sharedPreferences = preferenceScreen.sharedPreferences!!
+
+        // Re-register the shared preference listener.
+        sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener)
+
+        // Update the realtime monitoring preference summary.
+        updateRealtimeMonitoringSummary()
+
+        // Restore the scroll position if the fragment has been restarted.
+        if (fragmentRestarted) {
+            // Reset the fragment restarted flag.
+            fragmentRestarted = false
+
+            // Set the scroll position.
+            listView.smoothScrollBy(0, scrollY)
+        }
+    }
+
+    override fun onSaveInstanceState(savedInstanceState: Bundle) {
+        // Run the default commands.
+        super.onSaveInstanceState(savedInstanceState)
+
+        // Save the scroll position.
+        savedInstanceState.putInt(SCROLL_Y, listView.computeVerticalScrollOffset())
+    }
+
     private fun restartPrivacyCell() {
         // Create an intent to restart Privacy Cell.
         val restartIntent = requireActivity().parentActivityIntent!!