Update the night mode red text color. https://redmine.stoutner.com/issues/691

diff --git a/app/src/main/assets/css/theme.css b/app/src/main/assets/css/theme.css
index 3bdd0b90410a552f80268b0b600f3de592aab655..aa6f4fdf61e85f2641e6ee618810886d7bd1c62b 100644 (file)
--- a/app/src/main/assets/css/theme.css
+++ b/app/src/main/assets/css/theme.css
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2020,2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2017-2020,2022 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -57,7 +57,7 @@ strong.red {
 
 @media (prefers-color-scheme: dark) {
   strong.red {
-    color: #930606;  /* Red 1100. */
+    color: #E24B4C;  /* Red Night. */
   }
 }
 
@@ -172,4 +172,4 @@ img.center216 {
   margin-right: auto;
   height: 780;
   width: 360;
-}
\ No newline at end of file
+}

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
index 1b34ffd8bd8c961bfbca9e7dd358ab3103a52ea5..e1a8ca78f0b25e39d28b5348d394f30463a6e988 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -3118,19 +3118,10 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
         // Remove the lint warning below that the input method manager might be null.
         assert inputMethodManager != null;
 
-        // Initialize the gray foreground color spans for highlighting the URLs.
+        // Initialize the color spans for highlighting the URLs.
         initialGrayColorSpan = new ForegroundColorSpan(getColor(R.color.gray_500));
         finalGrayColorSpan = new ForegroundColorSpan(getColor(R.color.gray_500));
-
-        // Get the current theme status.
-        int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-
-        // Set the red color span according to the theme.
-        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-            redColorSpan = new ForegroundColorSpan(getColor(R.color.red_a700));
-        } else {
-            redColorSpan = new ForegroundColorSpan(getColor(R.color.red_900));
-        }
+        redColorSpan = new ForegroundColorSpan(getColor(R.color.red_text));
 
         // Remove the formatting from the URL edit text when the user is editing the text.
         urlEditText.setOnFocusChangeListener((View v, boolean hasFocus) -> {

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt
index 3769a6820448a37053a785aa307e6396eb6b8722..8868697a37d875e30001b014d3a373ce4d02ff23 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt
@@ -19,7 +19,6 @@
 
 package com.stoutner.privacybrowser.activities
 
-import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import android.text.SpannableStringBuilder
@@ -139,23 +138,10 @@ class ViewSourceActivity: AppCompatActivity(), UntrustedSslCertificateListener {
         // Populate the URL text box.
         urlEditText.setText(currentUrl)
 
-        // Initialize the gray foreground color spans for highlighting the URLs.  The deprecated `getColor()` must be used until the minimum API >= 23.
-        @Suppress("DEPRECATION")
-        initialGrayColorSpan = ForegroundColorSpan(resources.getColor(R.color.gray_500))
-        @Suppress("DEPRECATION")
-        finalGrayColorSpan = ForegroundColorSpan(resources.getColor(R.color.gray_500))
-
-        // Get the current theme status.
-        val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
-
-        // Set the red color span according to the theme.  The deprecated `getColor()` must be used until the minimum API >= 23.
-        redColorSpan = if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-            @Suppress("DEPRECATION")
-            ForegroundColorSpan(resources.getColor(R.color.red_a700))
-        } else {
-            @Suppress("DEPRECATION")
-            ForegroundColorSpan(resources.getColor(R.color.red_900))
-        }
+        // Initialize the gray foreground color spans for highlighting the URLs.
+        initialGrayColorSpan = ForegroundColorSpan(getColor(R.color.gray_500))
+        finalGrayColorSpan = ForegroundColorSpan(getColor(R.color.gray_500))
+        redColorSpan = ForegroundColorSpan(getColor(R.color.red_text))
 
         // Apply text highlighting to the URL.
         highlightUrlText()

diff --git a/app/src/main/java/com/stoutner/privacybrowser/adapters/RequestsArrayAdapter.java b/app/src/main/java/com/stoutner/privacybrowser/adapters/RequestsArrayAdapter.java
index c1e2ee8463368c93e1d8c195f84da0f8f5a0ca9c..d253307d30cdb5d6b67429eb72cb1a295b95a51a 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/adapters/RequestsArrayAdapter.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/adapters/RequestsArrayAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2018-2022 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -20,7 +20,6 @@
 package com.stoutner.privacybrowser.adapters;
 
 import android.content.Context;
-import android.content.res.Configuration;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -66,9 +65,6 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
         // The ID is one greater than the position because it is 0 based.
         int id = position + 1;
 
-        // Get the current theme status.
-        int currentThemeStatus = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-
         // Set the action text and the background color.
         switch (entryStringArray[0]) {
             case BlocklistHelper.REQUEST_DEFAULT:
@@ -90,11 +86,7 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
                 dispositionTextView.setText(requestAllowed);
 
                 // Set the background color.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-                    linearLayout.setBackgroundColor(context.getColor(R.color.blue_100));
-                } else {
-                    linearLayout.setBackgroundColor(context.getColor(R.color.blue_700_50));
-                }
+                linearLayout.setBackgroundColor(context.getColor(R.color.blue_background));
                 break;
 
             case BlocklistHelper.REQUEST_THIRD_PARTY:
@@ -105,11 +97,7 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
                 dispositionTextView.setText(requestThirdParty);
 
                 // Set the background color.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-                    linearLayout.setBackgroundColor(context.getColor(R.color.yellow_100));
-                } else {
-                    linearLayout.setBackgroundColor(context.getColor(R.color.yellow_700_50));
-                }
+                linearLayout.setBackgroundColor(context.getColor(R.color.yellow_background));
                 break;
 
 
@@ -121,11 +109,7 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
                 dispositionTextView.setText(requestBlocked);
 
                 // Set the background color.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-                    linearLayout.setBackgroundColor(context.getColor(R.color.red_100));
-                } else {
-                    linearLayout.setBackgroundColor(context.getColor(R.color.red_700_40));
-                }
+                linearLayout.setBackgroundColor(context.getColor(R.color.red_background));
                 break;
         }
 
