X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FSettingsFragment.java;h=95ca66b720e9b73a8ab75f503cdff0ca748185c5;hp=f1706184e8d6a1760347dc6f80a83e6f04c24ce9;hb=743982f883eab347e4029f8a3be760f780b14da1;hpb=a56ffa22c6a0ef7ad717cba03a433999553340cb diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java index f1706184..95ca66b7 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java @@ -60,7 +60,7 @@ public class SettingsFragment extends PreferenceFragment { // Set the current user-agent as the summary text for the "user_agent" preference when the preference screen is loaded. final Preference userAgentPreference = findPreference("user_agent"); - switch (savedPreferences.getString("user_agent", "Default user agent")) { + switch (savedPreferences.getString("user_agent", "PrivacyBrowser/1.0")) { case "Default user agent": // Get the user agent text from the webview (which changes based on the version of Android and WebView installed). userAgentPreference.setSummary(bareWebView.getSettings().getUserAgentString()); @@ -73,7 +73,7 @@ public class SettingsFragment extends PreferenceFragment { default: // Display the user agent from the preference as the summary text. - userAgentPreference.setSummary(savedPreferences.getString("user_agent", "Default user agent")); + userAgentPreference.setSummary(savedPreferences.getString("user_agent", "PrivacyBrowser/1.0")); break; } @@ -84,7 +84,7 @@ public class SettingsFragment extends PreferenceFragment { // Set the JavaScript-disabled search URL as the summary text for the JavaScript-disabled search preference when the preference screen is loaded. - // The default is "https://duckduckgo.com/html/?q=". + // The default is `https://duckduckgo.com/html/?q=`. final Preference javaScriptDisabledSearchPreference = findPreference("javascript_disabled_search"); String javaScriptDisabledSearchString = savedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q="); if (javaScriptDisabledSearchString.equals("Custom URL")) { @@ -95,14 +95,14 @@ public class SettingsFragment extends PreferenceFragment { javaScriptDisabledSearchPreference.setSummary(javaScriptDisabledSearchString); } - // Set the summary text for "javascript_disabled_search_custom_url" (the default is "") and enable it if "javascript_disabled_search" is set to "Custom URL". + // Set the summary text for `javascript_disabled_search_custom_url` (the default is `""`) and enable it if `javascript_disabled_search` is set to `Custom URL`. final Preference javaScriptDisabledSearchCustomURLPreference = findPreference("javascript_disabled_search_custom_url"); javaScriptDisabledSearchCustomURLPreference.setSummary(savedPreferences.getString("javascript_disabled_search_custom_url", "")); javaScriptDisabledSearchCustomURLPreference.setEnabled(javaScriptDisabledSearchString.equals("Custom URL")); // Set the JavaScript-enabled searchURL as the summary text for the JavaScript-enabled search preference when the preference screen is loaded. - // The default is "https://duckduckgo.com/?q=". + // The default is `https://duckduckgo.com/?q=`. final Preference javaScriptEnabledSearchPreference = findPreference("javascript_enabled_search"); String javaScriptEnabledSearchString = savedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q="); if (javaScriptEnabledSearchString.equals("Custom URL")) { @@ -113,12 +113,26 @@ public class SettingsFragment extends PreferenceFragment { javaScriptEnabledSearchPreference.setSummary(javaScriptEnabledSearchString); } - // Set the summary text for "javascript_enabled_search_custom_url" (the default is "") and enable it if "javascript_enabled_search" is set to "Custom URL". + // Set the summary text for `javascript_enabled_search_custom_url` (the default is `""`) and enable it if `javascript_enabled_search` is set to `Custom URL`. final Preference javaScriptEnabledSearchCustomURLPreference = findPreference("javascript_enabled_search_custom_url"); javaScriptEnabledSearchCustomURLPreference.setSummary(savedPreferences.getString("javascript_enabled_search_custom_url", "")); javaScriptEnabledSearchCustomURLPreference.setEnabled(javaScriptEnabledSearchString.equals("Custom URL")); + // Enable the full screen options if full screen browsing mode is enabled. + final Preference hideSystemBarsPreference = findPreference("hide_system_bars"); + final Preference translucentNavigationBarPreference = findPreference("translucent_navigation_bar"); + final boolean fullScreenBrowsingModeEnabled = savedPreferences.getBoolean("enable_full_screen_browsing_mode", false); + if (!fullScreenBrowsingModeEnabled) { + // Disable the full screen options. + hideSystemBarsPreference.setEnabled(false); + translucentNavigationBarPreference.setEnabled(false); + } else { + // Disable `transparent_navigation_bar` if `hide_system_bars` is `true`. + translucentNavigationBarPreference.setEnabled(!savedPreferences.getBoolean("hide_system_bars", false)); + } + + // Set the homepage URL as the summary text for the `Homepage` preference when the preference screen is loaded. The default is `https://www.duckduckgo.com`. final Preference homepagePreference = findPreference("homepage"); homepagePreference.setSummary(savedPreferences.getString("homepage", "https://www.duckduckgo.com")); @@ -128,10 +142,6 @@ public class SettingsFragment extends PreferenceFragment { String defaultFontSizeString = savedPreferences.getString("default_font_size", "100"); defaultFontSizePreference.setSummary(defaultFontSizeString + "%%"); - // Disable `transparent_navigation_bar` if `hide_system_bars` is enabled. - final Preference translucentNavigationBarPreference = findPreference("translucent_navigation_bar"); - translucentNavigationBarPreference.setEnabled(!savedPreferences.getBoolean("hide_system_bars", false)); - // Listen for preference changes. preferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() { @@ -154,7 +164,7 @@ public class SettingsFragment extends PreferenceFragment { break; case "user_agent": - String userAgentString = sharedPreferences.getString("user_agent", "Default user agent"); + String userAgentString = sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0"); switch (userAgentString) { case "Default user agent": @@ -171,14 +181,14 @@ public class SettingsFragment extends PreferenceFragment { default: // Display the user agent as the summary text for userAgentPreference, and disable customUserAgent. - userAgentPreference.setSummary(sharedPreferences.getString("user_agent", "Default user agent")); + userAgentPreference.setSummary(sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0")); customUserAgent.setEnabled(false); break; } break; case "custom_user_agent": - // Set the new custom user agent as the summary text for "custom_user_agent". The default is "PrivacyBrowser/1.0". + // Set the new custom user agent as the summary text for `custom_user_agent`. The default is `PrivacyBrowser/1.0`. customUserAgent.setSummary(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0")); break; @@ -216,6 +226,21 @@ public class SettingsFragment extends PreferenceFragment { javaScriptEnabledSearchCustomURLPreference.setSummary(sharedPreferences.getString("javascript_enabled_search_custom_url", "")); break; + case "enable_full_screen_browsing_mode": + boolean newFullScreenBrowsingModeEnabled = sharedPreferences.getBoolean("enable_full_screen_browsing_mode", false); + if (newFullScreenBrowsingModeEnabled) { + // Enable `hideSystemBarsPreference`. + hideSystemBarsPreference.setEnabled(true); + + // Only enable `transparent_navigation_bar` if `hide_system_bars` is `false`. + translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false)); + } else { + // Disable the full screen options. + hideSystemBarsPreference.setEnabled(false); + translucentNavigationBarPreference.setEnabled(false); + } + break; + case "homepage": // Set the new homepage URL as the summary text for the Homepage preference. The default is `https://www.duckduckgo.com`. homepagePreference.setSummary(sharedPreferences.getString("homepage", "https://www.duckduckgo.com"));