X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fadapters%2FRequestsArrayAdapter.java;h=49634bae40b71c887ab2e28c1aa4e30d7470bf06;hb=8a06558b0071fa94e2a7d1093b3118417ac5cc8f;hp=edc64f810678699d612d953d91e31ecb689444af;hpb=bb6f81978d4fdf732b3becc0dd2c055bad5f85d5;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 edc64f81..49634bae 100644
--- 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-2019 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2018-2020 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -20,8 +20,7 @@
 package com.stoutner.privacybrowser.adapters;
 
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
+import android.content.res.Configuration;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -45,12 +44,6 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
     @Override
     @NonNull
     public View getView(int position, View view, @NonNull ViewGroup parent) {
-        // Get a handle for the shared preferences.
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
-
-        // Get the theme preferences.
-        boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false);
-
         // Get a handle for the context.
         Context context = getContext();
 
@@ -73,6 +66,9 @@ 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:
@@ -94,10 +90,10 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
                 dispositionTextView.setText(requestAllowed);
 
                 // Set the background color.
-                if (darkTheme) {
-                    linearLayout.setBackgroundColor(context.getResources().getColor(R.color.blue_700_50));
-                } else {
+                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));
                 }
                 break;
 
@@ -109,10 +105,10 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
                 dispositionTextView.setText(requestThirdParty);
 
                 // Set the background color.
-                if (darkTheme) {
-                    linearLayout.setBackgroundColor(context.getResources().getColor(R.color.yellow_700_50));
-                } else {
+                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));
                 }
                 break;
 
@@ -125,10 +121,10 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
                 dispositionTextView.setText(requestBlocked);
 
                 // Set the background color.
-                if (darkTheme) {
-                    linearLayout.setBackgroundColor(context.getResources().getColor(R.color.red_700_40));
-                } else {
+                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));
                 }
                 break;
         }
@@ -136,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 (darkTheme) {
-            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;
     }