/*
- * 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>.
*
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatDialogFragment;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
import com.stoutner.privacybrowser.R;
import com.stoutner.privacybrowser.activities.MainWebViewActivity;
-public class ViewRequestDialog extends AppCompatDialogFragment {
+public class ViewRequestDialog extends DialogFragment {
// The public interface is used to send information back to the parent activity.
public interface ViewRequestListener {
void onPrevious(int id);
alertDialog.show();
// Get handles for the dialog views.
- TextView requestAction = alertDialog.findViewById(R.id.request_action);
+ TextView requestDisposition = alertDialog.findViewById(R.id.request_disposition);
TextView requestUrl = alertDialog.findViewById(R.id.request_url);
TextView requestBlockListLabel = alertDialog.findViewById(R.id.request_blocklist_label);
TextView requestBlockList = alertDialog.findViewById(R.id.request_blocklist);
switch (Integer.valueOf(requestDetails[MainWebViewActivity.REQUEST_DISPOSITION])) {
case MainWebViewActivity.REQUEST_DEFAULT:
// Set the text.
- requestAction.setText(R.string.default_allowed);
+ requestDisposition.setText(R.string.default_allowed);
// Set the background color.
- requestAction.setBackgroundColor(getResources().getColor(R.color.transparent));
+ requestDisposition.setBackgroundColor(getResources().getColor(R.color.transparent));
break;
case MainWebViewActivity.REQUEST_ALLOWED:
// Set the text.
- requestAction.setText(R.string.allowed);
+ requestDisposition.setText(R.string.allowed);
+
+ // Set the background color.
+ if (MainWebViewActivity.darkTheme) {
+ requestDisposition.setBackgroundColor(getResources().getColor(R.color.blue_700_50));
+ } else {
+ requestDisposition.setBackgroundColor(getResources().getColor(R.color.blue_100));
+ }
+ break;
+
+ case MainWebViewActivity.REQUEST_THIRD_PARTY:
+ // Set the text.
+ requestDisposition.setText(R.string.third_party_blocked);
// Set the background color.
if (MainWebViewActivity.darkTheme) {
- requestAction.setBackgroundColor(getResources().getColor(R.color.blue_700_50));
+ requestDisposition.setBackgroundColor(getResources().getColor(R.color.yellow_700_50));
} else {
- requestAction.setBackgroundColor(getResources().getColor(R.color.blue_100));
+ requestDisposition.setBackgroundColor(getResources().getColor(R.color.yellow_100));
}
break;
case MainWebViewActivity.REQUEST_BLOCKED:
// Set the text.
- requestAction.setText(R.string.blocked);
+ requestDisposition.setText(R.string.blocked);
// Set the background color.
if (MainWebViewActivity.darkTheme) {
- requestAction.setBackgroundColor(getResources().getColor(R.color.red_700_50));
+ requestDisposition.setBackgroundColor(getResources().getColor(R.color.red_700_40));
} else {
- requestAction.setBackgroundColor(getResources().getColor(R.color.red_100));
+ requestDisposition.setBackgroundColor(getResources().getColor(R.color.red_100));
}
break;
}
break;
case MainWebViewActivity.THIRD_PARTY_WHITELIST:
- requestSubList.setText(R.string.third_party_whiteist);
+ requestSubList.setText(R.string.third_party_whitelist);
break;
case MainWebViewActivity.THIRD_PARTY_DOMAIN_WHITELIST: