Refactor Domains with one activity and two fragments. https://redmine.stoutner.com...
authorSoren Stoutner <soren@stoutner.com>
Mon, 17 Jul 2017 22:00:12 +0000 (15:00 -0700)
committerSoren Stoutner <soren@stoutner.com>
Mon, 17 Jul 2017 22:00:12 +0000 (15:00 -0700)
17 files changed:
app/src/main/AndroidManifest.xml
app/src/main/java/com/stoutner/privacybrowser/activities/DomainSettingsActivity.java [deleted file]
app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java
app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
app/src/main/java/com/stoutner/privacybrowser/fragments/DomainsListFragment.java [new file with mode: 0644]
app/src/main/res/layout-w900dp/domains_fragments.xml [new file with mode: 0644]
app/src/main/res/layout-w900dp/domains_list.xml [deleted file]
app/src/main/res/layout-w900dp/domains_list_fragment.xml [new file with mode: 0644]
app/src/main/res/layout/domain_settings.xml [deleted file]
app/src/main/res/layout/domain_settings_coordinatorlayout.xml [deleted file]
app/src/main/res/layout/domain_settings_fragment.xml [new file with mode: 0644]
app/src/main/res/layout/domains_coordinatorlayout.xml
app/src/main/res/layout/domains_fragments.xml [new file with mode: 0644]
app/src/main/res/layout/domains_list.xml [deleted file]
app/src/main/res/layout/domains_list_fragment.xml [new file with mode: 0644]
app/src/main/res/menu/domains_options_menu.xml

index be16084..82ccd08 100644 (file)
             android:value="true" />
 
         <!-- The theme has to be defined here or an ugly title bar is displayed when the app launches.
-            `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: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. -->
         <activity
             android:name=".activities.MainWebViewActivity"
             android:label="@string/privacy_browser"
@@ -79,8 +78,8 @@
 
 
         <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `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. -->
         <activity
             android:name=".activities.BookmarksActivity"
             android:label="@string/bookmarks"
@@ -91,8 +90,8 @@
             tools:ignore="UnusedAttribute" />
 
         <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `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. -->
         <activity
             android:name=".activities.BookmarksDatabaseViewActivity"
             android:label="@string/bookmarks_database_view"
             tools:ignore="UnusedAttribute" />
 
         <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `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. -->
         <activity
             android:name=".activities.SettingsActivity"
             android:label="@string/privacy_browser_settings"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
-        <!-- `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:windowSoftInputMode="stateAlwaysHidden"` keeps the keyboard from displaying when the screen is rotated and after the `AddDomainDialog` is dismissed.
+             `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. -->
         <activity
             android:name=".activities.DomainsActivity"
             android:label="@string/domains"
             android:parentActivityName=".activities.MainWebViewActivity"
             android:screenOrientation="fullUser"
-            android:persistableMode="persistNever"
-            tools:ignore="UnusedAttribute" />
-
-        <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `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:windowSoftInputMode="stateAlwaysHidden"` removes the keyboard from the screen, which is displayed because `ScrollViews` always focus the first `EditText` despite being told not to. -->
-        <activity
-            android:name=".activities.DomainSettingsActivity"
-            android:label="@string/domain_settings"
-            android:parentActivityName=".activities.DomainsActivity"
-            android:configChanges="orientation|screenSize"
-            android:screenOrientation="fullUser"
             android:windowSoftInputMode="stateAlwaysHidden"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
         <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `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. -->
         <activity
             android:name=".activities.GuideActivity"
             android:label="@string/privacy_browser_guide"
             tools:ignore="UnusedAttribute" />
 
         <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
