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=c22da979983282c4ef40409db5ff6e17d954d9e5;hp=af87568b34493537dab5d04d9fe234779f2a8bcf;hb=f0393ca22075be3e5fe9199c7db87381256236fa;hpb=8cd4c56d559436ee6c5b81df9a411bbf211be7fd 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 af87568b..c22da979 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2018 Soren Stoutner . + * Copyright © 2016-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -78,8 +78,7 @@ public class SettingsFragment extends PreferenceFragment { 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"); @@ -88,8 +87,9 @@ public class SettingsFragment extends PreferenceFragment { 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"); @@ -97,9 +97,9 @@ public class SettingsFragment extends PreferenceFragment { // 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)); @@ -111,8 +111,8 @@ public class SettingsFragment extends PreferenceFragment { 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); + boolean darkTheme = savedPreferences.getBoolean("dark_theme", false); final boolean nightMode = savedPreferences.getBoolean("night_mode", false); // Only enable the third-party cookies preference if first-party cookies are enabled and API >= 21. @@ -212,11 +212,7 @@ public class SettingsFragment extends PreferenceFragment { 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. @@ -242,7 +238,7 @@ public class SettingsFragment extends PreferenceFragment { if (firstPartyCookiesEnabled) { firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled); } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); } else { firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); @@ -254,14 +250,14 @@ public class SettingsFragment extends PreferenceFragment { if (thirdPartyCookiesEnabled) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); } else { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); } } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark); } else { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light); @@ -273,14 +269,14 @@ public class SettingsFragment extends PreferenceFragment { 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) { + if (darkTheme) { domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark); } else { domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light); } } } else { // The preference is disabled. The icon should be ghosted. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_dark); } else { domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_light); @@ -292,7 +288,7 @@ public class SettingsFragment extends PreferenceFragment { if (savedPreferences.getBoolean("save_form_data", false)) { saveFormDataPreference.setIcon(R.drawable.form_data_enabled); } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { saveFormDataPreference.setIcon(R.drawable.form_data_disabled_dark); } else { saveFormDataPreference.setIcon(R.drawable.form_data_disabled_light); @@ -302,13 +298,13 @@ public class SettingsFragment extends PreferenceFragment { // Set the custom user agent icon. if (customUserAgentPreference.isEnabled()) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_dark); } else { customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_dark); } else { customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_light); @@ -317,13 +313,13 @@ public class SettingsFragment extends PreferenceFragment { // Set the incognito mode icon. if (savedPreferences.getBoolean("incognito_mode", false)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_dark); } else { incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_dark); } else { incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_light); @@ -332,13 +328,13 @@ public class SettingsFragment extends PreferenceFragment { // Set the Do Not Track icon. if (savedPreferences.getBoolean("do_not_track", false)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_dark); } else { doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_dark); } else { doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_light); @@ -347,13 +343,13 @@ public class SettingsFragment extends PreferenceFragment { // Set the allow screenshots icon. if (savedPreferences.getBoolean("allow_screenshots", false)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_dark); } else { allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_dark); } else { allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_light); @@ -362,13 +358,13 @@ public class SettingsFragment extends PreferenceFragment { // Set the EasyList icon. if (savedPreferences.getBoolean("easylist", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { easyListPreference.setIcon(R.drawable.block_ads_enabled_dark); } else { easyListPreference.setIcon(R.drawable.block_ads_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { easyListPreference.setIcon(R.drawable.block_ads_disabled_dark); } else { easyListPreference.setIcon(R.drawable.block_ads_disabled_light); @@ -377,13 +373,13 @@ public class SettingsFragment extends PreferenceFragment { // Set the EasyPrivacy icon. if (savedPreferences.getBoolean("easyprivacy", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark); } else { easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark); } else { easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light); @@ -392,7 +388,7 @@ public class SettingsFragment extends PreferenceFragment { // Set the Fanboy lists icons. if (fanboyAnnoyanceListEnabled) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { // Set the Fanboy annoyance list icon. fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_dark); @@ -406,7 +402,7 @@ public class SettingsFragment extends PreferenceFragment { fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { // Set the Fanboy annoyance list icon. fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_dark); @@ -431,13 +427,13 @@ public class SettingsFragment extends PreferenceFragment { // Set the UltraPrivacy icon. if (savedPreferences.getBoolean("ultraprivacy", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark); } else { ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark); } else { ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light); @@ -446,13 +442,13 @@ public class SettingsFragment extends PreferenceFragment { // Set the block all third-party requests icon. if (savedPreferences.getBoolean("block_all_third_party_requests", false)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_dark); } else { blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_dark); } else { blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_light); @@ -461,7 +457,7 @@ public class SettingsFragment extends PreferenceFragment { // Set the Tor icons according to the theme. if (proxyThroughOrbot) { // Proxying is enabled. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled_dark); torHomepagePreference.setIcon(R.drawable.home_enabled_dark); torSearchPreference.setIcon(R.drawable.search_enabled_dark); @@ -485,7 +481,7 @@ public class SettingsFragment extends PreferenceFragment { } } } else { // Proxying is disabled. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled_dark); torHomepagePreference.setIcon(R.drawable.home_ghosted_dark); torSearchPreference.setIcon(R.drawable.search_ghosted_dark); @@ -500,13 +496,13 @@ public class SettingsFragment extends PreferenceFragment { // Set the search custom URL icon. if (searchCustomURLPreference.isEnabled()) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark); } else { searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark); } else { searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light); @@ -516,61 +512,42 @@ public class SettingsFragment extends PreferenceFragment { // Set the full screen browsing mode icons. if (fullScreenBrowsingMode) { // Full screen browsing mode is enabled. // Set the `fullScreenBrowsingModePreference` icon according to the theme. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_dark); } else { fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_light); } - if (hideSystemBars) { // `hideSystemBarsBoolean` is `true`. - // 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); + // 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 (darkTheme) { + 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. - 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); - } + } else { // Hide app bar is disabled. + // Set the icon according to the theme. + if (darkTheme) { + 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) { + if (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 clear everything preference icon. if (clearEverything) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_dark); } else { clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_light); @@ -581,7 +558,7 @@ public class SettingsFragment extends PreferenceFragment { // Set the clear cookies preference icon. if (clearEverything || savedPreferences.getBoolean("clear_cookies", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { clearCookiesPreference.setIcon(R.drawable.cookies_cleared_dark); } else { clearCookiesPreference.setIcon(R.drawable.cookies_cleared_light); @@ -592,7 +569,7 @@ public class SettingsFragment extends PreferenceFragment { // Set the clear DOM storage preference icon. if (clearEverything || savedPreferences.getBoolean("clear_dom_storage", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_dark); } else { clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_light); @@ -604,7 +581,7 @@ public class SettingsFragment extends PreferenceFragment { // Set the clear form data preference icon if the API < 26. It has no effect on newer versions of Android. if (Build.VERSION.SDK_INT < 26) { if (clearEverything || savedPreferences.getBoolean("clear_form_data", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); } else { clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); @@ -616,7 +593,7 @@ public class SettingsFragment extends PreferenceFragment { // Set the clear cache preference icon. if (clearEverything || savedPreferences.getBoolean("clear_cache", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { clearCachePreference.setIcon(R.drawable.cache_cleared_dark); } else { clearCachePreference.setIcon(R.drawable.cache_cleared_light); @@ -627,49 +604,64 @@ public class SettingsFragment extends PreferenceFragment { // Set the swipe to refresh preference icon. if (savedPreferences.getBoolean("swipe_to_refresh", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_dark); } else { swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_dark); } else { swipeToRefreshPreference.setIcon(R.drawable.refresh_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); + // Set the scroll app bar preference icon. + if (savedPreferences.getBoolean("scroll_app_bar", true)) { + if (darkTheme) { + 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); + if (darkTheme) { + 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 display additional app bar icons preference icon. if (savedPreferences.getBoolean("display_additional_app_bar_icons", false)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_dark); } else { displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_dark); } else { displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_light); } } + // Set the download with external app preference icon. + if (savedPreferences.getBoolean("download_with_external_app", false)) { + if (darkTheme) { + downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_dark); + } else { + downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_light); + } + } else { + if (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); @@ -679,13 +671,13 @@ public class SettingsFragment extends PreferenceFragment { // Set the night mode preference icon. if (nightMode) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { nightModePreference.setIcon(R.drawable.night_mode_enabled_dark); } else { nightModePreference.setIcon(R.drawable.night_mode_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { nightModePreference.setIcon(R.drawable.night_mode_disabled_dark); } else { nightModePreference.setIcon(R.drawable.night_mode_disabled_light); @@ -694,13 +686,13 @@ public class SettingsFragment extends PreferenceFragment { // Set the display webpage images preference icon. if (savedPreferences.getBoolean("display_webpage_images", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_dark); } else { displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_dark); } else { displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_light); @@ -724,7 +716,7 @@ public class SettingsFragment extends PreferenceFragment { if (sharedPreferences.getBoolean("dom_storage", false)) { domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark); } else { domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light); @@ -738,7 +730,7 @@ public class SettingsFragment extends PreferenceFragment { domStoragePreference.setEnabled(false); // Set the icon for DOM storage preference to be ghosted. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_dark); } else { domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_light); @@ -757,14 +749,14 @@ public class SettingsFragment extends PreferenceFragment { if (sharedPreferences.getBoolean("third_party_cookies", false)) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); } else { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); } } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark); } else { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light); @@ -772,14 +764,14 @@ public class SettingsFragment extends PreferenceFragment { } } else { // `first_party_cookies` is `false`. // Update the icon for `first_party_cookies`. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); } else { firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); } // Set the icon for `third_party_cookies` to be ghosted. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark); } else { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light); @@ -795,7 +787,7 @@ public class SettingsFragment extends PreferenceFragment { if (sharedPreferences.getBoolean("third_party_cookies", false)) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); } else { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); @@ -808,7 +800,7 @@ public class SettingsFragment extends PreferenceFragment { if (sharedPreferences.getBoolean("dom_storage", false)) { domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark); } else { domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light); @@ -822,12 +814,13 @@ public class SettingsFragment extends PreferenceFragment { if (sharedPreferences.getBoolean("save_form_data", false)) { saveFormDataPreference.setIcon(R.drawable.form_data_enabled); } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { saveFormDataPreference.setIcon(R.drawable.form_data_disabled_dark); } else { saveFormDataPreference.setIcon(R.drawable.form_data_disabled_light); } } + break; case "user_agent": // Get the new user agent name. @@ -849,7 +842,7 @@ public class SettingsFragment extends PreferenceFragment { customUserAgentPreference.setEnabled(false); // Set the custom user agent preference icon according to the theme. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_dark); } else { customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_light); @@ -864,7 +857,7 @@ public class SettingsFragment extends PreferenceFragment { customUserAgentPreference.setEnabled(true); // Set the custom user agent preference icon according to the theme. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_dark); } else { customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_light); @@ -879,7 +872,7 @@ public class SettingsFragment extends PreferenceFragment { customUserAgentPreference.setEnabled(false); // Set the custom user agent preference icon according to the theme. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_dark); } else { customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_light); @@ -895,13 +888,13 @@ public class SettingsFragment extends PreferenceFragment { case "incognito_mode": // Update the icon. if (sharedPreferences.getBoolean("incognito_mode", false)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_dark); } else { incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_dark); } else { incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_light); @@ -912,13 +905,13 @@ public class SettingsFragment extends PreferenceFragment { case "do_not_track": // Update the icon. if (sharedPreferences.getBoolean("do_not_track", false)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_dark); } else { doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_dark); } else { doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_light); @@ -930,13 +923,13 @@ public class SettingsFragment extends PreferenceFragment { case "allow_screenshots": // Update the icon. if (sharedPreferences.getBoolean("allow_screenshots", false)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_dark); } else { allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_dark); } else { allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_light); @@ -949,7 +942,7 @@ public class SettingsFragment extends PreferenceFragment { // Assert that the intent is not null to remove the lint error below. assert allowScreenshotsRestartIntent != null; - // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack. It requires `Intent.FLAG_ACTIVITY_NEW_TASK`. + // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack. It requires `Intent.FLAG_ACTIVITY_NEW_TASK`. TODO. allowScreenshotsRestartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); // Make it so. @@ -959,13 +952,13 @@ public class SettingsFragment extends PreferenceFragment { case "easylist": // Update the icon. if (sharedPreferences.getBoolean("easylist", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { easyListPreference.setIcon(R.drawable.block_ads_enabled_dark); } else { easyListPreference.setIcon(R.drawable.block_ads_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { easyListPreference.setIcon(R.drawable.block_ads_disabled_dark); } else { easyListPreference.setIcon(R.drawable.block_ads_disabled_light); @@ -976,13 +969,13 @@ public class SettingsFragment extends PreferenceFragment { case "easyprivacy": // Update the icon. if (sharedPreferences.getBoolean("easyprivacy", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark); } else { easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark); } else { easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light); @@ -996,7 +989,7 @@ public class SettingsFragment extends PreferenceFragment { // Update the Fanboy icons. if (currentFanboyAnnoyanceList) { // Fanboy's annoyance list is enabled. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { // Update the Fanboy's annoyance list icon. fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_dark); @@ -1010,7 +1003,7 @@ public class SettingsFragment extends PreferenceFragment { fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_light); } } else { // Fanboy's annoyance list is disabled. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { // Update the Fanboy's annoyance list icon. fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_dark); @@ -1040,13 +1033,13 @@ public class SettingsFragment extends PreferenceFragment { case "fanboys_social_blocking_list": // Update the icon. if (sharedPreferences.getBoolean("fanboys_social_blocking_list", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_dark); } else { fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_dark); } else { fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_light); @@ -1057,13 +1050,13 @@ public class SettingsFragment extends PreferenceFragment { case "ultraprivacy": // Update the icon. if (sharedPreferences.getBoolean("ultraprivacy", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark); } else { ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark); } else { ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light); @@ -1074,13 +1067,13 @@ public class SettingsFragment extends PreferenceFragment { case "block_all_third_party_requests": // Update the icon. if (sharedPreferences.getBoolean("block_all_third_party_requests", false)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_dark); } else { blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_dark); } else { blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_light); @@ -1099,7 +1092,7 @@ public class SettingsFragment extends PreferenceFragment { // Update the icons. if (currentProxyThroughOrbot) { // Set the Tor icons according to the theme. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled_dark); torHomepagePreference.setIcon(R.drawable.home_enabled_dark); torSearchPreference.setIcon(R.drawable.search_enabled_dark); @@ -1123,7 +1116,7 @@ public class SettingsFragment extends PreferenceFragment { } } } else { // Proxy through Orbot is disabled. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled_dark); torHomepagePreference.setIcon(R.drawable.home_ghosted_dark); torSearchPreference.setIcon(R.drawable.search_ghosted_dark); @@ -1155,7 +1148,7 @@ public class SettingsFragment extends PreferenceFragment { torSearchCustomURLPreference.setEnabled(true); // Update the `torSearchCustomURLPreference` icon. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark); } else { torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_light); @@ -1168,7 +1161,7 @@ public class SettingsFragment extends PreferenceFragment { torSearchCustomURLPreference.setEnabled(false); // Update the `torSearchCustomURLPreference` icon. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark); } else { torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light); @@ -1194,7 +1187,7 @@ public class SettingsFragment extends PreferenceFragment { searchCustomURLPreference.setEnabled(true); // Set the `searchCustomURLPreference` according to the theme. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark); } else { searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_light); @@ -1207,7 +1200,7 @@ public class SettingsFragment extends PreferenceFragment { searchCustomURLPreference.setEnabled(false); // Set the `searchCustomURLPreference` according to the theme. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark); } else { searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light); @@ -1221,125 +1214,57 @@ public class SettingsFragment extends PreferenceFragment { break; case "full_screen_browsing_mode": - if (sharedPreferences.getBoolean("full_screen_browsing_mode", false)) { - // Set the `fullScreenBrowsingModePreference` icon according to the theme. - if (MainWebViewActivity.darkTheme) { + 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 (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. - if (MainWebViewActivity.darkTheme) { - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_dark); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark); + // 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 (darkTheme) { + 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 (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) { + if (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); - } - } - 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); - } + hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_light); } } break; - case "translucent_navigation_bar": + case "hide_app_bar": // Update the icon. - if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { - if (MainWebViewActivity.darkTheme) { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_dark); + if (sharedPreferences.getBoolean("hide_app_bar", true)) { // Hide app bar is enabled. + // Set the icon according to the theme. + if (darkTheme) { + 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 { - if (MainWebViewActivity.darkTheme) { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_dark); + } else { // Hide app bar is disabled. + // Set the icon according to the theme. + if (darkTheme) { + 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; @@ -1356,7 +1281,7 @@ public class SettingsFragment extends PreferenceFragment { // Update the `clearEverythingPreference` icon. if (newClearEverythingBoolean) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_dark); } else { clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_light); @@ -1367,7 +1292,7 @@ public class SettingsFragment extends PreferenceFragment { // Update the `clearCookiesPreference` icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cookies", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { clearCookiesPreference.setIcon(R.drawable.cookies_cleared_dark); } else { clearCookiesPreference.setIcon(R.drawable.cookies_cleared_light); @@ -1378,7 +1303,7 @@ public class SettingsFragment extends PreferenceFragment { // Update the `clearDomStoragePreference` icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_dom_storage", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_dark); } else { clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_light); @@ -1390,7 +1315,7 @@ public class SettingsFragment extends PreferenceFragment { // Update the clear form data preference icon if the API < 26. if (Build.VERSION.SDK_INT < 26) { if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_form_data", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); } else { clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); @@ -1402,7 +1327,7 @@ public class SettingsFragment extends PreferenceFragment { // Update the `clearCachePreference` icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cache", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { clearCachePreference.setIcon(R.drawable.cache_cleared_dark); } else { clearCachePreference.setIcon(R.drawable.cache_cleared_light); @@ -1415,7 +1340,7 @@ public class SettingsFragment extends PreferenceFragment { case "clear_cookies": // Update the icon. if (sharedPreferences.getBoolean("clear_cookies", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { clearCookiesPreference.setIcon(R.drawable.cookies_cleared_dark); } else { clearCookiesPreference.setIcon(R.drawable.cookies_cleared_light); @@ -1428,7 +1353,7 @@ public class SettingsFragment extends PreferenceFragment { case "clear_dom_storage": // Update the icon. if (sharedPreferences.getBoolean("clear_dom_storage", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_dark); } else { clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_light); @@ -1442,7 +1367,7 @@ public class SettingsFragment extends PreferenceFragment { case "clear_form_data": // Update the icon. if (sharedPreferences.getBoolean("clear_form_data", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); } else { clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); @@ -1455,7 +1380,7 @@ public class SettingsFragment extends PreferenceFragment { case "clear_cache": // Update the icon. if (sharedPreferences.getBoolean("clear_cache", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { clearCachePreference.setIcon(R.drawable.cache_cleared_dark); } else { clearCachePreference.setIcon(R.drawable.cache_cleared_light); @@ -1478,13 +1403,13 @@ public class SettingsFragment extends PreferenceFragment { case "swipe_to_refresh": // Update the icon. if (sharedPreferences.getBoolean("swipe_to_refresh", true)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_dark); } else { swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_dark); } else { swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_light); @@ -1492,19 +1417,19 @@ public class SettingsFragment extends PreferenceFragment { } break; - case "download_with_external_app": + case "scroll_app_bar": // Update the icon. - if (sharedPreferences.getBoolean("download_with_external_app", false)) { - if (MainWebViewActivity.darkTheme) { - downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_dark); + if (sharedPreferences.getBoolean("scroll_app_bar", true)) { + if (darkTheme) { + 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); + if (darkTheme) { + 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; @@ -1512,13 +1437,13 @@ public class SettingsFragment extends PreferenceFragment { case "display_additional_app_bar_icons": // Update the icon. if (sharedPreferences.getBoolean("display_additional_app_bar_icons", false)) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_dark); } else { displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_dark); } else { displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_light); @@ -1526,6 +1451,23 @@ public class SettingsFragment extends PreferenceFragment { } break; + case "download_with_external_app": + // Update the icon. + if (sharedPreferences.getBoolean("download_with_external_app", false)) { + if (darkTheme) { + downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_dark); + } else { + downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_light); + } + } else { + if (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)) { @@ -1540,7 +1482,7 @@ public class SettingsFragment extends PreferenceFragment { // Assert that the intent is not null to remove the lint error below. assert changeThemeRestartIntent != null; - // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack. It requires `Intent.FLAG_ACTIVITY_NEW_TASK`. + // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack. It requires `Intent.FLAG_ACTIVITY_NEW_TASK`. TODO. changeThemeRestartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); // Make it so. @@ -1549,7 +1491,7 @@ public class SettingsFragment extends PreferenceFragment { case "night_mode": // Set the URL to be reloaded on restart to apply the new night mode setting. - MainWebViewActivity.loadUrlOnRestart = true; + MainWebViewActivity.reloadOnRestart = true; // Store the current night mode status. boolean currentNightModeBoolean = sharedPreferences.getBoolean("night_mode", false); @@ -1557,13 +1499,13 @@ public class SettingsFragment extends PreferenceFragment { // Update the icon. if (currentNightModeBoolean) { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { nightModePreference.setIcon(R.drawable.night_mode_enabled_dark); } else { nightModePreference.setIcon(R.drawable.night_mode_enabled_light); } } else { - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { nightModePreference.setIcon(R.drawable.night_mode_disabled_dark); } else { nightModePreference.setIcon(R.drawable.night_mode_disabled_light); @@ -1586,14 +1528,14 @@ public class SettingsFragment extends PreferenceFragment { 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) { + if (darkTheme) { domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark); } else { domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light); } } } else { // The preference is disabled. The icon should be ghosted. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_dark); } else { domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_light); @@ -1604,7 +1546,7 @@ public class SettingsFragment extends PreferenceFragment { case "display_webpage_images": if (sharedPreferences.getBoolean("display_webpage_images", true)) { // Update the icon. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_dark); } else { displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_light); @@ -1614,7 +1556,7 @@ public class SettingsFragment extends PreferenceFragment { MainWebViewActivity.reloadOnRestart = false; } else { // Update the icon. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_dark); } else { displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_light); @@ -1631,8 +1573,7 @@ public class SettingsFragment extends PreferenceFragment { 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();