X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fadapters%2FRequestsArrayAdapter.java;fp=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fadapters%2FRequestsArrayAdapter.java;h=62dec5d884505146c5beff8b0ba785dc4e4d3748;hp=e0c58cea85e79b8870fd5297e01b6a767b793011;hb=69b0fea4c49422f5e3c377994c4cf249bdc5a434;hpb=23e147850398e0dd66da4bbef5ca5f2e517c28c6 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 e0c58cea..62dec5d8 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/adapters/RequestsArrayAdapter.java +++ b/app/src/main/java/com/stoutner/privacybrowser/adapters/RequestsArrayAdapter.java @@ -52,7 +52,7 @@ public class RequestsArrayAdapter extends ArrayAdapter { // 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 +71,7 @@ public class RequestsArrayAdapter extends ArrayAdapter { 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 +82,7 @@ public class RequestsArrayAdapter extends ArrayAdapter { 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 +92,32 @@ public class RequestsArrayAdapter extends ArrayAdapter { } 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 +129,10 @@ public class RequestsArrayAdapter extends ArrayAdapter { // 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)); }