X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FRequestsActivity.java;h=4c42db79f13af2eccf8e842c03fd52d8a26d35f1;hb=fc54425aa869d2672a02e475ce3cd547fc157718;hp=4b58053ac823fc94298e2957c44693ffeeb3ce99;hpb=69b0fea4c49422f5e3c377994c4cf249bdc5a434;p=PrivacyBrowserAndroid.git 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 4b58053a..4c42db79 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018 Soren Stoutner . + * Copyright © 2018-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -23,10 +23,6 @@ import android.content.Context; import android.database.Cursor; import android.database.MatrixCursor; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.app.AppCompatDialogFragment; -import android.support.v7.widget.Toolbar; import android.view.View; import android.view.WindowManager; import android.widget.AdapterView; @@ -36,6 +32,11 @@ import android.widget.ResourceCursorAdapter; import android.widget.Spinner; import android.widget.TextView; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; // The AndroidX toolbar must be used until the minimum API >= 21. +import androidx.fragment.app.DialogFragment; + import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.adapters.RequestsArrayAdapter; import com.stoutner.privacybrowser.dialogs.ViewRequestDialog; @@ -45,7 +46,7 @@ import java.util.List; public class RequestsActivity extends AppCompatActivity implements ViewRequestDialog.ViewRequestListener { // The list view is used in `onCreate()` and `launchViewRequestDialog()`. - private ListView resourceRequestsListView; + private ListView requestsListView; @Override public void onCreate(Bundle savedInstanceState) { @@ -67,19 +68,19 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi // Set the content view. setContentView(R.layout.requests_coordinatorlayout); - // Use the `SupportActionBar` from `android.support.v7.app.ActionBar` until the minimum API is >= 21. - Toolbar blockListsAppBar = findViewById(R.id.blocklists_toolbar); - setSupportActionBar(blockListsAppBar); + // Use the AndroidX toolbar from until the minimum API is >= 21. + Toolbar toolbar = findViewById(R.id.requests_toolbar); + setSupportActionBar(toolbar); // Get a handle for the app bar and the list view. ActionBar appBar = getSupportActionBar(); - resourceRequestsListView = findViewById(R.id.resource_requests_listview); + requestsListView = findViewById(R.id.requests_listview); // Remove the incorrect lint warning that `appBar` might be null. assert appBar != null; // Display the spinner and the back arrow in the app bar. - appBar.setCustomView(R.layout.requests_spinner); + appBar.setCustomView(R.layout.spinner); appBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM | ActionBar.DISPLAY_HOME_AS_UP); // Initialize the resource array lists. A list is needed for all the resource requests, or the activity can crash if `MainWebViewActivity.resourceRequests` is modified after the activity loads. @@ -137,7 +138,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi spinnerCursor.addRow(new Object[]{4, getString(R.string.blocked_plural) + " - " + blockedResourceRequests.size()}); // Create a resource cursor adapter for the spinner. - ResourceCursorAdapter spinnerCursorAdapter = new ResourceCursorAdapter(this, R.layout.requests_spinner_item, spinnerCursor, 0) { + ResourceCursorAdapter spinnerCursorAdapter = new ResourceCursorAdapter(this, R.layout.requests_appbar_spinner_item, spinnerCursor, 0) { @Override public void bindView(View view, Context context, Cursor cursor) { // Get a handle for the spinner item text view. @@ -149,10 +150,10 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi }; // Set the resource cursor adapter drop down view resource. - spinnerCursorAdapter.setDropDownViewResource(R.layout.requests_spinner_dropdown_item); + spinnerCursorAdapter.setDropDownViewResource(R.layout.requests_appbar_spinner_dropdown_item); // Get a handle for the app bar spinner and set the adapter. - Spinner appBarSpinner = findViewById(R.id.requests_spinner); + Spinner appBarSpinner = findViewById(R.id.spinner); appBarSpinner.setAdapter(spinnerCursorAdapter); // Handle clicks on the spinner dropdown. @@ -165,7 +166,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi ArrayAdapter allResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), allResourceRequests); // Display the adapter in the list view. - resourceRequestsListView.setAdapter(allResourceRequestsArrayAdapter); + requestsListView.setAdapter(allResourceRequestsArrayAdapter); break; case 1: // Default requests. @@ -173,7 +174,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi ArrayAdapter defaultResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), defaultResourceRequests); // Display the adapter in the list view. - resourceRequestsListView.setAdapter(defaultResourceRequestsArrayAdapter); + requestsListView.setAdapter(defaultResourceRequestsArrayAdapter); break; case 2: // Allowed requests. @@ -181,7 +182,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi ArrayAdapter allowedResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), allowedResourceRequests); // Display the adapter in the list view. - resourceRequestsListView.setAdapter(allowedResourceRequestsArrayAdapter); + requestsListView.setAdapter(allowedResourceRequestsArrayAdapter); break; case 3: // Third-party requests. @@ -189,7 +190,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi ArrayAdapter thirdPartyResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), thirdPartyResourceRequests); //Display the adapter in the list view. - resourceRequestsListView.setAdapter(thirdPartyResourceRequestsArrayAdapter); + requestsListView.setAdapter(thirdPartyResourceRequestsArrayAdapter); break; case 4: // Blocked requests. @@ -197,7 +198,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi ArrayAdapter blockedResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), blockedResourceRequests); // Display the adapter in the list view. - resourceRequestsListView.setAdapter(blockedResourceRequestsArrayAdapter); + requestsListView.setAdapter(blockedResourceRequestsArrayAdapter); break; } } @@ -212,10 +213,10 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi ArrayAdapter resourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), allResourceRequests); // Populate the list view with the resource requests adapter. - resourceRequestsListView.setAdapter(resourceRequestsArrayAdapter); + requestsListView.setAdapter(resourceRequestsArrayAdapter); // Listen for taps on entries in the list view. - resourceRequestsListView.setOnItemClickListener((AdapterView parent, View view, int position, long id) -> { + requestsListView.setOnItemClickListener((AdapterView parent, View view, int position, long id) -> { // Display the view request dialog. The list view is 0 based, so the position must be incremented by 1. launchViewRequestDialog(position + 1); }); @@ -235,16 +236,16 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi private void launchViewRequestDialog(int id) { // Determine if this is the last request in the list. - boolean isLastRequest = (id == resourceRequestsListView.getCount()); + boolean isLastRequest = (id == requestsListView.getCount()); // Get the string array for the selected resource request. The resource requests list view is zero based. - String[] selectedRequestStringArray = (String[]) resourceRequestsListView.getItemAtPosition(id - 1); + String[] selectedRequestStringArray = (String[]) requestsListView.getItemAtPosition(id - 1); // Remove the warning that `selectedRequest` might be null. assert selectedRequestStringArray != null; // Show the request detail dialog. - AppCompatDialogFragment viewRequestDialogFragment = ViewRequestDialog.request(id, isLastRequest, selectedRequestStringArray); + DialogFragment viewRequestDialogFragment = ViewRequestDialog.request(id, isLastRequest, selectedRequestStringArray); viewRequestDialogFragment.show(getSupportFragmentManager(), getString(R.string.request_details)); } } \ No newline at end of file