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=5bb6b0a4033bae5ce07511977532eaa2adada42a;hpb=3d167d1ec7d0cef1ef032f20859bb0de8ddb01cf;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 5bb6b0a4..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,27 +1,25 @@ /* - * Copyright © 2018-2019 Soren Stoutner . + * Copyright 2018-2022 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of 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 . + * along with Privacy Browser Android. If not, see . */ package com.stoutner.privacybrowser.adapters; import android.content.Context; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -32,7 +30,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import com.stoutner.privacybrowser.R; -import com.stoutner.privacybrowser.helpers.BlockListHelper; +import com.stoutner.privacybrowser.helpers.BlocklistHelper; import java.util.List; @@ -45,12 +43,6 @@ public class RequestsArrayAdapter extends ArrayAdapter { @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(); @@ -75,7 +67,7 @@ public class RequestsArrayAdapter extends ArrayAdapter { // Set the action text and the background color. switch (entryStringArray[0]) { - case BlockListHelper.REQUEST_DEFAULT: + case BlocklistHelper.REQUEST_DEFAULT: // Create the disposition string. String requestDefault = id + ". " + context.getResources().getString(R.string.allowed); @@ -83,10 +75,10 @@ public class RequestsArrayAdapter extends ArrayAdapter { 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: + case BlocklistHelper.REQUEST_ALLOWED: // Create the disposition string. String requestAllowed = id + ". " + context.getResources().getString(R.string.allowed); @@ -94,14 +86,10 @@ public class RequestsArrayAdapter extends ArrayAdapter { dispositionTextView.setText(requestAllowed); // Set the background color. - if (darkTheme) { - linearLayout.setBackgroundColor(context.getResources().getColor(R.color.blue_700_50)); - } else { - linearLayout.setBackgroundColor(context.getResources().getColor(R.color.blue_100)); - } + linearLayout.setBackgroundColor(context.getColor(R.color.blue_background)); break; - case BlockListHelper.REQUEST_THIRD_PARTY: + case BlocklistHelper.REQUEST_THIRD_PARTY: // Create the disposition string. String requestThirdParty = id + ". " + context.getResources().getString(R.string.blocked); @@ -109,15 +97,11 @@ public class RequestsArrayAdapter extends ArrayAdapter { dispositionTextView.setText(requestThirdParty); // Set the background color. - if (darkTheme) { - linearLayout.setBackgroundColor(context.getResources().getColor(R.color.yellow_700_50)); - } else { - linearLayout.setBackgroundColor(context.getResources().getColor(R.color.yellow_100)); - } + linearLayout.setBackgroundColor(context.getColor(R.color.yellow_background)); break; - case BlockListHelper.REQUEST_BLOCKED: + case BlocklistHelper.REQUEST_BLOCKED: // Create the disposition string. String requestBlocked = id + ". " + context.getResources().getString(R.string.blocked); @@ -125,27 +109,14 @@ public class RequestsArrayAdapter extends ArrayAdapter { dispositionTextView.setText(requestBlocked); // Set the background color. - if (darkTheme) { - linearLayout.setBackgroundColor(context.getResources().getColor(R.color.red_700_40)); - } else { - linearLayout.setBackgroundColor(context.getResources().getColor(R.color.red_100)); - } + linearLayout.setBackgroundColor(context.getColor(R.color.red_background)); break; } // 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; } -} \ No newline at end of file +}