-            `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. -->
         <activity
             android:name=".activities.AboutActivity"
             android:label="@string/about_privacy_browser"
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainSettingsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainSettingsActivity.java
deleted file mode 100644 (file)
index c4b6581..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
- *
- * This file is part of Privacy Browser <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>.
- */
-
-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;
-    }
-}
index e98b5fc..7c0b17a 100644 (file)
 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
index f1110c5..512e8c4 100644 (file)
@@ -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;
index dbd8bb9..98a7e92 100644 (file)
@@ -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 (file)
index 0000000..cd4bec0
--- /dev/null
@@ -0,0 +1,145 @@
+/*
+ * Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+ *
+ * This file is part of Privacy Browser <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>.
+ */
+
+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_fragments.xml b/app/src/main/res/layout-w900dp/domains_fragments.xml
new file mode 100644 (file)
index 0000000..15a55f4
--- /dev/null
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>. -->
+
+<!-- `android:baselineAligned="False"` reduces unneeded computational overhead with `RecyclerViews`. -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activities.DomainsActivity"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:baselineAligned="false"
+    android:divider="?android:attr/dividerHorizontal"
+    android:showDividers="middle" >
+
+    <RelativeLayout
+        android:id="@+id/domains_listview_fragment_container"
+        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_weight="2" />
+
+    <RelativeLayout
+        android:id="@+id/domain_settings_fragment_container"
+        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_weight="3" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-w900dp/domains_list.xml b/app/src/main/res/layout-w900dp/domains_list.xml
deleted file mode 100644 (file)
index a97d59e..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
-
-  This file is part of Privacy Browser <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>. -->
-
-<!-- `android:baselineAligned="False"` reduces unneeded computational overhead with `RecyclerViews`. -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activities.DomainsActivity"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:baselineAligned="false"
-    android:divider="?android:attr/dividerHorizontal"
-    android:showDividers="middle" >
-
-    <!-- `android:choiceMode="singleChoice" allows a selected domain to be highlighted. -->
-    <!-- `android:dividerHeight` must be specified with `android:divider` or the height will be `0dp`.  In our case we want the height to be `0dp`. -->
-    <ListView
-        android:id="@+id/domains_listview"
-        android:layout_height="match_parent"
-        android:layout_width="0dp"
-        android:layout_weight="2"
-        android:choiceMode="singleChoice"
-        android:divider="@color/transparent"
-        android:dividerHeight="0dp" />
-
-    <ScrollView
-        android:id="@+id/domain_settings_scrollview"
-        android:layout_height="match_parent"
-        android:layout_width="0dp"
-        android:layout_weight="3" />
-</LinearLayout>
\ No newline at end of file
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 (file)
index 0000000..2dbb698
--- /dev/null
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>. -->
+
+<!-- `android:choiceMode="singleChoice"` allows a selected domain to be highlighted.  `android:dividerHeight` must be specified with `android:divider` or the height will be `0dp`.  In our case we want the height to be `0dp`. -->
+<tools:ListView
+    android:id="@+id/domains_listview"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activities.DomainsActivity"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:choiceMode="singleChoice"
+    android:divider="@color/transparent"
+    android:dividerHeight="0dp" />
\ 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.xml
deleted file mode 100644 (file)
index 9d335d1..0000000
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
-
-  This file is part of Privacy Browser <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>. -->
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:descendantFocusability="beforeDescendants" >
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_margin="12dp"
-        android:orientation="vertical"
-        android:divider="?android:attr/dividerVertical"
-        android:showDividers="middle" >
-
-        <!-- Domain name. -->
-        <LinearLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:orientation="vertical" >
-
-            <LinearLayout
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:orientation="horizontal" >
-
-                <ImageView
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginBottom="12dp"
-                    android:layout_gravity="bottom"
-                    android:src="@drawable/domains"
-                    android:tint="?attr/iconTintColor"
-                    tools:ignore="contentDescription" />
-
-                <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
-                <android.support.design.widget.TextInputLayout
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:layout_marginStart="6dp" >
-
-                    <!-- `android:inputType="textUri"` disables spell check in the `EditText`. -->
-                    <android.support.design.widget.TextInputEditText
-                        android:id="@+id/domain_settings_name_edittext"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/domain_name"
-                        android:inputType="textUri" />
-                </android.support.design.widget.TextInputLayout>
-            </LinearLayout>
-
-            <TextView
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:text="@string/domain_name_instructions"
-                android:textSize="12sp"
-                android:layout_marginStart="43dp"
-                android:layout_marginBottom="14dp" />
-        </LinearLayout>
-
-        <!-- JavaScript. -->
-        <LinearLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:orientation="horizontal" >
-
-            <ImageView
-                android:id="@+id/domain_settings_javascript_imageview"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
-
-            <Switch
-                android:id="@+id/domain_settings_javascript_switch"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="14dp"
-                android:layout_marginBottom="14dp"
-                android:text="@string/javascript_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
-                android:textSize="18sp" />
-        </LinearLayout>
-
-        <!-- First-Party Cookies. -->
-        <LinearLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:orientation="horizontal" >
-
-            <ImageView
-                android:id="@+id/domain_settings_first_party_cookies_imageview"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
-
-            <Switch
-                android:id="@+id/domain_settings_first_party_cookies_switch"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="14dp"
-                android:layout_marginBottom="14dp"
-                android:text="@string/first_party_cookies_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
-                android:textSize="18sp" />
-        </LinearLayout>
-
-        <!-- Third-Party Cookies. -->
-        <LinearLayout
-            android:id="@+id/domain_settings_third_party_cookies_linearlayout"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:orientation="horizontal" >
-
-            <ImageView
-                android:id="@+id/domain_settings_third_party_cookies_imageview"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
-
-            <Switch
-                android:id="@+id/domain_settings_third_party_cookies_switch"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="14dp"
-                android:layout_marginBottom="14dp"
-                android:text="@string/third_party_cookies_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
-                android:textSize="18sp" />
-        </LinearLayout>
-
-        <!-- DOM Storage. -->
-        <LinearLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:orientation="horizontal" >
-
-            <ImageView
-                android:id="@+id/domain_settings_dom_storage_imageview"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
-
-            <Switch
-                android:id="@+id/domain_settings_dom_storage_switch"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="14dp"
-                android:layout_marginBottom="14dp"
-                android:text="@string/dom_storage_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
-                android:textSize="18sp" />
-        </LinearLayout>
-
-        <!-- Form Data. -->
-        <LinearLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:orientation="horizontal" >
-
-            <ImageView
-                android:id="@+id/domain_settings_form_data_imageview"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
-
-            <Switch
-                android:id="@+id/domain_settings_form_data_switch"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="14dp"
-                android:layout_marginBottom="14dp"
-                android:text="@string/form_data_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
-                android:textSize="18sp" />
-        </LinearLayout>
-
-        <!-- User Agent. -->
-        <LinearLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:orientation="vertical"
-            android:layout_marginTop="14dp"
-            android:layout_marginBottom="14dp" >
-
-            <LinearLayout
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:orientation="horizontal" >
-
-                <ImageView
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:layout_marginTop="1dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_gravity="center_vertical"
-                    android:src="@drawable/user_agent_light"
-                    android:tint="?attr/iconTintColor"
-                    android:contentDescription="@string/user_agent" />
-
-                <Spinner
-                    android:id="@+id/domain_settings_user_agent_spinner"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:labelFor="@+id/domain_settings_custom_user_agent_edittext" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/domain_settings_user_agent_textview"
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"
-                android:layout_marginStart="45dp"
-                android:layout_marginEnd="36dp"
-                android:textSize="13sp" />
-
-            <EditText
-                android:id="@id/domain_settings_custom_user_agent_edittext"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_marginStart="40dp"
-                android:layout_marginEnd="60dp"
-                android:inputType="textUri" />
-        </LinearLayout>
-
-        <!-- Font Size. -->
-        <LinearLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:orientation="horizontal" >
-
-            <ImageView
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                android:src="@drawable/font_size_light"
-                android:tint="?attr/iconTintColor"
-                android:contentDescription="@string/font_size" />
-
-            <Spinner
-                android:id="@+id/domain_settings_font_size_spinner"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_marginTop="14dp"
-                android:layout_marginBottom="14dp" />
-        </LinearLayout>
-
-        <!-- Display Images. -->
-        <LinearLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:orientation="horizontal" >
-
-            <ImageView
-                android:id="@+id/domain_settings_display_webpage_images_imageview"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                android:contentDescription="@string/display_webpage_images" />
-
-            <Spinner
-                android:id="@+id/domain_settings_display_webpage_images_spinner"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_marginTop="14dp"
-                android:layout_marginBottom="14dp" />
-        </LinearLayout>
-    </LinearLayout>
-</ScrollView>
\ 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 (file)
index e196ad5..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
-
-  This file is part of Privacy Browser <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>. -->
-
-<!-- `android:fitsSystemWindows="true"` moves the AppBar below the status bar.  When it is specified the theme should include `<item name="android:windowTranslucentStatus">true</item>` to make the status bar a transparent, darkened overlay. -->
-<android.support.design.widget.CoordinatorLayout
-    android:id="@+id/domain_settings_coordinatorlayout"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:fitsSystemWindows="true" >
-
-    <!-- The `LinearLayout` with `orientation="vertical"` moves the content below the `AppBarLayout`. -->
-    <LinearLayout
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:orientation="vertical" >
-
-        <android.support.design.widget.AppBarLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent" >
-
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/domain_settings_toolbar"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:background="?attr/colorPrimaryDark"
-                android:theme="?attr/appBarTextTheme" />
-        </android.support.design.widget.AppBarLayout>
-
-        <ScrollView
-            android:id="@+id/domain_settings_scrollview"
-            android:layout_height="match_parent"
-            android:layout_width="match_parent" />
-    </LinearLayout>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/domain_settings_fragment.xml b/app/src/main/res/layout/domain_settings_fragment.xml
new file mode 100644 (file)
index 0000000..1d7bf63
--- /dev/null
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>. -->
+
+<ScrollView
+    android:id="@+id/domain_settings_scrollview"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:descendantFocusability="beforeDescendants" >
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_margin="12dp"
+        android:orientation="vertical"
+        android:divider="?android:attr/dividerVertical" >
+
+        <!-- Domain name. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginEnd="10dp"
+                    android:layout_marginBottom="12dp"
+                    android:layout_gravity="bottom"
+                    android:src="@drawable/domains"
+                    android:tint="?attr/iconTintColor"
+                    tools:ignore="contentDescription" />
+
+                <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
+                <android.support.design.widget.TextInputLayout
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:layout_marginStart="6dp" >
+
+                    <!-- `android:inputType="textUri"` disables spell check in the `EditText`. -->
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/domain_settings_name_edittext"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/domain_name"
+                        android:inputType="textUri" />
+                </android.support.design.widget.TextInputLayout>
+            </LinearLayout>
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:text="@string/domain_name_instructions"
+                android:textSize="12sp"
+                android:layout_marginStart="43dp"
+                android:layout_marginBottom="14dp" />
+        </LinearLayout>
+
+        <!-- JavaScript. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/domain_settings_javascript_imageview"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginEnd="10dp"
+                android:layout_gravity="center_vertical"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_javascript_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/javascript_enabled"
+                android:textColor="?attr/primaryTextColorSelector"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- First-Party Cookies. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/domain_settings_first_party_cookies_imageview"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="10dp"
+                android:layout_gravity="center_vertical"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_first_party_cookies_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/first_party_cookies_enabled"
+                android:textColor="?attr/primaryTextColorSelector"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- Third-Party Cookies. -->
+        <LinearLayout
+            android:id="@+id/domain_settings_third_party_cookies_linearlayout"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/domain_settings_third_party_cookies_imageview"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="10dp"
+                android:layout_gravity="center_vertical"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_third_party_cookies_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/third_party_cookies_enabled"
+                android:textColor="?attr/primaryTextColorSelector"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- DOM Storage. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/domain_settings_dom_storage_imageview"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="10dp"
+                android:layout_gravity="center_vertical"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_dom_storage_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/dom_storage_enabled"
+                android:textColor="?attr/primaryTextColorSelector"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- Form Data. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/domain_settings_form_data_imageview"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="10dp"
+                android:layout_gravity="center_vertical"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_form_data_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/form_data_enabled"
+                android:textColor="?attr/primaryTextColorSelector"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- User Agent. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_marginTop="14dp"
+            android:layout_marginBottom="14dp" >
+
+            <LinearLayout
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/user_agent_light"
+                    android:tint="?attr/iconTintColor"
+                    android:contentDescription="@string/user_agent" />
+
+                <Spinner
+                    android:id="@+id/domain_settings_user_agent_spinner"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:labelFor="@+id/domain_settings_custom_user_agent_edittext" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/domain_settings_user_agent_textview"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"
+                android:layout_marginStart="45dp"
+                android:layout_marginEnd="36dp"
+                android:textSize="13sp" />
+
+            <EditText
+                android:id="@id/domain_settings_custom_user_agent_edittext"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="40dp"
+                android:layout_marginEnd="60dp"
+                android:inputType="textUri" />
+        </LinearLayout>
+
+        <!-- Font Size. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="10dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/font_size_light"
+                android:tint="?attr/iconTintColor"
+                android:contentDescription="@string/font_size" />
+
+            <Spinner
+                android:id="@+id/domain_settings_font_size_spinner"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp" />
+        </LinearLayout>
+
+        <!-- Display Images. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/domain_settings_display_webpage_images_imageview"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="10dp"
+                android:layout_gravity="center_vertical"
+                android:contentDescription="@string/display_webpage_images" />
+
+            <Spinner
+                android:id="@+id/domain_settings_display_webpage_images_spinner"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp" />
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
index f60466e..c875f44 100644 (file)
@@ -20,6 +20,7 @@
 
 <!-- `android:fitsSystemWindows="true"` moves the AppBar below the status bar.  When it is specified the theme should include `<item name="android:windowTranslucentStatus">true</item>` to make the status bar a transparent, darkened overlay. -->
 <android.support.design.widget.CoordinatorLayout
