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=49634bae40b71c887ab2e28c1aa4e30d7470bf06;hp=fcccba4861caf0f0388f084a466ffbdf25015ed0;hb=a4ec41c79f5050006fd4c8dd6454f3ec8a7f99ab;hpb=1a3d457d10c7b6c64d2454834bb0794909e43bd9 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..49634bae 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/adapters/RequestsArrayAdapter.java +++ b/app/src/main/java/com/stoutner/privacybrowser/adapters/RequestsArrayAdapter.java @@ -90,10 +90,10 @@ public class RequestsArrayAdapter extends ArrayAdapter { dispositionTextView.setText(requestAllowed); // Set the background color. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - 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; @@ -105,10 +105,10 @@ public class RequestsArrayAdapter extends ArrayAdapter { dispositionTextView.setText(requestThirdParty); // Set the background color. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - 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; @@ -121,10 +121,10 @@ public class RequestsArrayAdapter extends ArrayAdapter { dispositionTextView.setText(requestBlocked); // Set the background color. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - 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; } @@ -132,15 +132,6 @@ public class RequestsArrayAdapter extends ArrayAdapter { // 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; }