From 27e33047e14466c84212bca02a14a7fc4ff15af8 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Fri, 19 Jun 2020 14:58:51 -0700 Subject: [PATCH] Change the night access color to light violet. https://redmine.stoutner.com/issues/572 --- .../dialogs/AboutViewSourceDialog.kt | 12 +- .../privacybrowser/dialogs/AddDomainDialog.kt | 12 +- .../dialogs/HttpAuthenticationDialog.java | 4 +- .../dialogs/PinnedMismatchDialog.java | 2 +- .../dialogs/SslCertificateErrorDialog.java | 4 +- .../dialogs/ViewSslCertificateDialog.java | 2 +- .../fragments/AboutTabFragment.java | 4 +- .../fragments/DomainSettingsFragment.java | 18 ++- .../fragments/SettingsFragment.java | 16 +-- .../res/drawable/{add_day.xml => add.xml} | 0 app/src/main/res/drawable/add_night.xml | 13 --- .../allow_screenshots_enabled_night.xml | 2 +- .../res/drawable/app_bar_enabled_night.xml | 2 +- .../{theme_day.xml => app_theme_day.xml} | 4 +- .../{theme_night.xml => app_theme_night.xml} | 6 +- .../res/drawable/block_ads_disabled_day.xml | 4 +- .../res/drawable/block_ads_disabled_night.xml | 4 +- .../res/drawable/block_ads_enabled_day.xml | 4 +- .../res/drawable/block_ads_enabled_night.xml | 6 +- ..._all_third_party_requests_disabled_day.xml | 4 +- ...ll_third_party_requests_disabled_night.xml | 4 +- ...k_all_third_party_requests_enabled_day.xml | 4 +- ...all_third_party_requests_enabled_night.xml | 6 +- .../drawable/block_tracking_disabled_day.xml | 4 +- .../block_tracking_disabled_night.xml | 4 +- .../drawable/block_tracking_enabled_day.xml | 4 +- .../drawable/block_tracking_enabled_night.xml | 8 +- .../{bookmarks_day.xml => bookmarks.xml} | 0 app/src/main/res/drawable/bookmarks_night.xml | 18 --- .../main/res/drawable/cache_cleared_day.xml | 4 +- .../main/res/drawable/cache_cleared_night.xml | 6 +- app/src/main/res/drawable/clear_day.xml | 13 --- .../drawable/clear_everything_disabled.xml | 4 +- .../drawable/clear_everything_enabled_day.xml | 4 +- .../clear_everything_enabled_night.xml | 2 +- app/src/main/res/drawable/clear_night.xml | 13 --- app/src/main/res/drawable/close_day.xml | 6 +- app/src/main/res/drawable/close_night.xml | 6 +- .../main/res/drawable/cookies_cleared_day.xml | 4 +- .../res/drawable/cookies_cleared_night.xml | 6 +- .../res/drawable/cookies_disabled_day.xml | 4 +- .../res/drawable/cookies_disabled_night.xml | 4 +- app/src/main/res/drawable/cookies_enabled.xml | 4 +- .../main/res/drawable/cookies_ghosted_day.xml | 4 +- .../res/drawable/cookies_ghosted_night.xml | 4 +- app/src/main/res/drawable/cookies_warning.xml | 4 +- .../main/res/drawable/copy_enabled_night.xml | 2 +- ...e_bookmark_day.xml => create_bookmark.xml} | 4 +- .../res/drawable/create_bookmark_night.xml | 15 --- ...reate_folder_day.xml => create_folder.xml} | 4 +- .../main/res/drawable/create_folder_night.xml | 18 --- .../custom_user_agent_enabled_day.xml | 6 +- .../custom_user_agent_enabled_night.xml | 8 +- .../custom_user_agent_ghosted_day.xml | 6 +- .../custom_user_agent_ghosted_night.xml | 4 +- app/src/main/res/drawable/delete_day.xml | 4 +- app/src/main/res/drawable/delete_disabled.xml | 4 +- app/src/main/res/drawable/delete_night.xml | 4 +- .../res/drawable/dom_storage_cleared_day.xml | 4 +- .../drawable/dom_storage_cleared_night.xml | 6 +- .../res/drawable/dom_storage_disabled_day.xml | 4 +- .../drawable/dom_storage_disabled_night.xml | 4 +- .../main/res/drawable/dom_storage_enabled.xml | 4 +- .../res/drawable/dom_storage_ghosted_day.xml | 4 +- .../drawable/dom_storage_ghosted_night.xml | 4 +- .../main/res/drawable/dom_storage_warning.xml | 4 +- .../{domains_light.xml => domains_day.xml} | 4 +- app/src/main/res/drawable/domains_night.xml | 6 +- .../res/drawable/downloads_enabled_day.xml | 4 +- .../res/drawable/downloads_enabled_night.xml | 6 +- .../res/drawable/downloads_ghosted_day.xml | 4 +- .../res/drawable/downloads_ghosted_night.xml | 4 +- app/src/main/res/drawable/edit_day.xml | 4 +- app/src/main/res/drawable/edit_night.xml | 4 +- app/src/main/res/drawable/font_size_day.xml | 4 +- app/src/main/res/drawable/font_size_night.xml | 6 +- .../res/drawable/form_data_cleared_day.xml | 4 +- .../res/drawable/form_data_cleared_night.xml | 6 +- .../res/drawable/form_data_disabled_day.xml | 4 +- .../res/drawable/form_data_disabled_night.xml | 4 +- .../main/res/drawable/form_data_enabled.xml | 4 +- .../main/res/drawable/form_data_warning.xml | 4 +- .../res/drawable/full_screen_disabled_day.xml | 4 +- .../drawable/full_screen_disabled_night.xml | 4 +- .../res/drawable/full_screen_enabled_day.xml | 4 +- .../drawable/full_screen_enabled_night.xml | 6 +- .../main/res/drawable/home_enabled_day.xml | 4 +- .../main/res/drawable/home_enabled_night.xml | 6 +- .../main/res/drawable/images_disabled_day.xml | 4 +- .../res/drawable/images_disabled_night.xml | 4 +- .../main/res/drawable/images_enabled_day.xml | 4 +- .../res/drawable/images_enabled_night.xml | 6 +- .../main/res/drawable/import_export_day.xml | 6 +- .../main/res/drawable/import_export_night.xml | 6 +- .../drawable/incognito_mode_disabled_day.xml | 4 +- .../incognito_mode_disabled_night.xml | 4 +- .../drawable/incognito_mode_enabled_day.xml | 4 +- .../drawable/incognito_mode_enabled_night.xml | 6 +- .../main/res/drawable/list_selector_night.xml | 2 +- app/src/main/res/drawable/lock_day.xml | 4 +- app/src/main/res/drawable/lock_night.xml | 6 +- .../res/drawable/modify_url_enabled_night.xml | 2 +- .../main/res/drawable/more_disabled_day.xml | 4 +- .../main/res/drawable/more_disabled_night.xml | 4 +- .../main/res/drawable/more_enabled_day.xml | 4 +- .../main/res/drawable/more_enabled_night.xml | 6 +- .../main/res/drawable/move_to_folder_day.xml | 4 +- .../res/drawable/move_to_folder_night.xml | 4 +- .../main/res/drawable/move_up_disabled.xml | 4 +- .../main/res/drawable/move_up_enabled_day.xml | 4 +- .../res/drawable/move_up_enabled_night.xml | 4 +- .../res/drawable/night_mode_disabled_day.xml | 4 +- .../drawable/night_mode_disabled_night.xml | 4 +- .../res/drawable/night_mode_enabled_day.xml | 4 +- .../res/drawable/night_mode_enabled_night.xml | 2 +- .../main/res/drawable/proxy_disabled_day.xml | 4 +- .../res/drawable/proxy_disabled_night.xml | 4 +- .../main/res/drawable/proxy_enabled_day.xml | 4 +- .../main/res/drawable/proxy_enabled_night.xml | 6 +- .../main/res/drawable/proxy_ghosted_day.xml | 4 +- .../main/res/drawable/proxy_ghosted_night.xml | 4 +- .../res/drawable/refresh_disabled_day.xml | 4 +- .../res/drawable/refresh_disabled_night.xml | 4 +- .../main/res/drawable/refresh_enabled_day.xml | 4 +- .../res/drawable/refresh_enabled_night.xml | 6 +- app/src/main/res/drawable/save_dialog_day.xml | 4 +- .../main/res/drawable/save_dialog_night.xml | 6 +- .../search_custom_url_enabled_day.xml | 4 +- .../search_custom_url_enabled_night.xml | 6 +- .../search_custom_url_ghosted_day.xml | 4 +- .../search_custom_url_ghosted_night.xml | 4 +- .../main/res/drawable/search_enabled_day.xml | 4 +- .../res/drawable/search_enabled_night.xml | 6 +- app/src/main/res/drawable/select_all_day.xml | 4 +- .../main/res/drawable/select_all_night.xml | 4 +- .../drawable/social_media_disabled_day.xml | 4 +- .../drawable/social_media_disabled_night.xml | 4 +- .../res/drawable/social_media_enabled_day.xml | 4 +- .../drawable/social_media_enabled_night.xml | 6 +- .../res/drawable/social_media_ghosted_day.xml | 4 +- .../drawable/social_media_ghosted_night.xml | 4 +- app/src/main/res/drawable/sort_day.xml | 4 +- app/src/main/res/drawable/sort_night.xml | 4 +- .../drawable/ssl_certificate_disabled_day.xml | 4 +- .../ssl_certificate_disabled_night.xml | 4 +- .../drawable/ssl_certificate_enabled_day.xml | 4 +- .../ssl_certificate_enabled_night.xml | 6 +- ...isabled_light.xml => tab_disabled_day.xml} | 6 +- ...sabled_dark.xml => tab_disabled_night.xml} | 6 +- ..._enabled_light.xml => tab_enabled_day.xml} | 6 +- ...enabled_dark.xml => tab_enabled_night.xml} | 8 +- app/src/main/res/drawable/user_agent_day.xml | 4 +- .../main/res/drawable/user_agent_night.xml | 6 +- .../drawable/wide_viewport_disabled_day.xml | 4 +- .../drawable/wide_viewport_disabled_night.xml | 4 +- .../drawable/wide_viewport_enabled_day.xml | 4 +- .../drawable/wide_viewport_enabled_night.xml | 6 +- .../res/layout-w900dp/bookmarks_drawer.xml | 9 +- app/src/main/res/layout/add_domain_dialog.xml | 4 +- .../layout/bookmarks_coordinatorlayout.xml | 6 +- app/src/main/res/layout/bookmarks_drawer.xml | 9 +- .../databaseview_spinner_dropdown_items.xml | 4 +- .../res/layout/domain_settings_fragment.xml | 15 +-- .../res/layout/domains_coordinatorlayout.xml | 3 +- .../import_export_coordinatorlayout.xml | 4 +- app/src/main/res/layout/main_framelayout.xml | 2 +- app/src/main/res/layout/open_dialog.xml | 2 +- .../res/layout/pinned_mismatch_scrollview.xml | 10 +- app/src/main/res/layout/save_dialog.xml | 2 +- .../main/res/layout/save_logcat_dialog.xml | 2 +- .../main/res/layout/ssl_certificate_error.xml | 10 +- .../res/layout/unencrypted_website_dialog.xml | 4 +- .../main/res/layout/view_request_dialog.xml | 14 +-- .../layout/view_source_coordinatorlayout.xml | 8 +- .../layout/view_ssl_certificate_dialog.xml | 10 +- .../main/res/menu/bookmarks_context_menu.xml | 6 +- .../bookmarks_databaseview_context_menu.xml | 4 +- .../main/res/menu/domains_options_menu.xml | 3 +- app/src/main/res/menu/logcat_options_menu.xml | 4 +- .../main/res/menu/webview_navigation_menu.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 3 +- app/src/main/res/values-night-v23/styles.xml | 33 +++--- app/src/main/res/values-night-v27/styles.xml | 33 +++--- app/src/main/res/values-night/colors.xml | 107 ++++++++++++++++++ app/src/main/res/values-night/styles.xml | 33 +++--- app/src/main/res/values-v23/styles.xml | 15 +-- app/src/main/res/values-v27/styles.xml | 15 +-- app/src/main/res/values/attrs.xml | 11 +- app/src/main/res/values/colors.xml | 18 ++- app/src/main/res/values/styles.xml | 15 +-- 191 files changed, 612 insertions(+), 600 deletions(-) rename app/src/main/res/drawable/{add_day.xml => add.xml} (100%) delete mode 100644 app/src/main/res/drawable/add_night.xml rename app/src/main/res/drawable/{theme_day.xml => app_theme_day.xml} (94%) rename app/src/main/res/drawable/{theme_night.xml => app_theme_night.xml} (91%) rename app/src/main/res/drawable/{bookmarks_day.xml => bookmarks.xml} (100%) delete mode 100644 app/src/main/res/drawable/bookmarks_night.xml delete mode 100644 app/src/main/res/drawable/clear_day.xml delete mode 100644 app/src/main/res/drawable/clear_night.xml rename app/src/main/res/drawable/{create_bookmark_day.xml => create_bookmark.xml} (91%) delete mode 100644 app/src/main/res/drawable/create_bookmark_night.xml rename app/src/main/res/drawable/{create_folder_day.xml => create_folder.xml} (93%) delete mode 100644 app/src/main/res/drawable/create_folder_night.xml rename app/src/main/res/drawable/{domains_light.xml => domains_day.xml} (93%) rename app/src/main/res/drawable/{tab_disabled_light.xml => tab_disabled_day.xml} (85%) rename app/src/main/res/drawable/{tab_disabled_dark.xml => tab_disabled_night.xml} (85%) rename app/src/main/res/drawable/{tab_enabled_light.xml => tab_enabled_day.xml} (85%) rename app/src/main/res/drawable/{tab_enabled_dark.xml => tab_enabled_night.xml} (80%) create mode 100644 app/src/main/res/values-night/colors.xml diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AboutViewSourceDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AboutViewSourceDialog.kt index 70247f05..d780467f 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AboutViewSourceDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AboutViewSourceDialog.kt @@ -20,7 +20,6 @@ package com.stoutner.privacybrowser.dialogs import android.app.Dialog -import android.content.res.Configuration import android.os.Bundle import android.view.WindowManager @@ -35,17 +34,8 @@ class AboutViewSourceDialog: DialogFragment() { // Use a builder to create the alert dialog. val dialogBuilder: AlertDialog.Builder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog) - // Get the current theme status. - val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK - // Set the style and the icon according to the theme. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - // Set a dark icon. - dialogBuilder.setIcon(R.drawable.about_night) - } else { - // Set a light icon. - dialogBuilder.setIcon(R.drawable.about_day) - } + dialogBuilder.setIconAttribute(R.attr.aboutIcon) // Set the title. dialogBuilder.setTitle(R.string.about_view_source) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt index 527e0d7d..e26b6444 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt @@ -23,7 +23,6 @@ import android.annotation.SuppressLint import android.app.Dialog import android.content.Context import android.content.DialogInterface -import android.content.res.Configuration import android.net.Uri import android.os.Bundle import android.text.Editable @@ -91,17 +90,8 @@ class AddDomainDialog: DialogFragment() { // Use an alert dialog builder to create the alert dialog. val dialogBuilder: AlertDialog.Builder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog) - // Get the current theme status. - val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK - // Set the icon according to the theme. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - // Set the dark icon. - dialogBuilder.setIcon(R.drawable.domains_night) - } else { - // Set the light icon. - dialogBuilder.setIcon(R.drawable.domains_light) - } + dialogBuilder.setIconAttribute(R.attr.domainsIcon) // Set the title. dialogBuilder.setTitle(R.string.add_domain) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.java index 20e04a4b..9d7c0f38 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.java @@ -201,9 +201,9 @@ public class HttpAuthenticationDialog extends DialogFragment{ // Create a blue `ForegroundColorSpan`. ForegroundColorSpan blueColorSpan; - // Set `blueColorSpan` according to the theme. The deprecated `getResources()` must be used until API >= 23. + // Set the blue color span according to the theme. The deprecated `getResources()` must be used until API >= 23. if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400)); + blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.violet_500)); } else { blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700)); } diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.java index 0ab49b4c..49c15394 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.java @@ -433,7 +433,7 @@ public class PinnedMismatchDialog extends DialogFragment { // Set the color spans according to the theme. The deprecated `getResources()` must be used until the minimum API >= 23. if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400)); + blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.violet_500)); redColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.red_900)); } else { blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700)); diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.java index 9e329434..4b075d3b 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.java @@ -265,7 +265,7 @@ public class SslCertificateErrorDialog extends DialogFragment { // Set the color spans according to the theme. The deprecated `getResources()` must be used until the minimum API >= 23. if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400)); + blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.violet_500)); redColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.red_900)); } else { blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700)); @@ -432,7 +432,7 @@ public class SslCertificateErrorDialog extends DialogFragment { // Set the blue color span according to the theme. The deprecated `getColor()` must be used until the minimum API >= 23. if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - blueColorSpan = new ForegroundColorSpan(activity.getResources().getColor(R.color.blue_400)); + blueColorSpan = new ForegroundColorSpan(activity.getResources().getColor(R.color.violet_500)); } else { blueColorSpan = new ForegroundColorSpan(activity.getResources().getColor(R.color.blue_700)); } diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.java index 90ea8320..c382c05d 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.java @@ -239,7 +239,7 @@ public class ViewSslCertificateDialog extends DialogFragment { // Set the color spans according to the theme. The deprecated `getResources()` must be used until the minimum API >= 23. if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400)); + blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.violet_500)); redColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.red_900)); } else { blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700)); diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java index 8f148a4b..19b591c7 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java @@ -224,12 +224,12 @@ public class AboutTabFragment extends Fragment { SpannableStringBuilder ultraListStringBuilder = new SpannableStringBuilder(ultraListLabel + blocklistVersions[4]); SpannableStringBuilder ultraPrivacyStringBuilder = new SpannableStringBuilder(ultraPrivacyLabel + blocklistVersions[5]); - // Create the `blueColorSpan` variable. + // Define the blue color span variable. ForegroundColorSpan blueColorSpan; // Set the blue color span according to the theme. The deprecated `getResources()` must be used until the minimum API >= 23. if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400)); + blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.violet_500)); } else { blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700)); } diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java index 1af803a5..006fa216 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java @@ -295,16 +295,16 @@ public class DomainSettingsFragment extends Fragment { savedSslEndDateStringBuilder = new SpannableStringBuilder(endDateLabel + DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG).format(savedSslEndDate)); } - // Create a red foreground color span. The deprecated `resources.getColor` must be used until the minimum API >= 23. - final ForegroundColorSpan redColorSpan = new ForegroundColorSpan(resources.getColor(R.color.red_a700)); - - // Create a blue foreground color span. + // Create the foreground color spans. + final ForegroundColorSpan redColorSpan; final ForegroundColorSpan blueColorSpan; - // Set the blue color span according to the theme. The deprecated `resources` must be used until the minimum API >= 23. + // Set the color spans according to the theme. The deprecated `resources` must be used until the minimum API >= 23. if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - blueColorSpan = new ForegroundColorSpan(resources.getColor(R.color.blue_400)); + redColorSpan = new ForegroundColorSpan(resources.getColor(R.color.red_900)); + blueColorSpan = new ForegroundColorSpan(resources.getColor(R.color.violet_500)); } else { + redColorSpan = new ForegroundColorSpan(resources.getColor(R.color.red_a700)); blueColorSpan = new ForegroundColorSpan(resources.getColor(R.color.blue_700)); } @@ -410,9 +410,13 @@ public class DomainSettingsFragment extends Fragment { if (firstPartyCookiesInt == 1) { // First-party cookies are enabled. // Set the third-party cookies status. Once the minimum API >= 21 a selector can be used as the tint mode instead of specifying different icons. if (thirdPartyCookiesInt == 1) { // Both first-party and third-party cookies are enabled. + // Set the third-party cookies switch to be checked. thirdPartyCookiesSwitch.setChecked(true); + + // Set the icon to be red. thirdPartyCookiesImageView.setImageDrawable(resources.getDrawable(R.drawable.cookies_warning)); } else { // First party cookies are enabled but third-party cookies are disabled. + // Set the third-party cookies switch to be checked. thirdPartyCookiesSwitch.setChecked(false); // Set the icon according to the theme. @@ -1362,6 +1366,7 @@ public class DomainSettingsFragment extends Fragment { // Update the third-party cookies icon. if (thirdPartyCookiesSwitch.isChecked()) { // Third-party cookies are enabled. + // Set the third-party cookies icon to be red. thirdPartyCookiesImageView.setImageDrawable(resources.getDrawable(R.drawable.cookies_warning)); } else { // Third-party cookies are disabled. // Set the third-party cookies icon according to the theme. @@ -1395,6 +1400,7 @@ public class DomainSettingsFragment extends Fragment { thirdPartyCookiesSwitch.setOnCheckedChangeListener((CompoundButton buttonView, boolean isChecked) -> { // Update the icon. if (isChecked) { + // Set the third-party cookies icon to be red. thirdPartyCookiesImageView.setImageDrawable(resources.getDrawable(R.drawable.cookies_warning)); } else { // Update the third-party cookies icon according to the theme. diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java index 0c8d39b9..75f9b31d 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java @@ -814,15 +814,15 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Set the open intents in new tab preference icon. if (savedPreferences.getBoolean("open_intents_in_new_tab", true)) { if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_dark); + openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_night); } else { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_light); + openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_day); } } else { if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_dark); + openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_night); } else { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_light); + openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_day); } } @@ -1723,15 +1723,15 @@ public class SettingsFragment extends PreferenceFragmentCompat { // Update the icon. if (sharedPreferences.getBoolean("open_intents_in_new_tab", true)) { if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_dark); + openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_night); } else { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_light); + openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_day); } } else { if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_dark); + openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_night); } else { - openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_light); + openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_day); } } break; diff --git a/app/src/main/res/drawable/add_day.xml b/app/src/main/res/drawable/add.xml similarity index 100% rename from app/src/main/res/drawable/add_day.xml rename to app/src/main/res/drawable/add.xml diff --git a/app/src/main/res/drawable/add_night.xml b/app/src/main/res/drawable/add_night.xml deleted file mode 100644 index 38b6ddae..00000000 --- a/app/src/main/res/drawable/add_night.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/allow_screenshots_enabled_night.xml b/app/src/main/res/drawable/allow_screenshots_enabled_night.xml index de024260..ff9fe397 100644 --- a/app/src/main/res/drawable/allow_screenshots_enabled_night.xml +++ b/app/src/main/res/drawable/allow_screenshots_enabled_night.xml @@ -8,6 +8,6 @@ diff --git a/app/src/main/res/drawable/app_bar_enabled_night.xml b/app/src/main/res/drawable/app_bar_enabled_night.xml index 00b14af7..5eea93c1 100644 --- a/app/src/main/res/drawable/app_bar_enabled_night.xml +++ b/app/src/main/res/drawable/app_bar_enabled_night.xml @@ -8,6 +8,6 @@ diff --git a/app/src/main/res/drawable/theme_day.xml b/app/src/main/res/drawable/app_theme_day.xml similarity index 94% rename from app/src/main/res/drawable/theme_day.xml rename to app/src/main/res/drawable/app_theme_day.xml index a1383dc9..1aea1928 100644 --- a/app/src/main/res/drawable/theme_day.xml +++ b/app/src/main/res/drawable/app_theme_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0" + android:viewportWidth="24" + android:viewportHeight="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/theme_night.xml b/app/src/main/res/drawable/app_theme_night.xml similarity index 91% rename from app/src/main/res/drawable/theme_night.xml rename to app/src/main/res/drawable/app_theme_night.xml index 9c77a037..7fac5d55 100644 --- a/app/src/main/res/drawable/theme_night.xml +++ b/app/src/main/res/drawable/app_theme_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0" + android:viewportWidth="24" + android:viewportHeight="24" android:autoMirrored="true" tools:ignore="VectorRaster" > \ No newline at end of file diff --git a/app/src/main/res/drawable/block_ads_disabled_day.xml b/app/src/main/res/drawable/block_ads_disabled_day.xml index 106faa45..81f2d610 100644 --- a/app/src/main/res/drawable/block_ads_disabled_day.xml +++ b/app/src/main/res/drawable/block_ads_disabled_day.xml @@ -2,8 +2,8 @@ + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > diff --git a/app/src/main/res/drawable/block_all_third_party_requests_disabled_day.xml b/app/src/main/res/drawable/block_all_third_party_requests_disabled_day.xml index 4c681e53..bace6577 100644 --- a/app/src/main/res/drawable/block_all_third_party_requests_disabled_day.xml +++ b/app/src/main/res/drawable/block_all_third_party_requests_disabled_day.xml @@ -4,8 +4,8 @@ android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > diff --git a/app/src/main/res/drawable/block_tracking_disabled_day.xml b/app/src/main/res/drawable/block_tracking_disabled_day.xml index dcaaac4f..fc5037fb 100644 --- a/app/src/main/res/drawable/block_tracking_disabled_day.xml +++ b/app/src/main/res/drawable/block_tracking_disabled_day.xml @@ -7,8 +7,8 @@ android:autoMirrored="true" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/block_tracking_disabled_night.xml b/app/src/main/res/drawable/block_tracking_disabled_night.xml index 7cbe7390..44fab862 100644 --- a/app/src/main/res/drawable/block_tracking_disabled_night.xml +++ b/app/src/main/res/drawable/block_tracking_disabled_night.xml @@ -7,8 +7,8 @@ android:autoMirrored="true" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/block_tracking_enabled_day.xml b/app/src/main/res/drawable/block_tracking_enabled_day.xml index 26969ba0..9fa2641d 100644 --- a/app/src/main/res/drawable/block_tracking_enabled_day.xml +++ b/app/src/main/res/drawable/block_tracking_enabled_day.xml @@ -7,8 +7,8 @@ android:autoMirrored="true" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/block_tracking_enabled_night.xml b/app/src/main/res/drawable/block_tracking_enabled_night.xml index ed8d7104..df514483 100644 --- a/app/src/main/res/drawable/block_tracking_enabled_night.xml +++ b/app/src/main/res/drawable/block_tracking_enabled_night.xml @@ -4,15 +4,15 @@ diff --git a/app/src/main/res/drawable/bookmarks_day.xml b/app/src/main/res/drawable/bookmarks.xml similarity index 100% rename from app/src/main/res/drawable/bookmarks_day.xml rename to app/src/main/res/drawable/bookmarks.xml diff --git a/app/src/main/res/drawable/bookmarks_night.xml b/app/src/main/res/drawable/bookmarks_night.xml deleted file mode 100644 index 3608e8d5..00000000 --- a/app/src/main/res/drawable/bookmarks_night.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/cache_cleared_day.xml b/app/src/main/res/drawable/cache_cleared_day.xml index 3b8c9a78..091b4161 100644 --- a/app/src/main/res/drawable/cache_cleared_day.xml +++ b/app/src/main/res/drawable/cache_cleared_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/cache_cleared_night.xml b/app/src/main/res/drawable/cache_cleared_night.xml index 113973e1..9bf2fa0a 100644 --- a/app/src/main/res/drawable/cache_cleared_night.xml +++ b/app/src/main/res/drawable/cache_cleared_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/clear_day.xml b/app/src/main/res/drawable/clear_day.xml deleted file mode 100644 index 9e0ffc51..00000000 --- a/app/src/main/res/drawable/clear_day.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/clear_everything_disabled.xml b/app/src/main/res/drawable/clear_everything_disabled.xml index 05870616..cbef7a0f 100644 --- a/app/src/main/res/drawable/clear_everything_disabled.xml +++ b/app/src/main/res/drawable/clear_everything_disabled.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > = 21. Then `@color` or `?attr/colorControlNormal` may be used instead. --> diff --git a/app/src/main/res/drawable/clear_night.xml b/app/src/main/res/drawable/clear_night.xml deleted file mode 100644 index 8912a993..00000000 --- a/app/src/main/res/drawable/clear_night.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/close_day.xml b/app/src/main/res/drawable/close_day.xml index 50d196f5..24a94e9f 100644 --- a/app/src/main/res/drawable/close_day.xml +++ b/app/src/main/res/drawable/close_day.xml @@ -3,11 +3,11 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > diff --git a/app/src/main/res/drawable/close_night.xml b/app/src/main/res/drawable/close_night.xml index 47e515cf..d087b647 100644 --- a/app/src/main/res/drawable/close_night.xml +++ b/app/src/main/res/drawable/close_night.xml @@ -3,11 +3,11 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > diff --git a/app/src/main/res/drawable/cookies_cleared_day.xml b/app/src/main/res/drawable/cookies_cleared_day.xml index 1b400bca..6f9baa8f 100644 --- a/app/src/main/res/drawable/cookies_cleared_day.xml +++ b/app/src/main/res/drawable/cookies_cleared_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/cookies_cleared_night.xml b/app/src/main/res/drawable/cookies_cleared_night.xml index 1ebbc479..b87b1cd8 100644 --- a/app/src/main/res/drawable/cookies_cleared_night.xml +++ b/app/src/main/res/drawable/cookies_cleared_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > \ No newline at end of file diff --git a/app/src/main/res/drawable/cookies_disabled_day.xml b/app/src/main/res/drawable/cookies_disabled_day.xml index b2c60f2b..4468a8f7 100644 --- a/app/src/main/res/drawable/cookies_disabled_day.xml +++ b/app/src/main/res/drawable/cookies_disabled_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/cookies_disabled_night.xml b/app/src/main/res/drawable/cookies_disabled_night.xml index 49eca2f0..5bbbefdf 100644 --- a/app/src/main/res/drawable/cookies_disabled_night.xml +++ b/app/src/main/res/drawable/cookies_disabled_night.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/cookies_enabled.xml b/app/src/main/res/drawable/cookies_enabled.xml index 84492441..361bafe4 100644 --- a/app/src/main/res/drawable/cookies_enabled.xml +++ b/app/src/main/res/drawable/cookies_enabled.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/cookies_ghosted_day.xml b/app/src/main/res/drawable/cookies_ghosted_day.xml index d427e059..692920bf 100644 --- a/app/src/main/res/drawable/cookies_ghosted_day.xml +++ b/app/src/main/res/drawable/cookies_ghosted_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/cookies_ghosted_night.xml b/app/src/main/res/drawable/cookies_ghosted_night.xml index 14c30acc..c2c29949 100644 --- a/app/src/main/res/drawable/cookies_ghosted_night.xml +++ b/app/src/main/res/drawable/cookies_ghosted_night.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/cookies_warning.xml b/app/src/main/res/drawable/cookies_warning.xml index 4404b3d2..445ce90b 100644 --- a/app/src/main/res/drawable/cookies_warning.xml +++ b/app/src/main/res/drawable/cookies_warning.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/copy_enabled_night.xml b/app/src/main/res/drawable/copy_enabled_night.xml index 7a84453d..1ff95b11 100644 --- a/app/src/main/res/drawable/copy_enabled_night.xml +++ b/app/src/main/res/drawable/copy_enabled_night.xml @@ -13,6 +13,6 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/create_bookmark_day.xml b/app/src/main/res/drawable/create_bookmark.xml similarity index 91% rename from app/src/main/res/drawable/create_bookmark_day.xml rename to app/src/main/res/drawable/create_bookmark.xml index 1c40cce2..ae210b28 100644 --- a/app/src/main/res/drawable/create_bookmark_day.xml +++ b/app/src/main/res/drawable/create_bookmark.xml @@ -4,8 +4,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > . The resulting image is released under the GPLv3+ license. --> - - - - - - diff --git a/app/src/main/res/drawable/create_folder_day.xml b/app/src/main/res/drawable/create_folder.xml similarity index 93% rename from app/src/main/res/drawable/create_folder_day.xml rename to app/src/main/res/drawable/create_folder.xml index 3512e61c..5b598c2c 100644 --- a/app/src/main/res/drawable/create_folder_day.xml +++ b/app/src/main/res/drawable/create_folder.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/create_folder_night.xml b/app/src/main/res/drawable/create_folder_night.xml deleted file mode 100644 index 7b3c91cb..00000000 --- a/app/src/main/res/drawable/create_folder_night.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/custom_user_agent_enabled_day.xml b/app/src/main/res/drawable/custom_user_agent_enabled_day.xml index 3463bcb3..1f31c430 100644 --- a/app/src/main/res/drawable/custom_user_agent_enabled_day.xml +++ b/app/src/main/res/drawable/custom_user_agent_enabled_day.xml @@ -4,11 +4,11 @@ diff --git a/app/src/main/res/drawable/custom_user_agent_enabled_night.xml b/app/src/main/res/drawable/custom_user_agent_enabled_night.xml index e4076e43..1b67c431 100644 --- a/app/src/main/res/drawable/custom_user_agent_enabled_night.xml +++ b/app/src/main/res/drawable/custom_user_agent_enabled_night.xml @@ -4,15 +4,15 @@ diff --git a/app/src/main/res/drawable/custom_user_agent_ghosted_day.xml b/app/src/main/res/drawable/custom_user_agent_ghosted_day.xml index 6bda8913..bb0084fe 100644 --- a/app/src/main/res/drawable/custom_user_agent_ghosted_day.xml +++ b/app/src/main/res/drawable/custom_user_agent_ghosted_day.xml @@ -4,11 +4,11 @@ diff --git a/app/src/main/res/drawable/custom_user_agent_ghosted_night.xml b/app/src/main/res/drawable/custom_user_agent_ghosted_night.xml index fe6918cc..903cf518 100644 --- a/app/src/main/res/drawable/custom_user_agent_ghosted_night.xml +++ b/app/src/main/res/drawable/custom_user_agent_ghosted_night.xml @@ -7,8 +7,8 @@ android:autoMirrored="true" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/delete_day.xml b/app/src/main/res/drawable/delete_day.xml index 6fbf33a5..db6f4e50 100644 --- a/app/src/main/res/drawable/delete_day.xml +++ b/app/src/main/res/drawable/delete_day.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > diff --git a/app/src/main/res/drawable/dom_storage_cleared_night.xml b/app/src/main/res/drawable/dom_storage_cleared_night.xml index 149fcc5b..971c21ee 100644 --- a/app/src/main/res/drawable/dom_storage_cleared_night.xml +++ b/app/src/main/res/drawable/dom_storage_cleared_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/dom_storage_disabled_day.xml b/app/src/main/res/drawable/dom_storage_disabled_day.xml index fb26f261..3edbfb91 100644 --- a/app/src/main/res/drawable/dom_storage_disabled_day.xml +++ b/app/src/main/res/drawable/dom_storage_disabled_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/dom_storage_disabled_night.xml b/app/src/main/res/drawable/dom_storage_disabled_night.xml index f99dba1e..e123a560 100644 --- a/app/src/main/res/drawable/dom_storage_disabled_night.xml +++ b/app/src/main/res/drawable/dom_storage_disabled_night.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/dom_storage_enabled.xml b/app/src/main/res/drawable/dom_storage_enabled.xml index b3d86fbc..5a5e4955 100644 --- a/app/src/main/res/drawable/dom_storage_enabled.xml +++ b/app/src/main/res/drawable/dom_storage_enabled.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/dom_storage_ghosted_day.xml b/app/src/main/res/drawable/dom_storage_ghosted_day.xml index 4bf96175..e26431ac 100644 --- a/app/src/main/res/drawable/dom_storage_ghosted_day.xml +++ b/app/src/main/res/drawable/dom_storage_ghosted_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/dom_storage_ghosted_night.xml b/app/src/main/res/drawable/dom_storage_ghosted_night.xml index bf4ee919..800ad172 100644 --- a/app/src/main/res/drawable/dom_storage_ghosted_night.xml +++ b/app/src/main/res/drawable/dom_storage_ghosted_night.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/dom_storage_warning.xml b/app/src/main/res/drawable/dom_storage_warning.xml index 0abbe9f5..c7e772af 100644 --- a/app/src/main/res/drawable/dom_storage_warning.xml +++ b/app/src/main/res/drawable/dom_storage_warning.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/domains_light.xml b/app/src/main/res/drawable/domains_day.xml similarity index 93% rename from app/src/main/res/drawable/domains_light.xml rename to app/src/main/res/drawable/domains_day.xml index 7c2b9953..23a4bab2 100644 --- a/app/src/main/res/drawable/domains_light.xml +++ b/app/src/main/res/drawable/domains_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/domains_night.xml b/app/src/main/res/drawable/domains_night.xml index 5ea08689..28f64bb2 100644 --- a/app/src/main/res/drawable/domains_night.xml +++ b/app/src/main/res/drawable/domains_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/downloads_enabled_day.xml b/app/src/main/res/drawable/downloads_enabled_day.xml index 0315a5a7..a242b72e 100644 --- a/app/src/main/res/drawable/downloads_enabled_day.xml +++ b/app/src/main/res/drawable/downloads_enabled_day.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > \ No newline at end of file diff --git a/app/src/main/res/drawable/downloads_ghosted_day.xml b/app/src/main/res/drawable/downloads_ghosted_day.xml index 654c1930..eea35fec 100644 --- a/app/src/main/res/drawable/downloads_ghosted_day.xml +++ b/app/src/main/res/drawable/downloads_ghosted_day.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > diff --git a/app/src/main/res/drawable/edit_night.xml b/app/src/main/res/drawable/edit_night.xml index 2bd724ca..36a58547 100644 --- a/app/src/main/res/drawable/edit_night.xml +++ b/app/src/main/res/drawable/edit_night.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/font_size_day.xml b/app/src/main/res/drawable/font_size_day.xml index 99609b6d..9f7596e8 100644 --- a/app/src/main/res/drawable/font_size_day.xml +++ b/app/src/main/res/drawable/font_size_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/font_size_night.xml b/app/src/main/res/drawable/font_size_night.xml index 8b2a77c7..33936791 100644 --- a/app/src/main/res/drawable/font_size_night.xml +++ b/app/src/main/res/drawable/font_size_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > \ No newline at end of file diff --git a/app/src/main/res/drawable/form_data_cleared_day.xml b/app/src/main/res/drawable/form_data_cleared_day.xml index 99ecf439..a1d2d6d0 100644 --- a/app/src/main/res/drawable/form_data_cleared_day.xml +++ b/app/src/main/res/drawable/form_data_cleared_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/form_data_cleared_night.xml b/app/src/main/res/drawable/form_data_cleared_night.xml index f9c4922a..5909f78e 100644 --- a/app/src/main/res/drawable/form_data_cleared_night.xml +++ b/app/src/main/res/drawable/form_data_cleared_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/form_data_disabled_day.xml b/app/src/main/res/drawable/form_data_disabled_day.xml index fab8b382..15cc2099 100644 --- a/app/src/main/res/drawable/form_data_disabled_day.xml +++ b/app/src/main/res/drawable/form_data_disabled_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/form_data_disabled_night.xml b/app/src/main/res/drawable/form_data_disabled_night.xml index f6626c6d..b3c51a9b 100644 --- a/app/src/main/res/drawable/form_data_disabled_night.xml +++ b/app/src/main/res/drawable/form_data_disabled_night.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/form_data_enabled.xml b/app/src/main/res/drawable/form_data_enabled.xml index 5737b8f7..ce0cfbf5 100644 --- a/app/src/main/res/drawable/form_data_enabled.xml +++ b/app/src/main/res/drawable/form_data_enabled.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/form_data_warning.xml b/app/src/main/res/drawable/form_data_warning.xml index a555261b..f0a766d1 100644 --- a/app/src/main/res/drawable/form_data_warning.xml +++ b/app/src/main/res/drawable/form_data_warning.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="26dp" android:width="26dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/full_screen_disabled_day.xml b/app/src/main/res/drawable/full_screen_disabled_day.xml index ca8a5784..61c4464e 100644 --- a/app/src/main/res/drawable/full_screen_disabled_day.xml +++ b/app/src/main/res/drawable/full_screen_disabled_day.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > diff --git a/app/src/main/res/drawable/home_enabled_day.xml b/app/src/main/res/drawable/home_enabled_day.xml index b233b73f..fdd71573 100644 --- a/app/src/main/res/drawable/home_enabled_day.xml +++ b/app/src/main/res/drawable/home_enabled_day.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > \ No newline at end of file diff --git a/app/src/main/res/drawable/images_disabled_day.xml b/app/src/main/res/drawable/images_disabled_day.xml index 3b361dd5..293dc593 100644 --- a/app/src/main/res/drawable/images_disabled_day.xml +++ b/app/src/main/res/drawable/images_disabled_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/images_disabled_night.xml b/app/src/main/res/drawable/images_disabled_night.xml index aa358d4f..568c7385 100644 --- a/app/src/main/res/drawable/images_disabled_night.xml +++ b/app/src/main/res/drawable/images_disabled_night.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/images_enabled_day.xml b/app/src/main/res/drawable/images_enabled_day.xml index 07865428..c43a90e2 100644 --- a/app/src/main/res/drawable/images_enabled_day.xml +++ b/app/src/main/res/drawable/images_enabled_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/images_enabled_night.xml b/app/src/main/res/drawable/images_enabled_night.xml index cb3cb4af..4dee11f3 100644 --- a/app/src/main/res/drawable/images_enabled_night.xml +++ b/app/src/main/res/drawable/images_enabled_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/import_export_day.xml b/app/src/main/res/drawable/import_export_day.xml index 84927542..577fde7e 100644 --- a/app/src/main/res/drawable/import_export_day.xml +++ b/app/src/main/res/drawable/import_export_day.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > \ No newline at end of file diff --git a/app/src/main/res/drawable/import_export_night.xml b/app/src/main/res/drawable/import_export_night.xml index 55c712b5..59fe9d0e 100644 --- a/app/src/main/res/drawable/import_export_night.xml +++ b/app/src/main/res/drawable/import_export_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > \ No newline at end of file diff --git a/app/src/main/res/drawable/incognito_mode_disabled_day.xml b/app/src/main/res/drawable/incognito_mode_disabled_day.xml index db223220..c6b62081 100644 --- a/app/src/main/res/drawable/incognito_mode_disabled_day.xml +++ b/app/src/main/res/drawable/incognito_mode_disabled_day.xml @@ -7,8 +7,8 @@ android:autoMirrored="true" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/incognito_mode_disabled_night.xml b/app/src/main/res/drawable/incognito_mode_disabled_night.xml index eb2d06bc..b540b3ba 100644 --- a/app/src/main/res/drawable/incognito_mode_disabled_night.xml +++ b/app/src/main/res/drawable/incognito_mode_disabled_night.xml @@ -7,8 +7,8 @@ android:autoMirrored="true" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/incognito_mode_enabled_day.xml b/app/src/main/res/drawable/incognito_mode_enabled_day.xml index 981a79ab..97364d78 100644 --- a/app/src/main/res/drawable/incognito_mode_enabled_day.xml +++ b/app/src/main/res/drawable/incognito_mode_enabled_day.xml @@ -7,8 +7,8 @@ android:autoMirrored="true" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/incognito_mode_enabled_night.xml b/app/src/main/res/drawable/incognito_mode_enabled_night.xml index cb663bdd..725bca08 100644 --- a/app/src/main/res/drawable/incognito_mode_enabled_night.xml +++ b/app/src/main/res/drawable/incognito_mode_enabled_night.xml @@ -7,12 +7,12 @@ android:autoMirrored="true" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/list_selector_night.xml b/app/src/main/res/drawable/list_selector_night.xml index 433e4e7a..de971c97 100644 --- a/app/src/main/res/drawable/list_selector_night.xml +++ b/app/src/main/res/drawable/list_selector_night.xml @@ -22,5 +22,5 @@ + android:drawable="@color/violet_700" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/lock_day.xml b/app/src/main/res/drawable/lock_day.xml index 1e9fac95..e1a756db 100644 --- a/app/src/main/res/drawable/lock_day.xml +++ b/app/src/main/res/drawable/lock_day.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > diff --git a/app/src/main/res/drawable/modify_url_enabled_night.xml b/app/src/main/res/drawable/modify_url_enabled_night.xml index 136c5132..0a089e2c 100644 --- a/app/src/main/res/drawable/modify_url_enabled_night.xml +++ b/app/src/main/res/drawable/modify_url_enabled_night.xml @@ -13,6 +13,6 @@ diff --git a/app/src/main/res/drawable/more_disabled_day.xml b/app/src/main/res/drawable/more_disabled_day.xml index a2bdfd9f..bd75de68 100644 --- a/app/src/main/res/drawable/more_disabled_day.xml +++ b/app/src/main/res/drawable/more_disabled_day.xml @@ -7,8 +7,8 @@ android:autoMirrored="true" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/more_disabled_night.xml b/app/src/main/res/drawable/more_disabled_night.xml index 16af07c1..94f65cf0 100644 --- a/app/src/main/res/drawable/more_disabled_night.xml +++ b/app/src/main/res/drawable/more_disabled_night.xml @@ -7,8 +7,8 @@ android:autoMirrored="true" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/more_enabled_day.xml b/app/src/main/res/drawable/more_enabled_day.xml index 30317fcf..f456ac5f 100644 --- a/app/src/main/res/drawable/more_enabled_day.xml +++ b/app/src/main/res/drawable/more_enabled_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:autoMirrored="true" android:height="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:width="24dp" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/more_enabled_night.xml b/app/src/main/res/drawable/more_enabled_night.xml index a7f45e39..abe7ec7c 100644 --- a/app/src/main/res/drawable/more_enabled_night.xml +++ b/app/src/main/res/drawable/more_enabled_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:autoMirrored="true" android:height="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:width="24dp" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/move_to_folder_day.xml b/app/src/main/res/drawable/move_to_folder_day.xml index e723dbf3..99d22510 100644 --- a/app/src/main/res/drawable/move_to_folder_day.xml +++ b/app/src/main/res/drawable/move_to_folder_day.xml @@ -7,8 +7,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/move_to_folder_night.xml b/app/src/main/res/drawable/move_to_folder_night.xml index 98b0e0b6..a71f6b03 100644 --- a/app/src/main/res/drawable/move_to_folder_night.xml +++ b/app/src/main/res/drawable/move_to_folder_night.xml @@ -7,8 +7,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/move_up_disabled.xml b/app/src/main/res/drawable/move_up_disabled.xml index 5f9735a9..4fe0a539 100644 --- a/app/src/main/res/drawable/move_up_disabled.xml +++ b/app/src/main/res/drawable/move_up_disabled.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > diff --git a/app/src/main/res/drawable/night_mode_disabled_night.xml b/app/src/main/res/drawable/night_mode_disabled_night.xml index 9f44fe8b..0ee9accd 100644 --- a/app/src/main/res/drawable/night_mode_disabled_night.xml +++ b/app/src/main/res/drawable/night_mode_disabled_night.xml @@ -7,8 +7,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/night_mode_enabled_day.xml b/app/src/main/res/drawable/night_mode_enabled_day.xml index 20979016..ffbec3f7 100644 --- a/app/src/main/res/drawable/night_mode_enabled_day.xml +++ b/app/src/main/res/drawable/night_mode_enabled_day.xml @@ -7,8 +7,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/night_mode_enabled_night.xml b/app/src/main/res/drawable/night_mode_enabled_night.xml index 38d0d8b1..55d63136 100644 --- a/app/src/main/res/drawable/night_mode_enabled_night.xml +++ b/app/src/main/res/drawable/night_mode_enabled_night.xml @@ -14,6 +14,6 @@ diff --git a/app/src/main/res/drawable/proxy_disabled_day.xml b/app/src/main/res/drawable/proxy_disabled_day.xml index 00a2ebab..1ad61f02 100644 --- a/app/src/main/res/drawable/proxy_disabled_day.xml +++ b/app/src/main/res/drawable/proxy_disabled_day.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > diff --git a/app/src/main/res/drawable/proxy_ghosted_day.xml b/app/src/main/res/drawable/proxy_ghosted_day.xml index 0cd951a6..7e9ade75 100644 --- a/app/src/main/res/drawable/proxy_ghosted_day.xml +++ b/app/src/main/res/drawable/proxy_ghosted_day.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > diff --git a/app/src/main/res/drawable/refresh_disabled_night.xml b/app/src/main/res/drawable/refresh_disabled_night.xml index 44e074d5..57b9f830 100644 --- a/app/src/main/res/drawable/refresh_disabled_night.xml +++ b/app/src/main/res/drawable/refresh_disabled_night.xml @@ -7,8 +7,8 @@ android:autoMirrored="true" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/refresh_enabled_day.xml b/app/src/main/res/drawable/refresh_enabled_day.xml index 8a675c7f..947369d0 100644 --- a/app/src/main/res/drawable/refresh_enabled_day.xml +++ b/app/src/main/res/drawable/refresh_enabled_day.xml @@ -7,8 +7,8 @@ android:autoMirrored="true" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/refresh_enabled_night.xml b/app/src/main/res/drawable/refresh_enabled_night.xml index 2423ff7d..8d1964d2 100644 --- a/app/src/main/res/drawable/refresh_enabled_night.xml +++ b/app/src/main/res/drawable/refresh_enabled_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/save_dialog_day.xml b/app/src/main/res/drawable/save_dialog_day.xml index f18953e4..4c50e9e0 100644 --- a/app/src/main/res/drawable/save_dialog_day.xml +++ b/app/src/main/res/drawable/save_dialog_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/save_dialog_night.xml b/app/src/main/res/drawable/save_dialog_night.xml index 43aee33d..1c79b353 100644 --- a/app/src/main/res/drawable/save_dialog_night.xml +++ b/app/src/main/res/drawable/save_dialog_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > \ No newline at end of file diff --git a/app/src/main/res/drawable/search_custom_url_enabled_day.xml b/app/src/main/res/drawable/search_custom_url_enabled_day.xml index e1d4074f..1dc7aca4 100644 --- a/app/src/main/res/drawable/search_custom_url_enabled_day.xml +++ b/app/src/main/res/drawable/search_custom_url_enabled_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/search_custom_url_enabled_night.xml b/app/src/main/res/drawable/search_custom_url_enabled_night.xml index e03c1300..f9b1ae41 100644 --- a/app/src/main/res/drawable/search_custom_url_enabled_night.xml +++ b/app/src/main/res/drawable/search_custom_url_enabled_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/search_custom_url_ghosted_day.xml b/app/src/main/res/drawable/search_custom_url_ghosted_day.xml index 5026ae7d..02c7e37d 100644 --- a/app/src/main/res/drawable/search_custom_url_ghosted_day.xml +++ b/app/src/main/res/drawable/search_custom_url_ghosted_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/search_custom_url_ghosted_night.xml b/app/src/main/res/drawable/search_custom_url_ghosted_night.xml index ac7cd942..97d5e5db 100644 --- a/app/src/main/res/drawable/search_custom_url_ghosted_night.xml +++ b/app/src/main/res/drawable/search_custom_url_ghosted_night.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/search_enabled_day.xml b/app/src/main/res/drawable/search_enabled_day.xml index 78a75026..998cf366 100644 --- a/app/src/main/res/drawable/search_enabled_day.xml +++ b/app/src/main/res/drawable/search_enabled_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/search_enabled_night.xml b/app/src/main/res/drawable/search_enabled_night.xml index e9477a27..22da99ad 100644 --- a/app/src/main/res/drawable/search_enabled_night.xml +++ b/app/src/main/res/drawable/search_enabled_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/select_all_day.xml b/app/src/main/res/drawable/select_all_day.xml index 4ee0387c..849cd9a1 100644 --- a/app/src/main/res/drawable/select_all_day.xml +++ b/app/src/main/res/drawable/select_all_day.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > diff --git a/app/src/main/res/drawable/social_media_disabled_night.xml b/app/src/main/res/drawable/social_media_disabled_night.xml index 2e432f3a..c7a92b93 100644 --- a/app/src/main/res/drawable/social_media_disabled_night.xml +++ b/app/src/main/res/drawable/social_media_disabled_night.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/social_media_enabled_day.xml b/app/src/main/res/drawable/social_media_enabled_day.xml index 2aba5239..2fbc89be 100644 --- a/app/src/main/res/drawable/social_media_enabled_day.xml +++ b/app/src/main/res/drawable/social_media_enabled_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/social_media_enabled_night.xml b/app/src/main/res/drawable/social_media_enabled_night.xml index a8f611cd..915b454e 100644 --- a/app/src/main/res/drawable/social_media_enabled_night.xml +++ b/app/src/main/res/drawable/social_media_enabled_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/social_media_ghosted_day.xml b/app/src/main/res/drawable/social_media_ghosted_day.xml index 01d25ef3..d99f24d3 100644 --- a/app/src/main/res/drawable/social_media_ghosted_day.xml +++ b/app/src/main/res/drawable/social_media_ghosted_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/social_media_ghosted_night.xml b/app/src/main/res/drawable/social_media_ghosted_night.xml index f2f156f7..c17e89c7 100644 --- a/app/src/main/res/drawable/social_media_ghosted_night.xml +++ b/app/src/main/res/drawable/social_media_ghosted_night.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/sort_day.xml b/app/src/main/res/drawable/sort_day.xml index eeaa084a..40ef0806 100644 --- a/app/src/main/res/drawable/sort_day.xml +++ b/app/src/main/res/drawable/sort_day.xml @@ -7,8 +7,8 @@ android:autoMirrored="true" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/sort_night.xml b/app/src/main/res/drawable/sort_night.xml index 279c99d0..9153c62c 100644 --- a/app/src/main/res/drawable/sort_night.xml +++ b/app/src/main/res/drawable/sort_night.xml @@ -7,8 +7,8 @@ android:autoMirrored="true" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/ssl_certificate_disabled_day.xml b/app/src/main/res/drawable/ssl_certificate_disabled_day.xml index 3002d75b..a8a43598 100644 --- a/app/src/main/res/drawable/ssl_certificate_disabled_day.xml +++ b/app/src/main/res/drawable/ssl_certificate_disabled_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/ssl_certificate_disabled_night.xml b/app/src/main/res/drawable/ssl_certificate_disabled_night.xml index d0a66708..cc7c2f0e 100644 --- a/app/src/main/res/drawable/ssl_certificate_disabled_night.xml +++ b/app/src/main/res/drawable/ssl_certificate_disabled_night.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/ssl_certificate_enabled_day.xml b/app/src/main/res/drawable/ssl_certificate_enabled_day.xml index 0273ee49..4a1b4209 100644 --- a/app/src/main/res/drawable/ssl_certificate_enabled_day.xml +++ b/app/src/main/res/drawable/ssl_certificate_enabled_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/ssl_certificate_enabled_night.xml b/app/src/main/res/drawable/ssl_certificate_enabled_night.xml index 2b04dac6..a49be5f3 100644 --- a/app/src/main/res/drawable/ssl_certificate_enabled_night.xml +++ b/app/src/main/res/drawable/ssl_certificate_enabled_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > \ No newline at end of file diff --git a/app/src/main/res/drawable/tab_disabled_light.xml b/app/src/main/res/drawable/tab_disabled_day.xml similarity index 85% rename from app/src/main/res/drawable/tab_disabled_light.xml rename to app/src/main/res/drawable/tab_disabled_day.xml index 3ca79bd2..f33a96fb 100644 --- a/app/src/main/res/drawable/tab_disabled_light.xml +++ b/app/src/main/res/drawable/tab_disabled_day.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable/tab_disabled_dark.xml b/app/src/main/res/drawable/tab_disabled_night.xml similarity index 85% rename from app/src/main/res/drawable/tab_disabled_dark.xml rename to app/src/main/res/drawable/tab_disabled_night.xml index 989bc9b7..ebbcb2e8 100644 --- a/app/src/main/res/drawable/tab_disabled_dark.xml +++ b/app/src/main/res/drawable/tab_disabled_night.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable/tab_enabled_light.xml b/app/src/main/res/drawable/tab_enabled_day.xml similarity index 85% rename from app/src/main/res/drawable/tab_enabled_light.xml rename to app/src/main/res/drawable/tab_enabled_day.xml index cbc2b248..e14784d6 100644 --- a/app/src/main/res/drawable/tab_enabled_light.xml +++ b/app/src/main/res/drawable/tab_enabled_day.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable/tab_enabled_dark.xml b/app/src/main/res/drawable/tab_enabled_night.xml similarity index 80% rename from app/src/main/res/drawable/tab_enabled_dark.xml rename to app/src/main/res/drawable/tab_enabled_night.xml index d8205149..29aad21f 100644 --- a/app/src/main/res/drawable/tab_enabled_dark.xml +++ b/app/src/main/res/drawable/tab_enabled_night.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/user_agent_day.xml b/app/src/main/res/drawable/user_agent_day.xml index 328990f8..b9f3ea69 100644 --- a/app/src/main/res/drawable/user_agent_day.xml +++ b/app/src/main/res/drawable/user_agent_day.xml @@ -6,8 +6,8 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/user_agent_night.xml b/app/src/main/res/drawable/user_agent_night.xml index c0d78f78..af7ecaaf 100644 --- a/app/src/main/res/drawable/user_agent_night.xml +++ b/app/src/main/res/drawable/user_agent_night.xml @@ -6,13 +6,13 @@ xmlns:tools="http://schemas.android.com/tools" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="24" + android:viewportWidth="24" android:autoMirrored="true" tools:ignore="VectorRaster" > diff --git a/app/src/main/res/drawable/wide_viewport_disabled_day.xml b/app/src/main/res/drawable/wide_viewport_disabled_day.xml index c17b01bd..a567081f 100644 --- a/app/src/main/res/drawable/wide_viewport_disabled_day.xml +++ b/app/src/main/res/drawable/wide_viewport_disabled_day.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > + android:viewportHeight="24" + android:viewportWidth="24" > diff --git a/app/src/main/res/layout-w900dp/bookmarks_drawer.xml b/app/src/main/res/layout-w900dp/bookmarks_drawer.xml index 3d2e8148..e1e5042c 100644 --- a/app/src/main/res/layout-w900dp/bookmarks_drawer.xml +++ b/app/src/main/res/layout-w900dp/bookmarks_drawer.xml @@ -57,7 +57,8 @@ android:layout_gravity="bottom|end" android:layout_marginEnd="16dp" android:layout_marginBottom="155dp" - android:src="?attr/bookmarksIcon" /> + android:src="@drawable/bookmarks" + android:tint="?attr/fabIconTintColor" /> + android:src="@drawable/create_folder" + android:tint="?attr/fabIconTintColor" /> + android:src="@drawable/create_bookmark" + android:tint="?attr/fabIconTintColor" /> \ No newline at end of file diff --git a/app/src/main/res/layout/add_domain_dialog.xml b/app/src/main/res/layout/add_domain_dialog.xml index d69a4488..1376a19a 100644 --- a/app/src/main/res/layout/add_domain_dialog.xml +++ b/app/src/main/res/layout/add_domain_dialog.xml @@ -1,7 +1,7 @@ diff --git a/app/src/main/res/layout/main_framelayout.xml b/app/src/main/res/layout/main_framelayout.xml index 419aed34..f067aad2 100644 --- a/app/src/main/res/layout/main_framelayout.xml +++ b/app/src/main/res/layout/main_framelayout.xml @@ -166,7 +166,7 @@ android:layout_gravity="center_vertical" android:paddingStart="10dp" android:paddingEnd="10dp" - android:src="@drawable/add_day" + android:src="@drawable/add" android:tint="?attr/addTabIconTintColor" android:background="?attr/selectableItemBackground" android:onClick="addTab" diff --git a/app/src/main/res/layout/open_dialog.xml b/app/src/main/res/layout/open_dialog.xml index fc339ac4..aa2b5507 100644 --- a/app/src/main/res/layout/open_dialog.xml +++ b/app/src/main/res/layout/open_dialog.xml @@ -68,7 +68,7 @@ android:layout_gravity="center_horizontal" android:layout_margin="5dp" android:text="@string/file_does_not_exist" - android:textColor="?attr/redText" + android:textColor="?attr/redTextColor" android:textAlignment="center" /> diff --git a/app/src/main/res/layout/pinned_mismatch_scrollview.xml b/app/src/main/res/layout/pinned_mismatch_scrollview.xml index b6b2a185..725ba34b 100644 --- a/app/src/main/res/layout/pinned_mismatch_scrollview.xml +++ b/app/src/main/res/layout/pinned_mismatch_scrollview.xml @@ -1,7 +1,7 @@ diff --git a/app/src/main/res/layout/save_logcat_dialog.xml b/app/src/main/res/layout/save_logcat_dialog.xml index 7a5ef004..57e6d293 100644 --- a/app/src/main/res/layout/save_logcat_dialog.xml +++ b/app/src/main/res/layout/save_logcat_dialog.xml @@ -68,7 +68,7 @@ android:layout_gravity="center_horizontal" android:layout_margin="5dp" android:text="@string/file_exists_warning" - android:textColor="?attr/redText" + android:textColor="?attr/redTextColor" android:textAlignment="center" /> diff --git a/app/src/main/res/layout/ssl_certificate_error.xml b/app/src/main/res/layout/ssl_certificate_error.xml index cda8751c..9ee6f132 100644 --- a/app/src/main/res/layout/ssl_certificate_error.xml +++ b/app/src/main/res/layout/ssl_certificate_error.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" - android:textColor="?attr/redText" + android:textColor="?attr/redTextColor" android:textStyle="bold"/> @@ -45,7 +45,7 @@ android:text="@string/url" android:textAllCaps="true" android:textStyle="bold" - android:textColor="?attr/sslTitle" /> + android:textColor="?attr/blueTitleTextColor" /> + android:textColor="?attr/blueTitleTextColor" /> + android:textColor="?attr/blueTitleTextColor" /> + android:textColor="?attr/blueTitleTextColor" /> + + + ?android:attr/colorBackground - @color/blue_800 - @color/blue_700 - @color/blue_600 + @color/violet_700 + @color/violet_500 + @color/violet_700 @color/button_background_color_selector_night @color/button_text_color_selector_night - @color/blue_600 - @color/blue_800 - @color/red_900 - @color/blue_700 + @color/violet_500 + @color/red_900 @color/gray_400 - @color/blue_600 - @color/blue_600 - @color/blue_600 + @color/violet_500 + @color/gray_875 + @color/violet_500 + @color/violet_500 + @color/violet_500 @drawable/list_selector_night @drawable/about_night - @drawable/add_night - @drawable/bookmarks_night - @drawable/clear_night + @drawable/close_night @drawable/copy_night - @drawable/create_bookmark_night - @drawable/create_folder_night @drawable/delete_night + @drawable/domains_night @drawable/edit_night @drawable/move_to_folder_night @drawable/save_night @@ -68,11 +65,11 @@ ?attr/isLightTheme - @color/blue_600 + @color/violet_500 ?android:attr/colorBackground - @drawable/theme_night + @drawable/app_theme_night @drawable/downloads_enabled_night @drawable/font_size_night @drawable/home_enabled_night @@ -81,6 +78,6 @@ \ No newline at end of file diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml index b7dcc566..4a72b943 100644 --- a/app/src/main/res/values-night-v27/styles.xml +++ b/app/src/main/res/values-night-v27/styles.xml @@ -29,34 +29,31 @@ ?android:attr/colorBackground - @color/blue_800 - @color/blue_700 - @color/blue_600 + @color/violet_700 + @color/violet_500 + @color/violet_700 @color/button_background_color_selector_night @color/button_text_color_selector_night - @color/blue_600 - @color/blue_800 - @color/red_900 - @color/blue_700 + @color/violet_500 + @color/red_900 @color/gray_400 - @color/blue_600 - @color/blue_600 - @color/blue_600 + @color/violet_500 + @color/gray_875 + @color/violet_500 + @color/violet_500 + @color/violet_500 @drawable/list_selector_night @drawable/about_night - @drawable/add_night - @drawable/bookmarks_night - @drawable/clear_night + @drawable/close_night @drawable/copy_night - @drawable/create_bookmark_night - @drawable/create_folder_night @drawable/delete_night + @drawable/domains_night @drawable/edit_night @drawable/move_to_folder_night @drawable/save_night @@ -72,11 +69,11 @@ ?attr/isLightTheme - @color/blue_600 + @color/violet_500 ?android:attr/colorBackground - @drawable/theme_night + @drawable/app_theme_night @drawable/downloads_enabled_night @drawable/font_size_night @drawable/home_enabled_night @@ -85,6 +82,6 @@ \ No newline at end of file diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml new file mode 100644 index 00000000..3f7d5af4 --- /dev/null +++ b/app/src/main/res/values-night/colors.xml @@ -0,0 +1,107 @@ + + + + + + + + #FF9E9E9E + #FF616161 + #FFB71C1C + + + #66000000 + + #FF000000 + #11000000 + #22000000 + #33000000 + + #FFE3F2FD + #FFBBDEFB + #FF90CAF9 + #FF64B5F6 + #FF42A5F5 + #FF2196F3 + #FF1E88E5 + #FF1976D2 + #881976D2 + #FF1770C6 + #FF1565C0 + #FF1760B5 + #FF0D47A1 + #FF082B61 + #FF2962FF + + #FFBAD3FB + #FF8AB4F8 + #FF5785C5 + #FF586479 + + #FF607D8B + + #FF1766A6 + #FF14568C + #FF0E3F66 + #FF002A4D + #FF001C33 + + #FF163317 + + #FFFAFAFA + #FFF5F5F5 + #FFEEEEEE + #FFE0E0E0 + #FFBDBDBD + #FFB7B7B7 + #FF9E9E9E + #FF757575 + #FF616161 + #FF515151 + #FF424242 + #FF313131 + #FF2D2D2D + #FF212121 + + #FFE8F5E9 + #FFC8E6C9 + #FFA5D6A7 + + #FFDCEDC8 + #FF64DD17 + + #FFFFCDD2 + #FFEF9A9A + #FFE53935 + #FFD32F2F + #55D32F2F + #FFC62828 + #FFB71C1C + #FFA21212 + #FFD50000 + + #00000000 + + #FFFFFFFF + + #FFFFF9C4 + #88FBC02D + #FFF57F17 + #FFFFD600 + \ No newline at end of file diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index a5858084..499bd779 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -25,34 +25,31 @@ ?android:attr/colorBackground - @color/blue_800 - @color/blue_700 - @color/blue_600 + @color/violet_700 + @color/violet_500 + @color/violet_700 @color/button_background_color_selector_night @color/button_text_color_selector_night - @color/blue_600 - @color/blue_800 - @color/red_900 - @color/blue_700 + @color/violet_500 + @color/red_900 @color/gray_400 - @color/blue_600 - @color/blue_600 - @color/blue_600 + @color/violet_500 + @color/gray_875 + @color/violet_500 + @color/violet_500 + @color/violet_500 @drawable/list_selector_night @drawable/about_night - @drawable/add_night - @drawable/bookmarks_night - @drawable/clear_night + @drawable/close_night @drawable/copy_night - @drawable/create_bookmark_night - @drawable/create_folder_night @drawable/delete_night + @drawable/domains_night @drawable/edit_night @drawable/move_to_folder_night @drawable/save_night @@ -62,11 +59,11 @@ \ No newline at end of file diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml index 77e6829c..7a9e08c6 100644 --- a/app/src/main/res/values-v23/styles.xml +++ b/app/src/main/res/values-v23/styles.xml @@ -33,12 +33,12 @@ @color/button_background_color_selector_day @color/button_text_color_selector_day @color/blue_700 - @color/blue_800 - @color/red_a700 - @color/blue_900 + @color/red_a700 @color/gray_700 + @color/blue_700 + @color/white @color/blue_800 @color/blue_800 @color/blue_700 @@ -48,13 +48,10 @@ @drawable/about_day - @drawable/add_day - @drawable/bookmarks_day - @drawable/clear_day + @drawable/close_day @drawable/copy_day - @drawable/create_bookmark_day - @drawable/create_folder_day @drawable/delete_day + @drawable/domains_day @drawable/edit_day @drawable/move_to_folder_day @drawable/save_day @@ -72,7 +69,7 @@ ?android:attr/colorBackground - @drawable/theme_day + @drawable/app_theme_day @drawable/downloads_enabled_day @drawable/font_size_day @drawable/home_enabled_day diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml index 4c54246c..efe68c8c 100644 --- a/app/src/main/res/values-v27/styles.xml +++ b/app/src/main/res/values-v27/styles.xml @@ -35,12 +35,12 @@ @color/button_background_color_selector_day @color/button_text_color_selector_day @color/blue_700 - @color/blue_800 - @color/red_a700 - @color/blue_900 + @color/red_a700 @color/gray_700 + @color/blue_700 + @color/white @color/blue_800 @color/blue_800 @color/blue_700 @@ -50,13 +50,10 @@ @drawable/about_day - @drawable/add_day - @drawable/bookmarks_day - @drawable/clear_day + @drawable/close_day @drawable/copy_day - @drawable/create_bookmark_day - @drawable/create_folder_day @drawable/delete_day + @drawable/domains_day @drawable/edit_day @drawable/move_to_folder_day @drawable/save_day @@ -76,7 +73,7 @@ ?android:attr/colorBackground - @drawable/theme_day + @drawable/app_theme_day @drawable/downloads_enabled_day @drawable/font_size_day @drawable/home_enabled_day diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index a564c398..dd911345 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -26,13 +26,13 @@ - - + + @@ -42,14 +42,11 @@ - - - + - - + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index bb10d238..7c7d15f8 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,7 @@ - + + + #FF757575 + #FFB7B7B7 + #FFB71C1C + + #66000000 #FF000000 @@ -43,6 +49,11 @@ #FF082B61 #FF2962FF + #FFBAD3FB + #FF8AB4F8 + #FF5785C5 + #FF586479 + #FF607D8B #FF1766A6 @@ -58,12 +69,14 @@ #FFEEEEEE #FFE0E0E0 #FFBDBDBD + #FFB7B7B7 #FF9E9E9E #FF757575 #FF616161 #FF515151 #FF424242 #FF313131 + #FF2D2D2D #FF212121 #FFE8F5E9 @@ -80,6 +93,7 @@ #55D32F2F #FFC62828 #FFB71C1C + #FFA21212 #FFD50000 #00000000 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index bead663b..08fcb8a4 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -31,12 +31,12 @@ @color/button_background_color_selector_day @color/button_text_color_selector_day @color/blue_700 - @color/blue_800 - @color/red_a700 - @color/blue_900 + @color/red_a700 @color/gray_700 + @color/blue_700 + @color/white @color/blue_800 @color/blue_800 @color/blue_700 @@ -46,13 +46,10 @@ @drawable/about_day - @drawable/add_day - @drawable/bookmarks_day - @drawable/clear_day + @drawable/close_day @drawable/copy_day - @drawable/create_bookmark_day - @drawable/create_folder_day @drawable/delete_day + @drawable/domains_day @drawable/edit_day @drawable/move_to_folder_day @drawable/save_day @@ -66,7 +63,7 @@ ?android:attr/colorBackground - @drawable/theme_day + @drawable/app_theme_day @drawable/downloads_enabled_day @drawable/font_size_day @drawable/home_enabled_day -- 2.45.2