Create a dark theme for `SettingsActivity`.
authorSoren Stoutner <soren@stoutner.com>
Mon, 19 Jun 2017 23:31:29 +0000 (16:31 -0700)
committerSoren Stoutner <soren@stoutner.com>
Mon, 19 Jun 2017 23:31:29 +0000 (16:31 -0700)
144 files changed:
app/src/main/AndroidManifest.xml
app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
app/src/main/java/com/stoutner/privacybrowser/activities/SettingsActivity.java
app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
app/src/main/res/drawable/block_ads_disabled.xml [deleted file]
app/src/main/res/drawable/block_ads_disabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/block_ads_disabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/block_ads_enabled.xml [deleted file]
app/src/main/res/drawable/block_ads_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/block_ads_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/cache_cleared.xml [deleted file]
app/src/main/res/drawable/cache_cleared_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/cache_cleared_light.xml [new file with mode: 0644]
app/src/main/res/drawable/cache_warning.xml
app/src/main/res/drawable/clear_everything_disabled.xml
app/src/main/res/drawable/clear_everything_enabled.xml [deleted file]
app/src/main/res/drawable/clear_everything_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/clear_everything_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/cookies_cleared.xml [deleted file]
app/src/main/res/drawable/cookies_cleared_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/cookies_cleared_light.xml [new file with mode: 0644]
app/src/main/res/drawable/cookies_disabled.xml [deleted file]
app/src/main/res/drawable/cookies_disabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/cookies_disabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/cookies_ghosted.xml [deleted file]
app/src/main/res/drawable/cookies_ghosted_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/cookies_ghosted_light.xml [new file with mode: 0644]
app/src/main/res/drawable/cookies_warning.xml
app/src/main/res/drawable/custom_user_agent_enabled.xml [deleted file]
app/src/main/res/drawable/custom_user_agent_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/custom_user_agent_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/custom_user_agent_ghosted.xml [deleted file]
app/src/main/res/drawable/custom_user_agent_ghosted_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/custom_user_agent_ghosted_light.xml [new file with mode: 0644]
app/src/main/res/drawable/do_not_track_disabled.xml [deleted file]
app/src/main/res/drawable/do_not_track_disabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/do_not_track_disabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/do_not_track_enabled.xml [deleted file]
app/src/main/res/drawable/do_not_track_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/do_not_track_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/dom_storage_cleared.xml [deleted file]
app/src/main/res/drawable/dom_storage_cleared_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/dom_storage_cleared_light.xml [new file with mode: 0644]
app/src/main/res/drawable/dom_storage_disabled.xml [deleted file]
app/src/main/res/drawable/dom_storage_disabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/dom_storage_disabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/dom_storage_ghosted.xml [deleted file]
app/src/main/res/drawable/dom_storage_ghosted_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/dom_storage_ghosted_light.xml [new file with mode: 0644]
app/src/main/res/drawable/dom_storage_warning.xml
app/src/main/res/drawable/font_size.xml [deleted file]
app/src/main/res/drawable/font_size_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/font_size_light.xml [new file with mode: 0644]
app/src/main/res/drawable/form_data_cleared.xml [deleted file]
app/src/main/res/drawable/form_data_cleared_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/form_data_cleared_light.xml [new file with mode: 0644]
app/src/main/res/drawable/form_data_disabled.xml [deleted file]
app/src/main/res/drawable/form_data_disabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/form_data_disabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/form_data_warning.xml
app/src/main/res/drawable/full_screen_disabled.xml [deleted file]
app/src/main/res/drawable/full_screen_disabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/full_screen_disabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/full_screen_enabled.xml [deleted file]
app/src/main/res/drawable/full_screen_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/full_screen_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/hide_system_bars_disabled.xml [deleted file]
app/src/main/res/drawable/hide_system_bars_disabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/hide_system_bars_disabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/hide_system_bars_enabled.xml [deleted file]
app/src/main/res/drawable/hide_system_bars_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/hide_system_bars_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/hide_system_bars_ghosted.xml [deleted file]
app/src/main/res/drawable/hide_system_bars_ghosted_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/hide_system_bars_ghosted_light.xml [new file with mode: 0644]
app/src/main/res/drawable/home_enabled.xml [deleted file]
app/src/main/res/drawable/home_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/home_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/home_ghosted.xml [deleted file]
app/src/main/res/drawable/home_ghosted_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/home_ghosted_light.xml [new file with mode: 0644]
app/src/main/res/drawable/images_disabled.xml [deleted file]
app/src/main/res/drawable/images_disabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/images_disabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/images_enabled.xml [deleted file]
app/src/main/res/drawable/images_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/images_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/incognito_mode_disabled.xml [deleted file]
app/src/main/res/drawable/incognito_mode_disabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/incognito_mode_disabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/incognito_mode_enabled.xml [deleted file]
app/src/main/res/drawable/incognito_mode_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/incognito_mode_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/more_disabled.xml [deleted file]
app/src/main/res/drawable/more_disabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/more_disabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/more_enabled.xml [deleted file]
app/src/main/res/drawable/more_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/more_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/orbot_disabled.xml [deleted file]
app/src/main/res/drawable/orbot_disabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/orbot_disabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/orbot_enabled.xml [deleted file]
app/src/main/res/drawable/orbot_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/orbot_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/refresh_disabled.xml [deleted file]
app/src/main/res/drawable/refresh_disabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/refresh_disabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/refresh_enabled.xml [deleted file]
app/src/main/res/drawable/refresh_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/refresh_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/search_custom_url_disabled.xml [deleted file]
app/src/main/res/drawable/search_custom_url_enabled.xml [deleted file]
app/src/main/res/drawable/search_custom_url_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/search_custom_url_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/search_custom_url_ghosted.xml [deleted file]
app/src/main/res/drawable/search_custom_url_ghosted_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/search_custom_url_ghosted_light.xml [new file with mode: 0644]
app/src/main/res/drawable/search_enabled.xml [deleted file]
app/src/main/res/drawable/search_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/search_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/search_ghosted.xml [deleted file]
app/src/main/res/drawable/search_ghosted_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/search_ghosted_light.xml [new file with mode: 0644]
app/src/main/res/drawable/theme_dark.xml
app/src/main/res/drawable/translucent_bar_disabled.xml [deleted file]
app/src/main/res/drawable/translucent_bar_disabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/translucent_bar_disabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/translucent_bar_enabled.xml [deleted file]
app/src/main/res/drawable/translucent_bar_enabled_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/translucent_bar_enabled_light.xml [new file with mode: 0644]
app/src/main/res/drawable/translucent_bar_ghosted.xml [deleted file]
app/src/main/res/drawable/translucent_bar_ghosted_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/translucent_bar_ghosted_light.xml [new file with mode: 0644]
app/src/main/res/drawable/user_agent.xml [deleted file]
app/src/main/res/drawable/user_agent_dark.xml [new file with mode: 0644]
app/src/main/res/drawable/user_agent_light.xml [new file with mode: 0644]
app/src/main/res/layout/domain_settings.xml
app/src/main/res/menu/webview_navigation_menu.xml
app/src/main/res/values/attrs.xml
app/src/main/res/values/colors.xml
app/src/main/res/values/styles.xml
app/src/main/res/xml/preferences.xml

index 48e4878..015c4ec 100644 (file)
         <activity
             android:name=".activities.SettingsActivity"
             android:label="@string/privacy_browser_settings"
-            android:theme="@style/Settings"
             android:parentActivityName=".activities.MainWebViewActivity"
             android:configChanges="orientation|screenSize"
             android:screenOrientation="fullUser"