@@ -135,4 +119,4 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
         // Return the modified view.
         return view;
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.kt
index 56ec5192a2d4c35cb26b4e4075b8be6c122a6eda..b3f6de21c8625fcb8e581af10a8179b889d9a6ce 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/PinnedMismatchDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2017-2022 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -116,7 +116,7 @@ class PinnedMismatchDialog : DialogFragment() {
         // Set the favorite icon as the dialog icon if it exists.
         if (favoriteIconBitmap.sameAs(defaultFavoriteIconBitmap)) {  // There is no website favorite icon.
             // Set the icon.
-            dialogBuilder.setIcon(R.drawable.ssl_certificate_enabled)
+            dialogBuilder.setIcon(R.drawable.ssl_certificate)
         } else {  // There is a favorite icon.
             // Create a drawable version of the favorite icon.
             val favoriteIconDrawable: Drawable = BitmapDrawable(resources, favoriteIconBitmap)
@@ -220,4 +220,4 @@ class PinnedMismatchDialog : DialogFragment() {
         // Return the alert dialog.
         return alertDialog
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.kt
index 1179c29e59502d0e8948d04998533b0337c3d511..1090bedd2285244a368ada1b331059fa4f6c8eb5 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SslCertificateErrorDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2016-2022 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -136,7 +136,7 @@ class SslCertificateErrorDialog : DialogFragment() {
         val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
 
         // Set the icon.
-        dialogBuilder.setIcon(R.drawable.ssl_certificate_enabled)
+        dialogBuilder.setIcon(R.drawable.ssl_certificate)
 
         // Set the title.
         dialogBuilder.setTitle(R.string.ssl_certificate_error)
@@ -391,4 +391,4 @@ class SslCertificateErrorDialog : DialogFragment() {
             ipAddressesTextView.text = ipAddresses
         }
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/UntrustedSslCertificateDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/UntrustedSslCertificateDialog.kt
index f44710f8e6dd2989d932588fbc102777a287f84e..97eef400867848774a1b2e2b5ca97f0c1641f9c4 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/UntrustedSslCertificateDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/UntrustedSslCertificateDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2021-2022 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -56,7 +56,7 @@ class UntrustedSslCertificateDialog : DialogFragment() {
             val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
 
             // Set the icon.
-            dialogBuilder.setIcon(R.drawable.ssl_certificate_enabled)
+            dialogBuilder.setIcon(R.drawable.ssl_certificate)
 
             // Set the title.
             dialogBuilder.setTitle(R.string.ssl_certificate_error)
@@ -113,4 +113,4 @@ class UntrustedSslCertificateDialog : DialogFragment() {
             dialog!!.dismiss()
         }
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.kt
index 54e997af4507e7885e1f9a64c72a8635be4c87b7..55e6bb585a31bd79a7f4dc8ea262cb2c9d5b39e6 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2018-2022 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -22,13 +22,13 @@ package com.stoutner.privacybrowser.dialogs
 import android.app.Dialog
 import android.content.Context
 import android.content.DialogInterface
-import android.content.res.Configuration
 import android.os.Bundle
 import android.view.View
 import android.view.WindowManager
 import android.widget.TextView
 
 import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat.getColor
 import androidx.fragment.app.DialogFragment
 import androidx.preference.PreferenceManager
 
@@ -93,9 +93,6 @@ class ViewRequestDialog : DialogFragment() {
         // Use an alert dialog 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.
         dialogBuilder.setIcon(R.drawable.block_ads_enabled)
 
@@ -164,50 +161,31 @@ class ViewRequestDialog : DialogFragment() {
                 // Set the text.
                 requestDisposition.setText(R.string.default_allowed)
 
-                // Set the background color.  The deprecated `getColor()` must be used until the minimum API >= 23.
-                @Suppress("DEPRECATION")
-                requestDisposition.setBackgroundColor(resources.getColor(R.color.transparent))
+                // Set the background color to be transparent.
+                requestDisposition.setBackgroundColor(getColor(requireContext(), R.color.transparent))
             }
 
             BlocklistHelper.REQUEST_ALLOWED -> {
                 // Set the text.
                 requestDisposition.setText(R.string.allowed)
 
-                // Set the background color according to the theme.  The deprecated `getColor()` must be used until the minimum API >= 23.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-                    @Suppress("DEPRECATION")
-                    requestDisposition.setBackgroundColor(resources.getColor(R.color.blue_100))
-                } else {
-                    @Suppress("DEPRECATION")
-                    requestDisposition.setBackgroundColor(resources.getColor(R.color.blue_700_50))
-                }
+                // Set the background color to be blue.
+                requestDisposition.setBackgroundColor(getColor(requireContext(), R.color.blue_background))
             }
 
             BlocklistHelper.REQUEST_THIRD_PARTY -> {
                 // Set the text.
                 requestDisposition.setText(R.string.third_party_blocked)
 
-                // Set the background color according to the theme.  The deprecated `getColor()` must be used until the minimum API >= 23.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-                    @Suppress("DEPRECATION")
-                    requestDisposition.setBackgroundColor(resources.getColor(R.color.yellow_100))
-                } else {
-                    @Suppress("DEPRECATION")
-                    requestDisposition.setBackgroundColor(resources.getColor(R.color.yellow_700_50))
-                }
+                // Set the background color to be yellow.
+                requestDisposition.setBackgroundColor(getColor(requireContext(), R.color.yellow_background))
             }
             BlocklistHelper.REQUEST_BLOCKED -> {
                 // Set the text.
                 requestDisposition.setText(R.string.blocked)
 
-                // Set the background color according to the theme.  The deprecated `getColor()` must be used until the minimum API >= 23.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-                    @Suppress("DEPRECATION")
-                    requestDisposition.setBackgroundColor(resources.getColor(R.color.red_100))
-                } else {
-                    @Suppress("DEPRECATION")
-                    requestDisposition.setBackgroundColor(resources.getColor(R.color.red_700_40))
-                }
+                // Set the background color to be red.
+                requestDisposition.setBackgroundColor(getColor(requireContext(), R.color.red_background))
             }
         }
 
@@ -259,4 +237,4 @@ class ViewRequestDialog : DialogFragment() {
         // Return the alert dialog.
         return alertDialog
     }
-}
\ No newline at end of file
+}

