From 876163beb210da82f38327bc1b838d65dd8fb1d1 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Mon, 17 Jul 2017 15:00:12 -0700 Subject: [PATCH] Refactor Domains with one activity and two fragments. https://redmine.stoutner.com/issues/102. --- app/src/main/AndroidManifest.xml | 47 +- .../activities/DomainSettingsActivity.java | 205 --------- .../activities/DomainsActivity.java | 418 ++++++++++-------- .../activities/MainWebViewActivity.java | 2 +- .../fragments/DomainSettingsFragment.java | 13 +- .../fragments/DomainsListFragment.java | 145 ++++++ ...domains_list.xml => domains_fragments.xml} | 15 +- .../layout-w900dp/domains_list_fragment.xml | 30 ++ .../domain_settings_coordinatorlayout.xml | 52 --- ...tings.xml => domain_settings_fragment.xml} | 4 +- .../res/layout/domains_coordinatorlayout.xml | 3 +- app/src/main/res/layout/domains_fragments.xml | 25 ++ ...ins_list.xml => domains_list_fragment.xml} | 1 - .../main/res/menu/domains_options_menu.xml | 7 - 14 files changed, 477 insertions(+), 490 deletions(-) delete mode 100644 app/src/main/java/com/stoutner/privacybrowser/activities/DomainSettingsActivity.java create mode 100644 app/src/main/java/com/stoutner/privacybrowser/fragments/DomainsListFragment.java rename app/src/main/res/layout-w900dp/{domains_list.xml => domains_fragments.xml} (74%) create mode 100644 app/src/main/res/layout-w900dp/domains_list_fragment.xml delete mode 100644 app/src/main/res/layout/domain_settings_coordinatorlayout.xml rename app/src/main/res/layout/{domain_settings.xml => domain_settings_fragment.xml} (99%) create mode 100644 app/src/main/res/layout/domains_fragments.xml rename app/src/main/res/layout/{domains_list.xml => domains_list_fragment.xml} (97%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index be16084b..82ccd085 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -47,11 +47,10 @@ android:value="true" /> + `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes, which preserves scroll location in the WebView. + `android:launchMode="singleTask"` makes the app launch in a new task instead of inside the task of the program that sends it an intent. It also makes it reuse an existing Privacy Browser activity if available instead of launching a new one. + `android:persistableMode="persistNever"` removes Privacy Browser from the recents screen on a device reboot. + `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. --> + `android:persistableMode="persistNever"` removes Privacy Browser from the recents screen on a device reboot. + `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. --> + `android:persistableMode="persistNever"` removes Privacy Browser from the recents screen on a device reboot. + `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. --> + `android:persistableMode="persistNever"` removes Privacy Browser from the recents screen on a device reboot. + `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. --> - + - - - + `android:persistableMode="persistNever"` removes Privacy Browser from the recents screen on a device reboot. + `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. --> + `android:persistableMode="persistNever"` removes Privacy Browser from the recents screen on a device reboot. + `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. --> . - * - * This file is part of Privacy Browser . - * - * Privacy Browser 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, - * 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 . - */ - -package com.stoutner.privacybrowser.activities; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.support.design.widget.CoordinatorLayout; -import android.support.design.widget.Snackbar; -import android.support.v4.app.NavUtils; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.widget.EditText; -import android.widget.Spinner; -import android.widget.Switch; - -import com.stoutner.privacybrowser.R; -import com.stoutner.privacybrowser.fragments.DomainSettingsFragment; -import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper; - -public class DomainSettingsActivity extends AppCompatActivity { - // `databaseId` is used in `onCreate()` and `onOptionsItemSelected()`. - int databaseId; - - @Override - protected void onCreate(Bundle savedInstanceState) { - // Set the activity theme. - if (MainWebViewActivity.darkTheme) { - setTheme(R.style.PrivacyBrowserDark_SecondaryActivity); - } else { - setTheme(R.style.PrivacyBrowserLight_SecondaryActivity); - } - - // Run the default commands. - super.onCreate(savedInstanceState); - - // Set the content view. - setContentView(R.layout.domain_settings_coordinatorlayout); - - // We ned to use `SupportActionBar` from `android.support.v7.app.ActionBar` until the minimum API is >= 21. - Toolbar domainSettingsAppBar = (Toolbar) findViewById(R.id.domain_settings_toolbar); - setSupportActionBar(domainSettingsAppBar); - - // Display the home arrow on `appBar`. - final ActionBar appBar = getSupportActionBar(); - assert appBar != null; // This assert removes the incorrect lint warning in Android Studio on the following line that `appBar` might be `null`. - appBar.setDisplayHomeAsUpEnabled(true); - - // Get the intent that started the activity. - final Intent launchingIntent = getIntent(); - - // Extract the `databaseID`. The default value is `1`. - databaseId = launchingIntent.getIntExtra(DomainSettingsFragment.DATABASE_ID, 1); - - // Store `databaseId` in `argumentsBundle`. - Bundle argumentsBundle = new Bundle(); - argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, databaseId); - - // Add `argumentsBundle` to `domainSettingsFragment`. - DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment(); - domainSettingsFragment.setArguments(argumentsBundle); - - // Display `domainSettingsFragment`. - getSupportFragmentManager().beginTransaction().replace(R.id.domain_settings_scrollview, domainSettingsFragment).commit(); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu. - getMenuInflater().inflate(R.menu.domains_options_menu, menu); - - // Success! - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem menuItem) { - // Get the ID of the `MenuItem` that was selected. - int menuItemID = menuItem.getItemId(); - - // Initialize the database handler. `this` specifies the context. The two `nulls` do not specify the database name or a `CursorFactory`. - // The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`. - final DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(getApplicationContext(), null, null, 0); - - switch (menuItemID) { - case android.R.id.home: // The home arrow is identified as `android.R.id.home`, not just `R.id.home`. - // Go home. - NavUtils.navigateUpFromSameTask(this); - break; - - case R.id.save_domain: - // Get handles for the domain settings. - EditText domainNameEditText = (EditText) findViewById(R.id.domain_settings_name_edittext); - Switch javaScriptEnabledSwitch = (Switch) findViewById(R.id.domain_settings_javascript_switch); - Switch firstPartyCookiesEnabledSwitch = (Switch) findViewById(R.id.domain_settings_first_party_cookies_switch); - Switch thirdPartyCookiesEnabledSwitch = (Switch) findViewById(R.id.domain_settings_third_party_cookies_switch); - Switch domStorageEnabledSwitch = (Switch) findViewById(R.id.domain_settings_dom_storage_switch); - Switch formDataEnabledSwitch = (Switch) findViewById(R.id.domain_settings_form_data_switch); - Spinner userAgentSpinner = (Spinner) findViewById(R.id.domain_settings_user_agent_spinner); - EditText customUserAgentEditText = (EditText) findViewById(R.id.domain_settings_custom_user_agent_edittext); - Spinner fontSizeSpinner = (Spinner) findViewById(R.id.domain_settings_font_size_spinner); - Spinner displayWebpageImagesSpinner = (Spinner) findViewById(R.id.domain_settings_display_webpage_images_spinner); - - // Extract the data for the domain settings. - String domainNameString = domainNameEditText.getText().toString(); - boolean javaScriptEnabledBoolean = javaScriptEnabledSwitch.isChecked(); - boolean firstPartyCookiesEnabledBoolean = firstPartyCookiesEnabledSwitch.isChecked(); - boolean thirdPartyCookiesEnabledBoolean = thirdPartyCookiesEnabledSwitch.isChecked(); - boolean domStorageEnabledEnabledBoolean = domStorageEnabledSwitch.isChecked(); - boolean formDataEnabledBoolean = formDataEnabledSwitch.isChecked(); - int userAgentPositionInt = userAgentSpinner.getSelectedItemPosition(); - int fontSizePositionInt = fontSizeSpinner.getSelectedItemPosition(); - int displayWebpageImagesInt = displayWebpageImagesSpinner.getSelectedItemPosition(); - - // Get the data for the `Spinners` from the entry values string arrays. - String userAgentString = getResources().getStringArray(R.array.domain_settings_user_agent_entry_values)[userAgentPositionInt]; - int fontSizeInt = Integer.parseInt(getResources().getStringArray(R.array.domain_settings_font_size_entry_values)[fontSizePositionInt]); - - // Check to see if we are using a custom user agent. - if (userAgentString.equals("Custom user agent")) { - // Set `userAgentString` to the custom user agent string. - userAgentString = customUserAgentEditText.getText().toString(); - } - - // Save the domain settings. - domainsDatabaseHelper.saveDomain(databaseId, domainNameString, javaScriptEnabledBoolean, firstPartyCookiesEnabledBoolean, thirdPartyCookiesEnabledBoolean, domStorageEnabledEnabledBoolean, formDataEnabledBoolean, userAgentString, fontSizeInt, - displayWebpageImagesInt); - - // Navigate to `DomainsActivity`. - NavUtils.navigateUpFromSameTask(this); - break; - - case R.id.delete_domain: - // Get a handle for the current activity. - final Activity activity = this; - - // Get a handle for `domain_settings_coordinatorlayout` so we can display a `SnackBar` later. - CoordinatorLayout domainSettingsCoordinatorLayout = (CoordinatorLayout) findViewById(R.id.domain_settings_coordinatorlayout); - - // Detach `domain_settings_scrollview`. - getSupportFragmentManager().beginTransaction().detach(getSupportFragmentManager().findFragmentById(R.id.domain_settings_scrollview)).commit(); - - Snackbar.make(domainSettingsCoordinatorLayout, R.string.domain_deleted, Snackbar.LENGTH_SHORT) - .setAction(R.string.undo, new View.OnClickListener() { - @Override - public void onClick(View v) { - // Do nothing because everything will be handled by `onDismiss` below. - } - }) - .addCallback(new Snackbar.Callback() { - @Override - public void onDismissed(Snackbar snackbar, int event) { - switch (event) { - // The user pushed the `undo` button. - case Snackbar.Callback.DISMISS_EVENT_ACTION: - // Store `databaseId` in `argumentsBundle`. - Bundle argumentsBundle = new Bundle(); - argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, databaseId); - - // Add `argumentsBundle` to `domainSettingsFragment`. - DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment(); - domainSettingsFragment.setArguments(argumentsBundle); - - // Display `domainSettingsFragment`. - getSupportFragmentManager().beginTransaction().replace(R.id.domain_settings_scrollview, domainSettingsFragment).commit(); - break; - - // The `Snackbar` was dismissed without the `Undo` button being pushed. - default: - // Delete the selected domain. - domainsDatabaseHelper.deleteDomain(databaseId); - - // Navigate to `DomainsActivity`. - NavUtils.navigateUpFromSameTask(activity); - break; - } - } - }) - .show(); - break; - } - return true; - } -} diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java index e98b5fc1..7c0b17a6 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java @@ -20,11 +20,11 @@ package com.stoutner.privacybrowser.activities; import android.content.Context; -import android.content.Intent; import android.database.Cursor; import android.os.Bundle; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; +import android.support.v4.app.FragmentManager; import android.support.v4.app.NavUtils; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; @@ -34,7 +34,6 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.AdapterView; import android.widget.CursorAdapter; import android.widget.EditText; import android.widget.ListView; @@ -45,29 +44,36 @@ import android.widget.TextView; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.dialogs.AddDomainDialog; import com.stoutner.privacybrowser.fragments.DomainSettingsFragment; +import com.stoutner.privacybrowser.fragments.DomainsListFragment; import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper; public class DomainsActivity extends AppCompatActivity implements AddDomainDialog.AddDomainListener { - // `context` is used in `onCreate()` and `onOptionsItemSelected()`. - private Context context; + // `twoPanedMode` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreate()` and `populateDomainsListView()`. + public static boolean twoPanedMode; - // `domainsDatabaseHelper` is used in `onCreate()`, `onOptionsItemSelected()`, `onAddDomain()`, and `updateDomainsRecyclerView()`. - private static DomainsDatabaseHelper domainsDatabaseHelper; + // `databaseId` is public static so it can be accessed from `DomainsListFragment`. It is also used in `saveDomainSettings()` and `populateDomainsListView()`. + public static int currentDomainDatabaseId; - // `twoPaneMode` is used in `onCreate()` and `updateDomainsListView()`. - private boolean twoPaneMode; + // `domainSettingsFragmentDisplayed` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreate()`, `onOptionsItemSelected()`, and `onBackPressed()`. + public static boolean domainSettingsFragmentDisplayed; - // `domainsListView` is used in `onCreate()`, `onOptionsItemSelected()`, and `updateDomainsListView()`. - private ListView domainsListView; + // `deleteMenuItem` is public static so it can be accessed from `DomainsListFragment`. It is also used in `onCreateOptionsMenu()`, `onOptionsItemSelected()`, and `onBackPressed()`. + public static MenuItem deleteMenuItem; + + // `context` is used in `onCreate()`, `onOptionsItemSelected()`, and `onAddDomain()`. + private Context context; + + // `supportFragmentManager` is used in `onCreate()`. + private FragmentManager supportFragmentManager; - // `databaseId` is used in `onCreate()` and `onOptionsItemSelected()`. - private int databaseId; + // `domainsDatabaseHelper` is used in `onCreate()` and `saveDomainSettings()`. + private static DomainsDatabaseHelper domainsDatabaseHelper; - // `saveMenuItem` is used in `onCreate()`, `onOptionsItemSelected()`, and `onCreateOptionsMenu()`. - private MenuItem saveMenuItem; + // `domainsListView` is used in `onCreate()` and `populateDomainsList()`. + private ListView domainsListView; - // `deleteMenuItem` is used in `onCreate()`, `onOptionsItemSelected()`, and `onCreateOptionsMenu()`. - private MenuItem deleteMenuItem; + // `addDomainFAB` is used in `onCreate()`, `onOptionsItemSelected()`, and `onBackPressed()`. + private FloatingActionButton addDomainFAB; @Override protected void onCreate(Bundle savedInstanceState) { @@ -87,6 +93,9 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Get a handle for the context. context = this; + // Get a handle for the fragment manager. + supportFragmentManager = getSupportFragmentManager(); + // We need to use the `SupportActionBar` from `android.support.v7.app.ActionBar` until the minimum API is >= 21. final Toolbar domainsAppBar = (Toolbar) findViewById(R.id.domains_toolbar); setSupportActionBar(domainsAppBar); @@ -96,52 +105,25 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo assert appBar != null;// This assert removes the incorrect warning in Android Studio on the following line that `appBar` might be null. appBar.setDisplayHomeAsUpEnabled(true); - // Initialize the database handler. `this` specifies the context. The two `nulls` do not specify the database name or a `CursorFactory`. - // The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`. - domainsDatabaseHelper = new DomainsDatabaseHelper(this, null, null, 0); + // Initialize the database handler. The two `nulls` do not specify the database name or a `CursorFactory`. The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`. + domainsDatabaseHelper = new DomainsDatabaseHelper(context, null, null, 0); - // Determine if we are in two pane mode. `domains_settings_scrollview` is only populated if two panes are present. - twoPaneMode = ((findViewById(R.id.domain_settings_scrollview)) != null); + // Determine if we are in two pane mode. `domain_settings_fragment_container` does not exist on devices with a width less than 900dp. + twoPanedMode = (findViewById(R.id.domain_settings_fragment_container) != null); - // Initialize `domainsListView`. - domainsListView = (ListView) findViewById(R.id.domains_listview); - - domainsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - // Convert the id from `long` to `int` to match the format of the domains database. - databaseId = (int) id; - - // Display the Domain Settings. - if (twoPaneMode) { // Display a fragment in two paned mode. - // Store `databaseId` in `argumentsBundle`. - Bundle argumentsBundle = new Bundle(); - argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, databaseId); - - // Add `argumentsBundle` to `domainSettingsFragment`. - DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment(); - domainSettingsFragment.setArguments(argumentsBundle); - - // Display `domainSettingsFragment`. - getSupportFragmentManager().beginTransaction().replace(R.id.domain_settings_scrollview, domainSettingsFragment).commit(); - } else { // Load the second activity on smaller screens. - // Create `domainSettingsActivityIntent` with the `databaseId`. - Intent domainSettingsActivityIntent = new Intent(context, DomainSettingsActivity.class); - domainSettingsActivityIntent.putExtra(DomainSettingsFragment.DATABASE_ID, databaseId); - - // Start `DomainSettingsActivity`. - context.startActivity(domainSettingsActivityIntent); - } - } - }); + // Display `DomainsListFragment`. + DomainsListFragment domainsListFragment = new DomainsListFragment(); + supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); + supportFragmentManager.executePendingTransactions(); - FloatingActionButton addDomainFAB = (FloatingActionButton) findViewById(R.id.add_domain_fab); + // Configure `addDomainFAB`. + addDomainFAB = (FloatingActionButton) findViewById(R.id.add_domain_fab); addDomainFAB.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { // Show the `AddDomainDialog` `AlertDialog` and name the instance `@string/add_domain`. AppCompatDialogFragment addDomainDialog = new AddDomainDialog(); - addDomainDialog.show(getSupportFragmentManager(), getResources().getString(R.string.add_domain)); + addDomainDialog.show(supportFragmentManager, getResources().getString(R.string.add_domain)); } }); } @@ -151,16 +133,14 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Inflate the menu. getMenuInflater().inflate(R.menu.domains_options_menu, menu); - // Store the `MenuItems` for future use. + // Store `deleteMenuItem` for future use. deleteMenuItem = menu.findItem(R.id.delete_domain); - saveMenuItem = menu.findItem(R.id.save_domain); - // Only display the options `MenuItems` in two pane mode. - deleteMenuItem.setVisible(twoPaneMode); - saveMenuItem.setVisible(twoPaneMode); + // Only display `deleteMenuItem` (initially) in two-paned mode. + deleteMenuItem.setVisible(twoPanedMode); - // Load the `ListView`. We have to do this from `onCreateOptionsMenu()` instead of `onCreate()` because `updateDomainsListView()` needs the `MenuItems` to be inflated. - updateDomainsListView(); + // Populate the list of domains. We have to do this from `onCreateOptionsMenu()` instead of `onCreate()` because `populateDomainsListView()` needs the `deleteMenuItem` to be inflated. + populateDomainsListView(); // Success! return true; @@ -173,61 +153,73 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo switch (menuItemID) { case android.R.id.home: // The home arrow is identified as `android.R.id.home`, not just `R.id.home`. - // Go home. - NavUtils.navigateUpFromSameTask(this); - break; + if (twoPanedMode) { // The device is in two-paned mode. + // If there is at least one domain, save the current domain settings. + if (domainsListView.getCount() > 0) { + saveDomainSettings(); + } - case R.id.save_domain: - // Get handles for the domain settings. - EditText domainNameEditText = (EditText) findViewById(R.id.domain_settings_name_edittext); - Switch javaScriptEnabledSwitch = (Switch) findViewById(R.id.domain_settings_javascript_switch); - Switch firstPartyCookiesEnabledSwitch = (Switch) findViewById(R.id.domain_settings_first_party_cookies_switch); - Switch thirdPartyCookiesEnabledSwitch = (Switch) findViewById(R.id.domain_settings_third_party_cookies_switch); - Switch domStorageEnabledSwitch = (Switch) findViewById(R.id.domain_settings_dom_storage_switch); - Switch formDataEnabledSwitch = (Switch) findViewById(R.id.domain_settings_form_data_switch); - Spinner userAgentSpinner = (Spinner) findViewById(R.id.domain_settings_user_agent_spinner); - EditText customUserAgentEditText = (EditText) findViewById(R.id.domain_settings_custom_user_agent_edittext); - Spinner fontSizeSpinner = (Spinner) findViewById(R.id.domain_settings_font_size_spinner); - Spinner displayWebpageImagesSpinner = (Spinner) findViewById(R.id.domain_settings_display_webpage_images_spinner); - - // Extract the data for the domain settings. - String domainNameString = domainNameEditText.getText().toString(); - boolean javaScriptEnabledBoolean = javaScriptEnabledSwitch.isChecked(); - boolean firstPartyCookiesEnabledBoolean = firstPartyCookiesEnabledSwitch.isChecked(); - boolean thirdPartyCookiesEnabledBoolean = thirdPartyCookiesEnabledSwitch.isChecked(); - boolean domStorageEnabledEnabledBoolean = domStorageEnabledSwitch.isChecked(); - boolean formDataEnabledBoolean = formDataEnabledSwitch.isChecked(); - int userAgentPositionInt = userAgentSpinner.getSelectedItemPosition(); - int fontSizePositionInt = fontSizeSpinner.getSelectedItemPosition(); - int displayWebpageImagesInt = displayWebpageImagesSpinner.getSelectedItemPosition(); - - // Get the data for the `Spinners` from the entry values string arrays. - String userAgentString = getResources().getStringArray(R.array.user_agent_entry_values)[userAgentPositionInt]; - int fontSizeInt = Integer.parseInt(getResources().getStringArray(R.array.default_font_size_entry_values)[fontSizePositionInt]); - - // Check to see if we are using a custom user agent. - if (userAgentString.equals("Custom user agent")) { - // Set `userAgentString` to the custom user agent string. - userAgentString = customUserAgentEditText.getText().toString(); - } + // Go home. + NavUtils.navigateUpFromSameTask(this); + } else if (domainSettingsFragmentDisplayed) { // The device is in single-paned mode and `DomainSettingsFragment` is displayed. + // Save the current domain settings. + saveDomainSettings(); - // Save the domain settings. - domainsDatabaseHelper.saveDomain(databaseId, domainNameString, javaScriptEnabledBoolean, firstPartyCookiesEnabledBoolean, thirdPartyCookiesEnabledBoolean, domStorageEnabledEnabledBoolean, formDataEnabledBoolean, userAgentString, fontSizeInt, - displayWebpageImagesInt); + // Display `DomainsListFragment`. + DomainsListFragment domainsListFragment = new DomainsListFragment(); + supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); + supportFragmentManager.executePendingTransactions(); - // Display a `Snackbar`. - Snackbar.make(domainsListView, R.string.domain_settings_saved, Snackbar.LENGTH_SHORT).show(); + // Populate the list of domains. + populateDomainsListView(); + + // Update `domainSettingsFragmentDisplayed`. + domainSettingsFragmentDisplayed = false; + + // Display `addDomainFAB`. + addDomainFAB.setVisibility(View.VISIBLE); - // update the domains `ListView`. - updateDomainsListView(); + // Hide `deleteMenuItem`. + deleteMenuItem.setVisible(false); + } else { // The device is in single-paned mode and `DomainsListFragment` is displayed. + // Go home. + NavUtils.navigateUpFromSameTask(this); + } break; case R.id.delete_domain: - // Save the `ListView` `currentPosition`. - final int currentPosition = domainsListView.getCheckedItemPosition(); + // Store a copy of `currentDomainDatabaseId` because it could change while the `Snackbar` is displayed. + final int databaseIdToDelete = currentDomainDatabaseId; + + // Store the deleted domain position, which is needed if `Undo` is selected in the `Snackbar`. + final int deletedDomainPosition = domainsListView.getCheckedItemPosition(); + + // Update the fragments and menu items. + if (twoPanedMode) { // Two-paned mode. + // Disable the options `MenuItems`. + deleteMenuItem.setEnabled(false); + deleteMenuItem.setIcon(R.drawable.delete_blue); + + // Remove the domain settings fragment. + supportFragmentManager.beginTransaction().remove(supportFragmentManager.findFragmentById(R.id.domain_settings_fragment_container)).commit(); + } else { // Single-paned mode. + // Display `DomainsListFragment`. + DomainsListFragment domainsListFragment = new DomainsListFragment(); + supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); + supportFragmentManager.executePendingTransactions(); + + // Update `domainSettingsFragmentDisplayed`. + domainSettingsFragmentDisplayed = false; + + // Display `addDomainFAB`. + addDomainFAB.setVisibility(View.VISIBLE); + + // Hide `deleteMenuItem`. + deleteMenuItem.setVisible(false); + } // Get a `Cursor` that does not show the domain to be deleted. - Cursor domainsPendingDeleteCursor = domainsDatabaseHelper.getDomainNameCursorOrderedByDomainExcept(databaseId); + Cursor domainsPendingDeleteCursor = domainsDatabaseHelper.getDomainNameCursorOrderedByDomainExcept(databaseIdToDelete); // Setup `domainsPendingDeleteCursorAdapter` with `this` context. `false` disables `autoRequery`. CursorAdapter domainsPendingDeleteCursorAdapter = new CursorAdapter(this, domainsPendingDeleteCursor, false) { @@ -246,17 +238,12 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo } }; + // Update the handle for the current `domains_listview`. + domainsListView = (ListView) findViewById(R.id.domains_listview); + // Update the `ListView`. domainsListView.setAdapter(domainsPendingDeleteCursorAdapter); - // Detach the domain settings `Fragment`. - getSupportFragmentManager().beginTransaction().detach(getSupportFragmentManager().findFragmentById(R.id.domain_settings_scrollview)).commit(); - - // Disable the options `MenuItems`. - deleteMenuItem.setEnabled(false); - deleteMenuItem.setIcon(R.drawable.delete_blue); - saveMenuItem.setEnabled(false); - // Display a `Snackbar`. Snackbar.make(domainsListView, R.string.domain_deleted, Snackbar.LENGTH_LONG) .setAction(R.string.undo, new View.OnClickListener() { @@ -271,53 +258,70 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo switch (event) { // The user pushed the `Undo` button. case Snackbar.Callback.DISMISS_EVENT_ACTION: - // Get a `Cursor` with the current contents of the domains database. - Cursor undoDeleteDomainsCursor = domainsDatabaseHelper.getDomainNameCursorOrderedByDomain(); - - // Setup `domainsCursorAdapter` with `this` context. `false` disables `autoRequery`. - CursorAdapter undoDeleteDomainsCursorAdapter = new CursorAdapter(context, undoDeleteDomainsCursor, false) { - @Override - public View newView(Context context, Cursor cursor, ViewGroup parent) { - // Inflate the individual item layout. `false` does not attach it to the root. - return getLayoutInflater().inflate(R.layout.domain_name_linearlayout, parent, false); - } - - @Override - public void bindView(View view, Context context, Cursor cursor) { - // Set the domain name. - String domainNameString = cursor.getString(cursor.getColumnIndex(DomainsDatabaseHelper.DOMAIN_NAME)); - TextView domainNameTextView = (TextView) view.findViewById(R.id.domain_name_textview); - domainNameTextView.setText(domainNameString); - } - }; - - // Update the `ListView`. - domainsListView.setAdapter(undoDeleteDomainsCursorAdapter); - - // Select the entry in the domain list at `currentPosition`. - domainsListView.setItemChecked(currentPosition, true); - // Store `databaseId` in `argumentsBundle`. Bundle argumentsBundle = new Bundle(); - argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, databaseId); + argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, databaseIdToDelete); // Add `argumentsBundle` to `domainSettingsFragment`. DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment(); domainSettingsFragment.setArguments(argumentsBundle); - // Display `domainSettingsFragment`. - getSupportFragmentManager().beginTransaction().replace(R.id.domain_settings_scrollview, domainSettingsFragment).commit(); - - // Enable the options `MenuItems`. - deleteMenuItem.setEnabled(true); - deleteMenuItem.setIcon(R.drawable.delete_light); - saveMenuItem.setEnabled(true); + // Display the correct fragments. + if (twoPanedMode) { // The device in in two-paned mode. + // Get a `Cursor` with the current contents of the domains database. + Cursor undoDeleteDomainsCursor = domainsDatabaseHelper.getDomainNameCursorOrderedByDomain(); + + // Setup `domainsCursorAdapter` with `this` context. `false` disables `autoRequery`. + CursorAdapter undoDeleteDomainsCursorAdapter = new CursorAdapter(context, undoDeleteDomainsCursor, false) { + @Override + public View newView(Context context, Cursor cursor, ViewGroup parent) { + // Inflate the individual item layout. `false` does not attach it to the root. + return getLayoutInflater().inflate(R.layout.domain_name_linearlayout, parent, false); + } + + @Override + public void bindView(View view, Context context, Cursor cursor) { + // Set the domain name. + String domainNameString = cursor.getString(cursor.getColumnIndex(DomainsDatabaseHelper.DOMAIN_NAME)); + TextView domainNameTextView = (TextView) view.findViewById(R.id.domain_name_textview); + domainNameTextView.setText(domainNameString); + } + }; + + // Update the `ListView`. + domainsListView.setAdapter(undoDeleteDomainsCursorAdapter); + // Select the previously deleted domain in `domainsListView`. + domainsListView.setItemChecked(deletedDomainPosition, true); + + // Display `domainSettingsFragment`. + supportFragmentManager.beginTransaction().replace(R.id.domain_settings_fragment_container, domainSettingsFragment).commit(); + + // Enable the options `MenuItems`. + deleteMenuItem.setEnabled(true); + deleteMenuItem.setIcon(R.drawable.delete_light); + } else { // The device in in one-paned mode. + // Display `domainSettingsFragment`. + supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); + + // Hide `add_domain_fab`. + FloatingActionButton addDomainFAB = (FloatingActionButton) findViewById(R.id.add_domain_fab); + addDomainFAB.setVisibility(View.GONE); + + // Show and enable `deleteMenuItem`. + deleteMenuItem.setVisible(true); + + // Set `domainSettingsFragmentDisplayed`. + domainSettingsFragmentDisplayed = true; + + // Display `domainSettingsFragment`. + supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); + } break; // The `Snackbar` was dismissed without the `Undo` button being pushed. default: // Delete the selected domain. - domainsDatabaseHelper.deleteDomain(databaseId); + domainsDatabaseHelper.deleteDomain(databaseIdToDelete); break; } } @@ -330,6 +334,43 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo return true; } + // Control what the navigation bar back button does. + @Override + public void onBackPressed() { + if (twoPanedMode) { // The device is in two-paned mode. + // If there is at least one domain, save the current domain settings. + if (domainsListView.getCount() > 0) { + saveDomainSettings(); + } + + // Go home. + NavUtils.navigateUpFromSameTask(this); + } else if (domainSettingsFragmentDisplayed) { // The device is in single-paned mode and `DomainSettingsFragment` is displayed. + // Save the current domain settings. + saveDomainSettings(); + + // Display `DomainsListFragment`. + DomainsListFragment domainsListFragment = new DomainsListFragment(); + supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainsListFragment).commit(); + supportFragmentManager.executePendingTransactions(); + + // Populate the list of domains. + populateDomainsListView(); + + // Update `domainSettingsFragmentDisplayed`. + domainSettingsFragmentDisplayed = false; + + // Display `addDomainFAB`. + addDomainFAB.setVisibility(View.VISIBLE); + + // Hide `deleteMenuItem`. + deleteMenuItem.setVisible(false); + } else { // The device is in single-paned mode and `DomainsListFragment` is displayed. + // Pass `onBackPressed()` to the system. + super.onBackPressed(); + } + } + @Override public void onAddDomain(AppCompatDialogFragment dialogFragment) { // Get the `domainNameEditText` from `dialogFragment` and extract the string. @@ -339,27 +380,58 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo // Create the domain. domainsDatabaseHelper.addDomain(domainNameString); - // Refresh the `ListView`. - updateDomainsListView(); + // Populate the `ListView`. + populateDomainsListView(); } - private void updateDomainsListView() { - // Initialize `currentPosition`. - int currentPosition; - - // Store the current position of `domainsListView` if it is already populated. - if (domainsListView.getCount() > 0){ - currentPosition = domainsListView.getCheckedItemPosition(); - } else { - // Set `currentPosition` to 0; - currentPosition = 0; + private void saveDomainSettings() { + // Get handles for the domain settings. + EditText domainNameEditText = (EditText) findViewById(R.id.domain_settings_name_edittext); + Switch javaScriptEnabledSwitch = (Switch) findViewById(R.id.domain_settings_javascript_switch); + Switch firstPartyCookiesEnabledSwitch = (Switch) findViewById(R.id.domain_settings_first_party_cookies_switch); + Switch thirdPartyCookiesEnabledSwitch = (Switch) findViewById(R.id.domain_settings_third_party_cookies_switch); + Switch domStorageEnabledSwitch = (Switch) findViewById(R.id.domain_settings_dom_storage_switch); + Switch formDataEnabledSwitch = (Switch) findViewById(R.id.domain_settings_form_data_switch); + Spinner userAgentSpinner = (Spinner) findViewById(R.id.domain_settings_user_agent_spinner); + EditText customUserAgentEditText = (EditText) findViewById(R.id.domain_settings_custom_user_agent_edittext); + Spinner fontSizeSpinner = (Spinner) findViewById(R.id.domain_settings_font_size_spinner); + Spinner displayWebpageImagesSpinner = (Spinner) findViewById(R.id.domain_settings_display_webpage_images_spinner); + + // Extract the data for the domain settings. + String domainNameString = domainNameEditText.getText().toString(); + boolean javaScriptEnabledBoolean = javaScriptEnabledSwitch.isChecked(); + boolean firstPartyCookiesEnabledBoolean = firstPartyCookiesEnabledSwitch.isChecked(); + boolean thirdPartyCookiesEnabledBoolean = thirdPartyCookiesEnabledSwitch.isChecked(); + boolean domStorageEnabledEnabledBoolean = domStorageEnabledSwitch.isChecked(); + boolean formDataEnabledBoolean = formDataEnabledSwitch.isChecked(); + int userAgentPositionInt = userAgentSpinner.getSelectedItemPosition(); + int fontSizePositionInt = fontSizeSpinner.getSelectedItemPosition(); + int displayWebpageImagesInt = displayWebpageImagesSpinner.getSelectedItemPosition(); + + // Get the data for the `Spinners` from the entry values string arrays. + String userAgentString = getResources().getStringArray(R.array.domain_settings_user_agent_entry_values)[userAgentPositionInt]; + int fontSizeInt = Integer.parseInt(getResources().getStringArray(R.array.domain_settings_font_size_entry_values)[fontSizePositionInt]); + + // Check to see if we are using a custom user agent. + if (userAgentString.equals("Custom user agent")) { + // Set `userAgentString` to the custom user agent string. + userAgentString = customUserAgentEditText.getText().toString(); } + // Save the domain settings. + domainsDatabaseHelper.saveDomain(currentDomainDatabaseId, domainNameString, javaScriptEnabledBoolean, firstPartyCookiesEnabledBoolean, thirdPartyCookiesEnabledBoolean, domStorageEnabledEnabledBoolean, formDataEnabledBoolean, userAgentString, fontSizeInt, + displayWebpageImagesInt); + } + + private void populateDomainsListView() { + // get a handle for the current `domains_listview`. + domainsListView = (ListView) findViewById(R.id.domains_listview); + // Get a `Cursor` with the current contents of the domains database. Cursor domainsCursor = domainsDatabaseHelper.getDomainNameCursorOrderedByDomain(); // Setup `domainsCursorAdapter` with `this` context. `false` disables `autoRequery`. - CursorAdapter domainsCursorAdapter = new CursorAdapter(this, domainsCursor, false) { + CursorAdapter domainsCursorAdapter = new CursorAdapter(context, domainsCursor, false) { @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { // Inflate the individual item layout. `false` does not attach it to the root. @@ -379,28 +451,27 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo domainsListView.setAdapter(domainsCursorAdapter); // Display the domain settings in the second pane if operating in two pane mode and the database contains at least one domain. - if (twoPaneMode && (domainsCursor.getCount() > 0)) { - // Select the entry in the domain list at `currentPosition`. - domainsListView.setItemChecked(currentPosition, true); + if (DomainsActivity.twoPanedMode && (domainsCursor.getCount() > 0)) { // Two-paned mode is enabled and there is at least one domain. + // Select the first domain. + domainsListView.setItemChecked(0, true); - // Get the `databaseId` for `currentPosition`. - domainsCursor.moveToPosition(currentPosition); - databaseId = domainsCursor.getInt(domainsCursor.getColumnIndex(DomainsDatabaseHelper._ID)); + // Get the `databaseId` for the first domain. + domainsCursor.moveToPosition(0); + currentDomainDatabaseId = domainsCursor.getInt(domainsCursor.getColumnIndex(DomainsDatabaseHelper._ID)); // Store `databaseId` in `argumentsBundle`. Bundle argumentsBundle = new Bundle(); - argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, databaseId); + argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, currentDomainDatabaseId); // Add `argumentsBundle` to `domainSettingsFragment`. DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment(); domainSettingsFragment.setArguments(argumentsBundle); // Display `domainSettingsFragment`. - getSupportFragmentManager().beginTransaction().replace(R.id.domain_settings_scrollview, domainSettingsFragment).commit(); + supportFragmentManager.beginTransaction().replace(R.id.domain_settings_fragment_container, domainSettingsFragment).commit(); // Enable the options `MenuItems`. deleteMenuItem.setEnabled(true); - saveMenuItem.setEnabled(true); // Set the delete icon according to the theme. if (MainWebViewActivity.darkTheme) { @@ -408,11 +479,10 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo } else { deleteMenuItem.setIcon(R.drawable.delete_light); } - } else { + } else if (twoPanedMode) { // Two-paned mode is enabled but there are no domains. // Disable the options `MenuItems`. deleteMenuItem.setEnabled(false); deleteMenuItem.setIcon(R.drawable.delete_blue); - saveMenuItem.setEnabled(false); } } } \ No newline at end of file diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java index f1110c57..512e8c4d 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -122,7 +122,7 @@ import java.util.Set; public class MainWebViewActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, CreateHomeScreenShortcutDialog.CreateHomeScreenSchortcutListener, SslCertificateErrorDialog.SslCertificateErrorListener, DownloadFileDialog.DownloadFileListener, DownloadImageDialog.DownloadImageListener, UrlHistoryDialog.UrlHistoryListener { - // `darkTheme` is public static so it can be accessed from `AboutActivity`, `GuideActivity`, `AddDomainDialog`, `SettingsActivity`, `DomainsActivity`, `DomainsSettingsActivity`, `BookmarksActivity`, `BookmarksDatabaseViewActivity`, + // `darkTheme` is public static so it can be accessed from `AboutActivity`, `GuideActivity`, `AddDomainDialog`, `SettingsActivity`, `DomainsActivity`, `DomainsListFragment`, `BookmarksActivity`, `BookmarksDatabaseViewActivity`, // `CreateBookmarkDialog`, `CreateBookmarkFolderDialog`, `DownloadFileDialog`, `DownloadImageDialog`, `EditBookmarkDialog`, `EditBookmarkFolderDialog`, `MoveToFolderDialog`, `SslCertificateErrorDialog`, `UrlHistoryDialog`, `ViewSslCertificateDialog`, // `CreateHomeScreenShortcutDialog`, and `OrbotProxyHelper`. It is also used in `onCreate()`, `applyAppSettings()`, `applyDomainSettings()`, and `updatePrivacyIcons()`. public static boolean darkTheme; diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java index dbd8bb9b..98a7e929 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java @@ -65,8 +65,8 @@ public class DomainSettingsFragment extends Fragment { @SuppressWarnings("deprecation") @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - // Inflate `domain_settings`. `false` does not attach it to the root `container`. - View domainSettingsView = inflater.inflate(R.layout.domain_settings, container, false); + // Inflate `domain_settings_fragment`. `false` does not attach it to the root `container`. + View domainSettingsView = inflater.inflate(R.layout.domain_settings_fragment, container, false); // Get a handle for the `Context`. Context context = getContext(); @@ -91,9 +91,8 @@ public class DomainSettingsFragment extends Fragment { final ImageView displayWebpageImagesImageView = (ImageView) domainSettingsView.findViewById(R.id.domain_settings_display_webpage_images_imageview); Spinner displayWebpageImagesSpinner = (Spinner) domainSettingsView.findViewById(R.id.domain_settings_display_webpage_images_spinner); - // Initialize the database handler. `this` specifies the context. The two `nulls` do not specify the database name or a `CursorFactory`. - // The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`. - DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(getContext(), null, null, 0); + // Initialize the database handler. The two `nulls` do not specify the database name or a `CursorFactory`. The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`. + DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(context, null, null, 0); // Get the database `Cursor` for this ID and move it to the first row. Cursor domainCursor = domainsDatabaseHelper.getCursorForId(databaseId); @@ -253,8 +252,8 @@ public class DomainSettingsFragment extends Fragment { WebView bareWebView = (WebView) bareWebViewLayout.findViewById(R.id.bare_webview); final String webViewDefaultUserAgentString = bareWebView.getSettings().getUserAgentString(); - // Get a handle for the shared preference. `this` references the current context. - SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext()); + // Get a handle for the shared preference. + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); // Store the default user agent string values. final String defaultUserAgentString = sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0"); diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainsListFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainsListFragment.java new file mode 100644 index 00000000..cd4bec0c --- /dev/null +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainsListFragment.java @@ -0,0 +1,145 @@ +/* + * Copyright © 2017 Soren Stoutner . + * + * This file is part of Privacy Browser . + * + * Privacy Browser 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, + * 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 . + */ + +package com.stoutner.privacybrowser.fragments; + +import android.os.Bundle; +import android.support.design.widget.FloatingActionButton; +// We have to use `android.support.v4.app.Fragment` until minimum API >= 23. Otherwise we cannot call `getContext()`. +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.EditText; +import android.widget.ListView; +import android.widget.Spinner; +import android.widget.Switch; + +import com.stoutner.privacybrowser.R; +import com.stoutner.privacybrowser.activities.DomainsActivity; +import com.stoutner.privacybrowser.activities.MainWebViewActivity; +import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper; + +public class DomainsListFragment extends Fragment { + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + // Inflate `domains_list_fragment`. `false` does not attach it to the root `container`. + View domainsListFragmentView = inflater.inflate(R.layout.domains_list_fragment, container, false); + + // Initialize `domainsListView`. + ListView domainsListView = (ListView) domainsListFragmentView.findViewById(R.id.domains_listview); + + // Initialize the database handler. The two `nulls` do not specify the database name or a `CursorFactory`. The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`. + final DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(getContext(), null, null, 0); + + // Get a handle for `supportFragmentManager`. + final FragmentManager supportFragmentManager = getActivity().getSupportFragmentManager(); + + domainsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + // Save the current domain settings if operating in two-paned mode a domain is currently selected. + if (DomainsActivity.twoPanedMode && DomainsActivity.deleteMenuItem.isEnabled()) { + View domainSettingsFragmentView = supportFragmentManager.findFragmentById(R.id.domain_settings_fragment_container).getView(); + assert domainSettingsFragmentView != null; + + // Get handles for the domain settings. + EditText domainNameEditText = (EditText) domainSettingsFragmentView.findViewById(R.id.domain_settings_name_edittext); + Switch javaScriptEnabledSwitch = (Switch) domainSettingsFragmentView.findViewById(R.id.domain_settings_javascript_switch); + Switch firstPartyCookiesEnabledSwitch = (Switch) domainSettingsFragmentView.findViewById(R.id.domain_settings_first_party_cookies_switch); + Switch thirdPartyCookiesEnabledSwitch = (Switch) domainSettingsFragmentView.findViewById(R.id.domain_settings_third_party_cookies_switch); + Switch domStorageEnabledSwitch = (Switch) domainSettingsFragmentView.findViewById(R.id.domain_settings_dom_storage_switch); + Switch formDataEnabledSwitch = (Switch) domainSettingsFragmentView.findViewById(R.id.domain_settings_form_data_switch); + Spinner userAgentSpinner = (Spinner) domainSettingsFragmentView.findViewById(R.id.domain_settings_user_agent_spinner); + EditText customUserAgentEditText = (EditText) domainSettingsFragmentView.findViewById(R.id.domain_settings_custom_user_agent_edittext); + Spinner fontSizeSpinner = (Spinner) domainSettingsFragmentView.findViewById(R.id.domain_settings_font_size_spinner); + Spinner displayWebpageImagesSpinner = (Spinner) domainSettingsFragmentView.findViewById(R.id.domain_settings_display_webpage_images_spinner); + + // Extract the data for the domain settings. + String domainNameString = domainNameEditText.getText().toString(); + boolean javaScriptEnabledBoolean = javaScriptEnabledSwitch.isChecked(); + boolean firstPartyCookiesEnabledBoolean = firstPartyCookiesEnabledSwitch.isChecked(); + boolean thirdPartyCookiesEnabledBoolean = thirdPartyCookiesEnabledSwitch.isChecked(); + boolean domStorageEnabledEnabledBoolean = domStorageEnabledSwitch.isChecked(); + boolean formDataEnabledBoolean = formDataEnabledSwitch.isChecked(); + int userAgentPositionInt = userAgentSpinner.getSelectedItemPosition(); + int fontSizePositionInt = fontSizeSpinner.getSelectedItemPosition(); + int displayWebpageImagesInt = displayWebpageImagesSpinner.getSelectedItemPosition(); + + // Get the data for the `Spinners` from the entry values string arrays. + String userAgentString = getResources().getStringArray(R.array.domain_settings_user_agent_entry_values)[userAgentPositionInt]; + int fontSizeInt = Integer.parseInt(getResources().getStringArray(R.array.domain_settings_font_size_entry_values)[fontSizePositionInt]); + + // Check to see if we are using a custom user agent. + if (userAgentString.equals("Custom user agent")) { + // Set `userAgentString` to the custom user agent string. + userAgentString = customUserAgentEditText.getText().toString(); + } + + // Save the domain settings. + domainsDatabaseHelper.saveDomain(DomainsActivity.currentDomainDatabaseId, domainNameString, javaScriptEnabledBoolean, firstPartyCookiesEnabledBoolean, thirdPartyCookiesEnabledBoolean, domStorageEnabledEnabledBoolean, formDataEnabledBoolean, userAgentString, fontSizeInt, + displayWebpageImagesInt); + } + + // Store the new `currentDomainDatabaseId`, converting it from `long` to `int` to match the format of the domains database. + DomainsActivity.currentDomainDatabaseId = (int) id; + + // Add `currentDomainDatabaseId` to `argumentsBundle`. + Bundle argumentsBundle = new Bundle(); + argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, DomainsActivity.currentDomainDatabaseId); + + // Add `argumentsBundle` to `domainSettingsFragment`. + DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment(); + domainSettingsFragment.setArguments(argumentsBundle); + + // Display the domain settings fragment. + if (DomainsActivity.twoPanedMode) { // The device in in two-paned mode. + // Display `domainSettingsFragment`. + supportFragmentManager.beginTransaction().replace(R.id.domain_settings_fragment_container, domainSettingsFragment).commit(); + + // Enable the options `MenuItems`. + DomainsActivity.deleteMenuItem.setEnabled(true); + + // Set the delete icon according to the theme. + if (MainWebViewActivity.darkTheme) { + DomainsActivity.deleteMenuItem.setIcon(R.drawable.delete_dark); + } else { + DomainsActivity.deleteMenuItem.setIcon(R.drawable.delete_light); + } + } else { // The device in in single-paned mode + // Hide `add_domain_fab`. + FloatingActionButton addDomainFAB = (FloatingActionButton) getActivity().findViewById(R.id.add_domain_fab); + addDomainFAB.setVisibility(View.GONE); + + // Show and enable `deleteMenuItem`. + DomainsActivity.deleteMenuItem.setVisible(true); + + // Set `domainSettingsFragmentDisplayed`. + DomainsActivity.domainSettingsFragmentDisplayed = true; + + // Display `domainSettingsFragment`. + supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit(); + } + } + }); + + return domainsListFragmentView; + } +} diff --git a/app/src/main/res/layout-w900dp/domains_list.xml b/app/src/main/res/layout-w900dp/domains_fragments.xml similarity index 74% rename from app/src/main/res/layout-w900dp/domains_list.xml rename to app/src/main/res/layout-w900dp/domains_fragments.xml index a97d59ec..15a55f43 100644 --- a/app/src/main/res/layout-w900dp/domains_list.xml +++ b/app/src/main/res/layout-w900dp/domains_fragments.xml @@ -30,19 +30,14 @@ android:divider="?android:attr/dividerHorizontal" android:showDividers="middle" > - - - + android:layout_weight="2" /> - diff --git a/app/src/main/res/layout-w900dp/domains_list_fragment.xml b/app/src/main/res/layout-w900dp/domains_list_fragment.xml new file mode 100644 index 00000000..2dbb6980 --- /dev/null +++ b/app/src/main/res/layout-w900dp/domains_list_fragment.xml @@ -0,0 +1,30 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/domain_settings_coordinatorlayout.xml b/app/src/main/res/layout/domain_settings_coordinatorlayout.xml deleted file mode 100644 index e196ad5d..00000000 --- a/app/src/main/res/layout/domain_settings_coordinatorlayout.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/domain_settings.xml b/app/src/main/res/layout/domain_settings_fragment.xml similarity index 99% rename from app/src/main/res/layout/domain_settings.xml rename to app/src/main/res/layout/domain_settings_fragment.xml index 9d335d18..1d7bf639 100644 --- a/app/src/main/res/layout/domain_settings.xml +++ b/app/src/main/res/layout/domain_settings_fragment.xml @@ -19,6 +19,7 @@ along with Privacy Browser. If not, see . --> + android:divider="?android:attr/dividerVertical" > true` to make the status bar a transparent, darkened overlay. --> - + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/domains_list.xml b/app/src/main/res/layout/domains_list_fragment.xml similarity index 97% rename from app/src/main/res/layout/domains_list.xml rename to app/src/main/res/layout/domains_list_fragment.xml index 312f41f4..28e1155f 100644 --- a/app/src/main/res/layout/domains_list.xml +++ b/app/src/main/res/layout/domains_list_fragment.xml @@ -1,5 +1,4 @@ -