index 06b4c4c..ff12917 100644 (file)
@@ -122,9 +122,9 @@ import java.util.Set;
 public class MainWebViewActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, CreateHomeScreenShortcutDialog.CreateHomeScreenSchortcutListener,
         SslCertificateErrorDialog.SslCertificateErrorListener, DownloadFileDialog.DownloadFileListener, DownloadImageDialog.DownloadImageListener, UrlHistoryDialog.UrlHistoryListener {
 
-    // `darkTheme` is public static so it can be accessed from `AboutActivity`, `GuideActivity`, `AddDomainDialog`, `CreateBookmarkDialog`, `CreateBookmarkFolderDialog`, `DownloadFileDialog`, `DownloadImageDialog`, `EditBookmarkDialog`,
+    // `darkTheme` is public static so it can be accessed from `AboutActivity`, `GuideActivity`, `AddDomainDialog`, `SettingsActivity`, `CreateBookmarkDialog`, `CreateBookmarkFolderDialog`, `DownloadFileDialog`, `DownloadImageDialog`, `EditBookmarkDialog`,
     // `EditBookmarkFolderDialog`, `MoveToFolderDialog`, `SslCertificateErrorDialog`, `UrlHistoryDialog`, `ViewSslCertificateDialog`, `CreateHomeScreenShortcutDialog`, and `OrbotProxyHelper`.
-    // It is also used in `onCreate()`, `applyAppSettings()`, and `applyDomainSettings()`.
+    // It is also used in `onCreate()`, `applyAppSettings()`, `applyDomainSettings()`, and `updatePrivacyIcons()`.
     public static boolean darkTheme;
 
     // `favoriteIconBitmap` is public static so it can be accessed from `CreateHomeScreenShortcutDialog`, `BookmarksActivity`, `CreateBookmarkDialog`, `CreateBookmarkFolderDialog`, `EditBookmarkDialog`, `EditBookmarkFolderDialog`, `ViewSslCertificateDialog`.
@@ -2582,23 +2582,39 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
         if (firstPartyCookiesEnabled) {  // First-party cookies are enabled.
             firstPartyCookiesIconMenuItem.setIcon(R.drawable.cookies_enabled);
         } else {  // First-party cookies are disabled.
-            firstPartyCookiesIconMenuItem.setIcon(R.drawable.cookies_disabled);
+            if (darkTheme) {
+                firstPartyCookiesIconMenuItem.setIcon(R.drawable.cookies_disabled_dark);
+            } else {
+                firstPartyCookiesIconMenuItem.setIcon(R.drawable.cookies_disabled_light);
+            }
         }
 
         // Update `domStorageIcon`.
         if (javaScriptEnabled && domStorageEnabled) {  // Both JavaScript and DOM storage are enabled.
             domStorageIconMenuItem.setIcon(R.drawable.dom_storage_enabled);
         } else if (javaScriptEnabled) {  // JavaScript is enabled but DOM storage is disabled.
-            domStorageIconMenuItem.setIcon(R.drawable.dom_storage_disabled);
+            if (darkTheme) {
+                domStorageIconMenuItem.setIcon(R.drawable.dom_storage_disabled_dark);
+            } else {
+                domStorageIconMenuItem.setIcon(R.drawable.dom_storage_disabled_light);
+            }
         } else {  // JavaScript is disabled, so DOM storage is ghosted.
-            domStorageIconMenuItem.setIcon(R.drawable.dom_storage_ghosted);
+            if (darkTheme) {
+                domStorageIconMenuItem.setIcon(R.drawable.dom_storage_ghosted_dark);
+            } else {
+                domStorageIconMenuItem.setIcon(R.drawable.dom_storage_ghosted_light);
+            }
         }
 
         // Update `formDataIcon`.
         if (saveFormDataEnabled) {  // Form data is enabled.
             formDataIconMenuItem.setIcon(R.drawable.form_data_enabled);
         } else {  // Form data is disabled.
-            formDataIconMenuItem.setIcon(R.drawable.form_data_disabled);
+            if (darkTheme) {
+                formDataIconMenuItem.setIcon(R.drawable.form_data_disabled_dark);
+            } else {
+                formDataIconMenuItem.setIcon(R.drawable.form_data_disabled_light);
+            }
         }
 
         // `invalidateOptionsMenu` calls `onPrepareOptionsMenu()` and redraws the icons in the `AppBar`.  `this` references the current activity.
index 075d5ec..e1592a6 100644 (file)
@@ -21,14 +21,22 @@ package com.stoutner.privacybrowser.activities;
 
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
-import android.support.v4.app.NavUtils;
 import android.support.v7.app.AppCompatActivity;
 
+import com.stoutner.privacybrowser.R;
 import com.stoutner.privacybrowser.fragments.SettingsFragment;
 
 public class SettingsActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        // Set the activity theme.
+        if (MainWebViewActivity.darkTheme) {
+            setTheme(R.style.PrivacyBrowserSettingsDark);
+        } else {
+            setTheme(R.style.PrivacyBrowserSettingsLight);
+        }
+
+        // Run the default commands.
         super.onCreate(savedInstanceState);
 
         // Display SettingsFragment.
index 112a429..a231391 100644 (file)
@@ -152,7 +152,7 @@ public class DomainSettingsFragment extends Fragment {
             firstPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_enabled));
         } else {  // First-party cookies are disabled.
             firstPartyCookiesEnabledSwitch.setChecked(false);
-            firstPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled));
+            firstPartyCookiesImageView.setImageDrawable(getResources().getDrawable(R.drawable.cookies_disabled_light));
         }
 
         // Only display third-party cookies if SDK_INT >= 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;
                 }
             }
index 340e455..6ce6cdc 100644 (file)
@@ -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.xml b/app/src/main/res/drawable/block_ads_disabled.xml
deleted file mode 100644 (file)
index e4b999a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- `block_ads_disabled.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="24dp"
-        android:width="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#88000000"
-        android:pathData="M20,12c0,-1.1 0.9,-2 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2zM15.58,16.8L12,14.5l-3.58,2.3 1.08,-4.12 -3.29,-2.69 4.24,-0.25L12,5.8l1.54,3.95 4.24,0.25 -3.29,2.69 1.09,4.11z"/>
-</vector>
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 (file)
index 0000000..f01efad
--- /dev/null
@@ -0,0 +1,12 @@
+<!-- `block_ads_disabled_dark.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF9E9E9E"
+        android:pathData="M20,12c0,-1.1 0.9,-2 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2zM15.58,16.8L12,14.5l-3.58,2.3 1.08,-4.12 -3.29,-2.69 4.24,-0.25L12,5.8l1.54,3.95 4.24,0.25 -3.29,2.69 1.09,4.11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/block_ads_disabled_light.xml b/app/src/main/res/drawable/block_ads_disabled_light.xml
new file mode 100644 (file)
index 0000000..d60cbca
--- /dev/null
@@ -0,0 +1,12 @@
+<!-- `block_ads_disabled_light.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M20,12c0,-1.1 0.9,-2 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2zM15.58,16.8L12,14.5l-3.58,2.3 1.08,-4.12 -3.29,-2.69 4.24,-0.25L12,5.8l1.54,3.95 4.24,0.25 -3.29,2.69 1.09,4.11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/block_ads_enabled.xml b/app/src/main/res/drawable/block_ads_enabled.xml
deleted file mode 100644 (file)
index b71fce2..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- `block_ads_enabled.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="24dp"
-        android:width="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M20,12c0,-1.1 0.9,-2 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2zM15.58,16.8L12,14.5l-3.58,2.3 1.08,-4.12 -3.29,-2.69 4.24,-0.25L12,5.8l1.54,3.95 4.24,0.25 -3.29,2.69 1.09,4.11z"/>
-</vector>
diff --git a/app/src/main/res/drawable/block_ads_enabled_dark.xml b/app/src/main/res/drawable/block_ads_enabled_dark.xml
new file mode 100644 (file)
index 0000000..a75ee70
--- /dev/null
@@ -0,0 +1,12 @@
+<!-- `block_ads_enabled_dark.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M20,12c0,-1.1 0.9,-2 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2zM15.58,16.8L12,14.5l-3.58,2.3 1.08,-4.12 -3.29,-2.69 4.24,-0.25L12,5.8l1.54,3.95 4.24,0.25 -3.29,2.69 1.09,4.11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/block_ads_enabled_light.xml b/app/src/main/res/drawable/block_ads_enabled_light.xml
new file mode 100644 (file)
index 0000000..ca8ae42
--- /dev/null
@@ -0,0 +1,12 @@
+<!-- `block_ads_enabled_light.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M20,12c0,-1.1 0.9,-2 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2zM15.58,16.8L12,14.5l-3.58,2.3 1.08,-4.12 -3.29,-2.69 4.24,-0.25L12,5.8l1.54,3.95 4.24,0.25 -3.29,2.69 1.09,4.11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/cache_cleared.xml b/app/src/main/res/drawable/cache_cleared.xml
deleted file mode 100644 (file)
index 4eea31a..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `cache_cleared.xml` comes from the Android Material icon set, where it is called `ic_donut_small`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M11,9.16V2c-5,0.5 -9,4.79 -9,10s4,9.5 9,10v-7.16c-1,-0.41 -2,-1.52 -2,-2.84s1,-2.43 2,-2.84zM14.86,11H22c-0.48,-4.75 -4,-8.53 -9,-9v7.16c1,0.3 1.52,0.98 1.86,1.84zM13,14.84V22c5,-0.47 8.52,-4.25 9,-9h-7.14c-0.34,0.86 -0.86,1.54 -1.86,1.84z"/>
-</vector>
diff --git a/app/src/main/res/drawable/cache_cleared_dark.xml b/app/src/main/res/drawable/cache_cleared_dark.xml
new file mode 100644 (file)
index 0000000..19b5b02
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `cache_cleared_dark.xml` comes from the Android Material icon set, where it is called `ic_donut_small`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M11,9.16V2c-5,0.5 -9,4.79 -9,10s4,9.5 9,10v-7.16c-1,-0.41 -2,-1.52 -2,-2.84s1,-2.43 2,-2.84zM14.86,11H22c-0.48,-4.75 -4,-8.53 -9,-9v7.16c1,0.3 1.52,0.98 1.86,1.84zM13,14.84V22c5,-0.47 8.52,-4.25 9,-9h-7.14c-0.34,0.86 -0.86,1.54 -1.86,1.84z"/>
+</vector>
diff --git a/app/src/main/res/drawable/cache_cleared_light.xml b/app/src/main/res/drawable/cache_cleared_light.xml
new file mode 100644 (file)
index 0000000..0ad00d9
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `cache_cleared_light.xml` comes from the Android Material icon set, where it is called `ic_donut_small`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M11,9.16V2c-5,0.5 -9,4.79 -9,10s4,9.5 9,10v-7.16c-1,-0.41 -2,-1.52 -2,-2.84s1,-2.43 2,-2.84zM14.86,11H22c-0.48,-4.75 -4,-8.53 -9,-9v7.16c1,0.3 1.52,0.98 1.86,1.84zM13,14.84V22c5,-0.47 8.52,-4.25 9,-9h-7.14c-0.34,0.86 -0.86,1.54 -1.86,1.84z"/>
+</vector>
index 7b99760..4fcd547 100644 (file)
@@ -13,6 +13,6 @@
 
     <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
