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=eb70ef25fdf17ce6651778bb34de7d50cb76b253;hp=16ca2998ca88e379359534641808ae4f40bf4e3d;hb=0488649384ddea89d768c1fc1cc5fb71f8af6528;hpb=01d647c09b892384e0b42e86b000b5cb858f7a2b 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 16ca2998..eb70ef25 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-2019 Soren Stoutner . + * Copyright © 2016-2020 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -24,6 +24,8 @@ 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; @@ -32,18 +34,21 @@ 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) { @@ -56,8 +61,12 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Remove the lint warning below that `getApplicationContext()` might produce a null pointer exception. assert activity != null; - // Get a handle for the context. + // Get a handle for the context and the resources. 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(); @@ -95,14 +104,15 @@ public class SettingsFragment extends PreferenceFragmentCompat { Preference clearFormDataPreference = findPreference("clear_form_data"); // The clear form data preference can be removed once the minimum API >= 26. 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 downloadWithExternalAppPreference = findPreference("download_with_external_app"); - 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"); @@ -139,48 +149,46 @@ public class SettingsFragment extends PreferenceFragmentCompat { assert clearFormDataPreference != 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 downloadWithExternalAppPreference != 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; @@ -192,19 +200,20 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Only enable Fanboy's social blocking list preference if Fanboy's annoyance list is disabled. fanboySocialBlockingListPreference.setEnabled(!fanboyAnnoyanceListEnabled); + // Inflate a WebView to get the default user agent. LayoutInflater inflater = getActivity().getLayoutInflater(); + // `@SuppressLint("InflateParams")` removes the warning about using `null` as the `ViewGroup`, which in this case makes sense because the `bare_webview` will not be displayed. @SuppressLint("InflateParams") View bareWebViewLayout = inflater.inflate(R.layout.bare_webview, null, false); + + // Get a handle for a bare WebView. WebView bareWebView = bareWebViewLayout.findViewById(R.id.bare_webview); // Get the user agent arrays. ArrayAdapter userAgentNamesArray = ArrayAdapter.createFromResource(context, R.array.user_agent_names, R.layout.spinner_item); - String[] translatedUserAgentNamesArray = getResources().getStringArray(R.array.translated_user_agent_names); - String[] userAgentDataArray = getResources().getStringArray(R.array.user_agent_data); - - // Get the current user agent name from the preference. - String userAgentName = savedPreferences.getString("user_agent", getString(R.string.user_agent_default_value)); + String[] translatedUserAgentNamesArray = resources.getStringArray(R.array.translated_user_agent_names); + String[] userAgentDataArray = resources.getStringArray(R.array.user_agent_data); // Get the array position of the user agent name. int userAgentArrayPosition = userAgentNamesArray.getPosition(userAgentName); @@ -231,10 +240,13 @@ public class SettingsFragment extends PreferenceFragmentCompat { userAgentPreference.setSummary(translatedUserAgentNamesArray[userAgentArrayPosition] + ":\n" + userAgentDataArray[userAgentArrayPosition]); } - // Set the summary text for the custom user agent preference and enable it if user agent preference is set to custom. + // Set the summary text for the custom user agent preference. customUserAgentPreference.setSummary(savedPreferences.getString("custom_user_agent", getString(R.string.custom_user_agent_default_value))); + + // Only enable the custom user agent preference if the user agent is set to `Custom`. customUserAgentPreference.setEnabled(userAgentPreference.getSummary().equals(getString(R.string.custom_user_agent))); + // Set the search URL as the summary text for the search preference when the preference screen is loaded. if (searchString.equals("Custom URL")) { // Use R.string.custom_url, which will be translated, instead of the array value, which will not. @@ -244,10 +256,13 @@ public class SettingsFragment extends PreferenceFragmentCompat { searchPreference.setSummary(searchString); } - // Set the summary text for `search_custom_url` (the default is `""`) and enable it if `search` is set to `Custom URL`. + // Set the summary text for the search custom URL (the default is `""`). searchCustomURLPreference.setSummary(savedPreferences.getString("search_custom_url", getString(R.string.search_custom_url_default_value))); + + // Only enable the search custom URL preference if the search is set to `Custom URL`. searchCustomURLPreference.setEnabled(searchString.equals("Custom URL")); + // Set the summary text for the proxy preference when the preference screen is loaded. switch (proxyString) { case ProxyHelper.NONE: @@ -271,11 +286,12 @@ public class SettingsFragment extends PreferenceFragmentCompat { break; } + // Set the summary text for the custom proxy URL. + proxyCustomUrlPreference.setSummary(savedPreferences.getString("proxy_custom_url", getString(R.string.proxy_custom_url_default_value))); + // Only enable the custom proxy URL if a custom proxy is selected. proxyCustomUrlPreference.setEnabled(proxyString.equals("Custom")); - // Set the summary text for the custom proxy URL. - proxyCustomUrlPreference.setSummary(savedPreferences.getString("proxy_custom_url", getString(R.string.proxy_custom_url_default_value))); // Set the status of the Clear and Exit preferences. clearCookiesPreference.setEnabled(!clearEverything); @@ -283,17 +299,104 @@ public class SettingsFragment extends PreferenceFragmentCompat { clearFormDataPreference.setEnabled(!clearEverything); // The form data line can be removed once the minimum API is >= 26. clearCachePreference.setEnabled(!clearEverything); + // Set the homepage URL as the summary text for the homepage preference. 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); + + // Instantiate the download location helper. + DownloadLocationHelper downloadLocationHelper = new DownloadLocationHelper(); + + // 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)); + + // Disable the download custom location preference. + downloadCustomLocationPreference.setEnabled(false); + } + + // 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 font size as the summary text for the preference. fontSizePreference.setSummary(savedPreferences.getString("font_size", getString(R.string.font_size_default_value)) + "%"); - // Disable the JavaScript preference if Night Mode is enabled. JavaScript will be enabled for all web pages. - javaScriptPreference.setEnabled(!nightMode); + + // 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); + + // Get the current app theme. + String currentAppTheme = savedPreferences.getString("app_theme", getString(R.string.app_theme_default_value)); + + // Define an app theme entry number. + int appThemeEntryNumber; + + // 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 current theme as the summary text for the preference. + appThemePreference.setSummary(appThemeEntriesStringArray[appThemeEntryNumber]); + + + // 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]); + } + // Set the JavaScript icon. - if (javaScriptEnabled || nightMode) { + if (javaScriptEnabled) { javaScriptPreference.setIcon(R.drawable.javascript_enabled); } else { javaScriptPreference.setIcon(R.drawable.privacy_mode); @@ -303,48 +406,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); } } @@ -353,283 +456,283 @@ 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); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_night); } else { - incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_light); + incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_day); } } else { - if (darkTheme) { - incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_night); } else { - incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_light); + incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_day); } } // 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) { + doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_night); } else { - doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_light); + doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_day); } } else { - if (darkTheme) { - doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_night); } else { - doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_light); + doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_day); } } // Set the allow screenshots icon. if (savedPreferences.getBoolean("allow_screenshots", false)) { - if (darkTheme) { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_night); } else { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_light); + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_day); } } else { - if (darkTheme) { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_night); } else { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_light); + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_day); } } // 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); } } } @@ -637,45 +740,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); @@ -683,10 +786,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); @@ -694,10 +797,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); @@ -706,10 +809,10 @@ 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); @@ -718,139 +821,146 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Set the clear cache preference icon. if (clearEverything || savedPreferences.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); } + // Set the download custom location icon. + if (downloadCustomLocationPreference.isEnabled()) { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + downloadCustomLocationPreference.setIcon(R.drawable.downloads_enabled_night); + } else { + downloadCustomLocationPreference.setIcon(R.drawable.downloads_enabled_day); + } + } else { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + downloadCustomLocationPreference.setIcon(R.drawable.downloads_ghosted_night); + } else { + downloadCustomLocationPreference.setIcon(R.drawable.downloads_ghosted_day); + } + } + // 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 download with external app preference icon. - if (savedPreferences.getBoolean("download_with_external_app", false)) { - if (darkTheme) { - downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_dark); - } else { - downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_light); - } - } else { - if (darkTheme) { - downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_dark); - } else { - downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_light); - } - } + // Set the 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 dark theme preference icon. - if (savedPreferences.getBoolean("dark_theme", false)) { - darkThemePreference.setIcon(R.drawable.theme_dark); - } else { - darkThemePreference.setIcon(R.drawable.theme_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; - // 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 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); } } @@ -871,10 +981,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. @@ -885,10 +995,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; @@ -904,32 +1014,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); } } @@ -942,10 +1052,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; @@ -955,10 +1065,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; @@ -969,10 +1079,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; @@ -997,10 +1107,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; @@ -1012,10 +1122,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; @@ -1027,10 +1137,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; @@ -1043,16 +1153,16 @@ 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); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_night); } else { - incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_light); + incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_day); } } else { - if (darkTheme) { - incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_night); } else { - incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_light); + incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_day); } } break; @@ -1060,16 +1170,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { 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) { + doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_night); } else { - doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_light); + doNotTrackPreference.setIcon(R.drawable.block_tracking_enabled_day); } } else { - if (darkTheme) { - doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_night); } else { - doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_light); + doNotTrackPreference.setIcon(R.drawable.block_tracking_disabled_day); } } @@ -1078,16 +1188,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "allow_screenshots": // Update the icon. if (sharedPreferences.getBoolean("allow_screenshots", false)) { - if (darkTheme) { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_night); } else { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_light); + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_day); } } else { - if (darkTheme) { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_dark); + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_night); } else { - allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_light); + allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_day); } } @@ -1119,16 +1229,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; @@ -1136,16 +1246,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; @@ -1156,39 +1266,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); } } } @@ -1200,16 +1310,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; @@ -1217,16 +1327,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; @@ -1234,16 +1344,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; @@ -1251,16 +1361,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; @@ -1268,16 +1378,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; @@ -1285,16 +1395,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; @@ -1302,16 +1412,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; @@ -1320,7 +1430,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Store the new search string. String newSearchString = sharedPreferences.getString("search", getString(R.string.search_default_value)); - // Update `searchPreference` and `searchCustomURLPreference`. + // Update the search and search custom URL preferences. if (newSearchString.equals("Custom URL")) { // `Custom URL` is selected. // Set the summary text to `R.string.custom_url`, which is translated. searchPreference.setSummary(R.string.custom_url); @@ -1329,10 +1439,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`. @@ -1342,16 +1452,16 @@ 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; case "search_custom_url": - // Set the new custom search URL as the summary text for `search_custom_url`. The default is `""`. + // Set the new search custom URL as the summary text for the preference. searchCustomURLPreference.setSummary(sharedPreferences.getString("search_custom_url", getString(R.string.search_custom_url_default_value))); break; @@ -1387,39 +1497,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); } } } @@ -1433,36 +1543,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; @@ -1471,17 +1581,17 @@ 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; @@ -1498,10 +1608,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Update the `clearEverythingPreference` 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); @@ -1509,10 +1619,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Update the `clearCookiesPreference` 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); @@ -1520,10 +1630,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Update the `clearDomStoragePreference` 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); @@ -1532,10 +1642,10 @@ 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); @@ -1544,10 +1654,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Update the `clearCachePreference` 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); @@ -1557,10 +1667,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); @@ -1570,10 +1680,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); @@ -1584,10 +1694,10 @@ 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); @@ -1597,10 +1707,10 @@ public class SettingsFragment extends PreferenceFragmentCompat { case "clear_cache": // Update the icon. if (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); @@ -1612,6 +1722,46 @@ public class SettingsFragment extends PreferenceFragmentCompat { 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 (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + downloadCustomLocationPreference.setIcon(R.drawable.downloads_enabled_night); + } else { + downloadCustomLocationPreference.setIcon(R.drawable.downloads_enabled_day); + } + } else { + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + downloadCustomLocationPreference.setIcon(R.drawable.downloads_ghosted_night); + } else { + downloadCustomLocationPreference.setIcon(R.drawable.downloads_ghosted_day); + } + } + 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))); + break; + case "font_size": // Update the font size summary text. fontSizePreference.setSummary(sharedPreferences.getString("font_size", getString(R.string.font_size_default_value)) + "%"); @@ -1620,16 +1770,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; @@ -1637,16 +1787,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; @@ -1654,16 +1804,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; @@ -1671,134 +1821,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 "download_with_external_app": - // Update the icon. - if (sharedPreferences.getBoolean("download_with_external_app", false)) { - if (darkTheme) { - downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_dark); - } else { - downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_enabled_light); - } - } else { - if (darkTheme) { - downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_dark); - } else { - downloadWithExternalAppPreference.setIcon(R.drawable.open_with_external_app_disabled_light); + 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); } } - 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); - } - - // 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; @@ -1806,16 +1941,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;