/*
- * Copyright © 2018-2019 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2018-2022 Soren Stoutner <soren@stoutner.com>.
*
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android. If not, see <http://www.gnu.org/licenses/>.
*/
package com.stoutner.privacybrowser.adapters;
import android.content.Context;
+import android.content.res.Configuration;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import com.stoutner.privacybrowser.R;
-import com.stoutner.privacybrowser.activities.MainWebViewActivity;
+import com.stoutner.privacybrowser.helpers.BlocklistHelper;
import java.util.List;
// 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 (Integer.valueOf(entryStringArray[0])) {
- case MainWebViewActivity.REQUEST_DEFAULT:
+ switch (entryStringArray[0]) {
+ case BlocklistHelper.REQUEST_DEFAULT:
// Create the disposition string.
String requestDefault = id + ". " + context.getResources().getString(R.string.allowed);
dispositionTextView.setText(requestDefault);
// Set the background color.
- linearLayout.setBackgroundColor(context.getResources().getColor(R.color.transparent));
+ linearLayout.setBackgroundColor(context.getColor(R.color.transparent));
break;
- case MainWebViewActivity.REQUEST_ALLOWED:
+ case BlocklistHelper.REQUEST_ALLOWED:
// Create the disposition string.
String requestAllowed = id + ". " + context.getResources().getString(R.string.allowed);
dispositionTextView.setText(requestAllowed);
// Set the background color.
- if (MainWebViewActivity.darkTheme) {
- linearLayout.setBackgroundColor(context.getResources().getColor(R.color.blue_700_50));
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ linearLayout.setBackgroundColor(context.getColor(R.color.blue_100));
} else {
- linearLayout.setBackgroundColor(context.getResources().getColor(R.color.blue_100));
+ linearLayout.setBackgroundColor(context.getColor(R.color.blue_700_50));
}
break;
- case MainWebViewActivity.REQUEST_THIRD_PARTY:
+ case BlocklistHelper.REQUEST_THIRD_PARTY:
// Create the disposition string.
String requestThirdParty = id + ". " + context.getResources().getString(R.string.blocked);
dispositionTextView.setText(requestThirdParty);
// Set the background color.
- if (MainWebViewActivity.darkTheme) {
- linearLayout.setBackgroundColor(context.getResources().getColor(R.color.yellow_700_50));
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ linearLayout.setBackgroundColor(context.getColor(R.color.yellow_100));
} else {
- linearLayout.setBackgroundColor(context.getResources().getColor(R.color.yellow_100));
+ linearLayout.setBackgroundColor(context.getColor(R.color.yellow_700_50));
}
break;
- case MainWebViewActivity.REQUEST_BLOCKED:
+ case BlocklistHelper.REQUEST_BLOCKED:
// Create the disposition string.
String requestBlocked = id + ". " + context.getResources().getString(R.string.blocked);
dispositionTextView.setText(requestBlocked);
// Set the background color.
- if (MainWebViewActivity.darkTheme) {
- linearLayout.setBackgroundColor(context.getResources().getColor(R.color.red_700_40));
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+ linearLayout.setBackgroundColor(context.getColor(R.color.red_100));
} else {
- linearLayout.setBackgroundColor(context.getResources().getColor(R.color.red_100));
+ linearLayout.setBackgroundColor(context.getColor(R.color.red_700_40));
}
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 (MainWebViewActivity.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