-        android:fillColor="#FFD50000"
+        android:fillColor="#FFB71C1C"
         android:pathData="M11,9.16V2c-5,0.5 -9,4.79 -9,10s4,9.5 9,10v-7.16c-1,-0.41 -2,-1.52 -2,-2.84s1,-2.43 2,-2.84zM14.86,11H22c-0.48,-4.75 -4,-8.53 -9,-9v7.16c1,0.3 1.52,0.98 1.86,1.84zM13,14.84V22c5,-0.47 8.52,-4.25 9,-9h-7.14c-0.34,0.86 -0.86,1.54 -1.86,1.84z"/>
 </vector>
index 9432434..77233c5 100644 (file)
@@ -8,6 +8,6 @@
 
     <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
-        android:fillColor="#FFD50000"
+        android:fillColor="#FFB71C1C"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/clear_everything_enabled.xml b/app/src/main/res/drawable/clear_everything_enabled.xml
deleted file mode 100644 (file)
index 9cebc87..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- `clear_everything_enabled.xml` comes from the Android Material icon set, where it is called `ic_delete_forever`.  It is released under the Apache License 2.0. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
-</vector>
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 (file)
index 0000000..b6242a3
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `clear_everything_enabled_dark.xml` comes from the Android Material icon set, where it is called `ic_delete_forever`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/clear_everything_enabled_light.xml b/app/src/main/res/drawable/clear_everything_enabled_light.xml
new file mode 100644 (file)
index 0000000..118387f
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `clear_everything_enabled_light.xml` comes from the Android Material icon set, where it is called `ic_delete_forever`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/cookies_cleared.xml b/app/src/main/res/drawable/cookies_cleared.xml
deleted file mode 100644 (file)
index 32c1abe..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `cookies_cleared.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:height="26dp"
-    android:width="26dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:autoMirrored="true"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cookies_cleared_dark.xml b/app/src/main/res/drawable/cookies_cleared_dark.xml
new file mode 100644 (file)
index 0000000..1d718d4
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `cookies_cleared_dark.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cookies_cleared_light.xml b/app/src/main/res/drawable/cookies_cleared_light.xml
new file mode 100644 (file)
index 0000000..1a14271
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `cookies_cleared_light.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
+</vector>
\ 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.xml
deleted file mode 100644 (file)
index ea28b27..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `cookies_disabled.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:height="26dp"
-    android:width="26dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:autoMirrored="true"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#88000000"
-        android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cookies_disabled_dark.xml b/app/src/main/res/drawable/cookies_disabled_dark.xml
new file mode 100644 (file)
index 0000000..850341a
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `cookies_disabled_dark.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF9E9E9E"
+        android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cookies_disabled_light.xml b/app/src/main/res/drawable/cookies_disabled_light.xml
new file mode 100644 (file)
index 0000000..d0deb11
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `cookies_disabled_light.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
+</vector>
\ 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.xml
deleted file mode 100644 (file)
index cd1cc86..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `cookies_warning.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:height="26dp"
-    android:width="26dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:autoMirrored="true"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#44000000"
-        android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cookies_ghosted_dark.xml b/app/src/main/res/drawable/cookies_ghosted_dark.xml
new file mode 100644 (file)
index 0000000..e6c08c1
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `cookies_ghosted_dark.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF616161"
+        android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
+</vector>
\ 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
new file mode 100644 (file)
index 0000000..18bbaac
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `cookies_ghosted_light.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#44000000"
+        android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
+</vector>
\ No newline at end of file
index 55678cd..733448f 100644 (file)
@@ -13,6 +13,6 @@
 
     <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
-        android:fillColor="#FFD50000"
+        android:fillColor="#FFB71C1C"
         android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/custom_user_agent_enabled.xml b/app/src/main/res/drawable/custom_user_agent_enabled.xml
deleted file mode 100644 (file)
index bb47570..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `custom_user_agent_enabled.xml` comes from the Android Material icon set, where it is called `ic_important_devices_off`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster">
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M23,11.01L18,11c-0.55,0 -1,0.45 -1,1v9c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1v-9c0,-0.55 -0.45,-0.99 -1,-0.99zM23,20h-5v-7h5v7zM20,2L2,2C0.89,2 0,2.89 0,4v12c0,1.1 0.89,2 2,2h7v2L7,20v2h8v-2h-2v-2h2v-2L2,16L2,4h18v5h2L22,4c0,-1.11 -0.9,-2 -2,-2zM11.97,9L11,6l-0.97,3L7,9l2.47,1.76 -0.94,2.91 2.47,-1.8 2.47,1.8 -0.94,-2.91L15,9h-3.03z"/>
-</vector>
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 (file)
index 0000000..9077197
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `custom_user_agent_enabled_dark.xml` comes from the Android Material icon set, where it is called `ic_important_devices_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M23,11.01L18,11c-0.55,0 -1,0.45 -1,1v9c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1v-9c0,-0.55 -0.45,-0.99 -1,-0.99zM23,20h-5v-7h5v7zM20,2L2,2C0.89,2 0,2.89 0,4v12c0,1.1 0.89,2 2,2h7v2L7,20v2h8v-2h-2v-2h2v-2L2,16L2,4h18v5h2L22,4c0,-1.11 -0.9,-2 -2,-2zM11.97,9L11,6l-0.97,3L7,9l2.47,1.76 -0.94,2.91 2.47,-1.8 2.47,1.8 -0.94,-2.91L15,9h-3.03z"/>
+</vector>
diff --git a/app/src/main/res/drawable/custom_user_agent_enabled_light.xml b/app/src/main/res/drawable/custom_user_agent_enabled_light.xml
new file mode 100644 (file)
index 0000000..34fd440
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `custom_user_agent_enabled_light.xml` comes from the Android Material icon set, where it is called `ic_important_devices_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M23,11.01L18,11c-0.55,0 -1,0.45 -1,1v9c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1v-9c0,-0.55 -0.45,-0.99 -1,-0.99zM23,20h-5v-7h5v7zM20,2L2,2C0.89,2 0,2.89 0,4v12c0,1.1 0.89,2 2,2h7v2L7,20v2h8v-2h-2v-2h2v-2L2,16L2,4h18v5h2L22,4c0,-1.11 -0.9,-2 -2,-2zM11.97,9L11,6l-0.97,3L7,9l2.47,1.76 -0.94,2.91 2.47,-1.8 2.47,1.8 -0.94,-2.91L15,9h-3.03z"/>
+</vector>
diff --git a/app/src/main/res/drawable/custom_user_agent_ghosted.xml b/app/src/main/res/drawable/custom_user_agent_ghosted.xml
deleted file mode 100644 (file)
index d6c46e8..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `custom_user_agent_ghosted.xml` comes from the Android Material icon set, where it is called `ic_important_devices_off`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster">
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#44000000"
-        android:pathData="M23,11.01L18,11c-0.55,0 -1,0.45 -1,1v9c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1v-9c0,-0.55 -0.45,-0.99 -1,-0.99zM23,20h-5v-7h5v7zM20,2L2,2C0.89,2 0,2.89 0,4v12c0,1.1 0.89,2 2,2h7v2L7,20v2h8v-2h-2v-2h2v-2L2,16L2,4h18v5h2L22,4c0,-1.11 -0.9,-2 -2,-2zM11.97,9L11,6l-0.97,3L7,9l2.47,1.76 -0.94,2.91 2.47,-1.8 2.47,1.8 -0.94,-2.91L15,9h-3.03z"/>
-</vector>
diff --git a/app/src/main/res/drawable/custom_user_agent_ghosted_dark.xml b/app/src/main/res/drawable/custom_user_agent_ghosted_dark.xml
new file mode 100644 (file)
index 0000000..0247e6c
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `custom_user_agent_ghosted_dark.xml` comes from the Android Material icon set, where it is called `ic_important_devices_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF616161"
+        android:pathData="M23,11.01L18,11c-0.55,0 -1,0.45 -1,1v9c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1v-9c0,-0.55 -0.45,-0.99 -1,-0.99zM23,20h-5v-7h5v7zM20,2L2,2C0.89,2 0,2.89 0,4v12c0,1.1 0.89,2 2,2h7v2L7,20v2h8v-2h-2v-2h2v-2L2,16L2,4h18v5h2L22,4c0,-1.11 -0.9,-2 -2,-2zM11.97,9L11,6l-0.97,3L7,9l2.47,1.76 -0.94,2.91 2.47,-1.8 2.47,1.8 -0.94,-2.91L15,9h-3.03z"/>
+</vector>
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
new file mode 100644 (file)
index 0000000..fa11a15
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `custom_user_agent_ghosted_light.xml` comes from the Android Material icon set, where it is called `ic_important_devices_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#44000000"
+        android:pathData="M23,11.01L18,11c-0.55,0 -1,0.45 -1,1v9c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1v-9c0,-0.55 -0.45,-0.99 -1,-0.99zM23,20h-5v-7h5v7zM20,2L2,2C0.89,2 0,2.89 0,4v12c0,1.1 0.89,2 2,2h7v2L7,20v2h8v-2h-2v-2h2v-2L2,16L2,4h18v5h2L22,4c0,-1.11 -0.9,-2 -2,-2zM11.97,9L11,6l-0.97,3L7,9l2.47,1.76 -0.94,2.91 2.47,-1.8 2.47,1.8 -0.94,-2.91L15,9h-3.03z"/>
+</vector>
diff --git a/app/src/main/res/drawable/do_not_track_disabled.xml b/app/src/main/res/drawable/do_not_track_disabled.xml
deleted file mode 100644 (file)
index 8910105..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `do_not_track_disabled.xml` comes from the Android Material icon set, where it is called `ic_location_off`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#88000000"
-        android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
-</vector>
diff --git a/app/src/main/res/drawable/do_not_track_disabled_dark.xml b/app/src/main/res/drawable/do_not_track_disabled_dark.xml
new file mode 100644 (file)
index 0000000..1cddc7d
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `do_not_track_disabled_dark.xml` comes from the Android Material icon set, where it is called `ic_location_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF9E9E9E"
+        android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
+</vector>
diff --git a/app/src/main/res/drawable/do_not_track_disabled_light.xml b/app/src/main/res/drawable/do_not_track_disabled_light.xml
new file mode 100644 (file)
index 0000000..f7d1f65
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `do_not_track_disabled_light.xml` comes from the Android Material icon set, where it is called `ic_location_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
+</vector>
diff --git a/app/src/main/res/drawable/do_not_track_enabled.xml b/app/src/main/res/drawable/do_not_track_enabled.xml
deleted file mode 100644 (file)
index 4aa90fd..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `do_not_track_enabled.xml` comes from the Android Material icon set, where it is called `ic_location_off`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
-</vector>
diff --git a/app/src/main/res/drawable/do_not_track_enabled_dark.xml b/app/src/main/res/drawable/do_not_track_enabled_dark.xml
new file mode 100644 (file)
index 0000000..3ebd6b1
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `do_not_track_enabled_dark.xml` comes from the Android Material icon set, where it is called `ic_location_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
+</vector>
diff --git a/app/src/main/res/drawable/do_not_track_enabled_light.xml b/app/src/main/res/drawable/do_not_track_enabled_light.xml
new file mode 100644 (file)
index 0000000..984e2cb
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `do_not_track_enabled_light.xml` comes from the Android Material icon set, where it is called `ic_location_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
+</vector>
diff --git a/app/src/main/res/drawable/dom_storage_cleared.xml b/app/src/main/res/drawable/dom_storage_cleared.xml
deleted file mode 100644 (file)
index 6e8a9e2..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `dom_storage_cleared.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:height="26dp"
-    android:width="26dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:autoMirrored="true"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
-</vector>
diff --git a/app/src/main/res/drawable/dom_storage_cleared_dark.xml b/app/src/main/res/drawable/dom_storage_cleared_dark.xml
new file mode 100644 (file)
index 0000000..ea03e21
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `dom_storage_cleared_dark.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/dom_storage_cleared_light.xml b/app/src/main/res/drawable/dom_storage_cleared_light.xml
new file mode 100644 (file)
index 0000000..4435a4e
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `dom_storage_cleared_light.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/dom_storage_disabled.xml b/app/src/main/res/drawable/dom_storage_disabled.xml
deleted file mode 100644 (file)
index 5067891..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `dom_storage_disabled.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:height="26dp"
-    android:width="26dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:autoMirrored="true"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#88000000"
-        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
-</vector>
diff --git a/app/src/main/res/drawable/dom_storage_disabled_dark.xml b/app/src/main/res/drawable/dom_storage_disabled_dark.xml
new file mode 100644 (file)
index 0000000..bc45742
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `dom_storage_disabled_dark.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF9E9E9E"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/dom_storage_disabled_light.xml b/app/src/main/res/drawable/dom_storage_disabled_light.xml
new file mode 100644 (file)
index 0000000..9009519
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `dom_storage_disabled_light.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/dom_storage_ghosted.xml b/app/src/main/res/drawable/dom_storage_ghosted.xml
deleted file mode 100644 (file)
index 6f00eb0..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `dom_storage_ghosted.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:height="26dp"
-    android:width="26dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:autoMirrored="true"
-    tools:ignore="VectorRaster">
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#44000000"
-        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
-</vector>
diff --git a/app/src/main/res/drawable/dom_storage_ghosted_dark.xml b/app/src/main/res/drawable/dom_storage_ghosted_dark.xml
new file mode 100644 (file)
index 0000000..dad32e7
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `dom_storage_ghosted_dark.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF616161"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/dom_storage_ghosted_light.xml b/app/src/main/res/drawable/dom_storage_ghosted_light.xml
new file mode 100644 (file)
index 0000000..354e707
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `dom_storage_ghosted_light.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#44000000"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
+</vector>
index f036ad8..d0780a0 100644 (file)
@@ -13,6 +13,6 @@
 
     <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
