X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fadapters%2FRequestsArrayAdapter.java;h=c1e2ee8463368c93e1d8c195f84da0f8f5a0ca9c;hp=fcccba4861caf0f0388f084a466ffbdf25015ed0;hb=8142ac5fc2489de735de4b6fa21a1eae733ccfce;hpb=74655c0cd0ba72c80ac6c48df55bc3d2f5280ad2

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 fcccba48..c1e2ee84 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/adapters/RequestsArrayAdapter.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/adapters/RequestsArrayAdapter.java
@@ -1,20 +1,20 @@
 /*
- * Copyright © 2018-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2018-2022 Soren Stoutner <soren@stoutner.com>.
  *
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
- * Privacy Browser is free software: you can redistribute it and/or modify
+ * Privacy Browser Android is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * Privacy Browser is distributed in the hope that it will be useful,
+ * Privacy Browser Android is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.stoutner.privacybrowser.adapters;
@@ -79,7 +79,7 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
                 dispositionTextView.setText(requestDefault);
 
                 // Set the background color.
-                linearLayout.setBackgroundColor(context.getResources().getColor(R.color.transparent));
+                linearLayout.setBackgroundColor(context.getColor(R.color.transparent));
                 break;
 
             case BlocklistHelper.REQUEST_ALLOWED:
@@ -90,10 +90,10 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
                 dispositionTextView.setText(requestAllowed);
 
                 // Set the background color.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
-                    linearLayout.setBackgroundColor(context.getResources().getColor(R.color.blue_700_50));
+                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                    linearLayout.setBackgroundColor(context.getColor(R.color.blue_100));
                 } else {
-                    linearLayout.setBackgroundColor(context.getResources().getColor(R.color.blue_100));
+                    linearLayout.setBackgroundColor(context.getColor(R.color.blue_700_50));
                 }
                 break;
 
@@ -105,10 +105,10 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
                 dispositionTextView.setText(requestThirdParty);
 
                 // Set the background color.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
-                    linearLayout.setBackgroundColor(context.getResources().getColor(R.color.yellow_700_50));
+                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                    linearLayout.setBackgroundColor(context.getColor(R.color.yellow_100));
                 } else {
-                    linearLayout.setBackgroundColor(context.getResources().getColor(R.color.yellow_100));
+                    linearLayout.setBackgroundColor(context.getColor(R.color.yellow_700_50));
                 }
                 break;
 
@@ -121,10 +121,10 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
                 dispositionTextView.setText(requestBlocked);
 
                 // Set the background color.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
-                    linearLayout.setBackgroundColor(context.getResources().getColor(R.color.red_700_40));
+                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                    linearLayout.setBackgroundColor(context.getColor(R.color.red_100));
                 } else {
-                    linearLayout.setBackgroundColor(context.getResources().getColor(R.color.red_100));
+                    linearLayout.setBackgroundColor(context.getColor(R.color.red_700_40));
                 }
                 break;
         }
@@ -132,15 +132,6 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
         // Set the URL text.
         urlTextView.setText(entryStringArray[1]);
 
-        // Set the text color.  For some unexplained reason, `android:textColor="?android:textColorPrimary"` doesn't work in the layout file.  Probably some bug relating to array adapters.
-        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
-            dispositionTextView.setTextColor(context.getResources().getColor(R.color.gray_200));
-            urlTextView.setTextColor(context.getResources().getColor(R.color.gray_200));
-        } else {
-            dispositionTextView.setTextColor(context.getResources().getColor(R.color.black));
-            urlTextView.setTextColor(context.getResources().getColor(R.color.black));
-        }
-
         // Return the modified view.
         return view;
     }