X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fadapters%2FRequestsArrayAdapter.java;h=d253307d30cdb5d6b67429eb72cb1a295b95a51a;hb=f441c077da729e1d3d97c9efb46e8380a0730dd9;hp=49634bae40b71c887ab2e28c1aa4e30d7470bf06;hpb=a4ec41c79f5050006fd4c8dd6454f3ec8a7f99ab;p=PrivacyBrowserAndroid.git

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 49634bae..d253307d 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/adapters/RequestsArrayAdapter.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/adapters/RequestsArrayAdapter.java
@@ -1,26 +1,25 @@
 /*
- * 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;
 
 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:
@@ -79,7 +75,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,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.getResources().getColor(R.color.blue_100));
-                } else {
-                    linearLayout.setBackgroundColor(context.getResources().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.getResources().getColor(R.color.yellow_100));
-                } else {
-                    linearLayout.setBackgroundColor(context.getResources().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.getResources().getColor(R.color.red_100));
-                } else {
-                    linearLayout.setBackgroundColor(context.getResources().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
+}