diff --git a/app/src/main/res/drawable/ssl_certificate.xml b/app/src/main/res/drawable/ssl_certificate.xml
new file mode 100644 (file)
index 0000000..dd6ac8c
--- /dev/null
+++ b/app/src/main/res/drawable/ssl_certificate.xml
@@ -0,0 +1,14 @@
+<!-- This file comes from the Android Material icon set, where it is called `vpn_lock`.  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"
+    android:viewportWidth="24"
+    android:autoMirrored="true" >
+
+    <path
+        android:fillColor="@color/blue_icon"
+        android:pathData="M22,4v-0.5C22,2.12 20.88,1 19.5,1S17,2.12 17,3.5L17,4c-0.55,0 -1,0.45 -1,1v4c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1L23,5c0,-0.55 -0.45,-1 -1,-1zM21.2,4h-3.4v-0.5c0,-0.94 0.76,-1.7 1.7,-1.7s1.7,0.76 1.7,1.7L21.2,4zM18.92,12c0.04,0.33 0.08,0.66 0.08,1 0,2.08 -0.8,3.97 -2.1,5.39 -0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L7,13v-2h2c0.55,0 1,-0.45 1,-1L10,8h2c1.1,0 2,-0.9 2,-2L14,3.46c-0.95,-0.3 -1.95,-0.46 -3,-0.46C5.48,3 1,7.48 1,13s4.48,10 10,10 10,-4.48 10,-10c0,-0.34 -0.02,-0.67 -0.05,-1h-2.03zM10,20.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L8,16v1c0,1.1 0.9,2 2,2v1.93z" />
+</vector>

