/*
- * Copyright © 2016-2018 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
savedPreferences = getPreferenceScreen().getSharedPreferences();
// Get handles for the preferences.
- final Preference javaScriptPreference = findPreference("javascript_enabled");
- final Preference firstPartyCookiesPreference = findPreference("first_party_cookies_enabled");
- final Preference thirdPartyCookiesPreference = findPreference("third_party_cookies_enabled");
- final Preference domStoragePreference = findPreference("dom_storage_enabled");
- final Preference saveFormDataPreference = findPreference("save_form_data_enabled"); // The form data preference can be removed once the minimum API >= 26.
+ final Preference javaScriptPreference = findPreference("javascript");
+ final Preference firstPartyCookiesPreference = findPreference("first_party_cookies");
+ final Preference thirdPartyCookiesPreference = findPreference("third_party_cookies");
+ final Preference domStoragePreference = findPreference("dom_storage");
+ final Preference saveFormDataPreference = findPreference("save_form_data"); // The form data preference can be removed once the minimum API >= 26.
final Preference userAgentPreference = findPreference("user_agent");
final Preference customUserAgentPreference = findPreference("custom_user_agent");
final Preference incognitoModePreference = findPreference("incognito_mode");
final Preference allowScreenshotsPreference = findPreference("allow_screenshots");
final Preference easyListPreference = findPreference("easylist");
final Preference easyPrivacyPreference = findPreference("easyprivacy");
- final Preference fanboyAnnoyanceListPreference = findPreference("fanboy_annoyance_list");
- final Preference fanboySocialBlockingListPreference = findPreference("fanboy_social_blocking_list");
+ final Preference fanboyAnnoyanceListPreference = findPreference("fanboys_annoyance_list");
+ final Preference fanboySocialBlockingListPreference = findPreference("fanboys_social_blocking_list");
final Preference ultraPrivacyPreference = findPreference("ultraprivacy");
final Preference blockAllThirdPartyRequestsPreference = findPreference("block_all_third_party_requests");
final Preference proxyThroughOrbotPreference = findPreference("proxy_through_orbot");
final Preference searchPreference = findPreference("search");
final Preference searchCustomURLPreference = findPreference("search_custom_url");
final Preference fullScreenBrowsingModePreference = findPreference("full_screen_browsing_mode");
- final Preference hideSystemBarsPreference = findPreference("hide_system_bars");
- final Preference translucentNavigationBarPreference = findPreference("translucent_navigation_bar");
+ final Preference hideAppBarPreference = findPreference("hide_app_bar");
final Preference clearEverythingPreference = findPreference("clear_everything");
final Preference clearCookiesPreference = findPreference("clear_cookies");
final Preference clearDomStoragePreference = findPreference("clear_dom_storage");
final Preference homepagePreference = findPreference("homepage");
final Preference fontSizePreference = findPreference("font_size");
final Preference swipeToRefreshPreference = findPreference("swipe_to_refresh");
- final Preference downloadWithExternalAppPreference = findPreference("download_with_external_app");
+ final Preference scrollAppBarPreference = findPreference("scroll_app_bar");
final Preference displayAdditionalAppBarIconsPreference = findPreference("display_additional_app_bar_icons");
+ final Preference downloadWithExternalAppPreference = findPreference("download_with_external_app");
final Preference darkThemePreference = findPreference("dark_theme");
final Preference nightModePreference = findPreference("night_mode");
final Preference displayWebpageImagesPreference = findPreference("display_webpage_images");
// Set dependencies.
torHomepagePreference.setDependency("proxy_through_orbot");
torSearchPreference.setDependency("proxy_through_orbot");
- hideSystemBarsPreference.setDependency("full_screen_browsing_mode");
+ hideAppBarPreference.setDependency("full_screen_browsing_mode");
- // Get Strings from the preferences.
+ // Get strings from the preferences.
String torSearchString = savedPreferences.getString("tor_search", getString(R.string.tor_search_default_value));
String searchString = savedPreferences.getString("search", getString(R.string.search_default_value));
// Get booleans that are used in multiple places from the preferences.
- final boolean javaScriptEnabled = savedPreferences.getBoolean("javascript_enabled", false);
- boolean firstPartyCookiesEnabled = savedPreferences.getBoolean("first_party_cookies_enabled", false);
- boolean thirdPartyCookiesEnabled = savedPreferences.getBoolean("third_party_cookies_enabled", false);
- boolean fanboyAnnoyanceListEnabled = savedPreferences.getBoolean("fanboy_annoyance_list", true);
- boolean fanboySocialBlockingEnabled = savedPreferences.getBoolean("fanboy_social_blocking_list", true);
+ final boolean javaScriptEnabled = savedPreferences.getBoolean("javascript", false);
+ boolean firstPartyCookiesEnabled = savedPreferences.getBoolean("first_party_cookies", false);
+ boolean thirdPartyCookiesEnabled = savedPreferences.getBoolean("third_party_cookies", false);
+ boolean fanboyAnnoyanceListEnabled = savedPreferences.getBoolean("fanboys_annoyance_list", true);
+ boolean fanboySocialBlockingEnabled = savedPreferences.getBoolean("fanboys_social_blocking_list", true);
boolean proxyThroughOrbot = savedPreferences.getBoolean("proxy_through_orbot", false);
boolean fullScreenBrowsingMode = savedPreferences.getBoolean("full_screen_browsing_mode", false);
- boolean hideSystemBars = savedPreferences.getBoolean("hide_system_bars", false);
boolean clearEverything = savedPreferences.getBoolean("clear_everything", true);
final boolean nightMode = savedPreferences.getBoolean("night_mode", false);
searchCustomURLPreference.setSummary(savedPreferences.getString("search_custom_url", getString(R.string.search_custom_url_default_value)));
searchCustomURLPreference.setEnabled(searchString.equals("Custom URL"));
-
- // Enable the translucent navigation bar preference only if full screen browsing mode is enabled and `hide_system_bars` is disabled.
- translucentNavigationBarPreference.setEnabled(fullScreenBrowsingMode && !hideSystemBars);
-
- // Set the status of the `Clear and Exit` preferences.
+ // Set the status of the Clear and Exit preferences.
clearCookiesPreference.setEnabled(!clearEverything);
clearDomStoragePreference.setEnabled(!clearEverything);
clearFormDataPreference.setEnabled(!clearEverything); // The form data line can be removed once the minimum API is >= 26.
// Set the DOM storage icon.
if (javaScriptEnabled || nightMode) { // The preference is enabled.
- if (savedPreferences.getBoolean("dom_storage_enabled", false)) { // DOM storage is enabled.
+ if (savedPreferences.getBoolean("dom_storage", false)) { // DOM storage is enabled.
domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else { // DOM storage is disabled.
if (MainWebViewActivity.darkTheme) {
// Set the save form data icon if API < 26. Save form data has no effect on API >= 26.
if (Build.VERSION.SDK_INT < 26) {
- if (savedPreferences.getBoolean("save_form_data_enabled", false)) {
+ if (savedPreferences.getBoolean("save_form_data", false)) {
saveFormDataPreference.setIcon(R.drawable.form_data_enabled);
} else {
if (MainWebViewActivity.darkTheme) {
fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_light);
}
- if (hideSystemBars) { // `hideSystemBarsBoolean` is `true`.
- // Set the icons according to the theme.
+ // Set the hide app bar icon.
+ if (savedPreferences.getBoolean("hide_app_bar", true)) { // Hide app bar is enabled.
+ // Set the icon according to the theme.
if (MainWebViewActivity.darkTheme) {
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_dark);
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark);
+ hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark);
} else {
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_light);
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light);
+ hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_light);
}
- } else { // `hideSystemBarsBoolean` is `false`.
- // Set the `hideSystemBarsPreference` icon according to the theme.
+ } else { // Hide app bar is disabled.
+ // Set the icon according to the theme.
if (MainWebViewActivity.darkTheme) {
- // Set the icon for `hideSystemBarsPreference`.
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_dark);
-
- // Set the icon for `translucentNavigationBarPreference`.
- if (savedPreferences.getBoolean("translucent_navigation_bar", true)) {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_dark);
- } else {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_dark);
- }
+ hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark);
} else {
- // Set the icon for `hideSystemBarsPreference`.
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_light);
-
- // Set the icon for `translucentNavigationBarPreference`.
- if (savedPreferences.getBoolean("translucent_navigation_bar", true)) {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_light);
- } else {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_light);
- }
+ hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_light);
}
}
} else { // Full screen browsing mode is disabled.
// Set the icons according to the theme.
if (MainWebViewActivity.darkTheme) {
fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_dark);
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted_dark);
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark);
+ hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_dark);
} else {
fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_light);
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted_light);
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light);
+ hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_light);
}
}
}
}
- // Set the download with external app preference icon.
- if (savedPreferences.getBoolean("download_with_external_app", false)) {
+ // Set the scroll app bar preference icon.
+ if (savedPreferences.getBoolean("scroll_app_bar", true)) {
if (MainWebViewActivity.darkTheme) {
- downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_dark);
+ scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark);
} else {
- downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_light);
+ scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_light);
}
} else {
if (MainWebViewActivity.darkTheme) {
- downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_dark);
+ scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark);
} else {
- downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_light);
+ scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_light);
}
}
}
}
+ // Set the download with external app preference icon.
+ if (savedPreferences.getBoolean("download_with_external_app", false)) {
+ if (MainWebViewActivity.darkTheme) {
+ downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_dark);
+ } else {
+ downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_light);
+ }
+ } else {
+ if (MainWebViewActivity.darkTheme) {
+ downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_dark);
+ } else {
+ downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_light);
+ }
+ }
+
// Set the dark theme preference icon.
if (savedPreferences.getBoolean("dark_theme", false)) {
darkThemePreference.setIcon(R.drawable.theme_dark);
// Listen for preference changes.
preferencesListener = (SharedPreferences sharedPreferences, String key) -> {
switch (key) {
- case "javascript_enabled":
+ case "javascript":
// Update the icons and the DOM storage preference status.
- if (sharedPreferences.getBoolean("javascript_enabled", false)) { // The JavaScript preference is enabled.
+ if (sharedPreferences.getBoolean("javascript", false)) { // The JavaScript preference is enabled.
// Update the icon for the JavaScript preference.
javaScriptPreference.setIcon(R.drawable.javascript_enabled);
domStoragePreference.setEnabled(true);
// Update the icon for the DOM storage preference.
- if (sharedPreferences.getBoolean("dom_storage_enabled", false)) {
+ if (sharedPreferences.getBoolean("dom_storage", false)) {
domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else {
if (MainWebViewActivity.darkTheme) {
}
break;
- case "first_party_cookies_enabled":
- // Update the icons for `first_party_cookies_enabled` and `third_party_cookies_enabled`.
- if (sharedPreferences.getBoolean("first_party_cookies_enabled", false)) {
- // Set the icon for `first_party_cookies_enabled`.
+ case "first_party_cookies":
+ // Update the icons for `first_party_cookies` and `third_party_cookies`.
+ if (sharedPreferences.getBoolean("first_party_cookies", false)) {
+ // Set the icon for `first_party_cookies`.
firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled);
- // Update the icon for `third_party_cookies_enabled`.
+ // Update the icon for `third_party_cookies`.
if (Build.VERSION.SDK_INT >= 21) {
- if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) {
+ if (sharedPreferences.getBoolean("third_party_cookies", false)) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
} else {
if (MainWebViewActivity.darkTheme) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light);
}
}
- } else { // `first_party_cookies_enabled` is `false`.
- // Update the icon for `first_party_cookies_enabled`.
+ } else { // `first_party_cookies` is `false`.
+ // Update the icon for `first_party_cookies`.
if (MainWebViewActivity.darkTheme) {
firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark);
} else {
firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light);
}
- // Set the icon for `third_party_cookies_enabled` to be ghosted.
+ // Set the icon for `third_party_cookies` to be ghosted.
if (MainWebViewActivity.darkTheme) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark);
} else {
}
}
- // Enable `third_party_cookies_enabled` if `first_party_cookies_enabled` is `true` and API >= 21.
- thirdPartyCookiesPreference.setEnabled(sharedPreferences.getBoolean("first_party_cookies_enabled", false) && (Build.VERSION.SDK_INT >= 21));
+ // Enable `third_party_cookies` if `first_party_cookies` is `true` and API >= 21.
+ thirdPartyCookiesPreference.setEnabled(sharedPreferences.getBoolean("first_party_cookies", false) && (Build.VERSION.SDK_INT >= 21));
break;
- case "third_party_cookies_enabled":
+ case "third_party_cookies":
// Update the icon.
- if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) {
+ if (sharedPreferences.getBoolean("third_party_cookies", false)) {
thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
} else {
if (MainWebViewActivity.darkTheme) {
}
break;
- case "dom_storage_enabled":
+ case "dom_storage":
// Update the icon.
- if (sharedPreferences.getBoolean("dom_storage_enabled", false)) {
+ if (sharedPreferences.getBoolean("dom_storage", false)) {
domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else {
if (MainWebViewActivity.darkTheme) {
break;
// Save form data can be removed once the minimum API >= 26.
- case "save_form_data_enabled":
+ case "save_form_data":
// Update the icon.
- if (sharedPreferences.getBoolean("save_form_data_enabled", false)) {
+ if (sharedPreferences.getBoolean("save_form_data", false)) {
saveFormDataPreference.setIcon(R.drawable.form_data_enabled);
} else {
if (MainWebViewActivity.darkTheme) {
}
break;
- case "fanboy_annoyance_list":
- boolean currentFanboyAnnoyanceList = sharedPreferences.getBoolean("fanboy_annoyance_list", true);
- boolean currentFanboySocialBlockingList = sharedPreferences.getBoolean("fanboy_social_blocking_list", true);
+ case "fanboys_annoyance_list":
+ boolean currentFanboyAnnoyanceList = sharedPreferences.getBoolean("fanboys_annoyance_list", true);
+ boolean currentFanboySocialBlockingList = sharedPreferences.getBoolean("fanboys_social_blocking_list", true);
// Update the Fanboy icons.
if (currentFanboyAnnoyanceList) { // Fanboy's annoyance list is enabled.
fanboySocialBlockingListPreference.setEnabled(!currentFanboyAnnoyanceList);
break;
- case "fanboy_social_blocking_list":
+ case "fanboys_social_blocking_list":
// Update the icon.
- if (sharedPreferences.getBoolean("fanboy_social_blocking_list", true)) {
+ if (sharedPreferences.getBoolean("fanboys_social_blocking_list", true)) {
if (MainWebViewActivity.darkTheme) {
fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_dark);
} else {
break;
case "full_screen_browsing_mode":
- if (sharedPreferences.getBoolean("full_screen_browsing_mode", false)) {
- // Set the `fullScreenBrowsingModePreference` icon according to the theme.
+ if (sharedPreferences.getBoolean("full_screen_browsing_mode", false)) { // Full screen browsing is enabled.
+ // Set the full screen browsing mode preference icon according to the theme.
if (MainWebViewActivity.darkTheme) {
fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_dark);
} else {
fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_light);
}
- if (sharedPreferences.getBoolean("hide_system_bars", false)) { // `hide_system_bars` is `true`.
- // Disable `translucentNavigationBarPreference`.
- translucentNavigationBarPreference.setEnabled(false);
-
- // Set the icons according to the theme.
+ // Set the hide app bar preference icon.
+ if (sharedPreferences.getBoolean("hide_app_bar", true)) { // Hide app bar is enabled.
+ // Set the icon according to the theme.
if (MainWebViewActivity.darkTheme) {
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_dark);
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark);
+ hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark);
} else {
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_light);
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light);
+ hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_light);
}
- } else { // `hide_system_bars` is `false`.
- // Enable `translucentNavigationBarPreference`.
- translucentNavigationBarPreference.setEnabled(true);
-
- // Set the icons according to the theme.
- if (MainWebViewActivity.darkTheme) { // Use the dark theme.
- // Set the `hideSystemBarsPreference` icon.
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_dark);
-
- // Set the `translucentNavigationBarPreference` icon.
- if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_dark);
- } else {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_dark);
- }
- } else { // Use the light theme.
- // Set the `hideSystemBarsPreference` icon.
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_light);
-
- // Set the `translucentNavigationBarPreference` icon.
- if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_light);
- } else {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_light);
- }
+ } else { // Hide app bar is disabled.
+ // Set the icon according to the theme.
+ if (MainWebViewActivity.darkTheme) {
+ hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark);
+ } else {
+ hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_light);
}
}
- } else { // `full_screen_browsing_mode` is false.
- // Disable `translucentNavigationBarPreference`.
- translucentNavigationBarPreference.setEnabled(false);
-
+ } else { // Full screen browsing is disabled.
// Update the icons according to the theme.
if (MainWebViewActivity.darkTheme) {
fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_dark);
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted_dark);
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark);
+ hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_dark);
} else {
fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_light);
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted_light);
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light);
+ hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_light);
}
}
break;
- case "hide_system_bars":
- if (sharedPreferences.getBoolean("hide_system_bars", false)) {
- // Disable `translucentNavigationBarPreference`.
- translucentNavigationBarPreference.setEnabled(false);
-
- // Set the icons according to the theme.
- if (MainWebViewActivity.darkTheme) {
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_dark);
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark);
- } else {
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_light);
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light);
- }
- } else { // `hide_system_bars` is false.
- // Enable `translucentNavigationBarPreference`.
- translucentNavigationBarPreference.setEnabled(true);
-
- // Set the icons according to the theme.
- if (MainWebViewActivity.darkTheme) {
- // Set the `hideSystemBarsPreference` icon.
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_dark);
-
- // Set the `translucentNavigationBarPreference` icon.
- if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_dark);
- } else {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_dark);
- }
- } else {
- // Set the `hideSystemBarsPreference` icon.
- hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_light);
-
- // Set the `translucentNavigationBarPreference` icon.
- if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_light);
- } else {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_light);
- }
- }
- }
- break;
-
- case "translucent_navigation_bar":
+ case "hide_app_bar":
// Update the icon.
- if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) {
+ if (sharedPreferences.getBoolean("hide_app_bar", true)) { // Hide app bar is enabled.
+ // Set the icon according to the theme.
if (MainWebViewActivity.darkTheme) {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_dark);
+ hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark);
} else {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_light);
+ hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_light);
}
- } else {
+ } else { // Hide app bar is disabled.
+ // Set the icon according to the theme.
if (MainWebViewActivity.darkTheme) {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_dark);
+ hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark);
} else {
- translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_light);
+ hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_light);
}
}
break;
}
break;
- case "download_with_external_app":
+ case "scroll_app_bar":
// Update the icon.
- if (sharedPreferences.getBoolean("download_with_external_app", false)) {
+ if (sharedPreferences.getBoolean("scroll_app_bar", true)) {
if (MainWebViewActivity.darkTheme) {
- downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_dark);
+ scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark);
} else {
- downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_light);
+ scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_light);
}
} else {
if (MainWebViewActivity.darkTheme) {
- downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_dark);
+ scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark);
} else {
- downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_light);
+ scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_light);
}
}
break;
}
break;
+ case "download_with_external_app":
+ // Update the icon.
+ if (sharedPreferences.getBoolean("download_with_external_app", false)) {
+ if (MainWebViewActivity.darkTheme) {
+ downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_dark);
+ } else {
+ downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_light);
+ }
+ } else {
+ if (MainWebViewActivity.darkTheme) {
+ downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_dark);
+ } else {
+ downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_light);
+ }
+ }
+ break;
+
case "dark_theme":
// Update the icon.
if (sharedPreferences.getBoolean("dark_theme", false)) {
// Store the current night mode status.
boolean currentNightModeBoolean = sharedPreferences.getBoolean("night_mode", false);
- boolean currentJavaScriptBoolean = sharedPreferences.getBoolean("javascript_enabled", false);
+ boolean currentJavaScriptBoolean = sharedPreferences.getBoolean("javascript", false);
// Update the icon.
if (currentNightModeBoolean) {
javaScriptPreference.setIcon(R.drawable.privacy_mode);
}
- // Update the `domStoragePreference` icon.
+ // Update the DOM storage preference icon.
if (currentNightModeBoolean || currentJavaScriptBoolean) { // The preference is enabled.
- if (sharedPreferences.getBoolean("dom_storage_enabled", false)) { // DOM storage is enabled.
+ if (sharedPreferences.getBoolean("dom_storage", false)) { // DOM storage is enabled.
domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
} else { // DOM storage is disabled.
if (MainWebViewActivity.darkTheme) {
savedPreferences.registerOnSharedPreferenceChangeListener(preferencesListener);
}
- // It is necessary to re-register the listener on every resume or it will randomly stop working because apps can be paused and resumed at any time
- // even while running in the foreground.
+ // It is necessary to re-register the listener on every resume or it will randomly stop working because apps can be paused and resumed at any time, even while running in the foreground.
@Override
public void onPause() {
super.onPause();
projects / PrivacyBrowserAndroid.git / blobdiff