-        android:fillColor="#FFD50000"
+        android:fillColor="#FFB71C1C"
         android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
 </vector>
diff --git a/app/src/main/res/drawable/font_size.xml b/app/src/main/res/drawable/font_size.xml
deleted file mode 100644 (file)
index 9371c71..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `font_size.xml` comes from the Android Material icon set, where it is called `ic_text_fields`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:autoMirrored="true"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M2.5,4v3h5v12h3L10.5,7h5L15.5,4h-13zM21.5,9h-9v3h3v7h3v-7h3L21.5,9z" />
-</vector>
\ No newline at end of file
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 (file)
index 0000000..ebdfe08
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `font_size_dark.xml` comes from the Android Material icon set, where it is called `ic_text_fields`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M2.5,4v3h5v12h3L10.5,7h5L15.5,4h-13zM21.5,9h-9v3h3v7h3v-7h3L21.5,9z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/font_size_light.xml b/app/src/main/res/drawable/font_size_light.xml
new file mode 100644 (file)
index 0000000..2a16bb9
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `font_size_light.xml` comes from the Android Material icon set, where it is called `ic_text_fields`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M2.5,4v3h5v12h3L10.5,7h5L15.5,4h-13zM21.5,9h-9v3h3v7h3v-7h3L21.5,9z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/form_data_cleared.xml b/app/src/main/res/drawable/form_data_cleared.xml
deleted file mode 100644 (file)
index 4b5a1bb..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `form_data_cleared.xml` comes from the Android Material icon set, where it is called `ic_subtitles`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:height="26dp"
-    android:width="26dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:autoMirrored="true"
-    tools:ignore="VectorRaster">
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/form_data_cleared_dark.xml b/app/src/main/res/drawable/form_data_cleared_dark.xml
new file mode 100644 (file)
index 0000000..76688fd
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `form_data_cleared_dark.xml` comes from the Android Material icon set, where it is called `ic_subtitles`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/form_data_cleared_light.xml b/app/src/main/res/drawable/form_data_cleared_light.xml
new file mode 100644 (file)
index 0000000..74b1ddb
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `form_data_cleared_light.xml` comes from the Android Material icon set, where it is called `ic_subtitles`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/form_data_disabled.xml b/app/src/main/res/drawable/form_data_disabled.xml
deleted file mode 100644 (file)
index 5cd0276..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `form_data_disabled.xml` comes from the Android Material icon set, where it is called `ic_subtitles`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:height="26dp"
-    android:width="26dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:autoMirrored="true"
-    tools:ignore="VectorRaster">
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#88000000"
-        android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/form_data_disabled_dark.xml b/app/src/main/res/drawable/form_data_disabled_dark.xml
new file mode 100644 (file)
index 0000000..4287a8b
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `form_data_disabled_dark.xml` comes from the Android Material icon set, where it is called `ic_subtitles`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF9E9E9E"
+        android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/form_data_disabled_light.xml b/app/src/main/res/drawable/form_data_disabled_light.xml
new file mode 100644 (file)
index 0000000..6a702b9
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `form_data_disabled_light.xml` comes from the Android Material icon set, where it is called `ic_subtitles`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>
+</vector>
index 8205e88..8fb3076 100644 (file)
@@ -13,6 +13,6 @@
 
     <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
-        android:fillColor="#FFD50000"
+        android:fillColor="#FFB71C1C"
         android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/full_screen_disabled.xml b/app/src/main/res/drawable/full_screen_disabled.xml
