From 07c283834aa292605e1ba462a76ceb5ff619c453 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Tue, 12 Jun 2018 10:55:45 -0700 Subject: [PATCH] Use solid colors for gray icons. https://redmine.stoutner.com/issues/154 --- .../privacybrowser/fragments/SettingsFragment.java | 12 ++++++------ .../drawable/allow_screenshots_disabled_light.xml | 2 +- .../main/res/drawable/block_ads_disabled_light.xml | 2 +- .../res/drawable/block_tracking_disabled_light.xml | 2 +- app/src/main/res/drawable/cache_cleared_dark.xml | 2 +- app/src/main/res/drawable/cache_cleared_light.xml | 2 +- app/src/main/res/drawable/clear_and_exit.xml | 4 ++-- .../main/res/drawable/clear_everything_disabled.xml | 2 +- app/src/main/res/drawable/cookies_disabled_light.xml | 2 +- app/src/main/res/drawable/cookies_ghosted_light.xml | 2 +- .../res/drawable/custom_user_agent_ghosted_light.xml | 2 +- .../main/res/drawable/dom_storage_disabled_light.xml | 2 +- .../main/res/drawable/dom_storage_ghosted_light.xml | 2 +- .../main/res/drawable/form_data_disabled_light.xml | 2 +- .../main/res/drawable/full_screen_disabled_light.xml | 2 +- .../res/drawable/hide_system_bars_disabled_light.xml | 2 +- .../res/drawable/hide_system_bars_ghosted_light.xml | 2 +- app/src/main/res/drawable/home_ghosted_light.xml | 2 +- app/src/main/res/drawable/images_disabled_light.xml | 2 +- .../res/drawable/incognito_mode_disabled_light.xml | 2 +- app/src/main/res/drawable/more_disabled_light.xml | 2 +- .../main/res/drawable/night_mode_disabled_light.xml | 2 +- app/src/main/res/drawable/orbot_disabled_light.xml | 2 +- app/src/main/res/drawable/refresh_disabled_light.xml | 2 +- .../res/drawable/search_custom_url_ghosted_light.xml | 2 +- app/src/main/res/drawable/search_ghosted_light.xml | 2 +- app/src/main/res/drawable/select_all_dark.xml | 2 +- app/src/main/res/drawable/select_all_light.xml | 2 +- app/src/main/res/drawable/settings.xml | 2 +- .../main/res/drawable/social_media_disabled_dark.xml | 1 + .../res/drawable/social_media_disabled_light.xml | 3 ++- .../main/res/drawable/social_media_enabled_dark.xml | 1 + .../main/res/drawable/social_media_enabled_light.xml | 1 + .../main/res/drawable/social_media_ghosted_dark.xml | 1 + .../main/res/drawable/social_media_ghosted_light.xml | 3 ++- .../res/drawable/ssl_certificate_disabled_light.xml | 2 +- .../res/drawable/translucent_bar_disabled_light.xml | 2 +- .../res/drawable/translucent_bar_ghosted_light.xml | 2 +- 38 files changed, 46 insertions(+), 40 deletions(-) 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 8e7a7112..aac9b0d3 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java @@ -944,7 +944,7 @@ public class SettingsFragment extends PreferenceFragment { boolean currentFanboySocialBlockingList = sharedPreferences.getBoolean("fanboy_social_blocking_list", true); // Update the Fanboy icons. - if (sharedPreferences.getBoolean("fanboy_annoyance_list", true)) { + if (currentFanboyAnnoyanceList) { // Fanboy's annoyance list is enabled. if (MainWebViewActivity.darkTheme) { // Update the Fanboy's annoyance list icon. fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_dark); @@ -958,16 +958,16 @@ public class SettingsFragment extends PreferenceFragment { // Update the Fanboy's social blocking list icon. fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_light); } - } else { + } else { // Fanboy's annoyance list is disabled. if (MainWebViewActivity.darkTheme) { // Update the Fanboy's annoyance list icon. fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_dark); // Update the Fanboy's social blocking list icon. if (currentFanboySocialBlockingList) { - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_dark); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_dark); } else { - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_dark); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_dark); } } else { // Update the Fanboy's annoyance list icon. @@ -975,9 +975,9 @@ public class SettingsFragment extends PreferenceFragment { // Update the Fanboy's social blocking list icon. if (currentFanboySocialBlockingList) { - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_light); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_light); } else { - fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_light); + fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_light); } } } diff --git a/app/src/main/res/drawable/allow_screenshots_disabled_light.xml b/app/src/main/res/drawable/allow_screenshots_disabled_light.xml index 93763084..5999604b 100644 --- a/app/src/main/res/drawable/allow_screenshots_disabled_light.xml +++ b/app/src/main/res/drawable/allow_screenshots_disabled_light.xml @@ -7,6 +7,6 @@ diff --git a/app/src/main/res/drawable/block_ads_disabled_light.xml b/app/src/main/res/drawable/block_ads_disabled_light.xml index 114d45d9..3d9f61eb 100644 --- a/app/src/main/res/drawable/block_ads_disabled_light.xml +++ b/app/src/main/res/drawable/block_ads_disabled_light.xml @@ -7,6 +7,6 @@ diff --git a/app/src/main/res/drawable/block_tracking_disabled_light.xml b/app/src/main/res/drawable/block_tracking_disabled_light.xml index ae6cde97..3a363b37 100644 --- a/app/src/main/res/drawable/block_tracking_disabled_light.xml +++ b/app/src/main/res/drawable/block_tracking_disabled_light.xml @@ -13,6 +13,6 @@ diff --git a/app/src/main/res/drawable/cache_cleared_dark.xml b/app/src/main/res/drawable/cache_cleared_dark.xml index 0836fdfc..22cb5f9c 100644 --- a/app/src/main/res/drawable/cache_cleared_dark.xml +++ b/app/src/main/res/drawable/cache_cleared_dark.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/cache_cleared_light.xml b/app/src/main/res/drawable/cache_cleared_light.xml index 00fd2452..03daa49c 100644 --- a/app/src/main/res/drawable/cache_cleared_light.xml +++ b/app/src/main/res/drawable/cache_cleared_light.xml @@ -11,7 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > - + diff --git a/app/src/main/res/drawable/clear_and_exit.xml b/app/src/main/res/drawable/clear_and_exit.xml index 82d54ad2..54617499 100644 --- a/app/src/main/res/drawable/clear_and_exit.xml +++ b/app/src/main/res/drawable/clear_and_exit.xml @@ -12,13 +12,13 @@ android:autoMirrored="true" tools:ignore="VectorRaster" > - + - + - + diff --git a/app/src/main/res/drawable/cookies_disabled_light.xml b/app/src/main/res/drawable/cookies_disabled_light.xml index d0deb113..21c326f5 100644 --- a/app/src/main/res/drawable/cookies_disabled_light.xml +++ b/app/src/main/res/drawable/cookies_disabled_light.xml @@ -13,6 +13,6 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/cookies_ghosted_light.xml b/app/src/main/res/drawable/cookies_ghosted_light.xml index 18bbaac3..0550b697 100644 --- a/app/src/main/res/drawable/cookies_ghosted_light.xml +++ b/app/src/main/res/drawable/cookies_ghosted_light.xml @@ -13,6 +13,6 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/custom_user_agent_ghosted_light.xml b/app/src/main/res/drawable/custom_user_agent_ghosted_light.xml index 8f2d46e6..f2a6dd5e 100644 --- a/app/src/main/res/drawable/custom_user_agent_ghosted_light.xml +++ b/app/src/main/res/drawable/custom_user_agent_ghosted_light.xml @@ -13,6 +13,6 @@ diff --git a/app/src/main/res/drawable/dom_storage_disabled_light.xml b/app/src/main/res/drawable/dom_storage_disabled_light.xml index 6c2cb72a..76340fc7 100644 --- a/app/src/main/res/drawable/dom_storage_disabled_light.xml +++ b/app/src/main/res/drawable/dom_storage_disabled_light.xml @@ -13,6 +13,6 @@ diff --git a/app/src/main/res/drawable/dom_storage_ghosted_light.xml b/app/src/main/res/drawable/dom_storage_ghosted_light.xml index 8dde9cec..2bc15534 100644 --- a/app/src/main/res/drawable/dom_storage_ghosted_light.xml +++ b/app/src/main/res/drawable/dom_storage_ghosted_light.xml @@ -13,6 +13,6 @@ diff --git a/app/src/main/res/drawable/form_data_disabled_light.xml b/app/src/main/res/drawable/form_data_disabled_light.xml index 174fc215..ba16dcff 100644 --- a/app/src/main/res/drawable/form_data_disabled_light.xml +++ b/app/src/main/res/drawable/form_data_disabled_light.xml @@ -13,6 +13,6 @@ diff --git a/app/src/main/res/drawable/full_screen_disabled_light.xml b/app/src/main/res/drawable/full_screen_disabled_light.xml index e05719e8..74674ef5 100644 --- a/app/src/main/res/drawable/full_screen_disabled_light.xml +++ b/app/src/main/res/drawable/full_screen_disabled_light.xml @@ -8,6 +8,6 @@ diff --git a/app/src/main/res/drawable/hide_system_bars_disabled_light.xml b/app/src/main/res/drawable/hide_system_bars_disabled_light.xml index 01fb167d..553b2642 100644 --- a/app/src/main/res/drawable/hide_system_bars_disabled_light.xml +++ b/app/src/main/res/drawable/hide_system_bars_disabled_light.xml @@ -8,6 +8,6 @@ diff --git a/app/src/main/res/drawable/hide_system_bars_ghosted_light.xml b/app/src/main/res/drawable/hide_system_bars_ghosted_light.xml index 25ddb5e6..28f03728 100644 --- a/app/src/main/res/drawable/hide_system_bars_ghosted_light.xml +++ b/app/src/main/res/drawable/hide_system_bars_ghosted_light.xml @@ -8,6 +8,6 @@ diff --git a/app/src/main/res/drawable/home_ghosted_light.xml b/app/src/main/res/drawable/home_ghosted_light.xml index 3e7f44b3..93975578 100644 --- a/app/src/main/res/drawable/home_ghosted_light.xml +++ b/app/src/main/res/drawable/home_ghosted_light.xml @@ -8,6 +8,6 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/images_disabled_light.xml b/app/src/main/res/drawable/images_disabled_light.xml index 82d307f8..e1baa4c4 100644 --- a/app/src/main/res/drawable/images_disabled_light.xml +++ b/app/src/main/res/drawable/images_disabled_light.xml @@ -13,6 +13,6 @@ diff --git a/app/src/main/res/drawable/incognito_mode_disabled_light.xml b/app/src/main/res/drawable/incognito_mode_disabled_light.xml index c1da367b..4bb39d26 100644 --- a/app/src/main/res/drawable/incognito_mode_disabled_light.xml +++ b/app/src/main/res/drawable/incognito_mode_disabled_light.xml @@ -13,6 +13,6 @@ diff --git a/app/src/main/res/drawable/more_disabled_light.xml b/app/src/main/res/drawable/more_disabled_light.xml index 8cc0f0da..7b6c9b55 100644 --- a/app/src/main/res/drawable/more_disabled_light.xml +++ b/app/src/main/res/drawable/more_disabled_light.xml @@ -13,6 +13,6 @@ diff --git a/app/src/main/res/drawable/night_mode_disabled_light.xml b/app/src/main/res/drawable/night_mode_disabled_light.xml index f7da08e9..64c3f02c 100644 --- a/app/src/main/res/drawable/night_mode_disabled_light.xml +++ b/app/src/main/res/drawable/night_mode_disabled_light.xml @@ -14,6 +14,6 @@ diff --git a/app/src/main/res/drawable/orbot_disabled_light.xml b/app/src/main/res/drawable/orbot_disabled_light.xml index 7df7b6ed..0713b724 100644 --- a/app/src/main/res/drawable/orbot_disabled_light.xml +++ b/app/src/main/res/drawable/orbot_disabled_light.xml @@ -14,6 +14,6 @@ diff --git a/app/src/main/res/drawable/refresh_disabled_light.xml b/app/src/main/res/drawable/refresh_disabled_light.xml index a57b9a46..db7bc07f 100644 --- a/app/src/main/res/drawable/refresh_disabled_light.xml +++ b/app/src/main/res/drawable/refresh_disabled_light.xml @@ -13,6 +13,6 @@ diff --git a/app/src/main/res/drawable/search_custom_url_ghosted_light.xml b/app/src/main/res/drawable/search_custom_url_ghosted_light.xml index 5c3d7b1a..f1de88ed 100644 --- a/app/src/main/res/drawable/search_custom_url_ghosted_light.xml +++ b/app/src/main/res/drawable/search_custom_url_ghosted_light.xml @@ -13,6 +13,6 @@ diff --git a/app/src/main/res/drawable/search_ghosted_light.xml b/app/src/main/res/drawable/search_ghosted_light.xml index f72c880e..760eb635 100644 --- a/app/src/main/res/drawable/search_ghosted_light.xml +++ b/app/src/main/res/drawable/search_ghosted_light.xml @@ -13,6 +13,6 @@ diff --git a/app/src/main/res/drawable/select_all_dark.xml b/app/src/main/res/drawable/select_all_dark.xml index 06737ce2..6f3fad01 100644 --- a/app/src/main/res/drawable/select_all_dark.xml +++ b/app/src/main/res/drawable/select_all_dark.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/select_all_light.xml b/app/src/main/res/drawable/select_all_light.xml index b0354b81..590eca08 100644 --- a/app/src/main/res/drawable/select_all_light.xml +++ b/app/src/main/res/drawable/select_all_light.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/settings.xml index 1fffa237..28cefcfb 100644 --- a/app/src/main/res/drawable/settings.xml +++ b/app/src/main/res/drawable/settings.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/social_media_disabled_dark.xml b/app/src/main/res/drawable/social_media_disabled_dark.xml index d188cb7e..259b5a3f 100644 --- a/app/src/main/res/drawable/social_media_disabled_dark.xml +++ b/app/src/main/res/drawable/social_media_disabled_dark.xml @@ -11,6 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > + diff --git a/app/src/main/res/drawable/social_media_disabled_light.xml b/app/src/main/res/drawable/social_media_disabled_light.xml index 958cbb5f..547fb97b 100644 --- a/app/src/main/res/drawable/social_media_disabled_light.xml +++ b/app/src/main/res/drawable/social_media_disabled_light.xml @@ -11,7 +11,8 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > + diff --git a/app/src/main/res/drawable/social_media_enabled_dark.xml b/app/src/main/res/drawable/social_media_enabled_dark.xml index 7829c737..2ec52c39 100644 --- a/app/src/main/res/drawable/social_media_enabled_dark.xml +++ b/app/src/main/res/drawable/social_media_enabled_dark.xml @@ -11,6 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > + diff --git a/app/src/main/res/drawable/social_media_enabled_light.xml b/app/src/main/res/drawable/social_media_enabled_light.xml index f7643c0d..5843202e 100644 --- a/app/src/main/res/drawable/social_media_enabled_light.xml +++ b/app/src/main/res/drawable/social_media_enabled_light.xml @@ -11,6 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > + diff --git a/app/src/main/res/drawable/social_media_ghosted_dark.xml b/app/src/main/res/drawable/social_media_ghosted_dark.xml index e3b94e59..c4a24c90 100644 --- a/app/src/main/res/drawable/social_media_ghosted_dark.xml +++ b/app/src/main/res/drawable/social_media_ghosted_dark.xml @@ -11,6 +11,7 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > + diff --git a/app/src/main/res/drawable/social_media_ghosted_light.xml b/app/src/main/res/drawable/social_media_ghosted_light.xml index 487d57d5..e347ff94 100644 --- a/app/src/main/res/drawable/social_media_ghosted_light.xml +++ b/app/src/main/res/drawable/social_media_ghosted_light.xml @@ -11,7 +11,8 @@ android:viewportWidth="24.0" tools:ignore="VectorRaster" > + diff --git a/app/src/main/res/drawable/ssl_certificate_disabled_light.xml b/app/src/main/res/drawable/ssl_certificate_disabled_light.xml index 4d613c25..80f30c2a 100644 --- a/app/src/main/res/drawable/ssl_certificate_disabled_light.xml +++ b/app/src/main/res/drawable/ssl_certificate_disabled_light.xml @@ -13,6 +13,6 @@ diff --git a/app/src/main/res/drawable/translucent_bar_disabled_light.xml b/app/src/main/res/drawable/translucent_bar_disabled_light.xml index 6d97bd73..3b203629 100644 --- a/app/src/main/res/drawable/translucent_bar_disabled_light.xml +++ b/app/src/main/res/drawable/translucent_bar_disabled_light.xml @@ -8,6 +8,6 @@ diff --git a/app/src/main/res/drawable/translucent_bar_ghosted_light.xml b/app/src/main/res/drawable/translucent_bar_ghosted_light.xml index d81dda65..4ae17b6f 100644 --- a/app/src/main/res/drawable/translucent_bar_ghosted_light.xml +++ b/app/src/main/res/drawable/translucent_bar_ghosted_light.xml @@ -8,6 +8,6 @@ -- 2.45.2