From a2a4b36a691762bac757ec32f2a19264f89382e0 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Mon, 19 Jun 2017 16:31:29 -0700 Subject: [PATCH] Create a dark theme for `SettingsActivity`. --- app/src/main/AndroidManifest.xml | 1 - .../activities/MainWebViewActivity.java | 28 +- .../activities/SettingsActivity.java | 10 +- .../fragments/DomainSettingsFragment.java | 46 +- .../fragments/SettingsFragment.java | 707 ++++++++++++++---- .../res/drawable/block_ads_disabled_dark.xml | 12 + ...abled.xml => block_ads_disabled_light.xml} | 2 +- .../res/drawable/block_ads_enabled_dark.xml | 12 + ...nabled.xml => block_ads_enabled_light.xml} | 2 +- .../main/res/drawable/cache_cleared_dark.xml | 18 + ...he_cleared.xml => cache_cleared_light.xml} | 2 +- app/src/main/res/drawable/cache_warning.xml | 2 +- .../drawable/clear_everything_disabled.xml | 2 +- .../clear_everything_enabled_dark.xml | 13 + ...xml => clear_everything_enabled_light.xml} | 2 +- .../res/drawable/cookies_cleared_dark.xml | 18 + ..._cleared.xml => cookies_cleared_light.xml} | 2 +- .../res/drawable/cookies_disabled_dark.xml | 18 + ...isabled.xml => cookies_disabled_light.xml} | 2 +- .../res/drawable/cookies_ghosted_dark.xml | 18 + ..._ghosted.xml => cookies_ghosted_light.xml} | 2 +- app/src/main/res/drawable/cookies_warning.xml | 2 +- .../custom_user_agent_enabled_dark.xml | 18 + ...ml => custom_user_agent_enabled_light.xml} | 2 +- .../custom_user_agent_ghosted_dark.xml | 18 + ...ml => custom_user_agent_ghosted_light.xml} | 2 +- .../drawable/do_not_track_disabled_dark.xml | 18 + ...ed.xml => do_not_track_disabled_light.xml} | 2 +- .../drawable/do_not_track_enabled_dark.xml | 18 + ...led.xml => do_not_track_enabled_light.xml} | 2 +- .../res/drawable/dom_storage_cleared_dark.xml | 18 + ...ared.xml => dom_storage_cleared_light.xml} | 2 +- .../drawable/dom_storage_disabled_dark.xml | 18 + ...led.xml => dom_storage_disabled_light.xml} | 2 +- .../res/drawable/dom_storage_ghosted_dark.xml | 18 + ...sted.xml => dom_storage_ghosted_light.xml} | 2 +- .../main/res/drawable/dom_storage_warning.xml | 2 +- app/src/main/res/drawable/font_size_dark.xml | 18 + .../{font_size.xml => font_size_light.xml} | 2 +- .../res/drawable/form_data_cleared_dark.xml | 18 + ...leared.xml => form_data_cleared_light.xml} | 2 +- .../res/drawable/form_data_disabled_dark.xml | 18 + ...abled.xml => form_data_disabled_light.xml} | 2 +- .../main/res/drawable/form_data_warning.xml | 2 +- .../drawable/full_screen_disabled_dark.xml | 13 + ...led.xml => full_screen_disabled_light.xml} | 2 +- .../res/drawable/full_screen_enabled_dark.xml | 13 + ...bled.xml => full_screen_enabled_light.xml} | 2 +- .../hide_system_bars_disabled_dark.xml | 13 + ...ml => hide_system_bars_disabled_light.xml} | 2 +- .../hide_system_bars_enabled_dark.xml | 13 + ...xml => hide_system_bars_enabled_light.xml} | 2 +- .../hide_system_bars_ghosted_dark.xml | 13 + ...xml => hide_system_bars_ghosted_light.xml} | 2 +- .../main/res/drawable/home_enabled_dark.xml | 13 + ...ome_enabled.xml => home_enabled_light.xml} | 2 +- .../main/res/drawable/home_ghosted_dark.xml | 13 + ...ome_ghosted.xml => home_ghosted_light.xml} | 2 +- .../res/drawable/images_disabled_dark.xml | 18 + ...disabled.xml => images_disabled_light.xml} | 2 +- .../main/res/drawable/images_enabled_dark.xml | 18 + ...s_enabled.xml => images_enabled_light.xml} | 2 +- .../drawable/incognito_mode_disabled_dark.xml | 18 + ....xml => incognito_mode_disabled_light.xml} | 2 +- .../drawable/incognito_mode_enabled_dark.xml | 18 + ...d.xml => incognito_mode_enabled_light.xml} | 2 +- .../main/res/drawable/more_disabled_dark.xml | 18 + ...e_disabled.xml => more_disabled_light.xml} | 4 +- .../main/res/drawable/more_enabled_dark.xml | 18 + ...ore_enabled.xml => more_enabled_light.xml} | 2 +- .../main/res/drawable/orbot_disabled_dark.xml | 19 + ..._disabled.xml => orbot_disabled_light.xml} | 2 +- .../main/res/drawable/orbot_enabled_dark.xml | 19 + ...ot_enabled.xml => orbot_enabled_light.xml} | 2 +- .../res/drawable/refresh_disabled_dark.xml | 18 + ...isabled.xml => refresh_disabled_light.xml} | 2 +- .../res/drawable/refresh_enabled_dark.xml | 18 + ..._enabled.xml => refresh_enabled_light.xml} | 2 +- ...xml => search_custom_url_enabled_dark.xml} | 4 +- ...ml => search_custom_url_enabled_light.xml} | 2 +- .../search_custom_url_ghosted_dark.xml | 18 + ...ml => search_custom_url_ghosted_light.xml} | 2 +- .../main/res/drawable/search_enabled_dark.xml | 18 + ...h_enabled.xml => search_enabled_light.xml} | 2 +- .../main/res/drawable/search_ghosted_dark.xml | 18 + ...h_ghosted.xml => search_ghosted_light.xml} | 2 +- app/src/main/res/drawable/theme_dark.xml | 2 +- .../translucent_bar_disabled_dark.xml | 13 + ...xml => translucent_bar_disabled_light.xml} | 2 +- .../drawable/translucent_bar_enabled_dark.xml | 13 + ....xml => translucent_bar_enabled_light.xml} | 2 +- .../drawable/translucent_bar_ghosted_dark.xml | 13 + ....xml => translucent_bar_ghosted_light.xml} | 2 +- app/src/main/res/drawable/user_agent_dark.xml | 18 + .../{user_agent.xml => user_agent_light.xml} | 2 +- app/src/main/res/layout/domain_settings.xml | 4 +- .../main/res/menu/webview_navigation_menu.xml | 2 +- app/src/main/res/values/attrs.xml | 5 + app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/styles.xml | 25 +- app/src/main/res/xml/preferences.xml | 8 +- 101 files changed, 1358 insertions(+), 254 deletions(-) create mode 100644 app/src/main/res/drawable/block_ads_disabled_dark.xml rename app/src/main/res/drawable/{block_ads_disabled.xml => block_ads_disabled_light.xml} (81%) create mode 100644 app/src/main/res/drawable/block_ads_enabled_dark.xml rename app/src/main/res/drawable/{block_ads_enabled.xml => block_ads_enabled_light.xml} (81%) create mode 100644 app/src/main/res/drawable/cache_cleared_dark.xml rename app/src/main/res/drawable/{cache_cleared.xml => cache_cleared_light.xml} (84%) create mode 100644 app/src/main/res/drawable/clear_everything_enabled_dark.xml rename app/src/main/res/drawable/{clear_everything_enabled.xml => clear_everything_enabled_light.xml} (77%) create mode 100644 app/src/main/res/drawable/cookies_cleared_dark.xml rename app/src/main/res/drawable/{cookies_cleared.xml => cookies_cleared_light.xml} (87%) create mode 100644 app/src/main/res/drawable/cookies_disabled_dark.xml rename app/src/main/res/drawable/{cookies_disabled.xml => cookies_disabled_light.xml} (87%) create mode 100644 app/src/main/res/drawable/cookies_ghosted_dark.xml rename app/src/main/res/drawable/{cookies_ghosted.xml => cookies_ghosted_light.xml} (87%) create mode 100644 app/src/main/res/drawable/custom_user_agent_enabled_dark.xml rename app/src/main/res/drawable/{custom_user_agent_enabled.xml => custom_user_agent_enabled_light.xml} (83%) create mode 100644 app/src/main/res/drawable/custom_user_agent_ghosted_dark.xml rename app/src/main/res/drawable/{custom_user_agent_ghosted.xml => custom_user_agent_ghosted_light.xml} (83%) create mode 100644 app/src/main/res/drawable/do_not_track_disabled_dark.xml rename app/src/main/res/drawable/{do_not_track_disabled.xml => do_not_track_disabled_light.xml} (85%) create mode 100644 app/src/main/res/drawable/do_not_track_enabled_dark.xml rename app/src/main/res/drawable/{do_not_track_enabled.xml => do_not_track_enabled_light.xml} (85%) create mode 100644 app/src/main/res/drawable/dom_storage_cleared_dark.xml rename app/src/main/res/drawable/{dom_storage_cleared.xml => dom_storage_cleared_light.xml} (83%) create mode 100644 app/src/main/res/drawable/dom_storage_disabled_dark.xml rename app/src/main/res/drawable/{dom_storage_disabled.xml => dom_storage_disabled_light.xml} (82%) create mode 100644 app/src/main/res/drawable/dom_storage_ghosted_dark.xml rename app/src/main/res/drawable/{dom_storage_ghosted.xml => dom_storage_ghosted_light.xml} (83%) create mode 100644 app/src/main/res/drawable/font_size_dark.xml rename app/src/main/res/drawable/{font_size.xml => font_size_light.xml} (81%) create mode 100644 app/src/main/res/drawable/form_data_cleared_dark.xml rename app/src/main/res/drawable/{form_data_cleared.xml => form_data_cleared_light.xml} (82%) create mode 100644 app/src/main/res/drawable/form_data_disabled_dark.xml rename app/src/main/res/drawable/{form_data_disabled.xml => form_data_disabled_light.xml} (82%) create mode 100644 app/src/main/res/drawable/full_screen_disabled_dark.xml rename app/src/main/res/drawable/{full_screen_disabled.xml => full_screen_disabled_light.xml} (74%) create mode 100644 app/src/main/res/drawable/full_screen_enabled_dark.xml rename app/src/main/res/drawable/{full_screen_enabled.xml => full_screen_enabled_light.xml} (74%) create mode 100644 app/src/main/res/drawable/hide_system_bars_disabled_dark.xml rename app/src/main/res/drawable/{hide_system_bars_disabled.xml => hide_system_bars_disabled_light.xml} (73%) create mode 100644 app/src/main/res/drawable/hide_system_bars_enabled_dark.xml rename app/src/main/res/drawable/{hide_system_bars_enabled.xml => hide_system_bars_enabled_light.xml} (73%) create mode 100644 app/src/main/res/drawable/hide_system_bars_ghosted_dark.xml rename app/src/main/res/drawable/{hide_system_bars_ghosted.xml => hide_system_bars_ghosted_light.xml} (73%) create mode 100644 app/src/main/res/drawable/home_enabled_dark.xml rename app/src/main/res/drawable/{home_enabled.xml => home_enabled_light.xml} (72%) create mode 100644 app/src/main/res/drawable/home_ghosted_dark.xml rename app/src/main/res/drawable/{home_ghosted.xml => home_ghosted_light.xml} (72%) create mode 100644 app/src/main/res/drawable/images_disabled_dark.xml rename app/src/main/res/drawable/{images_disabled.xml => images_disabled_light.xml} (82%) create mode 100644 app/src/main/res/drawable/images_enabled_dark.xml rename app/src/main/res/drawable/{images_enabled.xml => images_enabled_light.xml} (82%) create mode 100644 app/src/main/res/drawable/incognito_mode_disabled_dark.xml rename app/src/main/res/drawable/{incognito_mode_disabled.xml => incognito_mode_disabled_light.xml} (87%) create mode 100644 app/src/main/res/drawable/incognito_mode_enabled_dark.xml rename app/src/main/res/drawable/{incognito_mode_enabled.xml => incognito_mode_enabled_light.xml} (87%) create mode 100644 app/src/main/res/drawable/more_disabled_dark.xml rename app/src/main/res/drawable/{more_disabled.xml => more_disabled_light.xml} (87%) create mode 100644 app/src/main/res/drawable/more_enabled_dark.xml rename app/src/main/res/drawable/{more_enabled.xml => more_enabled_light.xml} (87%) create mode 100644 app/src/main/res/drawable/orbot_disabled_dark.xml rename app/src/main/res/drawable/{orbot_disabled.xml => orbot_disabled_light.xml} (84%) create mode 100644 app/src/main/res/drawable/orbot_enabled_dark.xml rename app/src/main/res/drawable/{orbot_enabled.xml => orbot_enabled_light.xml} (84%) create mode 100644 app/src/main/res/drawable/refresh_disabled_dark.xml rename app/src/main/res/drawable/{refresh_disabled.xml => refresh_disabled_light.xml} (83%) create mode 100644 app/src/main/res/drawable/refresh_enabled_dark.xml rename app/src/main/res/drawable/{refresh_enabled.xml => refresh_enabled_light.xml} (84%) rename app/src/main/res/drawable/{search_custom_url_disabled.xml => search_custom_url_enabled_dark.xml} (80%) rename app/src/main/res/drawable/{search_custom_url_enabled.xml => search_custom_url_enabled_light.xml} (83%) create mode 100644 app/src/main/res/drawable/search_custom_url_ghosted_dark.xml rename app/src/main/res/drawable/{search_custom_url_ghosted.xml => search_custom_url_ghosted_light.xml} (83%) create mode 100644 app/src/main/res/drawable/search_enabled_dark.xml rename app/src/main/res/drawable/{search_enabled.xml => search_enabled_light.xml} (84%) create mode 100644 app/src/main/res/drawable/search_ghosted_dark.xml rename app/src/main/res/drawable/{search_ghosted.xml => search_ghosted_light.xml} (84%) create mode 100644 app/src/main/res/drawable/translucent_bar_disabled_dark.xml rename app/src/main/res/drawable/{translucent_bar_disabled.xml => translucent_bar_disabled_light.xml} (73%) create mode 100644 app/src/main/res/drawable/translucent_bar_enabled_dark.xml rename app/src/main/res/drawable/{translucent_bar_enabled.xml => translucent_bar_enabled_light.xml} (73%) create mode 100644 app/src/main/res/drawable/translucent_bar_ghosted_dark.xml rename app/src/main/res/drawable/{translucent_bar_ghosted.xml => translucent_bar_ghosted_light.xml} (73%) create mode 100644 app/src/main/res/drawable/user_agent_dark.xml rename app/src/main/res/drawable/{user_agent.xml => user_agent_light.xml} (86%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 48e48789..015c4ecb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -110,7 +110,6 @@ = 21. @@ -165,18 +165,18 @@ public class DomainSettingsFragment extends Fragment { thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_warning)); } else { // First party cookies are enabled but third-party cookies are disabled. thirdPartyCookiesEnabledSwitch.setChecked(false); - thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled)); + thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled_light)); } } else { // First-party cookies are disabled. // Set the status of third-party cookies, but disable it. if (thirdPartyCookiesEnabledInt == 1) { // Third-party cookies are enabled but first-party cookies are disabled. thirdPartyCookiesEnabledSwitch.setChecked(true); thirdPartyCookiesEnabledSwitch.setEnabled(false); - thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_ghosted)); + thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_ghosted_light)); } else { // Both first party and third-party cookies are disabled. thirdPartyCookiesEnabledSwitch.setChecked(false); thirdPartyCookiesEnabledSwitch.setEnabled(false); - thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_ghosted)); + thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_ghosted_light)); } } } else { // Third-party cookies cannot be configured for API <= 21. @@ -192,7 +192,7 @@ public class DomainSettingsFragment extends Fragment { domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_enabled)); } else { // JavaScript is enabled but DOM storage is disabled. domStorageEnabledSwitch.setChecked(false); - domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_disabled)); + domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_disabled_light)); } } else { // JavaScript is disabled. // Set the checked status of DOM storage. @@ -204,7 +204,7 @@ public class DomainSettingsFragment extends Fragment { // Disable `domStorageEnabledSwitch` and set the icon to be ghosted. domStorageEnabledSwitch.setEnabled(false); - domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_ghosted)); + domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_ghosted_light)); } // Set the form data status. Once minimum API >= 21 we can use a selector as the tint mode instead of specifying different icons. @@ -213,7 +213,7 @@ public class DomainSettingsFragment extends Fragment { formDataImageView.setImageDrawable(getResources().getDrawable(R.drawable.form_data_enabled)); } else { // Form data is disabled. formDataEnabledSwitch.setChecked(false); - formDataImageView.setImageDrawable(getResources().getDrawable(R.drawable.form_data_disabled)); + formDataImageView.setImageDrawable(getResources().getDrawable(R.drawable.form_data_disabled_light)); } // We need to inflated a `WebView` to get the default user agent. @@ -269,18 +269,18 @@ public class DomainSettingsFragment extends Fragment { switch (displayImagesInt) { case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_SYSTEM_DEFAULT: if (MainWebViewActivity.displayWebpageImagesBoolean) { - displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_enabled)); + displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_enabled_light)); } else { - displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_disabled)); + displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_disabled_light)); } break; case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_ENABLED: - displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_enabled)); + displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_enabled_light)); break; case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_DISABLED: - displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_disabled)); + displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_disabled_light)); break; } @@ -300,7 +300,7 @@ public class DomainSettingsFragment extends Fragment { if (domStorageEnabledSwitch.isChecked()) { // DOM storage is enabled. domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_enabled)); } else { // DOM storage is disabled. - domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_disabled)); + domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_disabled_light)); } } else { // JavaScript is disabled. // Update the JavaScript icon. @@ -310,7 +310,7 @@ public class DomainSettingsFragment extends Fragment { domStorageEnabledSwitch.setEnabled(false); // Set the DOM storage icon to be ghosted. - domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_ghosted)); + domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_ghosted_light)); } } }); @@ -330,17 +330,17 @@ public class DomainSettingsFragment extends Fragment { if (thirdPartyCookiesEnabledSwitch.isChecked()) { // Third-party cookies are enabled. thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_warning)); } else { // Third-party cookies are disabled. - thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled)); + thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled_light)); } } else { // First-party cookies are disabled. // Update the first-party cookies icon. - firstPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled)); + firstPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled_light)); // Disable the third-party cookies `Switch`. thirdPartyCookiesEnabledSwitch.setEnabled(false); // Set the third-party cookies icon to be ghosted. - thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_ghosted)); + thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_ghosted_light)); } } }); @@ -353,7 +353,7 @@ public class DomainSettingsFragment extends Fragment { if (isChecked) { thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_warning)); } else { - thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled)); + thirdPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled_light)); } } }); @@ -366,7 +366,7 @@ public class DomainSettingsFragment extends Fragment { if (isChecked) { domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_enabled)); } else { - domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_disabled)); + domStorageImageView.setImageDrawable(getResources().getDrawable(R.drawable.dom_storage_disabled_light)); } } }); @@ -379,7 +379,7 @@ public class DomainSettingsFragment extends Fragment { if (isChecked) { formDataImageView.setImageDrawable(getResources().getDrawable(R.drawable.form_data_enabled)); } else { - formDataImageView.setImageDrawable(getResources().getDrawable(R.drawable.form_data_disabled)); + formDataImageView.setImageDrawable(getResources().getDrawable(R.drawable.form_data_disabled_light)); } } }); @@ -436,18 +436,18 @@ public class DomainSettingsFragment extends Fragment { switch (position) { case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_SYSTEM_DEFAULT: if (MainWebViewActivity.displayWebpageImagesBoolean) { - displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_enabled)); + displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_enabled_light)); } else { - displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_disabled)); + displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_disabled_light)); } break; case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_ENABLED: - displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_enabled)); + displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_enabled_light)); break; case DomainsDatabaseHelper.DISPLAY_WEBPAGE_IMAGES_DISABLED: - displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_disabled)); + displayWebpageImagesImageView.setImageDrawable(getResources().getDrawable(R.drawable.images_disabled_light)); break; } } 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 340e4552..6ce6cdcb 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java @@ -189,7 +189,11 @@ public class SettingsFragment extends PreferenceFragment { if (firstPartyCookiesEnabledBoolean) { firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled); } else { - firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled); + if (MainWebViewActivity.darkTheme) { + firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); + } else { + firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); + } } // Set the `thirdPartyCookiesPreference` icon. @@ -197,10 +201,18 @@ public class SettingsFragment extends PreferenceFragment { if (thirdPartyCookiesEnabledBoolean) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled); + if (MainWebViewActivity.darkTheme) { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); + } else { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); + } } } else { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted); + if (MainWebViewActivity.darkTheme) { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark); + } else { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light); + } } // Set the `domStoragePreference` icon. @@ -208,154 +220,283 @@ public class SettingsFragment extends PreferenceFragment { if (savedPreferences.getBoolean("dom_storage_enabled", false)) { domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { - domStoragePreference.setIcon(R.drawable.dom_storage_disabled); + if (MainWebViewActivity.darkTheme) { + domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark); + } else { + domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light); + } } } else { - domStoragePreference.setIcon(R.drawable.dom_storage_ghosted); + if (MainWebViewActivity.darkTheme) { + domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_dark); + } else { + domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_light); + } } // Set the `saveFormDataPreference` icon. if (savedPreferences.getBoolean("save_form_data_enabled", false)) { saveFormDataPreference.setIcon(R.drawable.form_data_enabled); } else { - saveFormDataPreference.setIcon(R.drawable.form_data_disabled); + if (MainWebViewActivity.darkTheme) { + saveFormDataPreference.setIcon(R.drawable.form_data_disabled_dark); + } else { + saveFormDataPreference.setIcon(R.drawable.form_data_disabled_light); + } } // Set the `customUserAgentPreference` icon. if (customUserAgentPreference.isEnabled()) { - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled); + if (MainWebViewActivity.darkTheme) { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_dark); + } else { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_light); + } } else { - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted); + if (MainWebViewActivity.darkTheme) { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_dark); + } else { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_light); + } } // Set the `blockAdsPreference` icon. if (savedPreferences.getBoolean("block_ads", true)) { - blockAdsPreference.setIcon(R.drawable.block_ads_enabled); + if (MainWebViewActivity.darkTheme) { + blockAdsPreference.setIcon(R.drawable.block_ads_enabled_dark); + } else { + blockAdsPreference.setIcon(R.drawable.block_ads_enabled_light); + } } else { - blockAdsPreference.setIcon(R.drawable.block_ads_disabled); + if (MainWebViewActivity.darkTheme) { + blockAdsPreference.setIcon(R.drawable.block_ads_disabled_dark); + } else { + blockAdsPreference.setIcon(R.drawable.block_ads_disabled_light); + } } // Set the `incognitoModePreference` icon. if (savedPreferences.getBoolean("incognito_mode", false)) { - incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled); + if (MainWebViewActivity.darkTheme) { + incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_dark); + } else { + incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_light); + } } else { - incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled); + if (MainWebViewActivity.darkTheme) { + incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_dark); + } else { + incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_light); + } } // Set the `doNotTrackPreference` icon. if (savedPreferences.getBoolean("do_not_track", false)) { - doNotTrackPreference.setIcon(R.drawable.do_not_track_enabled); + if (MainWebViewActivity.darkTheme) { + doNotTrackPreference.setIcon(R.drawable.do_not_track_enabled_dark); + } else { + doNotTrackPreference.setIcon(R.drawable.do_not_track_enabled_light); + } } else { - doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled); + if (MainWebViewActivity.darkTheme) { + doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled_dark); + } else { + doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled_light); + } } - // Set the `proxyThroughOrbotPreference` icon. - if (proxyThroughOrbotBoolean) { - proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled); - } else { - proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled); - } + // Set the Tor icons according to the theme. + if (proxyThroughOrbotBoolean) { // Proxying is enabled. + if (MainWebViewActivity.darkTheme) { + proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled_dark); + torHomepagePreference.setIcon(R.drawable.home_enabled_dark); + torSearchPreference.setIcon(R.drawable.search_enabled_dark); - // Set the `torSearchPreference` and `torSearchCustomURLPreference` icons. - if (proxyThroughOrbotBoolean) { - // Set the `torHomepagePreference` and `torSearchPreference` icons. - torHomepagePreference.setIcon(R.drawable.home_enabled); - torSearchPreference.setIcon(R.drawable.search_enabled); + // Set the custom search icon. + if (torSearchCustomURLPreference.isEnabled()) { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark); + } else { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark); + } + } else { + proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled_light); + torHomepagePreference.setIcon(R.drawable.home_enabled_light); + torSearchPreference.setIcon(R.drawable.search_enabled_light); - // Set the `torSearchCustomURLPreference` icon. - if (torSearchCustomURLPreference.isEnabled()) { - torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled); + // Set the custom search icon. + if (torSearchCustomURLPreference.isEnabled()) { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_light); + } else { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light); + } + } + } else { // Proxying is disabled. + if (MainWebViewActivity.darkTheme) { + proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled_dark); + torHomepagePreference.setIcon(R.drawable.home_ghosted_dark); + torSearchPreference.setIcon(R.drawable.search_ghosted_dark); + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark); } else { - torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_disabled); + proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled_light); + torHomepagePreference.setIcon(R.drawable.home_ghosted_light); + torSearchPreference.setIcon(R.drawable.search_ghosted_light); + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light); } - } else { // Proxy through Orbot is disabled. - torHomepagePreference.setIcon(R.drawable.home_ghosted); - torSearchPreference.setIcon(R.drawable.search_ghosted); - torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted); } // Set the `searchCustomURLPreference` icon. if (searchCustomURLPreference.isEnabled()) { - searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled); + if (MainWebViewActivity.darkTheme) { + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark); + } else { + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_light); + } } else { - searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted); + if (MainWebViewActivity.darkTheme) { + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark); + } else { + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light); + } } // Set the full screen browsing mode icons. - if (fullScreenBrowsingModeBoolean) { - // Set the `fullScreenBrowsingModePreference` icon. - fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled); - - if (hideSystemBarsBoolean) { - // Set `hideSystemBarsPreference` to use the enabled icon. - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled); - - // Set `translucentNavigationBarPreference` to use the ghosted icon. - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted); - } else { // `hideSystemBarsBoolean` is false. - // Set `hideSystemBarsPreference` to use the disabled icon. - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled); - - // Set the correct icon for `translucentNavigationBarPreference`. - if (savedPreferences.getBoolean("translucent_navigation_bar", true)) { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled); + if (fullScreenBrowsingModeBoolean) { // `fullScreenBrowsingModeBoolean` is `true`. + // Set the `fullScreenBrowsingModePreference` icon according to the theme. + if (MainWebViewActivity.darkTheme) { + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_dark); + } else { + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_light); + } + + if (hideSystemBarsBoolean) { // `hideSystemBarsBoolean` is `true`. + // Set the icons according to the theme. + if (MainWebViewActivity.darkTheme) { + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_dark); + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark); + } else { + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_light); + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light); + } + } else { // `hideSystemBarsBoolean` is `false`. + // Set the `hideSystemBarsPreference` icon according to the theme. + if (MainWebViewActivity.darkTheme) { + // Set the icon for `hideSystemBarsPreference`. + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_dark); + + // Set the icon for `translucentNavigationBarPreference`. + if (savedPreferences.getBoolean("translucent_navigation_bar", true)) { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_dark); + } else { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_dark); + } } else { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled); + // Set the icon for `hideSystemBarsPreference`. + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_light); + + // Set the icon for `translucentNavigationBarPreference`. + if (savedPreferences.getBoolean("translucent_navigation_bar", true)) { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_light); + } else { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_light); + } } } - } else { // `fullScreenBrowsingModeBoolean` is false. - fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled); - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted); + } else { // `fullScreenBrowsingModeBoolean` is `false`. + // Set the icons according to the theme. + if (MainWebViewActivity.darkTheme) { + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_dark); + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted_dark); + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark); + } else { + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_light); + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted_light); + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light); + } } // Set the `clearEverythingPreference` icon. if (clearEverythingBoolean) { - clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled); + if (MainWebViewActivity.darkTheme) { + clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_dark); + } else { + clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_light); + } } else { clearEverythingPreference.setIcon(R.drawable.clear_everything_disabled); } // Set the `clearCookiesPreference` icon. if (clearEverythingBoolean || savedPreferences.getBoolean("clear_cookies", true)) { - clearCookiesPreference.setIcon(R.drawable.cookies_cleared); + if (MainWebViewActivity.darkTheme) { + clearCookiesPreference.setIcon(R.drawable.cookies_cleared_dark); + } else { + clearCookiesPreference.setIcon(R.drawable.cookies_cleared_light); + } } else { clearCookiesPreference.setIcon(R.drawable.cookies_warning); } // Set the `clearDomStoragePreference` icon. if (clearEverythingBoolean || savedPreferences.getBoolean("clear_dom_storage", true)) { - clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared); + if (MainWebViewActivity.darkTheme) { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_dark); + } else { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_light); + } } else { clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning); } // Set the `clearFormDataPreference` icon. if (clearEverythingBoolean || savedPreferences.getBoolean("clear_form_data", true)) { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared); + if (MainWebViewActivity.darkTheme) { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); + } else { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); + } } else { clearFormDataPreference.setIcon(R.drawable.form_data_warning); } // Set the `clearCachePreference` icon. if (clearEverythingBoolean || savedPreferences.getBoolean("clear_cache", true)) { - clearCachePreference.setIcon(R.drawable.cache_cleared); + if (MainWebViewActivity.darkTheme) { + clearCachePreference.setIcon(R.drawable.cache_cleared_dark); + } else { + clearCachePreference.setIcon(R.drawable.cache_cleared_light); + } } else { clearCachePreference.setIcon(R.drawable.cache_warning); } // Set the `swipeToRefreshPreference` icon. if (savedPreferences.getBoolean("swipe_to_refresh", false)) { - swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled); + if (MainWebViewActivity.darkTheme) { + swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_dark); + } else { + swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_light); + } } else { - swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled); + if (MainWebViewActivity.darkTheme) { + swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_dark); + } else { + swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_light); + } } // Set the `displayAdditionalAppBarIconsPreference` icon. if (savedPreferences.getBoolean("display_additional_app_bar_icons", false)) { - displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled); + if (MainWebViewActivity.darkTheme) { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_dark); + } else { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_light); + } } else { - displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled); + if (MainWebViewActivity.darkTheme) { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_dark); + } else { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_light); + } } // Set the `darkThemePreference` icon. @@ -367,9 +508,17 @@ public class SettingsFragment extends PreferenceFragment { // Set the `displayWebpageImagesPreference` icon. if (savedPreferences.getBoolean("display_webpage_images", true)) { - displayWebpageImagesPreference.setIcon(R.drawable.images_enabled); + if (MainWebViewActivity.darkTheme) { + displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_dark); + } else { + displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_light); + } } else { - displayWebpageImagesPreference.setIcon(R.drawable.images_disabled); + if (MainWebViewActivity.darkTheme) { + displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_dark); + } else { + displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_light); + } } @@ -391,14 +540,22 @@ public class SettingsFragment extends PreferenceFragment { if (sharedPreferences.getBoolean("dom_storage_enabled", false)) { domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { - domStoragePreference.setIcon(R.drawable.dom_storage_disabled); + if (MainWebViewActivity.darkTheme) { + domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark); + } else { + domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light); + } } } else { // `javascript_enabled` is `false`. // Update the icon for `javascript_enabled`. javaScriptPreference.setIcon(R.drawable.privacy_mode); // Set the icon for `dom_storage_disabled` to be ghosted. - domStoragePreference.setIcon(R.drawable.dom_storage_ghosted); + if (MainWebViewActivity.darkTheme) { + domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_dark); + } else { + domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_light); + } } break; @@ -413,17 +570,33 @@ public class SettingsFragment extends PreferenceFragment { if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled); + if (MainWebViewActivity.darkTheme) { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); + } else { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); + } } } else { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted); + if (MainWebViewActivity.darkTheme) { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark); + } else { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light); + } } } else { // `first_party_cookies_enabled` is `false`. // Update the icon for `first_party_cookies_enabled`. - firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled); + if (MainWebViewActivity.darkTheme) { + firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); + } else { + firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); + } // Set the icon for `third_party_cookies_enabled` to be ghosted. - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted); + if (MainWebViewActivity.darkTheme) { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_dark); + } else { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted_light); + } } // Enable `third_party_cookies_enabled` if `first_party_cookies_enabled` is `true` and API >= 21. @@ -435,7 +608,11 @@ public class SettingsFragment extends PreferenceFragment { if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) { thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning); } else { - thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled); + if (MainWebViewActivity.darkTheme) { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_dark); + } else { + thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled_light); + } } break; @@ -444,7 +621,11 @@ public class SettingsFragment extends PreferenceFragment { if (sharedPreferences.getBoolean("dom_storage_enabled", false)) { domStoragePreference.setIcon(R.drawable.dom_storage_enabled); } else { - domStoragePreference.setIcon(R.drawable.dom_storage_disabled); + if (MainWebViewActivity.darkTheme) { + domStoragePreference.setIcon(R.drawable.dom_storage_disabled_dark); + } else { + domStoragePreference.setIcon(R.drawable.dom_storage_disabled_light); + } } break; @@ -453,7 +634,11 @@ public class SettingsFragment extends PreferenceFragment { if (sharedPreferences.getBoolean("save_form_data_enabled", false)) { saveFormDataPreference.setIcon(R.drawable.form_data_enabled); } else { - saveFormDataPreference.setIcon(R.drawable.form_data_disabled); + if (MainWebViewActivity.darkTheme) { + saveFormDataPreference.setIcon(R.drawable.form_data_disabled_dark); + } else { + saveFormDataPreference.setIcon(R.drawable.form_data_disabled_light); + } } case "user_agent": @@ -464,27 +649,45 @@ public class SettingsFragment extends PreferenceFragment { // Display the user agent as the summary text for `userAgentPreference`. userAgentPreference.setSummary(bareWebView.getSettings().getUserAgentString()); - // Update `customUserAgentPreference`. + // Disable `customUserAgentPreference`. customUserAgentPreference.setEnabled(false); - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted); + + // Set the `customUserAgentPreference` icon according to the theme. + if (MainWebViewActivity.darkTheme) { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_dark); + } else { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_light); + } break; case "Custom user agent": // Display `Custom user agent` as the summary text for `userAgentPreference`. userAgentPreference.setSummary(R.string.custom_user_agent); - // Update `customUserAgentPreference`. + // Enable `customUserAgentPreference`. customUserAgentPreference.setEnabled(true); - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled); + + // Set the `customUserAgentPreference` icon according to the theme. + if (MainWebViewActivity.darkTheme) { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_dark); + } else { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_light); + } break; default: // Display the user agent as the summary text for `userAgentPreference`. userAgentPreference.setSummary(sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0")); - // Update `customUserAgentPreference`. + // Disable `customUserAgentPreference`. customUserAgentPreference.setEnabled(false); - customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted); + + // Set the `customUserAgentPreference` icon according to the theme. + if (MainWebViewActivity.darkTheme) { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_dark); + } else { + customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_light); + } break; } break; @@ -497,27 +700,51 @@ public class SettingsFragment extends PreferenceFragment { case "block_ads": // Update the icon. if (sharedPreferences.getBoolean("block_ads", true)) { - blockAdsPreference.setIcon(R.drawable.block_ads_enabled); + if (MainWebViewActivity.darkTheme) { + blockAdsPreference.setIcon(R.drawable.block_ads_enabled_dark); + } else { + blockAdsPreference.setIcon(R.drawable.block_ads_enabled_light); + } } else { - blockAdsPreference.setIcon(R.drawable.block_ads_disabled); + if (MainWebViewActivity.darkTheme) { + blockAdsPreference.setIcon(R.drawable.block_ads_disabled_dark); + } else { + blockAdsPreference.setIcon(R.drawable.block_ads_disabled_light); + } } break; case "incognito_mode": // Update the icon. if (sharedPreferences.getBoolean("incognito_mode", false)) { - incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled); + if (MainWebViewActivity.darkTheme) { + incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_dark); + } else { + incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_light); + } } else { - incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled); + if (MainWebViewActivity.darkTheme) { + incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_dark); + } else { + incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_light); + } } break; case "do_not_track": // Update the icon. if (sharedPreferences.getBoolean("do_not_track", false)) { - doNotTrackPreference.setIcon(R.drawable.do_not_track_enabled); + if (MainWebViewActivity.darkTheme) { + doNotTrackPreference.setIcon(R.drawable.do_not_track_enabled_dark); + } else { + doNotTrackPreference.setIcon(R.drawable.do_not_track_enabled_light); + } } else { - doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled); + if (MainWebViewActivity.darkTheme) { + doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled_dark); + } else { + doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled_light); + } } break; @@ -532,22 +759,42 @@ public class SettingsFragment extends PreferenceFragment { // Update the icons. if (currentProxyThroughOrbot) { - // Set the `proxyThroughOrbotPreference`, `torHomepagePreference`, and `torSearchPreference` icons. - proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled); - torHomepagePreference.setIcon(R.drawable.home_enabled); - torSearchPreference.setIcon(R.drawable.search_enabled); - - // Set the `torSearchCustomURLPreference` icon. - if (torSearchCustomURLPreference.isEnabled()) { - torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled); + // Set the Tor icons according to the theme. + if (MainWebViewActivity.darkTheme) { + proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled_dark); + torHomepagePreference.setIcon(R.drawable.home_enabled_dark); + torSearchPreference.setIcon(R.drawable.search_enabled_dark); + + // Set the `torSearchCustomURLPreference` icon. + if (torSearchCustomURLPreference.isEnabled()) { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark); + } else { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark); + } } else { - torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_disabled); + proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled_light); + torHomepagePreference.setIcon(R.drawable.home_enabled_light); + torSearchPreference.setIcon(R.drawable.search_enabled_light); + + // Set the `torSearchCustomURLPreference` icon. + if (torSearchCustomURLPreference.isEnabled()) { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_light); + } else { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light); + } } } else { // Proxy through Orbot is disabled. - proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled); - torHomepagePreference.setIcon(R.drawable.home_ghosted); - torSearchPreference.setIcon(R.drawable.search_ghosted); - torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted); + if (MainWebViewActivity.darkTheme) { + proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled_dark); + torHomepagePreference.setIcon(R.drawable.home_ghosted_dark); + torSearchPreference.setIcon(R.drawable.search_ghosted_dark); + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark); + } else { + proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled_light); + torHomepagePreference.setIcon(R.drawable.home_ghosted_light); + torSearchPreference.setIcon(R.drawable.search_ghosted_light); + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light); + } } break; @@ -565,16 +812,28 @@ public class SettingsFragment extends PreferenceFragment { // Use `R.string.custom_url`, which is translated, as the summary instead of the array value, which isn't. torSearchPreference.setSummary(R.string.custom_url); - // Update `torSearchCustomURLPreference`. + // Enable `torSearchCustomURLPreference`. torSearchCustomURLPreference.setEnabled(true); - torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled); + + // Update the `torSearchCustomURLPreference` icon. + if (MainWebViewActivity.darkTheme) { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark); + } else { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_light); + } } else { // Set the array value as the summary text. torSearchPreference.setSummary(presentTorSearchString); - // Update `torSearchCustomURLPreference`. + // Disable `torSearchCustomURLPreference`. torSearchCustomURLPreference.setEnabled(false); - torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_disabled); + + // Update the `torSearchCustomURLPreference` icon. + if (MainWebViewActivity.darkTheme) { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark); + } else { + torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light); + } } break; @@ -592,16 +851,28 @@ public class SettingsFragment extends PreferenceFragment { // Set the summary text to `R.string.custom_url`, which is translated. searchPreference.setSummary(R.string.custom_url); - // Update `searchCustomURLPreference`. + // Enable `searchCustomURLPreference`. searchCustomURLPreference.setEnabled(true); - searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled); + + // Set the `searchCustomURLPreference` according to the theme. + if (MainWebViewActivity.darkTheme) { + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_dark); + } else { + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_light); + } } else { // `Custom URL` is not selected. // Set the summary text to `newSearchString`. searchPreference.setSummary(newSearchString); - // Update `searchCustomURLPreference`. + // Disable `searchCustomURLPreference`. searchCustomURLPreference.setEnabled(false); - searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted); + + // Set the `searchCustomURLPreference` according to the theme. + if (MainWebViewActivity.darkTheme) { + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_dark); + } else { + searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_light); + } } break; @@ -612,57 +883,107 @@ public class SettingsFragment extends PreferenceFragment { case "full_screen_browsing_mode": if (sharedPreferences.getBoolean("full_screen_browsing_mode", false)) { - // Set `fullScreenBrowsingModePreference` to use the enabled icon. - fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled); - - if (sharedPreferences.getBoolean("hide_system_bars", false)) { - // Set `hideSystemBarsPreference` to use the enabled icon. - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled); + // Set the `fullScreenBrowsingModePreference` icon according to the theme. + if (MainWebViewActivity.darkTheme) { + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_dark); + } else { + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_light); + } - // Update `translucentNavigationBarPreference`. + if (sharedPreferences.getBoolean("hide_system_bars", false)) { // `hide_system_bars` is `true`. + // Disable `translucentNavigationBarPreference`. translucentNavigationBarPreference.setEnabled(false); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted); - } else { // `hide_system_bars` is false. - // Set `hideSystemBarsPreference` to use the disabled icon. - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled); - // Update `translucentNavigationBarPreference`. - translucentNavigationBarPreference.setEnabled(true); - if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled); + // Set the icons according to the theme. + if (MainWebViewActivity.darkTheme) { + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_dark); + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark); } else { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled); + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_light); + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light); + } + } else { // `hide_system_bars` is `false`. + // Enable `translucentNavigationBarPreference`. + translucentNavigationBarPreference.setEnabled(true); + + // Set the icons according to the theme. + if (MainWebViewActivity.darkTheme) { // Use the dark theme. + // Set the `hideSystemBarsPreference` icon. + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_dark); + + // Set the `translucentNavigationBarPreference` icon. + if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_dark); + } else { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_dark); + } + } else { // Use the light theme. + // Set the `hideSystemBarsPreference` icon. + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_light); + + // Set the `translucentNavigationBarPreference` icon. + if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_light); + } else { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_light); + } } } } else { // `full_screen_browsing_mode` is false. // Disable `translucentNavigationBarPreference`. translucentNavigationBarPreference.setEnabled(false); - // Update the icons. - fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled); - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted); + // Update the icons according to the theme. + if (MainWebViewActivity.darkTheme) { + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_dark); + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted_dark); + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark); + } else { + fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_light); + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted_light); + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light); + } } break; case "hide_system_bars": if (sharedPreferences.getBoolean("hide_system_bars", false)) { - // Set `hideSystemBarsPreference` to use the enabled icon. - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled); - - // Update `translucentNavigationBarPreference`. + // Disable `translucentNavigationBarPreference`. translucentNavigationBarPreference.setEnabled(false); - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted); - } else { // `hide_system_bars` is false. - // Set `hideSystemBarsPreference` to use the disabled icon. - hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled); - // Update `translucentNavigationBarPreference`. + // Set the icons according to the theme. + if (MainWebViewActivity.darkTheme) { + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_dark); + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_dark); + } else { + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled_light); + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted_light); + } + } else { // `hide_system_bars` is false. + // Enable `translucentNavigationBarPreference`. translucentNavigationBarPreference.setEnabled(true); - if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled); + + // Set the icons according to the theme. + if (MainWebViewActivity.darkTheme) { + // Set the `hideSystemBarsPreference` icon. + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_dark); + + // Set the `translucentNavigationBarPreference` icon. + if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_dark); + } else { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_dark); + } } else { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled); + // Set the `hideSystemBarsPreference` icon. + hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled_light); + + // Set the `translucentNavigationBarPreference` icon. + if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_light); + } else { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_light); + } } } break; @@ -670,9 +991,17 @@ public class SettingsFragment extends PreferenceFragment { case "translucent_navigation_bar": // Update the icon. if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled); + if (MainWebViewActivity.darkTheme) { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_dark); + } else { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled_light); + } } else { - translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled); + if (MainWebViewActivity.darkTheme) { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_dark); + } else { + translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled_light); + } } break; @@ -688,35 +1017,55 @@ public class SettingsFragment extends PreferenceFragment { // Update the `clearEverythingPreference` icon. if (newClearEverythingBoolean) { - clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled); + if (MainWebViewActivity.darkTheme) { + clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_dark); + } else { + clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_light); + } } else { clearEverythingPreference.setIcon(R.drawable.clear_everything_disabled); } // Update the `clearCookiesPreference` icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cookies", true)) { - clearCookiesPreference.setIcon(R.drawable.cookies_cleared); + if (MainWebViewActivity.darkTheme) { + clearCookiesPreference.setIcon(R.drawable.cookies_cleared_dark); + } else { + clearCookiesPreference.setIcon(R.drawable.cookies_cleared_light); + } } else { clearCookiesPreference.setIcon(R.drawable.cookies_warning); } // Update the `clearDomStoragePreference` icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_dom_storage", true)) { - clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared); + if (MainWebViewActivity.darkTheme) { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_dark); + } else { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_light); + } } else { clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning); } // Update the `clearFormDataPreference` icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_form_data", true)) { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared); + if (MainWebViewActivity.darkTheme) { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); + } else { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); + } } else { clearFormDataPreference.setIcon(R.drawable.form_data_warning); } // Update the `clearCachePreference` icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cache", true)) { - clearCachePreference.setIcon(R.drawable.cache_cleared); + if (MainWebViewActivity.darkTheme) { + clearCachePreference.setIcon(R.drawable.cache_cleared_dark); + } else { + clearCachePreference.setIcon(R.drawable.cache_cleared_light); + } } else { clearCachePreference.setIcon(R.drawable.cache_warning); } @@ -725,7 +1074,11 @@ public class SettingsFragment extends PreferenceFragment { case "clear_cookies": // Update the icon. if (sharedPreferences.getBoolean("clear_cookies", true)) { - clearCookiesPreference.setIcon(R.drawable.cookies_cleared); + if (MainWebViewActivity.darkTheme) { + clearCookiesPreference.setIcon(R.drawable.cookies_cleared_dark); + } else { + clearCookiesPreference.setIcon(R.drawable.cookies_cleared_light); + } } else { clearCookiesPreference.setIcon(R.drawable.cookies_warning); } @@ -734,7 +1087,11 @@ public class SettingsFragment extends PreferenceFragment { case "clear_dom_storage": // Update the icon. if (sharedPreferences.getBoolean("clear_dom_storage", true)) { - clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared); + if (MainWebViewActivity.darkTheme) { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_dark); + } else { + clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_light); + } } else { clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning); } @@ -743,7 +1100,11 @@ public class SettingsFragment extends PreferenceFragment { case "clear_form_data": // Update the icon. if (sharedPreferences.getBoolean("clear_form_data", true)) { - clearFormDataPreference.setIcon(R.drawable.form_data_cleared); + if (MainWebViewActivity.darkTheme) { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_dark); + } else { + clearFormDataPreference.setIcon(R.drawable.form_data_cleared_light); + } } else { clearFormDataPreference.setIcon(R.drawable.form_data_warning); } @@ -752,7 +1113,11 @@ public class SettingsFragment extends PreferenceFragment { case "clear_cache": // Update the icon. if (sharedPreferences.getBoolean("clear_cache", true)) { - clearCachePreference.setIcon(R.drawable.cache_cleared); + if (MainWebViewActivity.darkTheme) { + clearCachePreference.setIcon(R.drawable.cache_cleared_dark); + } else { + clearCachePreference.setIcon(R.drawable.cache_cleared_light); + } } else { clearCachePreference.setIcon(R.drawable.cache_warning); } @@ -771,18 +1136,34 @@ public class SettingsFragment extends PreferenceFragment { case "swipe_to_refresh": // Update the icon. if (sharedPreferences.getBoolean("swipe_to_refresh", false)) { - swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled); + if (MainWebViewActivity.darkTheme) { + swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_dark); + } else { + swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_light); + } } else { - swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled); + if (MainWebViewActivity.darkTheme) { + swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_dark); + } else { + swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_light); + } } break; case "display_additional_app_bar_icons": // Update the icon. if (sharedPreferences.getBoolean("display_additional_app_bar_icons", false)) { - displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled); + if (MainWebViewActivity.darkTheme) { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_dark); + } else { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_light); + } } else { - displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled); + if (MainWebViewActivity.darkTheme) { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_dark); + } else { + displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_light); + } } break; @@ -810,13 +1191,21 @@ public class SettingsFragment extends PreferenceFragment { case "display_webpage_images": if (sharedPreferences.getBoolean("display_webpage_images", true)) { // Update the icon. - displayWebpageImagesPreference.setIcon(R.drawable.images_enabled); + if (MainWebViewActivity.darkTheme) { + displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_dark); + } else { + displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_light); + } // `mainWebView` does not need to be reloaded because unloaded images will load automatically. MainWebViewActivity.reloadOnRestartBoolean = false; } else { // Update the icon. - displayWebpageImagesPreference.setIcon(R.drawable.images_disabled); + if (MainWebViewActivity.darkTheme) { + displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_dark); + } else { + displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_light); + } // Set `mainWebView` to reload on restart to remove the current images. MainWebViewActivity.reloadOnRestartBoolean = true; diff --git a/app/src/main/res/drawable/block_ads_disabled_dark.xml b/app/src/main/res/drawable/block_ads_disabled_dark.xml new file mode 100644 index 00000000..f01efad9 --- /dev/null +++ b/app/src/main/res/drawable/block_ads_disabled_dark.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/app/src/main/res/drawable/block_ads_disabled.xml b/app/src/main/res/drawable/block_ads_disabled_light.xml similarity index 81% rename from app/src/main/res/drawable/block_ads_disabled.xml rename to app/src/main/res/drawable/block_ads_disabled_light.xml index e4b999a7..d60cbcab 100644 --- a/app/src/main/res/drawable/block_ads_disabled.xml +++ b/app/src/main/res/drawable/block_ads_disabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + diff --git a/app/src/main/res/drawable/block_ads_enabled.xml b/app/src/main/res/drawable/block_ads_enabled_light.xml similarity index 81% rename from app/src/main/res/drawable/block_ads_enabled.xml rename to app/src/main/res/drawable/block_ads_enabled_light.xml index b71fce2f..ca8ae425 100644 --- a/app/src/main/res/drawable/block_ads_enabled.xml +++ b/app/src/main/res/drawable/block_ads_enabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/cache_cleared.xml b/app/src/main/res/drawable/cache_cleared_light.xml similarity index 84% rename from app/src/main/res/drawable/cache_cleared.xml rename to app/src/main/res/drawable/cache_cleared_light.xml index 4eea31a9..0ad00d99 100644 --- a/app/src/main/res/drawable/cache_cleared.xml +++ b/app/src/main/res/drawable/cache_cleared_light.xml @@ -1,4 +1,4 @@ - + = 21. Then we can use `@color`. --> diff --git a/app/src/main/res/drawable/clear_everything_disabled.xml b/app/src/main/res/drawable/clear_everything_disabled.xml index 9432434e..77233c50 100644 --- a/app/src/main/res/drawable/clear_everything_disabled.xml +++ b/app/src/main/res/drawable/clear_everything_disabled.xml @@ -8,6 +8,6 @@ diff --git a/app/src/main/res/drawable/clear_everything_enabled_dark.xml b/app/src/main/res/drawable/clear_everything_enabled_dark.xml new file mode 100644 index 00000000..b6242a3b --- /dev/null +++ b/app/src/main/res/drawable/clear_everything_enabled_dark.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/clear_everything_enabled.xml b/app/src/main/res/drawable/clear_everything_enabled_light.xml similarity index 77% rename from app/src/main/res/drawable/clear_everything_enabled.xml rename to app/src/main/res/drawable/clear_everything_enabled_light.xml index 9cebc872..118387f7 100644 --- a/app/src/main/res/drawable/clear_everything_enabled.xml +++ b/app/src/main/res/drawable/clear_everything_enabled_light.xml @@ -1,4 +1,4 @@ - + . It is released under the Apache License 2.0. --> + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/cookies_cleared.xml b/app/src/main/res/drawable/cookies_cleared_light.xml similarity index 87% rename from app/src/main/res/drawable/cookies_cleared.xml rename to app/src/main/res/drawable/cookies_cleared_light.xml index 32c1abee..1a14271b 100644 --- a/app/src/main/res/drawable/cookies_cleared.xml +++ b/app/src/main/res/drawable/cookies_cleared_light.xml @@ -1,4 +1,4 @@ - + . It is released under the Apache License 2.0. --> + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/cookies_disabled.xml b/app/src/main/res/drawable/cookies_disabled_light.xml similarity index 87% rename from app/src/main/res/drawable/cookies_disabled.xml rename to app/src/main/res/drawable/cookies_disabled_light.xml index ea28b274..d0deb113 100644 --- a/app/src/main/res/drawable/cookies_disabled.xml +++ b/app/src/main/res/drawable/cookies_disabled_light.xml @@ -1,4 +1,4 @@ - + . It is released under the Apache License 2.0. --> + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/cookies_ghosted.xml b/app/src/main/res/drawable/cookies_ghosted_light.xml similarity index 87% rename from app/src/main/res/drawable/cookies_ghosted.xml rename to app/src/main/res/drawable/cookies_ghosted_light.xml index cd1cc86b..18bbaac3 100644 --- a/app/src/main/res/drawable/cookies_ghosted.xml +++ b/app/src/main/res/drawable/cookies_ghosted_light.xml @@ -1,4 +1,4 @@ - + = 21. Then we can use `@color`. --> \ No newline at end of file diff --git a/app/src/main/res/drawable/custom_user_agent_enabled_dark.xml b/app/src/main/res/drawable/custom_user_agent_enabled_dark.xml new file mode 100644 index 00000000..90771978 --- /dev/null +++ b/app/src/main/res/drawable/custom_user_agent_enabled_dark.xml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/custom_user_agent_enabled.xml b/app/src/main/res/drawable/custom_user_agent_enabled_light.xml similarity index 83% rename from app/src/main/res/drawable/custom_user_agent_enabled.xml rename to app/src/main/res/drawable/custom_user_agent_enabled_light.xml index bb47570e..34fd440e 100644 --- a/app/src/main/res/drawable/custom_user_agent_enabled.xml +++ b/app/src/main/res/drawable/custom_user_agent_enabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/custom_user_agent_ghosted.xml b/app/src/main/res/drawable/custom_user_agent_ghosted_light.xml similarity index 83% rename from app/src/main/res/drawable/custom_user_agent_ghosted.xml rename to app/src/main/res/drawable/custom_user_agent_ghosted_light.xml index d6c46e83..fa11a153 100644 --- a/app/src/main/res/drawable/custom_user_agent_ghosted.xml +++ b/app/src/main/res/drawable/custom_user_agent_ghosted_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/do_not_track_disabled.xml b/app/src/main/res/drawable/do_not_track_disabled_light.xml similarity index 85% rename from app/src/main/res/drawable/do_not_track_disabled.xml rename to app/src/main/res/drawable/do_not_track_disabled_light.xml index 89101050..f7d1f65d 100644 --- a/app/src/main/res/drawable/do_not_track_disabled.xml +++ b/app/src/main/res/drawable/do_not_track_disabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/do_not_track_enabled.xml b/app/src/main/res/drawable/do_not_track_enabled_light.xml similarity index 85% rename from app/src/main/res/drawable/do_not_track_enabled.xml rename to app/src/main/res/drawable/do_not_track_enabled_light.xml index 4aa90fdd..984e2cbc 100644 --- a/app/src/main/res/drawable/do_not_track_enabled.xml +++ b/app/src/main/res/drawable/do_not_track_enabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/dom_storage_cleared.xml b/app/src/main/res/drawable/dom_storage_cleared_light.xml similarity index 83% rename from app/src/main/res/drawable/dom_storage_cleared.xml rename to app/src/main/res/drawable/dom_storage_cleared_light.xml index 6e8a9e29..4435a4ed 100644 --- a/app/src/main/res/drawable/dom_storage_cleared.xml +++ b/app/src/main/res/drawable/dom_storage_cleared_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/dom_storage_disabled.xml b/app/src/main/res/drawable/dom_storage_disabled_light.xml similarity index 82% rename from app/src/main/res/drawable/dom_storage_disabled.xml rename to app/src/main/res/drawable/dom_storage_disabled_light.xml index 50678912..90095196 100644 --- a/app/src/main/res/drawable/dom_storage_disabled.xml +++ b/app/src/main/res/drawable/dom_storage_disabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/dom_storage_ghosted.xml b/app/src/main/res/drawable/dom_storage_ghosted_light.xml similarity index 83% rename from app/src/main/res/drawable/dom_storage_ghosted.xml rename to app/src/main/res/drawable/dom_storage_ghosted_light.xml index 6f00eb0d..354e7073 100644 --- a/app/src/main/res/drawable/dom_storage_ghosted.xml +++ b/app/src/main/res/drawable/dom_storage_ghosted_light.xml @@ -1,4 +1,4 @@ - + = 21. Then we can use `@color`. --> diff --git a/app/src/main/res/drawable/font_size_dark.xml b/app/src/main/res/drawable/font_size_dark.xml new file mode 100644 index 00000000..ebdfe087 --- /dev/null +++ b/app/src/main/res/drawable/font_size_dark.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/font_size.xml b/app/src/main/res/drawable/font_size_light.xml similarity index 81% rename from app/src/main/res/drawable/font_size.xml rename to app/src/main/res/drawable/font_size_light.xml index 9371c71b..2a16bb9a 100644 --- a/app/src/main/res/drawable/font_size.xml +++ b/app/src/main/res/drawable/font_size_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/form_data_cleared.xml b/app/src/main/res/drawable/form_data_cleared_light.xml similarity index 82% rename from app/src/main/res/drawable/form_data_cleared.xml rename to app/src/main/res/drawable/form_data_cleared_light.xml index 4b5a1bb7..74b1ddb6 100644 --- a/app/src/main/res/drawable/form_data_cleared.xml +++ b/app/src/main/res/drawable/form_data_cleared_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/form_data_disabled.xml b/app/src/main/res/drawable/form_data_disabled_light.xml similarity index 82% rename from app/src/main/res/drawable/form_data_disabled.xml rename to app/src/main/res/drawable/form_data_disabled_light.xml index 5cd02765..6a702b9d 100644 --- a/app/src/main/res/drawable/form_data_disabled.xml +++ b/app/src/main/res/drawable/form_data_disabled_light.xml @@ -1,4 +1,4 @@ - + = 21. Then we can use `@color`. --> diff --git a/app/src/main/res/drawable/full_screen_disabled_dark.xml b/app/src/main/res/drawable/full_screen_disabled_dark.xml new file mode 100644 index 00000000..46a48e6f --- /dev/null +++ b/app/src/main/res/drawable/full_screen_disabled_dark.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/full_screen_disabled.xml b/app/src/main/res/drawable/full_screen_disabled_light.xml similarity index 74% rename from app/src/main/res/drawable/full_screen_disabled.xml rename to app/src/main/res/drawable/full_screen_disabled_light.xml index 76ecc6b6..d449688e 100644 --- a/app/src/main/res/drawable/full_screen_disabled.xml +++ b/app/src/main/res/drawable/full_screen_disabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + diff --git a/app/src/main/res/drawable/full_screen_enabled.xml b/app/src/main/res/drawable/full_screen_enabled_light.xml similarity index 74% rename from app/src/main/res/drawable/full_screen_enabled.xml rename to app/src/main/res/drawable/full_screen_enabled_light.xml index e9a72ca9..c183c0c9 100644 --- a/app/src/main/res/drawable/full_screen_enabled.xml +++ b/app/src/main/res/drawable/full_screen_enabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + diff --git a/app/src/main/res/drawable/hide_system_bars_disabled.xml b/app/src/main/res/drawable/hide_system_bars_disabled_light.xml similarity index 73% rename from app/src/main/res/drawable/hide_system_bars_disabled.xml rename to app/src/main/res/drawable/hide_system_bars_disabled_light.xml index 819a896f..bf2eddec 100644 --- a/app/src/main/res/drawable/hide_system_bars_disabled.xml +++ b/app/src/main/res/drawable/hide_system_bars_disabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + diff --git a/app/src/main/res/drawable/hide_system_bars_enabled.xml b/app/src/main/res/drawable/hide_system_bars_enabled_light.xml similarity index 73% rename from app/src/main/res/drawable/hide_system_bars_enabled.xml rename to app/src/main/res/drawable/hide_system_bars_enabled_light.xml index b9d95944..83dd5a3e 100644 --- a/app/src/main/res/drawable/hide_system_bars_enabled.xml +++ b/app/src/main/res/drawable/hide_system_bars_enabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + diff --git a/app/src/main/res/drawable/hide_system_bars_ghosted.xml b/app/src/main/res/drawable/hide_system_bars_ghosted_light.xml similarity index 73% rename from app/src/main/res/drawable/hide_system_bars_ghosted.xml rename to app/src/main/res/drawable/hide_system_bars_ghosted_light.xml index 831e33b5..be0630d2 100644 --- a/app/src/main/res/drawable/hide_system_bars_ghosted.xml +++ b/app/src/main/res/drawable/hide_system_bars_ghosted_light.xml @@ -1,4 +1,4 @@ - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/home_enabled.xml b/app/src/main/res/drawable/home_enabled_light.xml similarity index 72% rename from app/src/main/res/drawable/home_enabled.xml rename to app/src/main/res/drawable/home_enabled_light.xml index c2a19a77..ba3d55e8 100644 --- a/app/src/main/res/drawable/home_enabled.xml +++ b/app/src/main/res/drawable/home_enabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/home_ghosted.xml b/app/src/main/res/drawable/home_ghosted_light.xml similarity index 72% rename from app/src/main/res/drawable/home_ghosted.xml rename to app/src/main/res/drawable/home_ghosted_light.xml index 1cded8c3..135f801a 100644 --- a/app/src/main/res/drawable/home_ghosted.xml +++ b/app/src/main/res/drawable/home_ghosted_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/images_disabled.xml b/app/src/main/res/drawable/images_disabled_light.xml similarity index 82% rename from app/src/main/res/drawable/images_disabled.xml rename to app/src/main/res/drawable/images_disabled_light.xml index 0051e2e3..f17dd4e5 100644 --- a/app/src/main/res/drawable/images_disabled.xml +++ b/app/src/main/res/drawable/images_disabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/images_enabled.xml b/app/src/main/res/drawable/images_enabled_light.xml similarity index 82% rename from app/src/main/res/drawable/images_enabled.xml rename to app/src/main/res/drawable/images_enabled_light.xml index 0b4c4054..499d6262 100644 --- a/app/src/main/res/drawable/images_enabled.xml +++ b/app/src/main/res/drawable/images_enabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/incognito_mode_disabled.xml b/app/src/main/res/drawable/incognito_mode_disabled_light.xml similarity index 87% rename from app/src/main/res/drawable/incognito_mode_disabled.xml rename to app/src/main/res/drawable/incognito_mode_disabled_light.xml index cde555b6..f7f4a3f7 100644 --- a/app/src/main/res/drawable/incognito_mode_disabled.xml +++ b/app/src/main/res/drawable/incognito_mode_disabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/incognito_mode_enabled.xml b/app/src/main/res/drawable/incognito_mode_enabled_light.xml similarity index 87% rename from app/src/main/res/drawable/incognito_mode_enabled.xml rename to app/src/main/res/drawable/incognito_mode_enabled_light.xml index 9bfa3c14..36282d26 100644 --- a/app/src/main/res/drawable/incognito_mode_enabled.xml +++ b/app/src/main/res/drawable/incognito_mode_enabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/more_disabled.xml b/app/src/main/res/drawable/more_disabled_light.xml similarity index 87% rename from app/src/main/res/drawable/more_disabled.xml rename to app/src/main/res/drawable/more_disabled_light.xml index 8b303c34..056195dd 100644 --- a/app/src/main/res/drawable/more_disabled.xml +++ b/app/src/main/res/drawable/more_disabled_light.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable/more_enabled_dark.xml b/app/src/main/res/drawable/more_enabled_dark.xml new file mode 100644 index 00000000..54bb63be --- /dev/null +++ b/app/src/main/res/drawable/more_enabled_dark.xml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/more_enabled.xml b/app/src/main/res/drawable/more_enabled_light.xml similarity index 87% rename from app/src/main/res/drawable/more_enabled.xml rename to app/src/main/res/drawable/more_enabled_light.xml index 127938b9..cd30f253 100644 --- a/app/src/main/res/drawable/more_enabled.xml +++ b/app/src/main/res/drawable/more_enabled_light.xml @@ -1,4 +1,4 @@ - + , which is released under the 3-clause BSD license. + Modifications copyright Soren Stoutner 2017. The resulting image is released under the GPLv3+ license. --> + + + + + + + diff --git a/app/src/main/res/drawable/orbot_disabled.xml b/app/src/main/res/drawable/orbot_disabled_light.xml similarity index 84% rename from app/src/main/res/drawable/orbot_disabled.xml rename to app/src/main/res/drawable/orbot_disabled_light.xml index a431e87a..1f35812b 100644 --- a/app/src/main/res/drawable/orbot_disabled.xml +++ b/app/src/main/res/drawable/orbot_disabled_light.xml @@ -1,4 +1,4 @@ - diff --git a/app/src/main/res/drawable/orbot_enabled_dark.xml b/app/src/main/res/drawable/orbot_enabled_dark.xml new file mode 100644 index 00000000..67c9f657 --- /dev/null +++ b/app/src/main/res/drawable/orbot_enabled_dark.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/orbot_enabled.xml b/app/src/main/res/drawable/orbot_enabled_light.xml similarity index 84% rename from app/src/main/res/drawable/orbot_enabled.xml rename to app/src/main/res/drawable/orbot_enabled_light.xml index 43ab496f..8fdad145 100644 --- a/app/src/main/res/drawable/orbot_enabled.xml +++ b/app/src/main/res/drawable/orbot_enabled_light.xml @@ -1,4 +1,4 @@ - diff --git a/app/src/main/res/drawable/refresh_disabled_dark.xml b/app/src/main/res/drawable/refresh_disabled_dark.xml new file mode 100644 index 00000000..0059dd56 --- /dev/null +++ b/app/src/main/res/drawable/refresh_disabled_dark.xml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/refresh_disabled.xml b/app/src/main/res/drawable/refresh_disabled_light.xml similarity index 83% rename from app/src/main/res/drawable/refresh_disabled.xml rename to app/src/main/res/drawable/refresh_disabled_light.xml index 5e06bb62..2758345b 100644 --- a/app/src/main/res/drawable/refresh_disabled.xml +++ b/app/src/main/res/drawable/refresh_disabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/refresh_enabled.xml b/app/src/main/res/drawable/refresh_enabled_light.xml similarity index 84% rename from app/src/main/res/drawable/refresh_enabled.xml rename to app/src/main/res/drawable/refresh_enabled_light.xml index c9786fea..f2e0916b 100644 --- a/app/src/main/res/drawable/refresh_enabled.xml +++ b/app/src/main/res/drawable/refresh_enabled_light.xml @@ -1,4 +1,4 @@ - + + = 21. Then we can use `@color`. --> diff --git a/app/src/main/res/drawable/search_custom_url_enabled.xml b/app/src/main/res/drawable/search_custom_url_enabled_light.xml similarity index 83% rename from app/src/main/res/drawable/search_custom_url_enabled.xml rename to app/src/main/res/drawable/search_custom_url_enabled_light.xml index 3b9579a3..4eff844d 100644 --- a/app/src/main/res/drawable/search_custom_url_enabled.xml +++ b/app/src/main/res/drawable/search_custom_url_enabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/search_custom_url_ghosted.xml b/app/src/main/res/drawable/search_custom_url_ghosted_light.xml similarity index 83% rename from app/src/main/res/drawable/search_custom_url_ghosted.xml rename to app/src/main/res/drawable/search_custom_url_ghosted_light.xml index 08aed01c..fc8259f4 100644 --- a/app/src/main/res/drawable/search_custom_url_ghosted.xml +++ b/app/src/main/res/drawable/search_custom_url_ghosted_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/search_enabled.xml b/app/src/main/res/drawable/search_enabled_light.xml similarity index 84% rename from app/src/main/res/drawable/search_enabled.xml rename to app/src/main/res/drawable/search_enabled_light.xml index cab15922..65f7f7ac 100644 --- a/app/src/main/res/drawable/search_enabled.xml +++ b/app/src/main/res/drawable/search_enabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/search_ghosted.xml b/app/src/main/res/drawable/search_ghosted_light.xml similarity index 84% rename from app/src/main/res/drawable/search_ghosted.xml rename to app/src/main/res/drawable/search_ghosted_light.xml index 596682ba..ad8a3503 100644 --- a/app/src/main/res/drawable/search_ghosted.xml +++ b/app/src/main/res/drawable/search_ghosted_light.xml @@ -1,4 +1,4 @@ - + = 21. Then we can use `@color`. --> diff --git a/app/src/main/res/drawable/translucent_bar_disabled_dark.xml b/app/src/main/res/drawable/translucent_bar_disabled_dark.xml new file mode 100644 index 00000000..73dba40a --- /dev/null +++ b/app/src/main/res/drawable/translucent_bar_disabled_dark.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/translucent_bar_disabled.xml b/app/src/main/res/drawable/translucent_bar_disabled_light.xml similarity index 73% rename from app/src/main/res/drawable/translucent_bar_disabled.xml rename to app/src/main/res/drawable/translucent_bar_disabled_light.xml index 4120c40f..3c0187d9 100644 --- a/app/src/main/res/drawable/translucent_bar_disabled.xml +++ b/app/src/main/res/drawable/translucent_bar_disabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + diff --git a/app/src/main/res/drawable/translucent_bar_enabled.xml b/app/src/main/res/drawable/translucent_bar_enabled_light.xml similarity index 73% rename from app/src/main/res/drawable/translucent_bar_enabled.xml rename to app/src/main/res/drawable/translucent_bar_enabled_light.xml index 18a5f8b4..66f62723 100644 --- a/app/src/main/res/drawable/translucent_bar_enabled.xml +++ b/app/src/main/res/drawable/translucent_bar_enabled_light.xml @@ -1,4 +1,4 @@ - + + + + + + diff --git a/app/src/main/res/drawable/translucent_bar_ghosted.xml b/app/src/main/res/drawable/translucent_bar_ghosted_light.xml similarity index 73% rename from app/src/main/res/drawable/translucent_bar_ghosted.xml rename to app/src/main/res/drawable/translucent_bar_ghosted_light.xml index 3d64eb57..a1697000 100644 --- a/app/src/main/res/drawable/translucent_bar_ghosted.xml +++ b/app/src/main/res/drawable/translucent_bar_ghosted_light.xml @@ -1,4 +1,4 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/user_agent.xml b/app/src/main/res/drawable/user_agent_light.xml similarity index 86% rename from app/src/main/res/drawable/user_agent.xml rename to app/src/main/res/drawable/user_agent_light.xml index cdaf0fb6..bf8899c0 100644 --- a/app/src/main/res/drawable/user_agent.xml +++ b/app/src/main/res/drawable/user_agent_light.xml @@ -1,4 +1,4 @@ - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e51f0471..46629aaa 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -63,6 +63,7 @@ #FFDCEDC8 #FF64DD17 + #FFB71C1C #FFD50000 #00000000 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 41ddc897..d493579d 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -52,10 +52,14 @@ - @@ -85,14 +89,14 @@ @@ -105,6 +109,15 @@ @style/PrivacyBrowserTabLayoutDark + + diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index d7e096b1..2b0c713d 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -59,7 +59,7 @@ android:entries="@array/user_agent_entries" android:entryValues="@array/user_agent_entry_values" android:defaultValue="PrivacyBrowser/1.0" - android:icon="@drawable/user_agent" /> + android:icon="?attr/userAgentIcon" /> + android:icon="?attr/searchIcon" /> + android:icon="?attr/homepageIcon" /> + android:icon="?attr/fontSizeIcon" />