+    android:id="@+id/domains_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
@@ -43,7 +44,7 @@
                 android:theme="?attr/appBarTextTheme" />
         </android.support.design.widget.AppBarLayout>
 
-        <include layout="@layout/domains_list" />
+        <include layout="@layout/domains_fragments" />
     </LinearLayout>
 
     <android.support.design.widget.FloatingActionButton
diff --git a/app/src/main/res/layout/domains_fragments.xml b/app/src/main/res/layout/domains_fragments.xml
new file mode 100644 (file)
index 0000000..b706f2e
--- /dev/null
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>. -->
+
+<RelativeLayout
+    android:id="@+id/domains_listview_fragment_container"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent" />
\ 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.xml
deleted file mode 100644 (file)
index 312f41f..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
-
-  This file is part of Privacy Browser <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>. -->
-
-<!-- `android:dividerHeight` must be specified with `android:divider` or the height will be `0dp`.  In our case we want the height to be `0dp`. -->
-<ListView
-    android:id="@+id/domains_listview"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activities.DomainsActivity"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:divider="@color/transparent"
-    android:dividerHeight="0dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/domains_list_fragment.xml b/app/src/main/res/layout/domains_list_fragment.xml
new file mode 100644 (file)
index 0000000..28e1155
--- /dev/null
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>. -->
+
+<!-- `android:dividerHeight` must be specified with `android:divider` or the height will be `0dp`.  In our case we want the height to be `0dp`. -->
+<ListView
+    android:id="@+id/domains_listview"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".activities.DomainsActivity"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:divider="@color/transparent"
+    android:dividerHeight="0dp" />
\ No newline at end of file
index a5bbf84..8d6ec2d 100644 (file)
         android:orderInCategory="10"
         android:icon="?attr/deleteIcon"
         app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/save_domain"
-        android:title="@string/save"
-        android:orderInCategory="20"
-        app:showAsAction="ifRoom" />
-
 </menu>
\ No newline at end of file