Migrate to AndroidX from the Android Support Library. https://redmine.stoutner.com...

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / adapters / RequestsArrayAdapter.java

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 e0c58cea85e79b8870fd5297e01b6a767b793011..f6f1e8b45b6afcae0849263a21ba917a1b2643f0 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 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2018-2019 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -20,7 +20,6 @@
 package com.stoutner.privacybrowser.adapters;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,6 +27,8 @@ import android.widget.ArrayAdapter;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import com.stoutner.privacybrowser.R;
 import com.stoutner.privacybrowser.activities.MainWebViewActivity;
 
@@ -52,7 +53,7 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
 
         // Get handles for the views.
         LinearLayout linearLayout = view.findViewById(R.id.request_item_linearlayout);
-        TextView actionTextView = view.findViewById(R.id.request_item_action);
+        TextView dispositionTextView = view.findViewById(R.id.request_item_disposition);
         TextView urlTextView = view.findViewById(R.id.request_item_url);
 
         // Get the string array for this entry.
@@ -71,7 +72,7 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
                 String requestDefault = id + ". " + context.getResources().getString(R.string.allowed);
 
                 // Set the disposition text.
-                actionTextView.setText(requestDefault);
+                dispositionTextView.setText(requestDefault);
 
                 // Set the background color.
                 linearLayout.setBackgroundColor(context.getResources().getColor(R.color.transparent));
@@ -82,7 +83,7 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
                 String requestAllowed = id + ". " + context.getResources().getString(R.string.allowed);
 
                 // Set the disposition text.
-                actionTextView.setText(requestAllowed);
+                dispositionTextView.setText(requestAllowed);
 
                 // Set the background color.
                 if (MainWebViewActivity.darkTheme) {
@@ -92,17 +93,32 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
                 }
                 break;
 
+            case MainWebViewActivity.REQUEST_THIRD_PARTY:
+                // Create the disposition string.
+                String requestThirdParty = id + ". " + context.getResources().getString(R.string.blocked);
+
+                // Set the disposition text.
+                dispositionTextView.setText(requestThirdParty);
+
+                // Set the background color.
+                if (MainWebViewActivity.darkTheme) {
+                    linearLayout.setBackgroundColor(context.getResources().getColor(R.color.yellow_700_50));
+                } else {
+                    linearLayout.setBackgroundColor(context.getResources().getColor(R.color.yellow_100));
+                }
+                break;
+
 
             case MainWebViewActivity.REQUEST_BLOCKED:
                 // Create the disposition string.
                 String requestBlocked = id + ". " + context.getResources().getString(R.string.blocked);
 
                 // Set the disposition text.
-                actionTextView.setText(requestBlocked);
+                dispositionTextView.setText(requestBlocked);
 
                 // Set the background color.
                 if (MainWebViewActivity.darkTheme) {
-                    linearLayout.setBackgroundColor(context.getResources().getColor(R.color.red_700_50));
+                    linearLayout.setBackgroundColor(context.getResources().getColor(R.color.red_700_40));
                 } else {
                     linearLayout.setBackgroundColor(context.getResources().getColor(R.color.red_100));
                 }
@@ -114,10 +130,10 @@ public class RequestsArrayAdapter extends ArrayAdapter<String[]> {
 
         // 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 (MainWebViewActivity.darkTheme) {
-            actionTextView.setTextColor(context.getResources().getColor(R.color.gray_200));
+            dispositionTextView.setTextColor(context.getResources().getColor(R.color.gray_200));
             urlTextView.setTextColor(context.getResources().getColor(R.color.gray_200));
         } else {
-            actionTextView.setTextColor(context.getResources().getColor(R.color.black));
+            dispositionTextView.setTextColor(context.getResources().getColor(R.color.black));
             urlTextView.setTextColor(context.getResources().getColor(R.color.black));
         }