Explain in the settings that displaying under cutouts also displays under the keyboar...

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / fragments / SettingsFragment.kt

diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt
index 397dad08fc69a281065dfd8e00e42da1aa7a304e..61d45ef11c169afa67ca60807b1127fa5983ca94 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2016-2024 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -82,6 +82,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
     private lateinit var formDataPreference: Preference  // The form data preference can be removed once the minimum API >= 26.
     private lateinit var fullScreenBrowsingModePreference: Preference
     private lateinit var hideAppBarPreference: Preference
+    private lateinit var displayUnderCutoutsPreference: Preference
     private lateinit var homepagePreference: Preference
     private lateinit var incognitoModePreference: Preference
     private lateinit var javaScriptPreference: Preference
@@ -145,6 +146,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         proxyCustomUrlPreference = findPreference(getString(R.string.proxy_custom_url_key))!!
         fullScreenBrowsingModePreference = findPreference(getString(R.string.full_screen_browsing_mode_key))!!
         hideAppBarPreference = findPreference(getString(R.string.hide_app_bar_key))!!
+        displayUnderCutoutsPreference = findPreference(getString(R.string.display_under_cutouts_key))!!
         clearEverythingPreference = findPreference(getString(R.string.clear_everything_key))!!
         clearCookiesPreference = findPreference(getString(R.string.clear_cookies_key))!!
         clearDomStoragePreference = findPreference(getString(R.string.clear_dom_storage_key))!!
@@ -167,6 +169,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         // Set the preference dependencies.
         domStoragePreference.dependency = getString(R.string.javascript_key)
         hideAppBarPreference.dependency = getString(R.string.full_screen_browsing_mode_key)
+        displayUnderCutoutsPreference.dependency = getString(R.string.full_screen_browsing_mode_key)
 
         // Get strings from the preferences.
         val userAgentName = sharedPreferences.getString(getString(R.string.user_agent_key), getString(R.string.user_agent_default_value))
@@ -456,6 +459,12 @@ class SettingsFragment : PreferenceFragmentCompat() {
             hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted)
         }
 
+        // Set the display under cutouts icon.
+        if (sharedPreferences.getBoolean(getString(R.string.display_under_cutouts_key), false))
+            displayUnderCutoutsPreference.setIcon(R.drawable.display_under_cutouts_enabled)
+        else
+            displayUnderCutoutsPreference.setIcon(R.drawable.display_under_cutouts_disabled)
+
         // Set the clear everything icon.
         if (clearEverything) {
             clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled)
@@ -514,7 +523,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
             downloadWithExternalAppPreference.setIcon(R.drawable.download_with_external_app_disabled)
 
         // Set the scroll app bar icon.
-        if (sharedPreferences.getBoolean(getString(R.string.scroll_app_bar_key), true))
+        if (sharedPreferences.getBoolean(getString(R.string.scroll_app_bar_key), false))
             scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled)
         else
             scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled)
@@ -607,7 +616,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
             fragmentRestarted = false
 
             // Set the scroll position.
-            listView.smoothScrollBy(0, scrollY)
+            listView.post { listView.smoothScrollBy(0, scrollY) }
         }
     }
 
@@ -933,6 +942,17 @@ class SettingsFragment : PreferenceFragmentCompat() {
                         hideAppBarPreference.setIcon(R.drawable.app_bar_disabled)
                 }
 
+                getString(R.string.display_under_cutouts_key) -> {
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean(getString(R.string.display_under_cutouts_key), true))
+                        displayUnderCutoutsPreference.setIcon(R.drawable.display_under_cutouts_enabled)
+                    else
+                        displayUnderCutoutsPreference.setIcon(R.drawable.display_under_cutouts_disabled)
+
+                    // Restart Privacy Browser.
+                    restartPrivacyBrowser()
+                }
+
                 getString(R.string.clear_everything_key) -> {
                     // Store the new clear everything status
                     val newClearEverythingBoolean = sharedPreferences.getBoolean(getString(R.string.clear_everything_key), true)
@@ -1059,7 +1079,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
                 getString(R.string.scroll_app_bar_key) -> {
                     // Update the icon.
-                    if (sharedPreferences.getBoolean(getString(R.string.scroll_app_bar_key), true))
+                    if (sharedPreferences.getBoolean(getString(R.string.scroll_app_bar_key), false))
                         scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled)
                     else
                         scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled)