Fix the app bar and options menu icon colors. https://redmine.stoutner.com/issues/618

diff --git a/app/build.gradle b/app/build.gradle
index ae709794eeb5b80bf0ce6324e294197f1913f070..595aab29e6eafb276c9f564e67813c38b5bf7889 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -82,7 +82,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
-    implementation "androidx.core:core-ktx:1.3.1"
+    implementation "androidx.core:core-ktx:1.3.2"
     implementation 'androidx.drawerlayout:drawerlayout:1.1.1'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

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 937dc3ab775ce11faee3018e03dfc9762444e0dd..1b9161eb2068447a14329a97c38b7477f94b9f29 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AboutViewSourceDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AboutViewSourceDialog.kt
@@ -34,8 +34,8 @@ class AboutViewSourceDialog: DialogFragment() {
         // Use a builder to create the alert dialog.
         val dialogBuilder: AlertDialog.Builder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
 
-        // Set the style and the icon according to the theme.
-        dialogBuilder.setIconAttribute(R.attr.aboutIcon)
+        // Set the icon according to the theme.
+        dialogBuilder.setIconAttribute(R.attr.aboutBlueIcon)
 
         // 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 a646a78d907d038f63a1c086239659cf8b76ba92..9860a04a10754309377a26eb2721bfbaf866c644 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt
@@ -94,7 +94,7 @@ class AddDomainDialog: DialogFragment() {
         val dialogBuilder: AlertDialog.Builder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
 
         // Set the icon according to the theme.
-        dialogBuilder.setIconAttribute(R.attr.domainsIcon)
+        dialogBuilder.setIconAttribute(R.attr.domainsBlueIcon)
 
         // Set the title.
         dialogBuilder.setTitle(R.string.add_domain)

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/FontSizeDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/FontSizeDialog.kt
index 75ef4e4517a88caa2bd9840e8097ae0db82d428d..e6f3110ba5e0f11c38a67d41a91becba92b1328e 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/FontSizeDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/FontSizeDialog.kt
@@ -85,15 +85,8 @@ class FontSizeDialog: DialogFragment() {
         // Use a builder to create the alert dialog.
         val dialogBuilder = 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_NO) {
-            dialogBuilder.setIcon(R.drawable.font_size_day)
-        } else {
-            dialogBuilder.setIcon(R.drawable.font_size_night)
-        }
+        dialogBuilder.setIconAttribute(R.attr.fontSizeBlueIcon)
 
         // Set the title.
         dialogBuilder.setTitle(R.string.font_size)

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt
index 7c94fcfbfdd72f52a2df00054dbea60cd0fee0ec..dca6032dc74abe26f574139166fcc057e3db8495 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt
@@ -108,16 +108,8 @@ class HttpAuthenticationDialog: DialogFragment() {
             // Use an alert dialog builder to create the alert dialog.
             val dialogBuilder = AlertDialog.Builder(requireActivity(), 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_NO) {
-                dialogBuilder.setIcon(R.drawable.lock_day)
-            } else {
-
-                dialogBuilder.setIcon(R.drawable.lock_night)
-            }
+            dialogBuilder.setIconAttribute(R.attr.lockBlueIcon)
 
             // Set the title.
             dialogBuilder.setTitle(R.string.http_authentication)
@@ -180,6 +172,9 @@ class HttpAuthenticationDialog: DialogFragment() {
             val hostLabel = getString(R.string.host) + "  "
             val hostStringBuilder = SpannableStringBuilder(hostLabel + httpAuthHost)
 
+            // Get the current theme status.
+            val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+
             // Create a blue foreground color span.
             val blueColorSpan: ForegroundColorSpan
 

diff --git a/app/src/main/res/drawable/about_blue_day.xml b/app/src/main/res/drawable/about_blue_day.xml
new file mode 100644 (file)
index 0000000..ce6ee32
--- /dev/null
+++ b/app/src/main/res/drawable/about_blue_day.xml
@@ -0,0 +1,13 @@
+<!-- This file comes from the Android Material icon set, where it is called `info_outline`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
+    <path
+        android:fillColor="#FF1565C0"
+        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
+</vector>

diff --git a/app/src/main/res/drawable/about_blue_night.xml b/app/src/main/res/drawable/about_blue_night.xml
new file mode 100644 (file)
index 0000000..8506e91
--- /dev/null
+++ b/app/src/main/res/drawable/about_blue_night.xml
@@ -0,0 +1,13 @@
+<!-- This file comes from the Android Material icon set, where it is called `info_outline`.  It is released under the Apache License 2.0. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
+    <path
+        android:fillColor="#FF8AB4F8"
+        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
+</vector>

diff --git a/app/src/main/res/drawable/about_day.xml b/app/src/main/res/drawable/about_day.xml
index 7a6293341197636d6c63ab1c7109656881dc290b..ae8f192f4b3fd446c27161cec89c426e1e107d7c 100644 (file)
--- a/app/src/main/res/drawable/about_day.xml
+++ b/app/src/main/res/drawable/about_day.xml
@@ -8,6 +8,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FF202020"
         android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
 </vector>

diff --git a/app/src/main/res/drawable/about_night.xml b/app/src/main/res/drawable/about_night.xml
index cdba373cec9b2b3fcce52ebb87afebf0e4d5d100..4150caa843d632852ad6bc5bfea1fc68b8784248 100644 (file)
--- a/app/src/main/res/drawable/about_night.xml
+++ b/app/src/main/res/drawable/about_night.xml
@@ -8,6 +8,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
 </vector>

diff --git a/app/src/main/res/drawable/close_day.xml b/app/src/main/res/drawable/close_day.xml
index 24a94e9fcadc709fa1fe89c4c1e4320a4c2f1936..4d257722029500f559ba5aec21f46bb3ee65c986 100644 (file)
--- a/app/src/main/res/drawable/close_day.xml
+++ b/app/src/main/res/drawable/close_day.xml
@@ -8,6 +8,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used instead. -->
     <path
-        android:fillColor="#FF616161"
+        android:fillColor="#FF202020"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
 </vector>

diff --git a/app/src/main/res/drawable/close_night.xml b/app/src/main/res/drawable/close_night.xml
index d087b647ce0f02b9e7b1b5b228cd700f434bd829..87a6d9676ec5d2b674429615c023955f71245845 100644 (file)
--- a/app/src/main/res/drawable/close_night.xml
+++ b/app/src/main/res/drawable/close_night.xml
@@ -8,6 +8,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used instead. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
 </vector>

diff --git a/app/src/main/res/drawable/copy_day.xml b/app/src/main/res/drawable/copy_day.xml
index 227515225010043b50d927afc9e059b4b063e1ae..05a8fa627b2e94a3622e2fe6cadcd64f77034867 100644 (file)
--- a/app/src/main/res/drawable/copy_day.xml
+++ b/app/src/main/res/drawable/copy_day.xml
@@ -13,6 +13,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FF616161"
+        android:fillColor="#FF202020"
         android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5l6,6v10c0,1.1 -0.9,2 -2,2L7.99,23C6.89,23 6,22.1 6,21l0.01,-14c0,-1.1 0.89,-2 1.99,-2h7zM14,12h5.5L14,6.5L14,12z"/>
 </vector>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/copy_night.xml b/app/src/main/res/drawable/copy_night.xml
index f1e7a828711825252b5b4c8e11e799f16d3bcf91..1742244f6232b275cd1341fd874688da3f8afdd2 100644 (file)
--- a/app/src/main/res/drawable/copy_night.xml
+++ b/app/src/main/res/drawable/copy_night.xml
@@ -13,6 +13,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5l6,6v10c0,1.1 -0.9,2 -2,2L7.99,23C6.89,23 6,22.1 6,21l0.01,-14c0,-1.1 0.89,-2 1.99,-2h7zM14,12h5.5L14,6.5L14,12z"/>
 </vector>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/delete_day.xml b/app/src/main/res/drawable/delete_day.xml
index db6f4e50e59f534580faf877e979a7dc5f595a3e..4f5db2a2ba475bc3729d199be4791c948ea0f0e4 100644 (file)
--- a/app/src/main/res/drawable/delete_day.xml
+++ b/app/src/main/res/drawable/delete_day.xml
@@ -8,6 +8,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FF616161"
+        android:fillColor="#FF202020"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
 </vector>

diff --git a/app/src/main/res/drawable/delete_night.xml b/app/src/main/res/drawable/delete_night.xml
index 423b5052b0b70687ad52d8742718697d18d34eda..8c5e5ee21ffd029443cb34b7e50f443efbe0ae0d 100644 (file)
--- a/app/src/main/res/drawable/delete_night.xml
+++ b/app/src/main/res/drawable/delete_night.xml
@@ -8,6 +8,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
 </vector>

diff --git a/app/src/main/res/drawable/edit_day.xml b/app/src/main/res/drawable/edit_day.xml
index 45587511a3daa3ad2e5a3ee6004b0adf3ab9d36d..3508d7979d3f0b45c4884d8b8a78444b844afbc2 100644 (file)
--- a/app/src/main/res/drawable/edit_day.xml
+++ b/app/src/main/res/drawable/edit_day.xml
@@ -13,6 +13,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FF616161"
+        android:fillColor="#FF202020"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
 </vector>

diff --git a/app/src/main/res/drawable/edit_night.xml b/app/src/main/res/drawable/edit_night.xml
index 36a58547f155270f413681a2c12c4499a8c6e832..bad07f55a99a9d6e091d2d0ab6b5f0db34047b77 100644 (file)
--- a/app/src/main/res/drawable/edit_night.xml
+++ b/app/src/main/res/drawable/edit_night.xml
@@ -13,6 +13,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
 </vector>

diff --git a/app/src/main/res/drawable/images_options_day.xml b/app/src/main/res/drawable/images_options_day.xml
index 04b2929b8962ec498945c7d583a90501880ec730..265962824ce1769b857d90dc4702eabd806fdbeb 100644 (file)
--- a/app/src/main/res/drawable/images_options_day.xml
+++ b/app/src/main/res/drawable/images_options_day.xml
@@ -13,6 +13,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used instead. -->
     <path
-        android:fillColor="#FF616161"
+        android:fillColor="#FF202020"
         android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z" />
 </vector>

diff --git a/app/src/main/res/drawable/images_options_night.xml b/app/src/main/res/drawable/images_options_night.xml
index 840a8beec1f4f2a1a0dd621a729bdcacff8c6f4b..ff0d06cbcf2505fecd5cdbfbcf6ef7389e8637d2 100644 (file)
--- a/app/src/main/res/drawable/images_options_night.xml
+++ b/app/src/main/res/drawable/images_options_night.xml
@@ -13,6 +13,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used instead. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z" />
 </vector>

diff --git a/app/src/main/res/drawable/move_down_enabled_day.xml b/app/src/main/res/drawable/move_down_enabled_day.xml
index 7ff2e3398e15663610e62000a2cc417df7336869..643f17c409534ff6c66a42d66bd0ce60f02fd28f 100644 (file)
--- a/app/src/main/res/drawable/move_down_enabled_day.xml
+++ b/app/src/main/res/drawable/move_down_enabled_day.xml
@@ -8,6 +8,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FF616161"
+        android:fillColor="#FF202020"
         android:pathData="M16,13h-3V3h-2v10H8l4,4 4,-4zM4,19v2h16v-2H4z"/>
 </vector>

diff --git a/app/src/main/res/drawable/move_down_enabled_night.xml b/app/src/main/res/drawable/move_down_enabled_night.xml
index 415811ba2f8dcb513c46a60625036d5427d58674..bf73f3bee177e53a6ea218ff367126c845ce0bac 100644 (file)
--- a/app/src/main/res/drawable/move_down_enabled_night.xml
+++ b/app/src/main/res/drawable/move_down_enabled_night.xml
@@ -8,6 +8,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M16,13h-3V3h-2v10H8l4,4 4,-4zM4,19v2h16v-2H4z"/>
 </vector>

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 99d22510ed017d4fc913f9ae54fe482b1edef72f..b0adbd1757971a2e2b6aa06f2f3b679c85213be3 100644 (file)
--- a/app/src/main/res/drawable/move_to_folder_day.xml
+++ b/app/src/main/res/drawable/move_to_folder_day.xml
@@ -14,6 +14,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FF616161"
+        android:fillColor="#FF202020"
         android:pathData="M4,4C2.9,4 2.01,4.9 2.01,6L2,18C2,19.1 2.9,20 4,20L20,20C21.1,20 22,19.1 22,18L22,8C22,6.9 21.1,6 20,6L12,6L10,4L4,4zM13.75,7.83L18.75,12.83L13.75,17.83L12.34,16.421L14.92,13.83L5.25,13.83L5.25,11.83L14.92,11.83L12.34,9.24L13.75,7.83z" />
 </vector>

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 a71f6b03750dbd7ecd54f26c1e13db724ae72768..ca34bdc05787ce9e0dca965801413a6a562ceb15 100644 (file)
--- a/app/src/main/res/drawable/move_to_folder_night.xml
+++ b/app/src/main/res/drawable/move_to_folder_night.xml
@@ -14,6 +14,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M4,4C2.9,4 2.01,4.9 2.01,6L2,18C2,19.1 2.9,20 4,20L20,20C21.1,20 22,19.1 22,18L22,8C22,6.9 21.1,6 20,6L12,6L10,4L4,4zM13.75,7.83L18.75,12.83L13.75,17.83L12.34,16.421L14.92,13.83L5.25,13.83L5.25,11.83L14.92,11.83L12.34,9.24L13.75,7.83z" />
 </vector>

diff --git a/app/src/main/res/drawable/move_up_enabled_day.xml b/app/src/main/res/drawable/move_up_enabled_day.xml
index ff8a8b457618f52d2fb86dd68e7a1ba56870e8b5..26437dfdae56d46c14553ebe8bd3cf01b9d3ff0a 100644 (file)
--- a/app/src/main/res/drawable/move_up_enabled_day.xml
+++ b/app/src/main/res/drawable/move_up_enabled_day.xml
@@ -8,6 +8,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FF616161"
+        android:fillColor="#FF202020"
         android:pathData="M8,11h3v10h2V11h3l-4,-4 -4,4zM4,3v2h16V3H4z"/>
 </vector>

diff --git a/app/src/main/res/drawable/move_up_enabled_night.xml b/app/src/main/res/drawable/move_up_enabled_night.xml
index 9a9a292d43c939dedb372c6c242ab5b5dcab6601..6f086af04d714cb6c31f34b5d31dcf240ee4961c 100644 (file)
--- a/app/src/main/res/drawable/move_up_enabled_night.xml
+++ b/app/src/main/res/drawable/move_up_enabled_night.xml
@@ -8,6 +8,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M8,11h3v10h2V11h3l-4,-4 -4,4zM4,3v2h16V3H4z"/>
 </vector>

diff --git a/app/src/main/res/drawable/save_day.xml b/app/src/main/res/drawable/save_day.xml
index 26559dfc0e661c971a0d5d34bde16d3093fdaf66..9c46e82466c11cfcb05efe505481908a29618260 100644 (file)
--- a/app/src/main/res/drawable/save_day.xml
+++ b/app/src/main/res/drawable/save_day.xml
@@ -13,6 +13,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FF616161"
+        android:fillColor="#FF202020"
         android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z" />
 </vector>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/save_night.xml b/app/src/main/res/drawable/save_night.xml
index 4553fd0b36aa25dfd1e13167d1fddc3fa9517ef5..21e219fd90f4f924f7207c55b8eef5d123be09fe 100644 (file)
--- a/app/src/main/res/drawable/save_night.xml
+++ b/app/src/main/res/drawable/save_night.xml
@@ -13,6 +13,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z" />
 </vector>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/save_text_day.xml b/app/src/main/res/drawable/save_text_day.xml
index 7d5d46808760d0f5df7de7f9fe503438a318a470..75b990f24dde8f960b28cfc9b2cc109bca1b6266 100644 (file)
--- a/app/src/main/res/drawable/save_text_day.xml
+++ b/app/src/main/res/drawable/save_text_day.xml
@@ -13,6 +13,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used instead. -->
     <path
-        android:fillColor="#FF616161"
+        android:fillColor="#FF202020"
         android:pathData="M13,12h7v1.5h-7zM13,9.5h7L20,11h-7zM13,14.5h7L20,16h-7zM21,4L3,4c-1.1,0 -2,0.9 -2,2v13c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,6c0,-1.1 -0.9,-2 -2,-2zM21,19h-9L12,6h9v13z"/>
 </vector>

diff --git a/app/src/main/res/drawable/save_text_night.xml b/app/src/main/res/drawable/save_text_night.xml
index ed5dc429d438cb1c97bfe4db3d8f8a0e2bbd8c77..91469a3f7d16eec3545cf338acf993ba9b9a7f30 100644 (file)
--- a/app/src/main/res/drawable/save_text_night.xml
+++ b/app/src/main/res/drawable/save_text_night.xml
@@ -13,6 +13,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used instead. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M13,12h7v1.5h-7zM13,9.5h7L20,11h-7zM13,14.5h7L20,16h-7zM21,4L3,4c-1.1,0 -2,0.9 -2,2v13c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,6c0,-1.1 -0.9,-2 -2,-2zM21,19h-9L12,6h9v13z"/>
 </vector>

diff --git a/app/src/main/res/drawable/select_all_day.xml b/app/src/main/res/drawable/select_all_day.xml
index 849cd9a1c394cb33a4c83be996027f5af6d9bf97..e066dd5a4631903fa94a789648508b242de50378 100644 (file)
--- a/app/src/main/res/drawable/select_all_day.xml
+++ b/app/src/main/res/drawable/select_all_day.xml
@@ -8,6 +8,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FF616161"
+        android:fillColor="#FF202020"
         android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
 </vector>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/select_all_night.xml b/app/src/main/res/drawable/select_all_night.xml
index d0f5f6cc5dd30ea38d36ac8e843438cc26839f4e..6b33ab6219f37c7fe7a329d660b2e24df42fd73d 100644 (file)
--- a/app/src/main/res/drawable/select_all_night.xml
+++ b/app/src/main/res/drawable/select_all_night.xml
@@ -8,6 +8,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
 </vector>
\ No newline at end of file

diff --git a/app/src/main/res/drawable/share_day.xml b/app/src/main/res/drawable/share_day.xml
index ee2f0e21bd3e76681e721eca25cf806a856b932d..95d6c42653b13440bd3a6d2f99a3531b094e1cec 100644 (file)
--- a/app/src/main/res/drawable/share_day.xml
+++ b/app/src/main/res/drawable/share_day.xml
@@ -13,6 +13,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used instead. -->
     <path
-        android:fillColor="#FF616161"
+        android:fillColor="#FF202020"
         android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
 </vector>

diff --git a/app/src/main/res/drawable/share_night.xml b/app/src/main/res/drawable/share_night.xml
index 3d3652bf843a8b279f9c5819ff3967e3d2d38794..1a7955feb695e26f8ca4638e50ef1c20a1866817 100644 (file)
--- a/app/src/main/res/drawable/share_night.xml
+++ b/app/src/main/res/drawable/share_night.xml
@@ -13,6 +13,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used instead. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
 </vector>

diff --git a/app/src/main/res/drawable/sort_day.xml b/app/src/main/res/drawable/sort_day.xml
index 40ef0806da2a513e087065f7a5fc9cb1a689e607..58d4b15661902b5d21b21fc07e0c2bad83af140c 100644 (file)
--- a/app/src/main/res/drawable/sort_day.xml
+++ b/app/src/main/res/drawable/sort_day.xml
@@ -13,6 +13,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FF616161"
+        android:fillColor="#FF202020"
         android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z" />
 </vector>

diff --git a/app/src/main/res/drawable/sort_night.xml b/app/src/main/res/drawable/sort_night.xml
index 9153c62cf36f3b2b017ff5951060a39cc85e6ea4..9aa55fbec00fd54cd7bb45a565f903eb8072e944 100644 (file)
--- a/app/src/main/res/drawable/sort_night.xml
+++ b/app/src/main/res/drawable/sort_night.xml
@@ -13,6 +13,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z" />
 </vector>

diff --git a/app/src/main/res/drawable/sort_selected_day.xml b/app/src/main/res/drawable/sort_selected_day.xml
index ea40a786e960173eaa4b7585f5d721f880e2c607..167008512c319620167406ad33612de948a7d4b1 100644 (file)
--- a/app/src/main/res/drawable/sort_selected_day.xml
+++ b/app/src/main/res/drawable/sort_selected_day.xml
@@ -19,6 +19,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FF616161"
+        android:fillColor="#FF202020"
         android:pathData="M3,18H9V16H3ZM3,6v2h18v-2zM3,13H15V11H3Z" />
 </vector>

diff --git a/app/src/main/res/drawable/sort_selected_night.xml b/app/src/main/res/drawable/sort_selected_night.xml
index 8c9f8afbe2db293457b06c4bcdc1f8edff26a567..2901466cbf1b692294732f77f6aa05c8be61d4a9 100644 (file)
--- a/app/src/main/res/drawable/sort_selected_night.xml
+++ b/app/src/main/res/drawable/sort_selected_night.xml
@@ -19,6 +19,6 @@
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` or `?attr/colorControlNormal` may be used. -->
     <path
-        android:fillColor="#FFE0E0E0"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M3,18H9V16H3ZM3,6v2h18v-2zM3,13H15V11H3Z" />
 </vector>

diff --git a/app/src/main/res/layout/about_coordinatorlayout.xml b/app/src/main/res/layout/about_coordinatorlayout.xml
index 1681e3674ccf9cfa29604346deffd97d6ecbf200..b9c6dc06a4f49c849d1f5934422c0b486b795537 100644 (file)
--- a/app/src/main/res/layout/about_coordinatorlayout.xml
+++ b/app/src/main/res/layout/about_coordinatorlayout.xml
@@ -31,11 +31,13 @@
         android:layout_width="match_parent"
         android:orientation="vertical" >
 
+        <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme. -->
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/about_appbarlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:background="?android:attr/colorBackground" >
+            android:background="?android:attr/colorBackground"
+            android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" >
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/about_toolbar"

diff --git a/app/src/main/res/layout/bookmarks_coordinatorlayout.xml b/app/src/main/res/layout/bookmarks_coordinatorlayout.xml
index 798759336d438ca38c2eff6f61133546324d14e6..20a88a0ea5558164c1be3e967ae0b6b8fd5d1315 100644 (file)
--- a/app/src/main/res/layout/bookmarks_coordinatorlayout.xml
+++ b/app/src/main/res/layout/bookmarks_coordinatorlayout.xml
@@ -30,11 +30,13 @@
         android:layout_width="match_parent"
         android:orientation="vertical" >
 
+        <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme. -->
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/bookmarks_appbarlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:background="?android:attr/colorBackground" >
+            android:background="?android:attr/colorBackground"
+            android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" >
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/bookmarks_toolbar"

diff --git a/app/src/main/res/layout/bookmarks_databaseview_coordinatorlayout.xml b/app/src/main/res/layout/bookmarks_databaseview_coordinatorlayout.xml
index 414ab2f91d3d45dbc5647999e68d8826ba3ac181..49a913f365e44a1233b31562b4f501db9a14b2a6 100644 (file)
--- a/app/src/main/res/layout/bookmarks_databaseview_coordinatorlayout.xml
+++ b/app/src/main/res/layout/bookmarks_databaseview_coordinatorlayout.xml
@@ -30,11 +30,13 @@
         android:layout_width="match_parent"
         android:orientation="vertical" >
 
+        <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme. -->
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/bookmarks_databaseview_appbarlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:background="?android:attr/colorBackground" >
+            android:background="?android:attr/colorBackground"
+            android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" >
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/bookmarks_databaseview_toolbar"

diff --git a/app/src/main/res/layout/domains_coordinatorlayout.xml b/app/src/main/res/layout/domains_coordinatorlayout.xml
index f609cebf82dbea41ece2203e3a300e80ba336df6..3fb0072090211c3238abc39a26048974c0f04b57 100644 (file)
--- a/app/src/main/res/layout/domains_coordinatorlayout.xml
+++ b/app/src/main/res/layout/domains_coordinatorlayout.xml
@@ -31,10 +31,12 @@
         android:layout_width="match_parent"
         android:orientation="vertical" >
 
+        <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme. -->
         <com.google.android.material.appbar.AppBarLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:background="?android:attr/colorBackground" >
+            android:background="?android:attr/colorBackground"
+            android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" >
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/domains_toolbar"

diff --git a/app/src/main/res/layout/guide_coordinatorlayout.xml b/app/src/main/res/layout/guide_coordinatorlayout.xml
index b193b360c8a37c80d44d0b7ca7c96d8e6c32bb39..5140dcc025d3a735b71aa350b11a87a031b37c1d 100644 (file)
--- a/app/src/main/res/layout/guide_coordinatorlayout.xml
+++ b/app/src/main/res/layout/guide_coordinatorlayout.xml
@@ -31,11 +31,13 @@
         android:layout_width="match_parent"
         android:orientation="vertical" >
 
+        <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme. -->
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/guide_appbarlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:background="?android:attr/colorBackground" >
+            android:background="?android:attr/colorBackground"
+            android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" >
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/guide_toolbar"

diff --git a/app/src/main/res/layout/import_export_coordinatorlayout.xml b/app/src/main/res/layout/import_export_coordinatorlayout.xml
index d203ec30b3cb67c72ebbbb0ed777a256496f1ce5..5803328693752d4c4477f97a041ad6d1bf78a207 100644 (file)
--- a/app/src/main/res/layout/import_export_coordinatorlayout.xml
+++ b/app/src/main/res/layout/import_export_coordinatorlayout.xml
@@ -31,11 +31,13 @@
         android:layout_width="match_parent"
         android:orientation="vertical" >
 
+        <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme. -->
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/import_export_appbarlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:background="?android:attr/colorBackground" >
+            android:background="?android:attr/colorBackground"
+            android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" >
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/import_export_toolbar"

diff --git a/app/src/main/res/layout/logcat_coordinatorlayout.xml b/app/src/main/res/layout/logcat_coordinatorlayout.xml
index a13ef592804eb30ea6f9558750c6a2db7f6e3575..12345a767535962cd68ca4660ae0e6db3b07f85b 100644 (file)
--- a/app/src/main/res/layout/logcat_coordinatorlayout.xml
+++ b/app/src/main/res/layout/logcat_coordinatorlayout.xml
@@ -30,11 +30,13 @@
         android:layout_width="match_parent"
         android:orientation="vertical" >
 
+        <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme.  The background is set programmatically based on the proxy status. -->
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/logcat_appbarlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:background="?android:attr/colorBackground" >
+            android:background="?android:attr/colorBackground"
+            android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" >
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/logcat_toolbar"

diff --git a/app/src/main/res/layout/main_framelayout.xml b/app/src/main/res/layout/main_framelayout.xml
index 61a196ee4ba9693f01f3fbd5a75bb3681c902aeb..3711e7245a7d6913d08dba60639dee543f8d9df1 100644 (file)
--- a/app/src/main/res/layout/main_framelayout.xml
+++ b/app/src/main/res/layout/main_framelayout.xml
@@ -48,10 +48,12 @@
                 android:focusable="true"
                 android:focusableInTouchMode="true" >
 
+                <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme.  The background is set programmatically based on the proxy status. -->
                 <com.google.android.material.appbar.AppBarLayout
                     android:id="@+id/appbar_layout"
                     android:layout_height="wrap_content"
-                    android:layout_width="match_parent" >
+                    android:layout_width="match_parent"
+                    android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" >
 
                     <!-- The toolbar.  It is initially `visibility="gone"` so it doesn't display while the blocklists are loading. -->
                     <androidx.appcompat.widget.Toolbar

diff --git a/app/src/main/res/layout/requests_coordinatorlayout.xml b/app/src/main/res/layout/requests_coordinatorlayout.xml
index 342b606fbea3108cf89b5883c4f42f6202c1ca6b..8df713104582ddebeff4f1125a97778d2e7ef165 100644 (file)
--- a/app/src/main/res/layout/requests_coordinatorlayout.xml
+++ b/app/src/main/res/layout/requests_coordinatorlayout.xml
@@ -30,11 +30,13 @@
         android:layout_width="match_parent"
         android:orientation="vertical" >
 
+        <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme. -->
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/requests_appbarlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:background="?android:attr/colorBackground" >
+            android:background="?android:attr/colorBackground"
+            android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" >
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/requests_toolbar"

diff --git a/app/src/main/res/layout/view_source_app_bar.xml b/app/src/main/res/layout/view_source_app_bar.xml
index 54c77d2741f182b85bbdc7727a0d57f257a32eaa..4da96083d45a31e659d03b8c20a8684e108865d4 100644 (file)
--- a/app/src/main/res/layout/view_source_app_bar.xml
+++ b/app/src/main/res/layout/view_source_app_bar.xml
@@ -21,15 +21,15 @@
 <!-- `RelativeLayout` is used instead of a `LinearLayout` because `supportAppBar` does not let `android:layout_weight="1"` cause `urlTextBox` to fill all the available space. -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    tools:context=".activities.ViewSourceActivity" >
+    android:layout_width="match_parent" >
 
     <ImageView
         android:id="@+id/back_arrow"
         android:src="@drawable/back"
-        android:tint="?attr/colorControlNormal"
+        app:tint="?attr/colorControlNormal"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_centerVertical="true"

diff --git a/app/src/main/res/layout/view_source_coordinatorlayout.xml b/app/src/main/res/layout/view_source_coordinatorlayout.xml
index 526140654544e64ef9856fea3bbcecd54deebb2a..603c1784e163da144aedd4eacd329977885eb44f 100644 (file)
--- a/app/src/main/res/layout/view_source_coordinatorlayout.xml
+++ b/app/src/main/res/layout/view_source_coordinatorlayout.xml
@@ -23,7 +23,6 @@
     android:id="@+id/view_source_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.stoutner.privacybrowser.activities.ViewSourceActivity"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:focusable="true"
@@ -35,10 +34,12 @@
         android:layout_width="match_parent"
         android:orientation="vertical" >
 
+        <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme. -->
         <com.google.android.material.appbar.AppBarLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:background="?android:attr/colorBackground" >
+            android:background="?android:attr/colorBackground"
+            android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" >
 
             <!-- The frame layout allows the toolbar and the progress bar to occupy the same space. -->
             <FrameLayout

diff --git a/app/src/main/res/values-night-v23/styles.xml b/app/src/main/res/values-night-v23/styles.xml
index bcee8538d1229120006aee9bd8f5eb1ebb785f7a..b43b6acd37a9e67b62f4beedd7d13f9909104a75 100644 (file)
--- a/app/src/main/res/values-night-v23/styles.xml
+++ b/app/src/main/res/values-night-v23/styles.xml
@@ -46,12 +46,11 @@
         <!-- Drawables. -->
         <item name="listSelectorDrawable">@drawable/list_selector_night</item>
 
-        <!-- Icons. -->
+        <!-- Options Icons. -->
         <item name="aboutIcon">@drawable/about_night</item>
         <item name="closeIcon">@drawable/close_night</item>
         <item name="copyIcon">@drawable/copy_night</item>
         <item name="deleteIcon">@drawable/delete_night</item>
-        <item name="domainsIcon">@drawable/domains_night</item>
         <item name="editIcon">@drawable/edit_night</item>
         <item name="moveToFolderIcon">@drawable/move_to_folder_night</item>
         <item name="saveIcon">@drawable/save_night</item>
@@ -60,6 +59,12 @@
         <item name="selectAllIcon">@drawable/select_all_night</item>
         <item name="shareIcon">@drawable/share_night</item>
         <item name="sortIcon">@drawable/sort_night</item>
+
+        <!-- Dialog Icons. -->
+        <item name="aboutBlueIcon">@drawable/about_blue_night</item>
+        <item name="domainsBlueIcon">@drawable/domains_night</item>
+        <item name="fontSizeBlueIcon">@drawable/font_size_night</item>
+        <item name="lockBlueIcon">@drawable/lock_night</item>
     </style>
 
     <style name="PrivacyBrowserSettings" parent="Theme.AppCompat.DayNight" >

diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
index 5235ba8c907b8dfc428a9ab5a65e1725111a1f1d..915223870ec3b7d353a7abdec49a31c58c7428fd 100644 (file)
--- a/app/src/main/res/values-night-v27/styles.xml
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -48,12 +48,11 @@
         <!-- Drawables. -->
         <item name="listSelectorDrawable">@drawable/list_selector_night</item>
 
-        <!-- Icons. -->
+        <!-- Options Icons. -->
         <item name="aboutIcon">@drawable/about_night</item>
         <item name="closeIcon">@drawable/close_night</item>
         <item name="copyIcon">@drawable/copy_night</item>
         <item name="deleteIcon">@drawable/delete_night</item>
-        <item name="domainsIcon">@drawable/domains_night</item>
         <item name="editIcon">@drawable/edit_night</item>
         <item name="moveToFolderIcon">@drawable/move_to_folder_night</item>
         <item name="saveIcon">@drawable/save_night</item>
@@ -62,6 +61,12 @@
         <item name="selectAllIcon">@drawable/select_all_night</item>
         <item name="shareIcon">@drawable/share_night</item>
         <item name="sortIcon">@drawable/sort_night</item>
+
+        <!-- Dialog Icons. -->
+        <item name="aboutBlueIcon">@drawable/about_blue_night</item>
+        <item name="domainsBlueIcon">@drawable/domains_night</item>
+        <item name="fontSizeBlueIcon">@drawable/font_size_night</item>
+        <item name="lockBlueIcon">@drawable/lock_night</item>
     </style>
 
     <style name="PrivacyBrowserSettings" parent="Theme.AppCompat.DayNight" >

diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index d485526bac2deaea895f21a276baa25a60adba91..e9690ffef97f2ab097822ab4c7261ecdd8f62145 100644 (file)
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -44,12 +44,11 @@
         <!-- Drawables. -->
         <item name="listSelectorDrawable">@drawable/list_selector_night</item>
 
-        <!-- Icons. -->
+        <!-- Options Icons. -->
         <item name="aboutIcon">@drawable/about_night</item>
         <item name="closeIcon">@drawable/close_night</item>
         <item name="copyIcon">@drawable/copy_night</item>
         <item name="deleteIcon">@drawable/delete_night</item>
-        <item name="domainsIcon">@drawable/domains_night</item>
         <item name="editIcon">@drawable/edit_night</item>
         <item name="moveToFolderIcon">@drawable/move_to_folder_night</item>
         <item name="saveIcon">@drawable/save_night</item>
@@ -58,6 +57,12 @@
         <item name="selectAllIcon">@drawable/select_all_night</item>
         <item name="shareIcon">@drawable/share_night</item>
         <item name="sortIcon">@drawable/sort_night</item>
+
+        <!-- Dialog Icons. -->
+        <item name="aboutBlueIcon">@drawable/about_blue_night</item>
+        <item name="domainsBlueIcon">@drawable/domains_night</item>
+        <item name="fontSizeBlueIcon">@drawable/font_size_night</item>
+        <item name="lockBlueIcon">@drawable/lock_night</item>
     </style>
 
     <style name="PrivacyBrowserSettings" parent="Theme.AppCompat.DayNight" >

diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index 67920ddb69bcb96168f05fdbad70b4c0e23bea99..2956335033902531547d105b99bdb9e5ab056e2b 100644 (file)
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -46,12 +46,11 @@
         <!-- Drawables. -->
         <item name="listSelectorDrawable">@drawable/list_selector_day</item>
 
-        <!-- Icons. -->
+        <!-- Options Icons. -->
         <item name="aboutIcon">@drawable/about_day</item>
         <item name="closeIcon">@drawable/close_day</item>
         <item name="copyIcon">@drawable/copy_day</item>
         <item name="deleteIcon">@drawable/delete_day</item>
-        <item name="domainsIcon">@drawable/domains_day</item>
         <item name="editIcon">@drawable/edit_day</item>
         <item name="moveToFolderIcon">@drawable/move_to_folder_day</item>
         <item name="saveIcon">@drawable/save_day</item>
@@ -60,6 +59,12 @@
         <item name="selectAllIcon">@drawable/select_all_day</item>
         <item name="shareIcon">@drawable/share_day</item>
         <item name="sortIcon">@drawable/sort_day</item>
+
+        <!-- Dialog Icons. -->
+        <item name="aboutBlueIcon">@drawable/about_blue_day</item>
+        <item name="domainsBlueIcon">@drawable/domains_day</item>
+        <item name="fontSizeBlueIcon">@drawable/font_size_day</item>
+        <item name="lockBlueIcon">@drawable/lock_day</item>
     </style>
 
     <style name="PrivacyBrowserSettings" parent="Theme.AppCompat.DayNight" >

diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index d044c6416e1b648e3c9799f1600062adf69cc1b2..e2d1c51122f05a5aab25c32d8c142a34a92104b7 100644 (file)
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -48,12 +48,11 @@
         <!-- Drawables. -->
         <item name="listSelectorDrawable">@drawable/list_selector_day</item>
 
-        <!-- Icons. -->
+        <!-- Options Icons. -->
         <item name="aboutIcon">@drawable/about_day</item>
         <item name="closeIcon">@drawable/close_day</item>
         <item name="copyIcon">@drawable/copy_day</item>
         <item name="deleteIcon">@drawable/delete_day</item>
-        <item name="domainsIcon">@drawable/domains_day</item>
         <item name="editIcon">@drawable/edit_day</item>
         <item name="moveToFolderIcon">@drawable/move_to_folder_day</item>
         <item name="saveIcon">@drawable/save_day</item>
@@ -62,6 +61,12 @@
         <item name="selectAllIcon">@drawable/select_all_day</item>
         <item name="shareIcon">@drawable/share_day</item>
         <item name="sortIcon">@drawable/sort_day</item>
+
+        <!-- Dialog Icons. -->
+        <item name="aboutBlueIcon">@drawable/about_blue_day</item>
+        <item name="domainsBlueIcon">@drawable/domains_day</item>
+        <item name="fontSizeBlueIcon">@drawable/font_size_day</item>
+        <item name="lockBlueIcon">@drawable/lock_day</item>
     </style>
 
     <style name="PrivacyBrowserSettings" parent="Theme.AppCompat.DayNight" >

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index a77f227dc87942b6fd81d25247db7fff2aa7ab41..ded150edacabe95a546958f587103bc377d4eea7 100644 (file)
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -39,13 +39,12 @@
     <!-- Drawables.  -->
     <attr name="listSelectorDrawable" format="reference" />
 
-    <!-- Icons. -->
+    <!-- Options Icons. -->
     <attr name="aboutIcon" format="reference" />
     <attr name="appThemeIcon" format="reference" />
     <attr name="closeIcon" format="reference" />
     <attr name="copyIcon" format="reference" />
     <attr name="deleteIcon" format="reference" />
-    <attr name="domainsIcon" format="reference" />
     <attr name="downloadIcon" format="reference" />
     <attr name="editIcon" format="reference" />
     <attr name="fontSizeIcon" format="reference" />
@@ -59,4 +58,10 @@
     <attr name="shareIcon" format="reference" />
     <attr name="sortIcon" format="reference" />
     <attr name="userAgentIcon" format="reference" />
+
+    <!-- Dialog Icons. -->
+    <attr name="aboutBlueIcon" format="reference" />
+    <attr name="domainsBlueIcon" format="reference" />
+    <attr name="fontSizeBlueIcon" format="reference" />
+    <attr name="lockBlueIcon" format="reference" />
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d1466b20161d9d6bc286b666e64b465d8c3de3e6..e381752197b9d9d050f84820b60cec73e9b43a52 100644 (file)
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -44,12 +44,11 @@
         <!-- Drawables. -->
         <item name="listSelectorDrawable">@drawable/list_selector_day</item>
 
-        <!-- Icons. -->
+        <!-- Options Icons. -->
         <item name="aboutIcon">@drawable/about_day</item>
         <item name="closeIcon">@drawable/close_day</item>
         <item name="copyIcon">@drawable/copy_day</item>
         <item name="deleteIcon">@drawable/delete_day</item>
-        <item name="domainsIcon">@drawable/domains_day</item>
         <item name="editIcon">@drawable/edit_day</item>
         <item name="moveToFolderIcon">@drawable/move_to_folder_day</item>
         <item name="saveIcon">@drawable/save_day</item>
@@ -58,6 +57,12 @@
         <item name="selectAllIcon">@drawable/select_all_day</item>
         <item name="shareIcon">@drawable/share_day</item>
         <item name="sortIcon">@drawable/sort_day</item>
+
+        <!-- Dialog Icons. -->
+        <item name="aboutBlueIcon">@drawable/about_blue_day</item>
+        <item name="domainsBlueIcon">@drawable/domains_day</item>
+        <item name="fontSizeBlueIcon">@drawable/font_size_day</item>
+        <item name="lockBlueIcon">@drawable/lock_day</item>
     </style>
 
     <style name="PrivacyBrowserSettings" parent="Theme.AppCompat.DayNight" >

diff --git a/build.gradle b/build.gradle
index cbb381a78b46d9f2ebf788185ff9835abb710b29..8aa3296229784cf5aba2aed94742ddec56695c4d 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"
 
         // NOTE: Do not place your application dependencies here; they belong