X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FRequestsActivity.java;h=1dba49a45299caa9d15377f47fd9afffe7654735;hp=eb6fb4fe3b7be225a69bd37ed877780c23257252;hb=8142ac5fc2489de735de4b6fa21a1eae733ccfce;hpb=b82022327701273b1b56419e8d6042895c0bc7b9 diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.java index eb6fb4fe..1dba49a4 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.java @@ -1,20 +1,20 @@ /* - * Copyright © 2018-2020 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.activities; @@ -64,8 +64,9 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi // Get a handle for the shared preferences. SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - // Get the screenshot preference. - boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); + // Get the preferences. + boolean allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false); + boolean bottomAppBar = sharedPreferences.getBoolean(getString(R.string.bottom_app_bar_key), false); // Disable screenshots if not allowed. if (!allowScreenshots) { @@ -85,7 +86,11 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi boolean blockAllThirdPartyRequests = intent.getBooleanExtra("block_all_third_party_requests", false); // Set the content view. - setContentView(R.layout.requests_coordinatorlayout); + if (bottomAppBar) { + setContentView(R.layout.requests_bottom_appbar); + } else { + setContentView(R.layout.requests_top_appbar); + } // Use the AndroidX toolbar until the minimum API is >= 21. Toolbar toolbar = findViewById(R.id.requests_toolbar); @@ -175,6 +180,9 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi Spinner appBarSpinner = findViewById(R.id.spinner); appBarSpinner.setAdapter(spinnerCursorAdapter); + // Get a handle for the context. + Context context = this; + // Handle clicks on the spinner dropdown. appBarSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override @@ -182,7 +190,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi switch ((int) id) { case 0: // All requests. // Get an adapter for all the request. - ArrayAdapter allResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), allResourceRequests); + ArrayAdapter allResourceRequestsArrayAdapter = new RequestsArrayAdapter(context, allResourceRequests); // Display the adapter in the list view. requestsListView.setAdapter(allResourceRequestsArrayAdapter); @@ -190,7 +198,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi case 1: // Default requests. // Get an adapter for the default requests. - ArrayAdapter defaultResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), defaultResourceRequests); + ArrayAdapter defaultResourceRequestsArrayAdapter = new RequestsArrayAdapter(context, defaultResourceRequests); // Display the adapter in the list view. requestsListView.setAdapter(defaultResourceRequestsArrayAdapter); @@ -198,7 +206,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi case 2: // Allowed requests. // Get an adapter for the allowed requests. - ArrayAdapter allowedResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), allowedResourceRequests); + ArrayAdapter allowedResourceRequestsArrayAdapter = new RequestsArrayAdapter(context, allowedResourceRequests); // Display the adapter in the list view. requestsListView.setAdapter(allowedResourceRequestsArrayAdapter); @@ -206,7 +214,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi case 3: // Third-party requests. // Get an adapter for the third-party requests. - ArrayAdapter thirdPartyResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), thirdPartyResourceRequests); + ArrayAdapter thirdPartyResourceRequestsArrayAdapter = new RequestsArrayAdapter(context, thirdPartyResourceRequests); //Display the adapter in the list view. requestsListView.setAdapter(thirdPartyResourceRequestsArrayAdapter); @@ -214,7 +222,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi case 4: // Blocked requests. // Get an adapter fo the blocked requests. - ArrayAdapter blockedResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), blockedResourceRequests); + ArrayAdapter blockedResourceRequestsArrayAdapter = new RequestsArrayAdapter(context, blockedResourceRequests); // Display the adapter in the list view. requestsListView.setAdapter(blockedResourceRequestsArrayAdapter); @@ -229,7 +237,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi }); // Create an array adapter with the list of the resource requests. - ArrayAdapter resourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), allResourceRequests); + ArrayAdapter resourceRequestsArrayAdapter = new RequestsArrayAdapter(context, allResourceRequests); // Populate the list view with the resource requests adapter. requestsListView.setAdapter(resourceRequestsArrayAdapter); @@ -260,15 +268,15 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi } @Override - public void onPrevious(int id) { + public void onPrevious(int currentId) { // Show the previous dialog. - launchViewRequestDialog(id -1); + launchViewRequestDialog(currentId -1); } @Override - public void onNext(int id) { + public void onNext(int currentId) { // Show the next dialog. - launchViewRequestDialog(id + 1); + launchViewRequestDialog(currentId + 1); } private void launchViewRequestDialog(int id) {