diff --git a/app/src/main/res/drawable/ssl_certificate_enabled.xml b/app/src/main/res/drawable/ssl_certificate_enabled.xml
deleted file mode 100644 (file)
index e9d2e50..0000000
--- a/app/src/main/res/drawable/ssl_certificate_enabled.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- This file comes from the Android Material icon set, where it is called `vpn_lock`.  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"
-    android:viewportWidth="24"
-    android:autoMirrored="true" >
-
-    <path
-        android:fillColor="@color/blue_icon"
-        android:pathData="M22,4v-0.5C22,2.12 20.88,1 19.5,1S17,2.12 17,3.5L17,4c-0.55,0 -1,0.45 -1,1v4c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1L23,5c0,-0.55 -0.45,-1 -1,-1zM21.2,4h-3.4v-0.5c0,-0.94 0.76,-1.7 1.7,-1.7s1.7,0.76 1.7,1.7L21.2,4zM18.92,12c0.04,0.33 0.08,0.66 0.08,1 0,2.08 -0.8,3.97 -2.1,5.39 -0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L7,13v-2h2c0.55,0 1,-0.45 1,-1L10,8h2c1.1,0 2,-0.9 2,-2L14,3.46c-0.95,-0.3 -1.95,-0.46 -3,-0.46C5.48,3 1,7.48 1,13s4.48,10 10,10 10,-4.48 10,-10c0,-0.34 -0.02,-0.67 -0.05,-1h-2.03zM10,20.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L8,16v1c0,1.1 0.9,2 2,2v1.93z" />
-</vector>
\ 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 f857fb69d5f583f9cf2290558e840e5faf3195d2..557103cf4b744b874ff38df92d7e9382a0b9018e 100644 (file)
--- a/app/src/main/res/layout/add_domain_dialog.xml
+++ b/app/src/main/res/layout/add_domain_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2017,2019-2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017,2019-2020,2022 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
@@ -48,7 +48,7 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:text="@string/domain_name_already_exists"
-        android:textColor="?attr/redTextColor"
+        android:textColor="@color/red_text"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>

diff --git a/app/src/main/res/layout/domain_settings_fragment.xml b/app/src/main/res/layout/domain_settings_fragment.xml
index 1f647a9dd4133074ee7261ed8e7634f46ebd7adb..c91d9254d323e9a15b15cb70d60a5c373e14b339 100644 (file)
--- a/app/src/main/res/layout/domain_settings_fragment.xml
+++ b/app/src/main/res/layout/domain_settings_fragment.xml
@@ -672,7 +672,7 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
-                    android:src="@drawable/ssl_certificate_enabled"
+                    android:src="@drawable/ssl_certificate"
                     app:tint="@color/blue_icon_selector"
                     tools:ignore="contentDescription" />
 
