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=ef0f1b9af4a34f68e6af62cd1418b9521991b697;hp=8e533363a92892b0a67fa149fa2a5e20e0c31f58;hb=d941ca283544e1c3231f59796a3f64270e747a99;hpb=7de44ca8dbf4330ee6fa3d9146940c1016edd608 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 8e533363..ef0f1b9a 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-2020 Soren Stoutner . + * Copyright © 2016-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -24,28 +24,31 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Configuration; import android.content.res.Resources; import android.os.Build; import android.os.Bundle; import android.os.Handler; +import android.os.Looper; import android.view.LayoutInflater; import android.view.View; import android.webkit.WebView; import android.widget.ArrayAdapter; +import androidx.appcompat.app.AppCompatDelegate; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceFragmentCompat; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.activities.MainWebViewActivity; -import com.stoutner.privacybrowser.helpers.DownloadLocationHelper; import com.stoutner.privacybrowser.helpers.ProxyHelper; public class SettingsFragment extends PreferenceFragmentCompat { // Define the class variables. private SharedPreferences.OnSharedPreferenceChangeListener preferencesListener; private SharedPreferences savedPreferences; + private int currentThemeStatus; @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { @@ -62,6 +65,9 @@ public class SettingsFragment extends PreferenceFragmentCompat { Context context = activity.getApplicationContext(); Resources resources = getResources(); + // Get the current theme status. + currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; + // Initialize savedPreferences. savedPreferences = getPreferenceScreen().getSharedPreferences(); @@ -74,8 +80,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { Preference userAgentPreference = findPreference("user_agent"); Preference customUserAgentPreference = findPreference("custom_user_agent"); Preference incognitoModePreference = findPreference("incognito_mode"); - Preference doNotTrackPreference = findPreference("do_not_track"); - Preference allowScreenshotsPreference = findPreference("allow_screenshots"); + Preference allowScreenshotsPreference = findPreference(getString(R.string.allow_screenshots_key)); Preference easyListPreference = findPreference("easylist"); Preference easyPrivacyPreference = findPreference("easyprivacy"); Preference fanboyAnnoyanceListPreference = findPreference("fanboys_annoyance_list"); @@ -96,17 +101,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { Preference clearCookiesPreference = findPreference("clear_cookies"); Preference clearDomStoragePreference = findPreference("clear_dom_storage"); Preference clearFormDataPreference = findPreference("clear_form_data"); // The clear form data preference can be removed once the minimum API >= 26. + Preference clearLogcatPreference = findPreference(getString(R.string.clear_logcat_key)); Preference clearCachePreference = findPreference("clear_cache"); Preference homepagePreference = findPreference("homepage"); - Preference downloadLocationPreference = findPreference("download_location"); - Preference downloadCustomLocationPreference = findPreference("download_custom_location"); Preference fontSizePreference = findPreference("font_size"); Preference openIntentsInNewTabPreference = findPreference("open_intents_in_new_tab"); Preference swipeToRefreshPreference = findPreference("swipe_to_refresh"); Preference scrollAppBarPreference = findPreference("scroll_app_bar"); Preference displayAdditionalAppBarIconsPreference = findPreference("display_additional_app_bar_icons"); - Preference darkThemePreference = findPreference("dark_theme"); - Preference nightModePreference = findPreference("night_mode"); + Preference appThemePreference = findPreference("app_theme"); + Preference webViewThemePreference = findPreference("webview_theme"); Preference wideViewportPreference = findPreference("wide_viewport"); Preference displayWebpageImagesPreference = findPreference("display_webpage_images"); @@ -119,7 +123,6 @@ public class SettingsFragment extends PreferenceFragmentCompat { assert userAgentPreference != null; assert customUserAgentPreference != null; assert incognitoModePreference != null; - assert doNotTrackPreference != null; assert allowScreenshotsPreference != null; assert easyListPreference != null; assert easyPrivacyPreference != null; @@ -141,53 +144,46 @@ public class SettingsFragment extends PreferenceFragmentCompat { assert clearCookiesPreference != null; assert clearDomStoragePreference != null; assert clearFormDataPreference != null; + assert clearLogcatPreference != null; assert clearCachePreference != null; assert homepagePreference != null; - assert downloadLocationPreference != null; - assert downloadCustomLocationPreference != null; assert fontSizePreference != null; assert openIntentsInNewTabPreference != null; assert swipeToRefreshPreference != null; assert scrollAppBarPreference != null; assert displayAdditionalAppBarIconsPreference != null; - assert darkThemePreference != null; - assert nightModePreference != null; + assert appThemePreference != null; + assert webViewThemePreference != null; assert wideViewportPreference != null; assert displayWebpageImagesPreference != null; - // Set the hide app bar preference dependency. + // Set the preference dependencies. hideAppBarPreference.setDependency("full_screen_browsing_mode"); + domStoragePreference.setDependency("javascript"); // Get strings from the preferences. String userAgentName = savedPreferences.getString("user_agent", getString(R.string.user_agent_default_value)); String searchString = savedPreferences.getString("search", getString(R.string.search_default_value)); String proxyString = savedPreferences.getString("proxy", getString(R.string.proxy_default_value)); - String downloadLocationString = savedPreferences.getString("download_location", getString(R.string.download_location_default_value)); // Get booleans that are used in multiple places from the preferences. 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 fullScreenBrowsingMode = savedPreferences.getBoolean("full_screen_browsing_mode", false); boolean clearEverything = savedPreferences.getBoolean("clear_everything", true); - boolean darkTheme = savedPreferences.getBoolean("dark_theme", false); - boolean nightMode = savedPreferences.getBoolean("night_mode", false); // Only enable the third-party cookies preference if first-party cookies are enabled and API >= 21. thirdPartyCookiesPreference.setEnabled(firstPartyCookiesEnabled && (Build.VERSION.SDK_INT >= 21)); - // Only enable the DOM storage preference if either JavaScript or Night Mode is enabled. - domStoragePreference.setEnabled(javaScriptEnabled || nightMode); - // Remove the form data preferences if the API is >= 26 as they no longer do anything. if (Build.VERSION.SDK_INT >= 26) { - // Get the categories. + // Get handles for the categories. PreferenceCategory privacyCategory = findPreference("privacy"); PreferenceCategory clearAndExitCategory = findPreference("clear_and_exit"); - // Remove the lint warnings below that the preference categories might be null. + // Remove the incorrect lint warnings below that the preference categories might be null. assert privacyCategory != null; assert clearAndExitCategory != null; @@ -292,10 +288,11 @@ public class SettingsFragment extends PreferenceFragmentCompat { proxyCustomUrlPreference.setEnabled(proxyString.equals("Custom")); - // 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. + clearLogcatPreference.setEnabled(!clearEverything); clearCachePreference.setEnabled(!clearEverything); @@ -303,38 +300,76 @@ public class SettingsFragment extends PreferenceFragmentCompat { homepagePreference.setSummary(savedPreferences.getString("homepage", getString(R.string.homepage_default_value))); - // Get the download location string arrays. - String[] downloadLocationEntriesStringArray = resources.getStringArray(R.array.download_location_entries); - String[] downloadLocationEntryValuesStringArray = resources.getStringArray(R.array.download_location_entry_values); + // Set the font size as the summary text for the preference. + fontSizePreference.setSummary(savedPreferences.getString("font_size", getString(R.string.font_size_default_value)) + "%"); + + + // Get the app theme string arrays. + String[] appThemeEntriesStringArray = resources.getStringArray(R.array.app_theme_entries); + String[] appThemeEntryValuesStringArray = resources.getStringArray(R.array.app_theme_entry_values); - // Instantiate the download location helper. - DownloadLocationHelper downloadLocationHelper = new DownloadLocationHelper(); + // Get the current app theme. + String currentAppTheme = savedPreferences.getString("app_theme", getString(R.string.app_theme_default_value)); - // Check to see if a download custom location is selected. - if (downloadLocationString.equals(downloadLocationEntryValuesStringArray[3])) { // A download custom location is selected. - // Set the download location summary text to be `Custom`. - downloadLocationPreference.setSummary(downloadLocationEntriesStringArray[3]); - } else { // A custom download location is not selected. - // Set the download location summary text to be the download location. - downloadLocationPreference.setSummary(downloadLocationHelper.getDownloadLocation(context)); + // Define an app theme entry number. + int appThemeEntryNumber; - // Disable the download custom location preference. - downloadCustomLocationPreference.setEnabled(false); + // Get the app theme entry number that matches the current app theme. A switch statement cannot be used because the theme entry values string array is not a compile time constant. + if (currentAppTheme.equals(appThemeEntryValuesStringArray[1])) { // The light theme is selected. + // Store the app theme entry number. + appThemeEntryNumber = 1; + } else if (currentAppTheme.equals(appThemeEntryValuesStringArray[2])) { // The dark theme is selected. + // Store the app theme entry number. + appThemeEntryNumber = 2; + } else { // The system default theme is selected. + // Store the app theme entry number. + appThemeEntryNumber = 0; } - // Set the summary text for the download custom location (the default is `"`). - downloadCustomLocationPreference.setSummary(savedPreferences.getString("download_custom_location", getString(R.string.download_custom_location_default_value))); + // Set the current theme as the summary text for the preference. + appThemePreference.setSummary(appThemeEntriesStringArray[appThemeEntryNumber]); - // Set the font size as the summary text for the preference. - fontSizePreference.setSummary(savedPreferences.getString("font_size", getString(R.string.font_size_default_value)) + "%"); + // Get the WebView theme string arrays. + String[] webViewThemeEntriesStringArray = resources.getStringArray(R.array.webview_theme_entries); + String[] webViewThemeEntryValuesStringArray = resources.getStringArray(R.array.webview_theme_entry_values); + // Get the current WebView theme. + String currentWebViewTheme = savedPreferences.getString("webview_theme", getString(R.string.webview_theme_default_value)); + + // Define a WebView theme entry number. + int webViewThemeEntryNumber; + + // Get the WebView theme entry number that matches the current WebView theme. A switch statement cannot be used because the WebView theme entry values string array is not a compile time constant. + if (currentWebViewTheme.equals(webViewThemeEntryValuesStringArray[1])) { // The light theme is selected. + // Store the WebView theme entry number. + webViewThemeEntryNumber = 1; + } else if (currentWebViewTheme.equals(webViewThemeEntryValuesStringArray[2])) { // The dark theme is selected. + // Store the WebView theme entry number. + webViewThemeEntryNumber = 2; + } else { // The system default theme is selected. + // Store the WebView theme entry number. + webViewThemeEntryNumber = 0; + } + + // Set the visibility of the WebView theme preference. + if (Build.VERSION.SDK_INT < 21) { // The device is running API 19. + // Get a handle for the general category. + PreferenceCategory generalCategory = findPreference("general"); + + // Remove the incorrect lint warning below that the general preference category might be null. + assert generalCategory != null; + + // Remove the WebView theme preference. + generalCategory.removePreference(webViewThemePreference); + } else { // The device is running API >= 21 + // Set the current theme as the summary text for the preference. + webViewThemePreference.setSummary(webViewThemeEntriesStringArray[webViewThemeEntryNumber]); + } - // Disable the JavaScript preference if Night Mode is enabled. JavaScript will be enabled for all web pages. - javaScriptPreference.setEnabled(!nightMode); // Set the JavaScript icon. - if (javaScriptEnabled || nightMode) { + if (javaScriptEnabled) { javaScriptPreference.setIcon(R.drawable.javascript_enabled); } else { javaScriptPreference.setIcon(R.drawable.privacy_mode); @@ -344,48 +379,48 @@ public class SettingsFragment extends PreferenceFragmentCompat { if (firstPartyCookiesEnabled) { firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled); } else { - if (darkTheme) { - firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_night); } else { - firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); + firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_day); } } // Set the third party cookies icon. if (firstPartyCookiesEnabled && Build.VERSION.SDK_INT >= 21) { - if (thirdPartyCookiesEnabled) { + if (savedPreferences.getBoolean("third_party_cookies", false)) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { - if (darkTheme) { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_night); } else { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_day); } } } else { - if (darkTheme) { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_night); } else { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_day); } } // Set the DOM storage icon. - if (javaScriptEnabled || nightMode) { // The preference is enabled. + if (javaScriptEnabled) { // The preference 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 (darkTheme) { - domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + domStoragePreference.setIcon(R.drawable.dom_storage_disabled_night); } else { - domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light); + domStoragePreference.setIcon(R.drawable.dom_storage_disabled_day); } } } else { // The preference is disabled. The icon should be ghosted. - if (darkTheme) { - domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_night); } else { - domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_light); + domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_day); } } @@ -394,283 +429,268 @@ public class SettingsFragment extends PreferenceFragmentCompat { if (savedPreferences.getBoolean("save_form_data", false)) { formDataPreference.setIcon(R.drawable.form_data_enabled); } else { - if (darkTheme) { - formDataPreference.setIcon(R.drawable.form_data_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + formDataPreference.setIcon(R.drawable.form_data_disabled_night); } else { - formDataPreference.setIcon(R.drawable.form_data_disabled_light); + formDataPreference.setIcon(R.drawable.form_data_disabled_day); } } } // Set the custom user agent icon. if (customUserAgentPreference.isEnabled()) { - if (darkTheme) { - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_night); } else { - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_light); + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_day); } } else { - if (darkTheme) { - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_night); } else { - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_light); + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_day); } } // Set the incognito mode icon. if (savedPreferences.getBoolean("incognito_mode", false)) { - if (darkTheme) { - incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_dark); - } else { - incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_light); - } - } else { - if (darkTheme) { - incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_dark); - } else { - incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_light); - } - } - - // Set the Do Not Track icon. - if (savedPreferences.getBoolean("do_not_track", false)) { - if (darkTheme) { - doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_night); } else { - doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_light); + incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_day); } } else { - if (darkTheme) { - doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_night); } else { - doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_light); + incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_day); } } // Set the allow screenshots icon. - if (savedPreferences.getBoolean("allow_screenshots", false)) { - if (darkTheme) { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_dark); + if (savedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_day); } else { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_light); + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_night); } } else { - if (darkTheme) { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_day); } else { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_light); + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_night); } } // Set the EasyList icon. if (savedPreferences.getBoolean("easylist", true)) { - if (darkTheme) { - easyListPreference.setIcon(R.drawable.block_ads_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + easyListPreference.setIcon(R.drawable.block_ads_enabled_night); } else { - easyListPreference.setIcon(R.drawable.block_ads_enabled_light); + easyListPreference.setIcon(R.drawable.block_ads_enabled_day); } } else { - if (darkTheme) { - easyListPreference.setIcon(R.drawable.block_ads_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + easyListPreference.setIcon(R.drawable.block_ads_disabled_night); } else { - easyListPreference.setIcon(R.drawable.block_ads_disabled_light); + easyListPreference.setIcon(R.drawable.block_ads_disabled_day); } } // Set the EasyPrivacy icon. if (savedPreferences.getBoolean("easyprivacy", true)) { - if (darkTheme) { - easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_night); } else { - easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light); + easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_day); } } else { - if (darkTheme) { - easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_night); } else { - easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light); + easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_day); } } // Set the Fanboy lists icons. if (fanboyAnnoyanceListEnabled) { - if (darkTheme) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { // Set the Fanboy annoyance list icon. - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_dark); + fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_night); // Set the Fanboy social blocking list icon. - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_dark); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_night); } else { // Set the Fanboy annoyance list icon. - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_light); + fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_day); // Set the Fanboy social blocking list icon. - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_light); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_day); } } else { - if (darkTheme) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { // Set the Fanboy annoyance list icon. - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_dark); + fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_night); // Set the Fanboy social blocking list icon. if (fanboySocialBlockingEnabled) { - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_dark); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_night); } else { - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_dark); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_night); } } else { // Set the Fanboy annoyance list icon. - fanboyAnnoyanceListPreference.setIcon(R.drawable.block_ads_disabled_light); + fanboyAnnoyanceListPreference.setIcon(R.drawable.block_ads_disabled_day); // Set the Fanboy social blocking list icon. if (fanboySocialBlockingEnabled) { - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_light); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_day); } else { - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_light); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_day); } } } // Set the UltraList icon. if (savedPreferences.getBoolean("ultralist", true)){ - if (darkTheme) { - ultraListPreference.setIcon(R.drawable.block_ads_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + ultraListPreference.setIcon(R.drawable.block_ads_enabled_night); } else { - ultraListPreference.setIcon(R.drawable.block_ads_enabled_light); + ultraListPreference.setIcon(R.drawable.block_ads_enabled_day); } } else { - if (darkTheme) { - ultraListPreference.setIcon(R.drawable.block_ads_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + ultraListPreference.setIcon(R.drawable.block_ads_disabled_night); } else { - ultraListPreference.setIcon(R.drawable.block_ads_disabled_light); + ultraListPreference.setIcon(R.drawable.block_ads_disabled_day); } } // Set the UltraPrivacy icon. if (savedPreferences.getBoolean("ultraprivacy", true)) { - if (darkTheme) { - ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_night); } else { - ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light); + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_day); } } else { - if (darkTheme) { - ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_night); } else { - ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light); + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_day); } } // Set the block all third-party requests icon. if (savedPreferences.getBoolean("block_all_third_party_requests", false)) { - if (darkTheme) { - blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_night); } else { - blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_light); + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_day); } } else { - if (darkTheme) { - blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_night); } else { - blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_light); + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_day); } } // Set the Google Analytics icon according to the theme. if (savedPreferences.getBoolean("google_analytics", true)) { - if (darkTheme) { - googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_night); } else { - googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_light); + googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_day); } } else { - if (darkTheme) { - googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_night); } else { - googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_light); + googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_day); } } // Set the Facebook Click IDs icon according to the theme. if (savedPreferences.getBoolean("facebook_click_ids", true)) { - if (darkTheme) { - facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_night); } else { - facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_light); + facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_day); } } else { - if (darkTheme) { - facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_night); } else { - facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_light); + facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_day); } } // Set the Twitter AMP redirects icon according to the theme. if (savedPreferences.getBoolean("twitter_amp_redirects", true)) { - if (darkTheme) { - twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_night); } else { - twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_light); + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_day); } } else { - if (darkTheme) { - twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_night); } else { - twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_light); + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_day); } } // Set the search custom URL icon. if (searchCustomURLPreference.isEnabled()) { - if (darkTheme) { - searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_night); } else { - searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_light); + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_day); } } else { - if (darkTheme) { - searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_night); } else { - searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light); + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_day); } } // Set the Proxy icons according to the theme and status. if (proxyString.equals("None")) { // Proxying is disabled. - if (darkTheme) { // Dark theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { // Dark theme. // Set the main proxy icon to be disabled. - proxyPreference.setIcon(R.drawable.proxy_disabled_dark); + proxyPreference.setIcon(R.drawable.proxy_disabled_night); // Set the custom proxy URL icon to be ghosted. - proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_dark); + proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_night); } else { // Light theme. // Set the main proxy icon to be disabled. - proxyPreference.setIcon(R.drawable.proxy_disabled_light); + proxyPreference.setIcon(R.drawable.proxy_disabled_day); // Set the custom proxy URL icon to be ghosted. - proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_light); + proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_day); } } else { // Proxying is enabled. - if (darkTheme) { // Dark theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { // Dark theme. // Set the main proxy icon to be enabled. - proxyPreference.setIcon(R.drawable.proxy_enabled_dark); + proxyPreference.setIcon(R.drawable.proxy_enabled_night); // Set the custom proxy URL icon according to its status. if (proxyCustomUrlPreference.isEnabled()) { // Custom proxy is enabled. - proxyCustomUrlPreference.setIcon(R.drawable.proxy_enabled_dark); + proxyCustomUrlPreference.setIcon(R.drawable.proxy_enabled_night); } else { // Custom proxy is disabled. - proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_dark); + proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_night); } } else { // Light theme. // Set the main proxy icon to be enabled. - proxyPreference.setIcon(R.drawable.proxy_enabled_light); + proxyPreference.setIcon(R.drawable.proxy_enabled_day); // Set the custom proxy URL icon according to its status. if (proxyCustomUrlPreference.isEnabled()) { // Custom proxy is enabled. - proxyCustomUrlPreference.setIcon(R.drawable.proxy_enabled_light); + proxyCustomUrlPreference.setIcon(R.drawable.proxy_enabled_day); } else { // Custom proxy is disabled. - proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_light); + proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_day); } } } @@ -678,45 +698,45 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Set the full screen browsing mode icons. if (fullScreenBrowsingMode) { // Full screen browsing mode is enabled. // Set the `fullScreenBrowsingModePreference` icon according to the theme. - if (darkTheme) { - fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_night); } else { - fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_light); + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_day); } // 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); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_night); } else { - hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_light); + hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_day); } } else { // Hide app bar is disabled. // Set the icon according to the theme. - if (darkTheme) { - hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_night); } else { - hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_light); + hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_day); } } } else { // Full screen browsing mode is disabled. // Set the icons according to the theme. - if (darkTheme) { - fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_dark); - hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_night); + hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_night); } else { - fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_light); - hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_light); + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_day); + hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_day); } } // Set the clear everything preference icon. if (clearEverything) { - if (darkTheme) { - clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_night); } else { - clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_light); + clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_day); } } else { clearEverythingPreference.setIcon(R.drawable.clear_everything_disabled); @@ -724,10 +744,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Set the clear cookies preference icon. if (clearEverything || savedPreferences.getBoolean("clear_cookies", true)) { - if (darkTheme) { - clearCookiesPreference.setIcon(R.drawable.cookies_cleared_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + clearCookiesPreference.setIcon(R.drawable.cookies_cleared_night); } else { - clearCookiesPreference.setIcon(R.drawable.cookies_cleared_light); + clearCookiesPreference.setIcon(R.drawable.cookies_cleared_day); } } else { clearCookiesPreference.setIcon(R.drawable.cookies_warning); @@ -735,10 +755,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Set the clear DOM storage preference icon. if (clearEverything || savedPreferences.getBoolean("clear_dom_storage", true)) { - if (darkTheme) { - clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_night); } else { - clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_light); + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_day); } } else { clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning); @@ -747,151 +767,154 @@ public class SettingsFragment extends PreferenceFragmentCompat { // 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 (darkTheme) { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_night); } else { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_day); } } else { clearFormDataPreference.setIcon(R.drawable.form_data_warning); } } - // Set the clear cache preference icon. - if (clearEverything || savedPreferences.getBoolean("clear_cache", true)) { - if (darkTheme) { - clearCachePreference.setIcon(R.drawable.cache_cleared_dark); + // Set the clear logcat preference icon. + if (clearEverything || savedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + clearLogcatPreference.setIcon(R.drawable.bug_cleared_day); } else { - clearCachePreference.setIcon(R.drawable.cache_cleared_light); + clearLogcatPreference.setIcon(R.drawable.bug_cleared_night); } } else { - clearCachePreference.setIcon(R.drawable.cache_warning); + clearLogcatPreference.setIcon(R.drawable.bug_warning); } - // Set the download custom location icon. - if (downloadCustomLocationPreference.isEnabled()) { - if (darkTheme) { - downloadCustomLocationPreference.setIcon(R.drawable.downloads_enabled_dark); + // Set the clear cache preference icon. + if (clearEverything || savedPreferences.getBoolean("clear_cache", true)) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + clearCachePreference.setIcon(R.drawable.cache_cleared_night); } else { - downloadCustomLocationPreference.setIcon(R.drawable.downloads_enabled_light); + clearCachePreference.setIcon(R.drawable.cache_cleared_day); } } else { - if (darkTheme) { - downloadCustomLocationPreference.setIcon(R.drawable.downloads_ghosted_dark); - } else { - downloadCustomLocationPreference.setIcon(R.drawable.downloads_ghosted_light); - } + clearCachePreference.setIcon(R.drawable.cache_warning); } // Set the open intents in new tab preference icon. if (savedPreferences.getBoolean("open_intents_in_new_tab", true)) { - if (darkTheme) { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_night); } else { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_light); + openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_day); } } else { - if (darkTheme) { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_night); } else { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_light); + openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_day); } } // Set the swipe to refresh preference icon. if (savedPreferences.getBoolean("swipe_to_refresh", true)) { - if (darkTheme) { - swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_night); } else { - swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_light); + swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_day); } } else { - if (darkTheme) { - swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_night); } else { - swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_light); + swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_day); } } // Set the scroll app bar preference icon. if (savedPreferences.getBoolean("scroll_app_bar", true)) { - if (darkTheme) { - scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_night); } else { - scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_light); + scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_day); } } else { - if (darkTheme) { - scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_night); } else { - scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_light); + scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_day); } } // Set the display additional app bar icons preference icon. if (savedPreferences.getBoolean("display_additional_app_bar_icons", false)) { - if (darkTheme) { - displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_night); } else { - displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_light); + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_day); } } else { - if (darkTheme) { - displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_night); } else { - displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_light); + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_day); } } - // Set the dark theme preference icon. - if (savedPreferences.getBoolean("dark_theme", false)) { - darkThemePreference.setIcon(R.drawable.theme_dark); - } else { - darkThemePreference.setIcon(R.drawable.theme_light); - } + // Set the WebView theme preference icon. + switch (webViewThemeEntryNumber) { + case 0: // The system default WebView theme is selected. + // Set the icon according to the app theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + webViewThemePreference.setIcon(R.drawable.webview_light_theme_day); + } else { + webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night); + } + break; - // Set the night mode preference icon. - if (nightMode) { - if (darkTheme) { - nightModePreference.setIcon(R.drawable.night_mode_enabled_dark); - } else { - nightModePreference.setIcon(R.drawable.night_mode_enabled_light); - } - } else { - if (darkTheme) { - nightModePreference.setIcon(R.drawable.night_mode_disabled_dark); - } else { - nightModePreference.setIcon(R.drawable.night_mode_disabled_light); - } + case 1: // The light WebView theme is selected. + // Set the icon according to the app theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + webViewThemePreference.setIcon(R.drawable.webview_light_theme_day); + } else { + webViewThemePreference.setIcon(R.drawable.webview_light_theme_night); + } + break; + + case 2: // The dark WebView theme is selected. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + webViewThemePreference.setIcon(R.drawable.webview_dark_theme_day); + } else { + webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night); + } + break; } // Set the wide viewport preference icon. if (savedPreferences.getBoolean("wide_viewport", true)) { - if (darkTheme) { - wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_night); } else { - wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_light); + wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_day); } } else { - if (darkTheme) { - wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_night); } else { - wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_light); + wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_day); } } // Set the display webpage images preference icon. if (savedPreferences.getBoolean("display_webpage_images", true)) { - if (darkTheme) { - displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_night); } else { - displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_light); + displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_day); } } else { - if (darkTheme) { - displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_night); } else { - displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_light); + displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_day); } } @@ -912,10 +935,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { if (sharedPreferences.getBoolean("dom_storage", false)) { domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { - if (darkTheme) { - domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + domStoragePreference.setIcon(R.drawable.dom_storage_disabled_night); } else { - domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light); + domStoragePreference.setIcon(R.drawable.dom_storage_disabled_day); } } } else { // The JavaScript preference is disabled. @@ -926,10 +949,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { domStoragePreference.setEnabled(false); // Set the icon for DOM storage preference to be ghosted. - if (darkTheme) { - domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_night); } else { - domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_light); + domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_day); } } break; @@ -945,32 +968,32 @@ public class SettingsFragment extends PreferenceFragmentCompat { if (sharedPreferences.getBoolean("third_party_cookies", false)) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { - if (darkTheme) { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_night); } else { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_day); } } } else { - if (darkTheme) { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_night); } else { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_day); } } } else { // `first_party_cookies` is `false`. // Update the icon for `first_party_cookies`. - if (darkTheme) { - firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_night); } else { - firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); + firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_day); } // Set the icon for `third_party_cookies` to be ghosted. - if (darkTheme) { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_night); } else { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_day); } } @@ -983,10 +1006,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { if (sharedPreferences.getBoolean("third_party_cookies", false)) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { - if (darkTheme) { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_night); } else { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_day); } } break; @@ -996,10 +1019,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { if (sharedPreferences.getBoolean("dom_storage", false)) { domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { - if (darkTheme) { - domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + domStoragePreference.setIcon(R.drawable.dom_storage_disabled_night); } else { - domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light); + domStoragePreference.setIcon(R.drawable.dom_storage_disabled_day); } } break; @@ -1010,10 +1033,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { if (sharedPreferences.getBoolean("save_form_data", false)) { formDataPreference.setIcon(R.drawable.form_data_enabled); } else { - if (darkTheme) { - formDataPreference.setIcon(R.drawable.form_data_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + formDataPreference.setIcon(R.drawable.form_data_disabled_night); } else { - formDataPreference.setIcon(R.drawable.form_data_disabled_light); + formDataPreference.setIcon(R.drawable.form_data_disabled_day); } } break; @@ -1038,10 +1061,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { customUserAgentPreference.setEnabled(false); // Set the custom user agent preference icon according to the theme. - if (darkTheme) { - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_night); } else { - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_light); + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_day); } break; @@ -1053,10 +1076,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { customUserAgentPreference.setEnabled(true); // Set the custom user agent preference icon according to the theme. - if (darkTheme) { - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_night); } else { - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_light); + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_day); } break; @@ -1068,10 +1091,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { customUserAgentPreference.setEnabled(false); // Set the custom user agent preference icon according to the theme. - if (darkTheme) { - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_night); } else { - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_light); + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_day); } } break; @@ -1084,51 +1107,33 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "incognito_mode": // Update the icon. if (sharedPreferences.getBoolean("incognito_mode", false)) { - if (darkTheme) { - incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_dark); - } else { - incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_light); - } - } else { - if (darkTheme) { - incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_dark); - } else { - incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_light); - } - } - break; - - case "do_not_track": - // Update the icon. - if (sharedPreferences.getBoolean("do_not_track", false)) { - if (darkTheme) { - doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_night); } else { - doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_light); + incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_day); } } else { - if (darkTheme) { - doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_night); } else { - doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_light); + incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_day); } } - break; case "allow_screenshots": // Update the icon. - if (sharedPreferences.getBoolean("allow_screenshots", false)) { - if (darkTheme) { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_dark); + if (sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_day); } else { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_light); + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_night); } } else { - if (darkTheme) { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_day); } else { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_light); + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_night); } } @@ -1142,7 +1147,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { allowScreenshotsRestartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); // Create a handler to restart the activity. - Handler allowScreenshotsRestartHandler = new Handler(); + Handler allowScreenshotsRestartHandler = new Handler(Looper.getMainLooper()); // Create a runnable to restart the activity. Runnable allowScreenshotsRestartRunnable = () -> { @@ -1160,16 +1165,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "easylist": // Update the icon. if (sharedPreferences.getBoolean("easylist", true)) { - if (darkTheme) { - easyListPreference.setIcon(R.drawable.block_ads_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + easyListPreference.setIcon(R.drawable.block_ads_enabled_night); } else { - easyListPreference.setIcon(R.drawable.block_ads_enabled_light); + easyListPreference.setIcon(R.drawable.block_ads_enabled_day); } } else { - if (darkTheme) { - easyListPreference.setIcon(R.drawable.block_ads_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + easyListPreference.setIcon(R.drawable.block_ads_disabled_night); } else { - easyListPreference.setIcon(R.drawable.block_ads_disabled_light); + easyListPreference.setIcon(R.drawable.block_ads_disabled_day); } } break; @@ -1177,16 +1182,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "easyprivacy": // Update the icon. if (sharedPreferences.getBoolean("easyprivacy", true)) { - if (darkTheme) { - easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_night); } else { - easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light); + easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_day); } } else { - if (darkTheme) { - easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_night); } else { - easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light); + easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_day); } } break; @@ -1197,39 +1202,39 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Update the Fanboy icons. if (currentFanboyAnnoyanceList) { // Fanboy's annoyance list is enabled. - if (darkTheme) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { // Update the Fanboy's annoyance list icon. - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_dark); + fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_night); // Update the Fanboy's social blocking list icon. - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_dark); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_night); } else { // Update the Fanboy's annoyance list icon. - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_light); + fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_day); // Update the Fanboy's social blocking list icon. - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_light); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_day); } } else { // Fanboy's annoyance list is disabled. - if (darkTheme) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { // Update the Fanboy's annoyance list icon. - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_dark); + fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_night); // Update the Fanboy's social blocking list icon. if (currentFanboySocialBlockingList) { - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_dark); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_night); } else { - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_dark); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_night); } } else { // Update the Fanboy's annoyance list icon. - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_light); + fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_day); // Update the Fanboy's social blocking list icon. if (currentFanboySocialBlockingList) { - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_light); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_day); } else { - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_light); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_day); } } } @@ -1241,16 +1246,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "fanboys_social_blocking_list": // Update the icon. if (sharedPreferences.getBoolean("fanboys_social_blocking_list", true)) { - if (darkTheme) { - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_night); } else { - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_light); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_day); } } else { - if (darkTheme) { - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_night); } else { - fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_light); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_day); } } break; @@ -1258,16 +1263,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "ultralist": // Update the icon. if (sharedPreferences.getBoolean("ultralist", true)) { - if (darkTheme) { - ultraListPreference.setIcon(R.drawable.block_ads_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + ultraListPreference.setIcon(R.drawable.block_ads_enabled_night); } else { - ultraListPreference.setIcon(R.drawable.block_ads_enabled_light); + ultraListPreference.setIcon(R.drawable.block_ads_enabled_day); } } else { - if (darkTheme) { - ultraListPreference.setIcon(R.drawable.block_ads_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + ultraListPreference.setIcon(R.drawable.block_ads_disabled_night); } else { - ultraListPreference.setIcon(R.drawable.block_ads_disabled_light); + ultraListPreference.setIcon(R.drawable.block_ads_disabled_day); } } break; @@ -1275,16 +1280,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "ultraprivacy": // Update the icon. if (sharedPreferences.getBoolean("ultraprivacy", true)) { - if (darkTheme) { - ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_night); } else { - ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_light); + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_day); } } else { - if (darkTheme) { - ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_night); } else { - ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_light); + ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_day); } } break; @@ -1292,16 +1297,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "block_all_third_party_requests": // Update the icon. if (sharedPreferences.getBoolean("block_all_third_party_requests", false)) { - if (darkTheme) { - blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_night); } else { - blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_light); + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_day); } } else { - if (darkTheme) { - blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_night); } else { - blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_light); + blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_day); } } break; @@ -1309,16 +1314,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "google_analytics": // Update the icon. if (sharedPreferences.getBoolean("google_analytics", true)) { - if (darkTheme) { - googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_night); } else { - googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_light); + googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_day); } } else { - if (darkTheme) { - googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_night); } else { - googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_light); + googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_day); } } break; @@ -1326,16 +1331,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "facebook_click_ids": // Update the icon. if (sharedPreferences.getBoolean("facebook_click_ids", true)) { - if (darkTheme) { - facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_night); } else { - facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_light); + facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_day); } } else { - if (darkTheme) { - facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_night); } else { - facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_light); + facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_day); } } break; @@ -1343,16 +1348,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "twitter_amp_redirects": // Update the icon. if (sharedPreferences.getBoolean("twitter_amp_redirects", true)) { - if (darkTheme) { - twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_night); } else { - twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_light); + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_day); } } else { - if (darkTheme) { - twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_night); } else { - twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_light); + twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_day); } } break; @@ -1370,10 +1375,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { searchCustomURLPreference.setEnabled(true); // Set the `searchCustomURLPreference` according to the theme. - if (darkTheme) { - searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_night); } else { - searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_light); + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_day); } } else { // `Custom URL` is not selected. // Set the summary text to `newSearchString`. @@ -1383,10 +1388,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { searchCustomURLPreference.setEnabled(false); // Set the `searchCustomURLPreference` according to the theme. - if (darkTheme) { - searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_night); } else { - searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light); + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_day); } } break; @@ -1428,39 +1433,39 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Update the icons. if (currentProxyString.equals("None")) { // Proxying is disabled. - if (darkTheme) { // Dark theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { // Dark theme. // Set the main proxy icon to be disabled - proxyPreference.setIcon(R.drawable.proxy_disabled_dark); + proxyPreference.setIcon(R.drawable.proxy_disabled_night); // Set the custom proxy URL icon to be ghosted. - proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_dark); + proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_night); } else { // Light theme. // Set the main proxy icon to be disabled. - proxyPreference.setIcon(R.drawable.proxy_disabled_light); + proxyPreference.setIcon(R.drawable.proxy_disabled_day); // Set the custom proxy URL icon to be ghosted. - proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_light); + proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_day); } } else { // Proxying is enabled. - if (darkTheme) { // Dark theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { // Dark theme. // Set the main proxy icon to be enabled. - proxyPreference.setIcon(R.drawable.proxy_enabled_dark); + proxyPreference.setIcon(R.drawable.proxy_enabled_night); /// Set the custom proxy URL icon according to its status. if (proxyCustomUrlPreference.isEnabled()) { // Custom proxy is enabled. - proxyCustomUrlPreference.setIcon(R.drawable.proxy_enabled_dark); + proxyCustomUrlPreference.setIcon(R.drawable.proxy_enabled_night); } else { // Custom proxy is disabled. - proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_dark); + proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_night); } } else { // Light theme. // Set the main proxy icon to be enabled. - proxyPreference.setIcon(R.drawable.proxy_enabled_light); + proxyPreference.setIcon(R.drawable.proxy_enabled_day); // Set the custom proxy URL icon according to its status. if (proxyCustomUrlPreference.isEnabled()) { // Custom proxy is enabled. - proxyCustomUrlPreference.setIcon(R.drawable.proxy_enabled_light); + proxyCustomUrlPreference.setIcon(R.drawable.proxy_enabled_day); } else { // Custom proxy is disabled. - proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_light); + proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_day); } } } @@ -1474,36 +1479,36 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "full_screen_browsing_mode": 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); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_night); } else { - fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_light); + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_day); } // 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); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_night); } else { - hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_light); + hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_day); } } else { // Hide app bar is disabled. // Set the icon according to the theme. - if (darkTheme) { - hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_night); } else { - hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_light); + hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_day); } } } else { // Full screen browsing is disabled. // Update the icons according to the theme. - if (darkTheme) { - fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_dark); - hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_night); + hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_night); } else { - fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_light); - hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_light); + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_day); + hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_day); } } break; @@ -1512,59 +1517,60 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Update the 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); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_night); } else { - hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_light); + hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_day); } } else { // Hide app bar is disabled. // Set the icon according to the theme. - if (darkTheme) { - hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_night); } else { - hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_light); + hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_day); } } break; case "clear_everything": - // Store the new `clear_everything` status + // Store the new clear everything status boolean newClearEverythingBoolean = sharedPreferences.getBoolean("clear_everything", true); - // Update the status of the `Clear and Exit` preferences. + // Update the status of the clear and exit preferences. clearCookiesPreference.setEnabled(!newClearEverythingBoolean); clearDomStoragePreference.setEnabled(!newClearEverythingBoolean); clearFormDataPreference.setEnabled(!newClearEverythingBoolean); // This line can be removed once the minimum API >= 26. + clearLogcatPreference.setEnabled(!newClearEverythingBoolean); clearCachePreference.setEnabled(!newClearEverythingBoolean); - // Update the `clearEverythingPreference` icon. + // Update the clear everything preference icon. if (newClearEverythingBoolean) { - if (darkTheme) { - clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_night); } else { - clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_light); + clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_day); } } else { clearEverythingPreference.setIcon(R.drawable.clear_everything_disabled); } - // Update the `clearCookiesPreference` icon. + // Update the clear cookies preference icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cookies", true)) { - if (darkTheme) { - clearCookiesPreference.setIcon(R.drawable.cookies_cleared_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + clearCookiesPreference.setIcon(R.drawable.cookies_cleared_night); } else { - clearCookiesPreference.setIcon(R.drawable.cookies_cleared_light); + clearCookiesPreference.setIcon(R.drawable.cookies_cleared_day); } } else { clearCookiesPreference.setIcon(R.drawable.cookies_warning); } - // Update the `clearDomStoragePreference` icon. + // Update the clear dom storage preference icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_dom_storage", true)) { - if (darkTheme) { - clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_night); } else { - clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_light); + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_day); } } else { clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning); @@ -1573,22 +1579,33 @@ public class SettingsFragment extends PreferenceFragmentCompat { // 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 (darkTheme) { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_night); } else { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_day); } } else { clearFormDataPreference.setIcon(R.drawable.form_data_warning); } } - // Update the `clearCachePreference` icon. + // Update the clear logcat preference icon. + if (newClearEverythingBoolean || sharedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + clearLogcatPreference.setIcon(R.drawable.bug_cleared_day); + } else { + clearLogcatPreference.setIcon(R.drawable.bug_cleared_night); + } + } else { + clearLogcatPreference.setIcon(R.drawable.cache_warning); + } + + // Update the clear cache preference icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cache", true)) { - if (darkTheme) { - clearCachePreference.setIcon(R.drawable.cache_cleared_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + clearCachePreference.setIcon(R.drawable.cache_cleared_night); } else { - clearCachePreference.setIcon(R.drawable.cache_cleared_light); + clearCachePreference.setIcon(R.drawable.cache_cleared_day); } } else { clearCachePreference.setIcon(R.drawable.cache_warning); @@ -1598,10 +1615,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "clear_cookies": // Update the icon. if (sharedPreferences.getBoolean("clear_cookies", true)) { - if (darkTheme) { - clearCookiesPreference.setIcon(R.drawable.cookies_cleared_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + clearCookiesPreference.setIcon(R.drawable.cookies_cleared_night); } else { - clearCookiesPreference.setIcon(R.drawable.cookies_cleared_light); + clearCookiesPreference.setIcon(R.drawable.cookies_cleared_day); } } else { clearCookiesPreference.setIcon(R.drawable.cookies_warning); @@ -1611,10 +1628,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "clear_dom_storage": // Update the icon. if (sharedPreferences.getBoolean("clear_dom_storage", true)) { - if (darkTheme) { - clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_night); } else { - clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_light); + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_day); } } else { clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning); @@ -1625,72 +1642,45 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "clear_form_data": // Update the icon. if (sharedPreferences.getBoolean("clear_form_data", true)) { - if (darkTheme) { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_night); } else { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_day); } } else { clearFormDataPreference.setIcon(R.drawable.form_data_warning); } break; - case "clear_cache": + case "clear_logcat": // Update the icon. - if (sharedPreferences.getBoolean("clear_cache", true)) { - if (darkTheme) { - clearCachePreference.setIcon(R.drawable.cache_cleared_dark); + if (sharedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + clearLogcatPreference.setIcon(R.drawable.bug_cleared_day); } else { - clearCachePreference.setIcon(R.drawable.cache_cleared_light); + clearLogcatPreference.setIcon(R.drawable.bug_cleared_night); } } else { - clearCachePreference.setIcon(R.drawable.cache_warning); + clearLogcatPreference.setIcon(R.drawable.bug_warning); } break; - case "homepage": - // Set the new homepage URL as the summary text for the Homepage preference. - homepagePreference.setSummary(sharedPreferences.getString("homepage", getString(R.string.homepage_default_value))); - break; - - case "download_location": - // Get the new download location. - String newDownloadLocationString = sharedPreferences.getString("download_location", getString(R.string.download_location_default_value)); - - // Check to see if a download custom location is selected. - if (newDownloadLocationString.equals(downloadLocationEntryValuesStringArray[3])) { // A download custom location is selected. - // Set the download location summary text to be `Custom`. - downloadLocationPreference.setSummary(downloadLocationEntriesStringArray[3]); - - // Enable the download custom location preference. - downloadCustomLocationPreference.setEnabled(true); - } else { // A download custom location is not selected. - // Set the download location summary text to be the download location. - downloadLocationPreference.setSummary(downloadLocationHelper.getDownloadLocation(context)); - - // Disable the download custom location. - downloadCustomLocationPreference.setEnabled(newDownloadLocationString.equals(downloadLocationEntryValuesStringArray[3])); - } - - // Update the download custom location icon. - if (downloadCustomLocationPreference.isEnabled()) { - if (darkTheme) { - downloadCustomLocationPreference.setIcon(R.drawable.downloads_enabled_dark); + case "clear_cache": + // Update the icon. + if (sharedPreferences.getBoolean("clear_cache", true)) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + clearCachePreference.setIcon(R.drawable.cache_cleared_night); } else { - downloadCustomLocationPreference.setIcon(R.drawable.downloads_enabled_light); + clearCachePreference.setIcon(R.drawable.cache_cleared_day); } } else { - if (darkTheme) { - downloadCustomLocationPreference.setIcon(R.drawable.downloads_ghosted_dark); - } else { - downloadCustomLocationPreference.setIcon(R.drawable.downloads_ghosted_light); - } + clearCachePreference.setIcon(R.drawable.cache_warning); } break; - case "download_custom_location": - // Set the new download custom location as the summary text for the preference. - downloadCustomLocationPreference.setSummary(sharedPreferences.getString("download_custom_location", getString(R.string.download_custom_location_default_value))); + case "homepage": + // Set the new homepage URL as the summary text for the Homepage preference. + homepagePreference.setSummary(sharedPreferences.getString("homepage", getString(R.string.homepage_default_value))); break; case "font_size": @@ -1701,16 +1691,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "open_intents_in_new_tab": // Update the icon. if (sharedPreferences.getBoolean("open_intents_in_new_tab", true)) { - if (darkTheme) { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_night); } else { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_light); + openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_day); } } else { - if (darkTheme) { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_night); } else { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_light); + openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_day); } } break; @@ -1718,16 +1708,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "swipe_to_refresh": // Update the icon. if (sharedPreferences.getBoolean("swipe_to_refresh", true)) { - if (darkTheme) { - swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_night); } else { - swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_light); + swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_day); } } else { - if (darkTheme) { - swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_night); } else { - swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_light); + swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_day); } } break; @@ -1735,16 +1725,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "scroll_app_bar": // Update the icon. if (sharedPreferences.getBoolean("scroll_app_bar", true)) { - if (darkTheme) { - scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_night); } else { - scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_light); + scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_day); } } else { - if (darkTheme) { - scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_night); } else { - scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_light); + scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_day); } } break; @@ -1752,117 +1742,119 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "display_additional_app_bar_icons": // Update the icon. if (sharedPreferences.getBoolean("display_additional_app_bar_icons", false)) { - if (darkTheme) { - displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_night); } else { - displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_light); + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_day); } } else { - if (darkTheme) { - displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_night); } else { - displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_light); + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_day); } } break; - case "dark_theme": - // Update the icon. - if (sharedPreferences.getBoolean("dark_theme", false)) { - darkThemePreference.setIcon(R.drawable.theme_dark); - } else { - darkThemePreference.setIcon(R.drawable.theme_light); + case "app_theme": + // Get the new theme. + String newAppTheme = sharedPreferences.getString("app_theme", getString(R.string.app_theme_default_value)); + + // Update the system according to the new theme. A switch statement cannot be used because the theme entry values string array is not a compile time constant. + if (newAppTheme.equals(appThemeEntryValuesStringArray[1])) { // The light theme is selected. + // Update the theme preference summary text. + appThemePreference.setSummary(appThemeEntriesStringArray[1]); + + // Apply the new theme. + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); + } else if (newAppTheme.equals(appThemeEntryValuesStringArray[2])) { // The dark theme is selected. + // Update the theme preference summary text. + appThemePreference.setSummary(appThemeEntriesStringArray[2]); + + // Apply the new theme. + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); + } else { // The system default theme is selected. + // Update the theme preference summary text. + appThemePreference.setSummary(appThemeEntriesStringArray[0]); + + // Apply the new theme. + if (Build.VERSION.SDK_INT >= 28) { // The system default theme is supported. + // Follow the system default theme. + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM); + } else {// The system default theme is not supported. + // Follow the battery saver mode. + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY); + } } - // Create an intent to restart Privacy Browser. - Intent changeThemeRestartIntent = getActivity().getParentActivityIntent(); - - // 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`. - changeThemeRestartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); - - // Create a handler to restart the activity. - Handler changeThemeRestartHandler = new Handler(); - - // Create a runnable to restart the activity. - Runnable changeThemeRestartRunnable = () -> { - // Restart the activity. - startActivity(changeThemeRestartIntent); - - // Kill this instance of Privacy Browser. Otherwise, the app exhibits sporadic behavior after the restart. - System.exit(0); - }; - - // Restart the activity after 150 milliseconds, so that the app has enough time to save the change to the preference. - changeThemeRestartHandler.postDelayed(changeThemeRestartRunnable, 150); + // Update the current theme status. + currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; break; - case "night_mode": - // Store the current night mode status. - boolean currentNightModeBoolean = sharedPreferences.getBoolean("night_mode", false); - boolean currentJavaScriptBoolean = sharedPreferences.getBoolean("javascript", false); - - // Update the icon. - if (currentNightModeBoolean) { - if (darkTheme) { - nightModePreference.setIcon(R.drawable.night_mode_enabled_dark); - } else { - nightModePreference.setIcon(R.drawable.night_mode_enabled_light); - } - } else { - if (darkTheme) { - nightModePreference.setIcon(R.drawable.night_mode_disabled_dark); - } else { - nightModePreference.setIcon(R.drawable.night_mode_disabled_light); - } + case "webview_theme": + // Get the new WebView theme. + String newWebViewTheme = sharedPreferences.getString("webview_theme", getString(R.string.webview_theme_default_value)); + + // Define a new WebView theme entry number. + int newWebViewThemeEntryNumber; + + // Get the webView theme entry number that matches the new WebView theme. A switch statement cannot be used because the theme entry values string array is not a compile time constant. + if (newWebViewTheme.equals(webViewThemeEntriesStringArray[1])) { // The light theme is selected. + // Store the new WebView theme entry number. + newWebViewThemeEntryNumber = 1; + } else if (newWebViewTheme.equals(webViewThemeEntryValuesStringArray[2])) { // The dark theme is selected. + // Store the WebView theme entry number. + newWebViewThemeEntryNumber = 2; + } else { // The system default theme is selected. + // Store the WebView theme entry number. + newWebViewThemeEntryNumber = 0; } - // Update the status of `javaScriptPreference` and `domStoragePreference`. - javaScriptPreference.setEnabled(!currentNightModeBoolean); - domStoragePreference.setEnabled(currentNightModeBoolean || currentJavaScriptBoolean); + // Update the icon. + switch (newWebViewThemeEntryNumber) { + case 0: // The system default WebView theme is selected. + // Set the icon according to the app theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + webViewThemePreference.setIcon(R.drawable.webview_light_theme_day); + } else { + webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night); + } + break; - // Update the `javaScriptPreference` icon. - if (currentNightModeBoolean || currentJavaScriptBoolean) { - javaScriptPreference.setIcon(R.drawable.javascript_enabled); - } else { - javaScriptPreference.setIcon(R.drawable.privacy_mode); - } + case 1: // The system default WebView theme is selected. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + webViewThemePreference.setIcon(R.drawable.webview_light_theme_day); + } else { + webViewThemePreference.setIcon(R.drawable.webview_light_theme_night); + } + break; - // Update the DOM storage preference icon. - if (currentNightModeBoolean || currentJavaScriptBoolean) { // The preference 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 (darkTheme) { - domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark); + case 2: // The system default WebView theme is selected. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + webViewThemePreference.setIcon(R.drawable.webview_dark_theme_day); } else { - domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light); + webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night); } - } - } else { // The preference is disabled. The icon should be ghosted. - if (darkTheme) { - domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_dark); - } else { - domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_light); - } + break; } + + // Set the current theme as the summary text for the preference. + webViewThemePreference.setSummary(webViewThemeEntriesStringArray[newWebViewThemeEntryNumber]); break; case "wide_viewport": // Update the icon. if (sharedPreferences.getBoolean("wide_viewport", true)) { - if (darkTheme) { - wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_night); } else { - wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_light); + wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_day); } } else { - if (darkTheme) { - wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_night); } else { - wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_light); + wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_day); } } break; @@ -1870,16 +1862,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "display_webpage_images": // Update the icon. if (sharedPreferences.getBoolean("display_webpage_images", true)) { - if (darkTheme) { - displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_night); } else { - displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_light); + displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_day); } } else { - if (darkTheme) { - displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_night); } else { - displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_light); + displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_day); } } break;