deleted file mode 100644 (file)
index 76ecc6b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- `full_screen_disabled.xml` comes from the Android Material icon set, where it is called `ic_smartphone`.  It is released under the Apache License 2.0. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#88000000"
-        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z"/>
-</vector>
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 (file)
index 0000000..46a48e6
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `full_screen_disabled_dark.xml` comes from the Android Material icon set, where it is called `ic_smartphone`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF9E9E9E"
+        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/full_screen_disabled_light.xml b/app/src/main/res/drawable/full_screen_disabled_light.xml
new file mode 100644 (file)
index 0000000..d449688
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `full_screen_disabled_light.xml` comes from the Android Material icon set, where it is called `ic_smartphone`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/full_screen_enabled.xml b/app/src/main/res/drawable/full_screen_enabled.xml
deleted file mode 100644 (file)
index e9a72ca..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- `full_screen_enabled.xml` comes from the Android Material icon set, where it is called `ic_smartphone`.  It is released under the Apache License 2.0. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z"/>
-</vector>
diff --git a/app/src/main/res/drawable/full_screen_enabled_dark.xml b/app/src/main/res/drawable/full_screen_enabled_dark.xml
new file mode 100644 (file)
index 0000000..5d4be52
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `full_screen_enabled_dark.xml` comes from the Android Material icon set, where it is called `ic_smartphone`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/full_screen_enabled_light.xml b/app/src/main/res/drawable/full_screen_enabled_light.xml
new file mode 100644 (file)
index 0000000..c183c0c
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `full_screen_enabled_light.xml` comes from the Android Material icon set, where it is called `ic_smartphone`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/hide_system_bars_disabled.xml b/app/src/main/res/drawable/hide_system_bars_disabled.xml
deleted file mode 100644 (file)
index 819a896..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- `hide_system_bars_disabled.xml` comes from the Android Material icon set, where it is called `ic_fullscreen`.  It is released under the Apache License 2.0. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#88000000"
-        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/hide_system_bars_disabled_dark.xml b/app/src/main/res/drawable/hide_system_bars_disabled_dark.xml
new file mode 100644 (file)
index 0000000..fedd0f4
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `hide_system_bars_disabled_dark.xml` comes from the Android Material icon set, where it is called `ic_fullscreen`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF9E9E9E"
+        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+</vector>
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
new file mode 100644 (file)
index 0000000..bf2edde
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `hide_system_bars_disabled_light.xml` comes from the Android Material icon set, where it is called `ic_fullscreen`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/hide_system_bars_enabled.xml b/app/src/main/res/drawable/hide_system_bars_enabled.xml
deleted file mode 100644 (file)
index b9d9594..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- `hide_system_bars_enabled.xml` comes from the Android Material icon set, where it is called `ic_fullscreen`.  It is released under the Apache License 2.0. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/hide_system_bars_enabled_dark.xml b/app/src/main/res/drawable/hide_system_bars_enabled_dark.xml
new file mode 100644 (file)
index 0000000..7efd872
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `hide_system_bars_enabled_dark.xml` comes from the Android Material icon set, where it is called `ic_fullscreen`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/hide_system_bars_enabled_light.xml b/app/src/main/res/drawable/hide_system_bars_enabled_light.xml
new file mode 100644 (file)
index 0000000..83dd5a3
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `hide_system_bars_enabled_light.xml` comes from the Android Material icon set, where it is called `ic_fullscreen`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/hide_system_bars_ghosted.xml b/app/src/main/res/drawable/hide_system_bars_ghosted.xml
deleted file mode 100644 (file)
index 831e33b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- `hide_system_bars_ghosted.xml` comes from the Android Material icon set, where it is called `ic_fullscreen`.  It is released under the Apache License 2.0. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#44000000"
-        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/hide_system_bars_ghosted_dark.xml b/app/src/main/res/drawable/hide_system_bars_ghosted_dark.xml
new file mode 100644 (file)
index 0000000..2f396f5
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `hide_system_bars_ghosted_dark.xml` comes from the Android Material icon set, where it is called `ic_fullscreen`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF616161"
+        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+</vector>
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
new file mode 100644 (file)
index 0000000..be0630d
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `hide_system_bars_ghosted_light.xml` comes from the Android Material icon set, where it is called `ic_fullscreen`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#44000000"
+        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/home_enabled.xml b/app/src/main/res/drawable/home_enabled.xml
deleted file mode 100644 (file)
index c2a19a7..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- `home_enabled.xml` comes from the Android Material icon set, where it is called `ic_home`.  It is released under the Apache License 2.0. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/home_enabled_dark.xml b/app/src/main/res/drawable/home_enabled_dark.xml
new file mode 100644 (file)
index 0000000..9d10705
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `home_enabled_dark.xml` comes from the Android Material icon set, where it is called `ic_home`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/home_enabled_light.xml b/app/src/main/res/drawable/home_enabled_light.xml
new file mode 100644 (file)
index 0000000..ba3d55e
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `home_enabled_light.xml` comes from the Android Material icon set, where it is called `ic_home`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
+</vector>
\ 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.xml
deleted file mode 100644 (file)
index 1cded8c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- `home_ghosted.xml` comes from the Android Material icon set, where it is called `ic_home`.  It is released under the Apache License 2.0. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#44000000"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/home_ghosted_dark.xml b/app/src/main/res/drawable/home_ghosted_dark.xml
new file mode 100644 (file)
index 0000000..4754495
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `home_ghosted_dark.xml` comes from the Android Material icon set, where it is called `ic_home`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF616161"
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/home_ghosted_light.xml b/app/src/main/res/drawable/home_ghosted_light.xml
new file mode 100644 (file)
index 0000000..135f801
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `home_ghosted_light.xml` comes from the Android Material icon set, where it is called `ic_home`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#44000000"
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/images_disabled.xml b/app/src/main/res/drawable/images_disabled.xml
deleted file mode 100644 (file)
index 0051e2e..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `images_disabled.xml` comes from the Android Material icon set, where it is called `ic_image`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#88000000"
-        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/images_disabled_dark.xml b/app/src/main/res/drawable/images_disabled_dark.xml
new file mode 100644 (file)
index 0000000..b9ab19e
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `images_disabled_dark.xml` comes from the Android Material icon set, where it is called `ic_image`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF9E9E9E"
+        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/images_disabled_light.xml b/app/src/main/res/drawable/images_disabled_light.xml
new file mode 100644 (file)
index 0000000..f17dd4e
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `images_disabled_light.xml` comes from the Android Material icon set, where it is called `ic_image`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/images_enabled.xml b/app/src/main/res/drawable/images_enabled.xml
deleted file mode 100644 (file)
index 0b4c405..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `images_enabled.xml` comes from the Android Material icon set, where it is called `ic_image`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/images_enabled_dark.xml b/app/src/main/res/drawable/images_enabled_dark.xml
new file mode 100644 (file)
index 0000000..dc446df
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `images_enabled_dark.xml` comes from the Android Material icon set, where it is called `ic_image`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/images_enabled_light.xml b/app/src/main/res/drawable/images_enabled_light.xml
new file mode 100644 (file)
index 0000000..499d626
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `images_enabled_light.xml` comes from the Android Material icon set, where it is called `ic_image`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/incognito_mode_disabled.xml b/app/src/main/res/drawable/incognito_mode_disabled.xml
deleted file mode 100644 (file)
index cde555b..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `incognito_mode_disabled.xml` comes from the Android Material icon set, where it is called `ic_visibility_off`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster">
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#88000000"
-        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
-</vector>
diff --git a/app/src/main/res/drawable/incognito_mode_disabled_dark.xml b/app/src/main/res/drawable/incognito_mode_disabled_dark.xml
new file mode 100644 (file)
index 0000000..86ea1a8
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `incognito_mode_disabled_dark.xml` comes from the Android Material icon set, where it is called `ic_visibility_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF9E9E9E"
+        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>
diff --git a/app/src/main/res/drawable/incognito_mode_disabled_light.xml b/app/src/main/res/drawable/incognito_mode_disabled_light.xml
new file mode 100644 (file)
index 0000000..f7f4a3f
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `incognito_mode_disabled_light.xml` comes from the Android Material icon set, where it is called `ic_visibility_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>
diff --git a/app/src/main/res/drawable/incognito_mode_enabled.xml b/app/src/main/res/drawable/incognito_mode_enabled.xml
deleted file mode 100644 (file)
index 9bfa3c1..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `incognito_mode_enabled.xml` comes from the Android Material icon set, where it is called `ic_visibility_off`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster">
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
-</vector>
diff --git a/app/src/main/res/drawable/incognito_mode_enabled_dark.xml b/app/src/main/res/drawable/incognito_mode_enabled_dark.xml
new file mode 100644 (file)
index 0000000..b3d5c54
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `incognito_mode_enabled_dark.xml` comes from the Android Material icon set, where it is called `ic_visibility_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>
diff --git a/app/src/main/res/drawable/incognito_mode_enabled_light.xml b/app/src/main/res/drawable/incognito_mode_enabled_light.xml
new file mode 100644 (file)
index 0000000..36282d2
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `incognito_mode_enabled_light.xml` comes from the Android Material icon set, where it is called `ic_visibility_off`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>
diff --git a/app/src/main/res/drawable/more_disabled.xml b/app/src/main/res/drawable/more_disabled.xml
deleted file mode 100644 (file)
index 8b303c3..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `more_disabled.xml` comes from the Android Material icon set, where it is called `ic_more`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:width="24dp"
-    tools:ignore="VectorRaster">
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#88000000"
-        android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.97,0.89 1.66,0.89L22,21c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM9,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM14,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/more_disabled_dark.xml b/app/src/main/res/drawable/more_disabled_dark.xml
new file mode 100644 (file)
index 0000000..c7a3aac
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `more_disabled_dark.xml` comes from the Android Material icon set, where it is called `ic_more`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF9E9E9E"
+        android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.97,0.89 1.66,0.89L22,21c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM9,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM14,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/more_disabled_light.xml b/app/src/main/res/drawable/more_disabled_light.xml
new file mode 100644 (file)
index 0000000..056195d
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `more_disabled_light.xml` comes from the Android Material icon set, where it is called `ic_more`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.97,0.89 1.66,0.89L22,21c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM9,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM14,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/more_enabled.xml b/app/src/main/res/drawable/more_enabled.xml
deleted file mode 100644 (file)
index 127938b..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `more_enabled.xml` comes from the Android Material icon set, where it is called `ic_more`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:width="24dp"
-    tools:ignore="VectorRaster">
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.97,0.89 1.66,0.89L22,21c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM9,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM14,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
-</vector>
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 (file)
index 0000000..54bb63b
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `more_enabled_dark.xml` comes from the Android Material icon set, where it is called `ic_more`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.97,0.89 1.66,0.89L22,21c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM9,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM14,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/more_enabled_light.xml b/app/src/main/res/drawable/more_enabled_light.xml
new file mode 100644 (file)
index 0000000..cd30f25
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `more_enabled_light.xml` comes from the Android Material icon set, where it is called `ic_more`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp"
+    tools:ignore="VectorRaster">
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.97,0.89 1.66,0.89L22,21c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM9,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM14,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/orbot_disabled.xml b/app/src/main/res/drawable/orbot_disabled.xml
deleted file mode 100644 (file)
index a431e87..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- `orbot_enabled.xml` comes from the Orbot project.  It is a modified version of <https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png>, which is released under the 3-clause BSD license.
-    Modifications copyright Soren Stoutner <soren@stoutner.com> 2017.  The resulting image is released under the GPLv3+ license. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="33.86667"
-    android:viewportWidth="33.866665"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#88000000"
-        android:pathData="m12.18,32.04c-4.14,-1.92 -6.77,-6.03 -6.77,-10.58 0,-4.35 1.64,-7.16 5.91,-10.12 1.46,-1.01 2.25,-1.97 2.45,-2.98 0.21,-1.03 0.52,-1.41 1.02,-1.22 0.4,0.15 1.72,0.28 2.93,0.28 1.94,0 2.24,0.15 2.52,1.27 0.18,0.7 1.25,1.92 2.39,2.7 4.22,2.92 5.84,5.75 5.82,10.17 -0.02,4.59 -2.89,8.88 -7.12,10.64 -2.51,1.05 -6.7,0.97 -9.17,-0.18zM14.95,5.83c-1.05,-1.13 -1.48,-4.92 -0.56,-4.92 0.96,0 2.54,2.69 2.54,4.33 0,1.96 -0.56,2.13 -1.99,0.59zM17.44,6.25c0,-0.68 1.54,-2.33 2.17,-2.33 0.68,0 0.31,1.37 -0.58,2.18 -1.11,1.01 -1.59,1.05 -1.59,0.16z" android:strokeWidth="0.50134861"/>
-</vector>
diff --git a/app/src/main/res/drawable/orbot_disabled_dark.xml b/app/src/main/res/drawable/orbot_disabled_dark.xml
new file mode 100644 (file)
index 0000000..39f6821
--- /dev/null
@@ -0,0 +1,19 @@
+<!-- `orbot_disabled_dark.xml` comes from the Orbot project.  It is a modified version of <https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png>, which is released under the 3-clause BSD license.
+    Modifications copyright Soren Stoutner <soren@stoutner.com> 2017.  The resulting image is released under the GPLv3+ license. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="33.86667"
+    android:viewportWidth="33.866665"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF9E9E9E"
+        android:pathData="m12.18,32.04c-4.14,-1.92 -6.77,-6.03 -6.77,-10.58 0,-4.35 1.64,-7.16 5.91,-10.12 1.46,-1.01 2.25,-1.97 2.45,-2.98 0.21,-1.03 0.52,-1.41 1.02,-1.22 0.4,0.15 1.72,0.28 2.93,0.28 1.94,0 2.24,0.15 2.52,1.27 0.18,0.7 1.25,1.92 2.39,2.7 4.22,2.92 5.84,5.75 5.82,10.17 -0.02,4.59 -2.89,8.88 -7.12,10.64 -2.51,1.05 -6.7,0.97 -9.17,-0.18zM14.95,5.83c-1.05,-1.13 -1.48,-4.92 -0.56,-4.92 0.96,0 2.54,2.69 2.54,4.33 0,1.96 -0.56,2.13 -1.99,0.59zM17.44,6.25c0,-0.68 1.54,-2.33 2.17,-2.33 0.68,0 0.31,1.37 -0.58,2.18 -1.11,1.01 -1.59,1.05 -1.59,0.16z" android:strokeWidth="0.50134861"/>
+</vector>
diff --git a/app/src/main/res/drawable/orbot_disabled_light.xml b/app/src/main/res/drawable/orbot_disabled_light.xml
new file mode 100644 (file)
index 0000000..1f35812
--- /dev/null
@@ -0,0 +1,19 @@
+<!-- `orbot_disabled_light.xml` comes from the Orbot project.  It is a modified version of <https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png>, which is released under the 3-clause BSD license.
+    Modifications copyright Soren Stoutner <soren@stoutner.com> 2017.  The resulting image is released under the GPLv3+ license. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="33.86667"
+    android:viewportWidth="33.866665"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="m12.18,32.04c-4.14,-1.92 -6.77,-6.03 -6.77,-10.58 0,-4.35 1.64,-7.16 5.91,-10.12 1.46,-1.01 2.25,-1.97 2.45,-2.98 0.21,-1.03 0.52,-1.41 1.02,-1.22 0.4,0.15 1.72,0.28 2.93,0.28 1.94,0 2.24,0.15 2.52,1.27 0.18,0.7 1.25,1.92 2.39,2.7 4.22,2.92 5.84,5.75 5.82,10.17 -0.02,4.59 -2.89,8.88 -7.12,10.64 -2.51,1.05 -6.7,0.97 -9.17,-0.18zM14.95,5.83c-1.05,-1.13 -1.48,-4.92 -0.56,-4.92 0.96,0 2.54,2.69 2.54,4.33 0,1.96 -0.56,2.13 -1.99,0.59zM17.44,6.25c0,-0.68 1.54,-2.33 2.17,-2.33 0.68,0 0.31,1.37 -0.58,2.18 -1.11,1.01 -1.59,1.05 -1.59,0.16z" android:strokeWidth="0.50134861"/>
+</vector>
diff --git a/app/src/main/res/drawable/orbot_enabled.xml b/app/src/main/res/drawable/orbot_enabled.xml
deleted file mode 100644 (file)
index 43ab496..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- `orbot_enabled.xml` comes from the Orbot project.  It is a modified version of <https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png>, which is released under the 3-clause BSD license.
-    Modifications copyright Soren Stoutner <soren@stoutner.com> 2017.  The resulting image is released under the GPLv3+ license. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="33.86667"
-    android:viewportWidth="33.866665"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="m12.18,32.04c-4.14,-1.92 -6.77,-6.03 -6.77,-10.58 0,-4.35 1.64,-7.16 5.91,-10.12 1.46,-1.01 2.25,-1.97 2.45,-2.98 0.21,-1.03 0.52,-1.41 1.02,-1.22 0.4,0.15 1.72,0.28 2.93,0.28 1.94,0 2.24,0.15 2.52,1.27 0.18,0.7 1.25,1.92 2.39,2.7 4.22,2.92 5.84,5.75 5.82,10.17 -0.02,4.59 -2.89,8.88 -7.12,10.64 -2.51,1.05 -6.7,0.97 -9.17,-0.18zM14.95,5.83c-1.05,-1.13 -1.48,-4.92 -0.56,-4.92 0.96,0 2.54,2.69 2.54,4.33 0,1.96 -0.56,2.13 -1.99,0.59zM17.44,6.25c0,-0.68 1.54,-2.33 2.17,-2.33 0.68,0 0.31,1.37 -0.58,2.18 -1.11,1.01 -1.59,1.05 -1.59,0.16z" android:strokeWidth="0.50134861"/>
-</vector>
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 (file)
index 0000000..67c9f65
--- /dev/null
@@ -0,0 +1,19 @@
+<!-- `orbot_enabled_dark.xml` comes from the Orbot project.  It is a modified version of <https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png>, which is released under the 3-clause BSD license.
+    Modifications copyright Soren Stoutner <soren@stoutner.com> 2017.  The resulting image is released under the GPLv3+ license. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="33.86667"
+    android:viewportWidth="33.866665"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="m12.18,32.04c-4.14,-1.92 -6.77,-6.03 -6.77,-10.58 0,-4.35 1.64,-7.16 5.91,-10.12 1.46,-1.01 2.25,-1.97 2.45,-2.98 0.21,-1.03 0.52,-1.41 1.02,-1.22 0.4,0.15 1.72,0.28 2.93,0.28 1.94,0 2.24,0.15 2.52,1.27 0.18,0.7 1.25,1.92 2.39,2.7 4.22,2.92 5.84,5.75 5.82,10.17 -0.02,4.59 -2.89,8.88 -7.12,10.64 -2.51,1.05 -6.7,0.97 -9.17,-0.18zM14.95,5.83c-1.05,-1.13 -1.48,-4.92 -0.56,-4.92 0.96,0 2.54,2.69 2.54,4.33 0,1.96 -0.56,2.13 -1.99,0.59zM17.44,6.25c0,-0.68 1.54,-2.33 2.17,-2.33 0.68,0 0.31,1.37 -0.58,2.18 -1.11,1.01 -1.59,1.05 -1.59,0.16z" android:strokeWidth="0.50134861"/>
+</vector>
diff --git a/app/src/main/res/drawable/orbot_enabled_light.xml b/app/src/main/res/drawable/orbot_enabled_light.xml
new file mode 100644 (file)
index 0000000..8fdad14
--- /dev/null
@@ -0,0 +1,19 @@
+<!-- `orbot_enabled_light.xml` comes from the Orbot project.  It is a modified version of <https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png>, which is released under the 3-clause BSD license.
+    Modifications copyright Soren Stoutner <soren@stoutner.com> 2017.  The resulting image is released under the GPLv3+ license. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="33.86667"
+    android:viewportWidth="33.866665"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="m12.18,32.04c-4.14,-1.92 -6.77,-6.03 -6.77,-10.58 0,-4.35 1.64,-7.16 5.91,-10.12 1.46,-1.01 2.25,-1.97 2.45,-2.98 0.21,-1.03 0.52,-1.41 1.02,-1.22 0.4,0.15 1.72,0.28 2.93,0.28 1.94,0 2.24,0.15 2.52,1.27 0.18,0.7 1.25,1.92 2.39,2.7 4.22,2.92 5.84,5.75 5.82,10.17 -0.02,4.59 -2.89,8.88 -7.12,10.64 -2.51,1.05 -6.7,0.97 -9.17,-0.18zM14.95,5.83c-1.05,-1.13 -1.48,-4.92 -0.56,-4.92 0.96,0 2.54,2.69 2.54,4.33 0,1.96 -0.56,2.13 -1.99,0.59zM17.44,6.25c0,-0.68 1.54,-2.33 2.17,-2.33 0.68,0 0.31,1.37 -0.58,2.18 -1.11,1.01 -1.59,1.05 -1.59,0.16z" android:strokeWidth="0.50134861"/>
+</vector>
diff --git a/app/src/main/res/drawable/refresh_disabled.xml b/app/src/main/res/drawable/refresh_disabled.xml
deleted file mode 100644 (file)
index 5e06bb6..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `refresh_disabled.xml` comes from the Android Material icon set, where it is called `ic_refresh`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#88000000"
-        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
-</vector>
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 (file)
index 0000000..0059dd5
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `refresh_disabled_dark.xml` comes from the Android Material icon set, where it is called `ic_refresh`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF9E9E9E"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/refresh_disabled_light.xml b/app/src/main/res/drawable/refresh_disabled_light.xml
new file mode 100644 (file)
index 0000000..2758345
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `refresh_disabled_light.xml` comes from the Android Material icon set, where it is called `ic_refresh`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/refresh_enabled.xml b/app/src/main/res/drawable/refresh_enabled.xml
deleted file mode 100644 (file)
index c9786fe..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `refresh_enabled.xml` comes from the Android Material icon set, where it is called `ic_refresh`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
-</vector>
diff --git a/app/src/main/res/drawable/refresh_enabled_dark.xml b/app/src/main/res/drawable/refresh_enabled_dark.xml
new file mode 100644 (file)
index 0000000..6c17502
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `refresh_enabled_dark.xml` comes from the Android Material icon set, where it is called `ic_refresh`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/refresh_enabled_light.xml b/app/src/main/res/drawable/refresh_enabled_light.xml
new file mode 100644 (file)
index 0000000..f2e0916
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `refresh_enabled_light.xml` comes from the Android Material icon set, where it is called `ic_refresh`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/search_custom_url_disabled.xml b/app/src/main/res/drawable/search_custom_url_disabled.xml
deleted file mode 100644 (file)
index 8867766..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `search_custom_url_ghosted.xml` comes from the Android Material icon set, where it is called `ic_find_in_page`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#88000000"
-        android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/search_custom_url_enabled.xml b/app/src/main/res/drawable/search_custom_url_enabled.xml
deleted file mode 100644 (file)
index 3b9579a..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `search_custom_url_enabled.xml` comes from the Android Material icon set, where it is called `ic_find_in_page`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/search_custom_url_enabled_dark.xml b/app/src/main/res/drawable/search_custom_url_enabled_dark.xml
new file mode 100644 (file)
index 0000000..e9cb36b
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `search_custom_url_enabled_dark.xml` comes from the Android Material icon set, where it is called `ic_find_in_page`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/search_custom_url_enabled_light.xml b/app/src/main/res/drawable/search_custom_url_enabled_light.xml
new file mode 100644 (file)
index 0000000..4eff844
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `search_custom_url_enabled_light.xml` comes from the Android Material icon set, where it is called `ic_find_in_page`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/search_custom_url_ghosted.xml b/app/src/main/res/drawable/search_custom_url_ghosted.xml
deleted file mode 100644 (file)
index 08aed01..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `search_custom_url_ghosted.xml` comes from the Android Material icon set, where it is called `ic_find_in_page`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#44000000"
-        android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/search_custom_url_ghosted_dark.xml b/app/src/main/res/drawable/search_custom_url_ghosted_dark.xml
new file mode 100644 (file)
index 0000000..a3b4843
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `search_custom_url_ghosted_dark.xml` comes from the Android Material icon set, where it is called `ic_find_in_page`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF616161"
+        android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
+</vector>
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
new file mode 100644 (file)
index 0000000..fc8259f
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `search_custom_url_ghosted_light.xml` comes from the Android Material icon set, where it is called `ic_find_in_page`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#44000000"
+        android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/search_enabled.xml b/app/src/main/res/drawable/search_enabled.xml
deleted file mode 100644 (file)
index cab1592..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `search_enabled.xml` comes from the Android Material icon set, where it is called `ic_search`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
-</vector>
diff --git a/app/src/main/res/drawable/search_enabled_dark.xml b/app/src/main/res/drawable/search_enabled_dark.xml
new file mode 100644 (file)
index 0000000..46f7e83
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `search_enabled_dark.xml` comes from the Android Material icon set, where it is called `ic_search`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/search_enabled_light.xml b/app/src/main/res/drawable/search_enabled_light.xml
new file mode 100644 (file)
index 0000000..65f7f7a
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `search_enabled_light.xml` comes from the Android Material icon set, where it is called `ic_search`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/search_ghosted.xml b/app/src/main/res/drawable/search_ghosted.xml
deleted file mode 100644 (file)
index 596682b..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `search_ghosted.xml` comes from the Android Material icon set, where it is called `ic_search`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#44000000"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
-</vector>
diff --git a/app/src/main/res/drawable/search_ghosted_dark.xml b/app/src/main/res/drawable/search_ghosted_dark.xml
new file mode 100644 (file)
index 0000000..d82fa8e
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `search_ghosted_dark.xml` comes from the Android Material icon set, where it is called `ic_search`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF616161"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/search_ghosted_light.xml b/app/src/main/res/drawable/search_ghosted_light.xml
new file mode 100644 (file)
index 0000000..ad8a350
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `search_ghosted_light.xml` comes from the Android Material icon set, where it is called `ic_search`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#44000000"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
index 2755eff..eb1339e 100644 (file)
@@ -13,6 +13,6 @@
 
     <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
-        android:fillColor="#FF424242"
+        android:fillColor="#FF616161"
         android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z"/>
 </vector>
diff --git a/app/src/main/res/drawable/translucent_bar_disabled.xml b/app/src/main/res/drawable/translucent_bar_disabled.xml
deleted file mode 100644 (file)
index 4120c40..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- `translucent_bar_disabled.xml` comes from the Android Material icon set, where it is called `ic_call_to_action`.  It is released under the Apache License 2.0. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#88000000"
-        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
-</vector>
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 (file)
index 0000000..73dba40
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `translucent_bar_disabled_dark.xml` comes from the Android Material icon set, where it is called `ic_call_to_action`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF9E9E9E"
+        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/translucent_bar_disabled_light.xml b/app/src/main/res/drawable/translucent_bar_disabled_light.xml
new file mode 100644 (file)
index 0000000..3c0187d
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `translucent_bar_disabled_light.xml` comes from the Android Material icon set, where it is called `ic_call_to_action`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#88000000"
+        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/translucent_bar_enabled.xml b/app/src/main/res/drawable/translucent_bar_enabled.xml
deleted file mode 100644 (file)
index 18a5f8b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- `translucent_bar_enabled.xml` comes from the Android Material icon set, where it is called `ic_call_to_action`.  It is released under the Apache License 2.0. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/translucent_bar_enabled_dark.xml b/app/src/main/res/drawable/translucent_bar_enabled_dark.xml
new file mode 100644 (file)
index 0000000..fd2c162
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `translucent_bar_enabled_dark.xml` comes from the Android Material icon set, where it is called `ic_call_to_action`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/translucent_bar_enabled_light.xml b/app/src/main/res/drawable/translucent_bar_enabled_light.xml
new file mode 100644 (file)
index 0000000..66f6272
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `translucent_bar_enabled_light.xml` comes from the Android Material icon set, where it is called `ic_call_to_action`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/translucent_bar_ghosted.xml b/app/src/main/res/drawable/translucent_bar_ghosted.xml
deleted file mode 100644 (file)
index 3d64eb5..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- `translucent_bar_ghosted.xml` comes from the Android Material icon set, where it is called `ic_call_to_action`.  It is released under the Apache License 2.0. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#44000000"
-        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/translucent_bar_ghosted_dark.xml b/app/src/main/res/drawable/translucent_bar_ghosted_dark.xml
new file mode 100644 (file)
index 0000000..5f5ac4c
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `translucent_bar_ghosted_dark.xml` comes from the Android Material icon set, where it is called `ic_call_to_action`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF616161"
+        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/translucent_bar_ghosted_light.xml b/app/src/main/res/drawable/translucent_bar_ghosted_light.xml
new file mode 100644 (file)
index 0000000..a169700
--- /dev/null
@@ -0,0 +1,13 @@
+<!-- `translucent_bar_ghosted_light.xml` comes from the Android Material icon set, where it is called `ic_call_to_action`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#44000000"
+        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/user_agent.xml b/app/src/main/res/drawable/user_agent.xml
deleted file mode 100644 (file)
index cdaf0fb..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- `user_agent_enabled.xml` comes from the Android Material icon set, where it is called `ic_devices_other`.  It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:autoMirrored="true"
-    tools:ignore="VectorRaster" >
-
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
-    <path
-        android:fillColor="#FF1565C0"
-        android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"/>
-</vector>
diff --git a/app/src/main/res/drawable/user_agent_dark.xml b/app/src/main/res/drawable/user_agent_dark.xml
new file mode 100644 (file)
index 0000000..83c8d02
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `user_agent_dark.xml` comes from the Android Material icon set, where it is called `ic_devices_other`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1E88E5"
+        android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/user_agent_light.xml b/app/src/main/res/drawable/user_agent_light.xml
new file mode 100644 (file)
index 0000000..bf8899c
--- /dev/null
@@ -0,0 +1,18 @@
+<!-- `user_agent_light.xml` comes from the Android Material icon set, where it is called `ic_devices_other`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"/>
+</vector>
index cdda48e..0a08e91 100644 (file)
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
-                    android:src="@drawable/user_agent"
+                    android:src="@drawable/user_agent_light"
                     android:contentDescription="@string/user_agent" />
 
                 <Spinner
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/font_size"
+                android:src="@drawable/font_size_light"
                 android:contentDescription="@string/font_size" />
 
             <Spinner
index 0659926..59d086d 100644 (file)
@@ -23,7 +23,7 @@
     <item
         android:id="@+id/home"
         android:title="@string/home"
-        android:icon="@drawable/home_enabled"
+        android:icon="@drawable/home_enabled_light"
         android:orderInCategory="10" />
 
     <item
index 594f906..0375220 100644 (file)
@@ -35,4 +35,9 @@
     <attr name="navigationIconTintColor" format="reference" />
 
     <attr name="findOnPageIconTintColor" format="reference" />
+
+    <attr name="userAgentIcon" format="reference" />
+    <attr name="searchIcon" format="reference" />
+    <attr name="homepageIcon" format="reference" />
+    <attr name="fontSizeIcon" format="reference" />
 </resources>
\ No newline at end of file
index e51f047..46629aa 100644 (file)
@@ -63,6 +63,7 @@
     <color name="light_green_100">#FFDCEDC8</color>
     <color name="light_green_a700">#FF64DD17</color>
 
+    <color name="red_900">#FFB71C1C</color>
     <color name="red_a700">#FFD50000</color>
 
     <color name="transparent">#00000000</color>
index 41ddc89..d493579 100644 (file)
     </style>
 
     <!-- `colorPrimaryDark` is the color of the status bar. -->
-    <style name="Settings" parent="Theme.AppCompat.Light.DarkActionBar" >
+    <style name="PrivacyBrowserSettingsLight" parent="Theme.AppCompat.Light.DarkActionBar" >
         <item name="colorPrimary">@color/blue_700</item>
         <item name="colorPrimaryDark">@color/blue_900</item>
         <item name="colorAccent">@color/blue_700</item>
+        <item name="userAgentIcon">@drawable/user_agent_light</item>
+        <item name="searchIcon">@drawable/search_enabled_light</item>
+        <item name="homepageIcon">@drawable/home_enabled_light</item>
+        <item name="fontSizeIcon">@drawable/font_size_light</item>
     </style>
 
     <!-- `ThemeOverlay.AppCompat.ActionBar` makes the hamburger icons dark. -->
     <style name="PrivacyBrowserDark" parent="Theme.AppCompat.NoActionBar" >
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:textColorPrimary">@color/dark_primary_text_color_selector</item>
-        <item name="colorAccent">@color/blue_900</item>
+        <item name="colorAccent">@color/blue_600</item>
         <item name="android:textColorHighlight">@color/blue_800</item>
-        <item name="navigationHeaderBackground">@color/blue_900</item>
+        <item name="navigationHeaderBackground">@color/blue_800</item>
         <item name="navigationHeaderTextColor">@color/gray_300</item>
         <item name="appBarTheme">@style/PrivacyBrowserAppBarDark</item>
         <item name="progressTintColor">@color/blue_800</item>
-        <item name="navigationIconTintColor">@color/blue_900</item>
-        <item name="findOnPageIconTintColor">@color/blue_900</item>
+        <item name="navigationIconTintColor">@color/blue_600</item>
+        <item name="findOnPageIconTintColor">@color/blue_600</item>
         <item name="sslTitle">@color/blue_700</item>
         <item name="urlHistoryText">@color/gray_200</item>
     </style>
         <item name="tabLayoutTheme">@style/PrivacyBrowserTabLayoutDark</item>
     </style>
 
+    <style name="PrivacyBrowserSettingsDark" parent="Theme.AppCompat" >
+        <item name="android:textColorPrimary">@color/dark_primary_text_color_selector</item>
+        <item name="colorAccent">@color/blue_600</item>
+        <item name="userAgentIcon">@drawable/user_agent_dark</item>
+        <item name="searchIcon">@drawable/search_enabled_dark</item>
+        <item name="homepageIcon">@drawable/home_enabled_dark</item>
+        <item name="fontSizeIcon">@drawable/font_size_dark</item>
+    </style>
+
     <!-- `ThemeOverlay.AppCompat.Dark.ActionBar` makes the text and the icons in the AppBar white. -->
     <style name="PrivacyBrowserAppBarDark" parent="ThemeOverlay.AppCompat.Dark.ActionBar" >
         <item name="android:textColorPrimary">@color/gray_300</item>
     <!-- Configure the About and Guide `TabLayouts`. -->
     <style name="PrivacyBrowserTabLayoutDark" parent="Widget.Design.TabLayout" >
         <item name="tabBackground">@color/blue_900</item>
-        <item name="android:textColorSecondary">@color/blue_700</item>
+        <item name="android:textColorSecondary">@color/blue_400</item>
         <item name="tabIndicatorColor">@color/gray_300</item>
     </style>
 
index d7e096b..2b0c713 100644 (file)
@@ -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:inputType="textVisiblePassword" sets the keyboard to have a dedicated number row.-->
         <EditTextPreference
             android:entries="@array/search_entries"
             android:entryValues="@array/search_entry_values"
             android:defaultValue="https://duckduckgo.com/html/?q="
-            android:icon="@drawable/search_enabled" />
+            android:icon="?attr/searchIcon" />
 
         <EditTextPreference
             android:key="search_custom_url"
             android:title="@string/homepage"
             android:defaultValue="https://start.duckduckgo.com"
             android:inputType="textUri"
-            android:icon="@drawable/home_enabled" />
+            android:icon="?attr/homepageIcon" />
 
         <ListPreference
             android:key="default_font_size"
             android:entries="@array/default_font_size_entries"
             android:entryValues="@array/default_font_size_entry_values"
             android:defaultValue="100"
-            android:icon="@drawable/font_size" />
+            android:icon="?attr/fontSizeIcon" />
 
         <SwitchPreference
             android:key="swipe_to_refresh"