@@ -927,7 +927,7 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
-                    android:src="@drawable/ssl_certificate_enabled"
+                    android:src="@drawable/ssl_certificate"
                     app:tint="@color/blue_icon_selector"
                     tools:ignore="contentDescription" />
 

diff --git a/app/src/main/res/layout/ssl_certificate_error.xml b/app/src/main/res/layout/ssl_certificate_error.xml
index a3250ca5f0420562d2f5f4741519c68e1b2a0bff..99ab6c4b3f9d2eec9b4a723f40b7a523655b2d90 100644 (file)
--- a/app/src/main/res/layout/ssl_certificate_error.xml
+++ b/app/src/main/res/layout/ssl_certificate_error.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017,2019-2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017,2019-2020,2022 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
@@ -34,7 +34,7 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:textColor="?attr/redTextColor"
+            android:textColor="@color/red_text"
             android:textStyle="bold"/>
 
         <!-- URL. -->
@@ -132,4 +132,4 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content" />
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>

diff --git a/app/src/main/res/layout/unencrypted_website_dialog.xml b/app/src/main/res/layout/unencrypted_website_dialog.xml
index 2e9d4fc303c3f9ac8b80d8354ac5abe1a1319a3a..9ad2b881bdba3311c44f62ae4abdf878b75526d4 100644 (file)
--- a/app/src/main/res/layout/unencrypted_website_dialog.xml
+++ b/app/src/main/res/layout/unencrypted_website_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017,2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017,2020,2022 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
@@ -23,5 +23,5 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:padding="15dp"
-    android:textColor="?attr/redTextColor"
-    android:text="@string/no_ssl_certificate" />
\ No newline at end of file
+    android:textColor="@color/red_text"
+    android:text="@string/no_ssl_certificate" />

diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
index d998db6b08f2c37c9bcb4d88d96c1a753161afec..d1e8aaa4acf2bc72762f4df4b25b4b1009649d17 100644 (file)
--- a/app/src/main/res/values-night-v27/styles.xml
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -30,7 +30,6 @@
         <item name="android:actionModeBackground">?android:attr/colorBackground</item>
         <item name="android:textColorHighlight">@color/violet_700</item>
         <item name="colorAccent">@color/violet_500</item>
-        <item name="redTextColor">@color/red_900</item>
 
         <!-- Tints. -->
         <item name="fabIconTintColor">@color/gray_875</item>

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index e34c49984eaef3046e64e4ed839d623808224efd..8865e6891fa0bbb6dd89ecc889e4fdb248b71398 100644 (file)
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017,2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017,2020,2022 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
@@ -21,6 +21,7 @@
 <resources>
     <!-- Nicknamed colors. -->
     <color name="alt_blue_text">@color/violet_700</color>
+    <color name="blue_background">@color/blue_700_50</color>
     <color name="blue_button">@color/violet_700</color>
     <color name="blue_icon">@color/violet_500</color>
     <color name="blue_text">@color/violet_500</color>
@@ -29,10 +30,12 @@
     <color name="disabled_button">@color/gray_750</color>
     <color name="disabled_button_text">@color/gray_500</color>
     <color name="disabled_icon">@color/gray_500</color>
+    <color name="domain_settings_url_background">@color/dark_blue_40</color>
     <color name="ghosted_icon">@color/gray_700</color>
     <color name="icon">@color/white</color>
-    <color name="domain_settings_url_background">@color/dark_blue_40</color>
-    <color name="red_text">@color/red_900</color>
+    <color name="red_background">@color/red_700_40</color>
+    <color name="red_text">@color/red_night</color>
     <color name="selected_icon_background">@color/gray_700</color>
     <color name="translucent_background">@color/black_translucent_33</color>
-</resources>
\ No newline at end of file
+    <color name="yellow_background">@color/yellow_700_50</color>
+</resources>

diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 483ab90aafb8420ca2f6bf323834ba0a7b92223c..513f3f2d0afb43e8825ddceac2a3946a36fe30f8 100644 (file)
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -28,7 +28,6 @@
         <item name="android:actionModeBackground">?android:attr/colorBackground</item>
         <item name="android:textColorHighlight">@color/violet_700</item>
         <item name="colorAccent">@color/violet_500</item>
-        <item name="redTextColor">@color/red_900</item>
 
         <!-- Tints. -->
         <item name="fabIconTintColor">@color/gray_875</item>

diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 82b618fb34968b5375cfa8f1f63b888ff943f907..f66d95fe189d349054464d3dcae7872e2d026214 100644 (file)
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -30,7 +30,6 @@
         <item name="android:actionModeBackground">?android:attr/colorBackground</item>
         <item name="android:textColorHighlight">@color/blue_200</item>
         <item name="colorAccent">@color/blue_700</item>
-        <item name="redTextColor">@color/red_a700</item>
 
         <!-- Tints. -->
         <item name="fabIconTintColor">@color/white</item>

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index fa72362ddc32e93075cb2edd4c2dd61c653433fb..db6a6efa97f2d79f33b2e72197c08e43f17e8d75 100644 (file)
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2017-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017-2022 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
@@ -17,11 +17,11 @@
 
   You should have received a copy of the GNU General Public License
   along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+
 <resources>
     <!-- Colors. -->
     <attr name="aboutBackground" format="color" />
     <attr name="activatedListViewItemBackground" format="color" />
-    <attr name="redTextColor" format="color" />
 
     <!-- Tint Colors. -->
     <attr name="fabIconTintColor" format="color" />
@@ -31,4 +31,4 @@
 
     <!-- Drawables.  -->
     <attr name="listSelectorDrawable" format="reference" />
-</resources>
\ No newline at end of file
+</resources>

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ae185134be03f1988d6ef6aee78d44fdde6926a5..3b2e546f921f9c0f6812b19a30e2f5aaa1593509 100644 (file)
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017,2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017,2020,2022 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
@@ -21,6 +21,7 @@
 <resources>
     <!-- Nicknamed colors. -->
     <color name="alt_blue_text">@color/blue_700</color>
+    <color name="blue_background">@color/blue_100</color>
     <color name="blue_button">@color/blue_600</color>
     <color name="blue_icon">@color/blue_800</color>
     <color name="blue_text">@color/blue_700</color>
@@ -29,12 +30,14 @@
     <color name="disabled_button">@color/gray_300</color>
     <color name="disabled_button_text">@color/gray_400</color>
     <color name="disabled_icon">@color/gray_600</color>
+    <color name="domain_settings_url_background">@color/green_200</color>
     <color name="ghosted_icon">@color/gray_425</color>
     <color name="icon">@color/gray_925</color>
-    <color name="domain_settings_url_background">@color/green_200</color>
+    <color name="red_background">@color/red_100</color>
     <color name="red_text">@color/red_a700</color>
     <color name="selected_icon_background">@color/gray_300</color>
     <color name="translucent_background">@color/black_translucent_11</color>
+    <color name="yellow_background">@color/yellow_100</color>
 
     <!-- Raw colors. -->
     <color name="semi_transparent_black">#66000000</color>
@@ -110,6 +113,7 @@
     <color name="red_1000">#FFA21212</color>
     <color name="red_1100">#FF930606</color>
     <color name="red_a700">#FFD50000</color>
+    <color name="red_night">#FFE24B4C</color>
 
     <color name="transparent">#00000000</color>
 
@@ -120,4 +124,4 @@
     <color name="yellow_700_50">#88FBC02D</color>
     <color name="yellow_900">#FFF57F17</color>
     <color name="yellow_a700">#FFFFD600</color>
-</resources>
\ No newline at end of file
+</resources>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f3a7411e3edeb4ce465d7c12d57d787c86759c29..2fdf9bb5ad28d4c1b448f0edebcd40e46230b45b 100644 (file)
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,7 +28,6 @@
         <item name="android:actionModeBackground">?android:attr/colorBackground</item>
         <item name="android:textColorHighlight">@color/blue_200</item>
         <item name="colorAccent">@color/blue_700</item>
-        <item name="redTextColor">@color/red_a700</item>
 
         <!-- Tints. -->
         <item name="fabIconTintColor">@color/white</item>