From 8498a3be7602976764d5b707fda012519deb88b4 Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Mon, 30 May 2016 21:49:23 -0700
Subject: [PATCH] Create a TabLayout for About and populate the Version tab.

---
 .idea/dictionaries/soren.xml                  |  16 +-
 .idea/gradle.xml                              |   1 -
 app/build.gradle                              |   2 +-
 app/src/main/AndroidManifest.xml              |  17 +-
 app/src/main/assets/about_changelog.html      |   5 +
 app/src/main/assets/about_contributors.html   |   5 +
 .../{about_text.html => about_license.html}   |   5 +
 app/src/main/assets/about_permissions.html    |   5 +
 .../privacybrowser/AboutActivity.java         |  90 +++++
 .../stoutner/privacybrowser/AboutDialog.java  |  68 ----
 .../privacybrowser/AboutTabFragment.java      | 163 +++++++++
 .../privacybrowser/MainWebViewActivity.java   |  38 +--
 app/src/main/res/drawable/about.xml           |  17 +-
 app/src/main/res/drawable/back.xml            |  19 +-
 app/src/main/res/drawable/downloads.xml       |  19 +-
 app/src/main/res/drawable/exit.xml            |  19 +-
 app/src/main/res/drawable/forward.xml         |  19 +-
 app/src/main/res/drawable/guide.xml           |  15 +
 app/src/main/res/drawable/home.xml            |  19 +-
 .../main/res/drawable/javascript_enabled.xml  |  33 +-
 app/src/main/res/drawable/privacy_mode.xml    |  33 +-
 app/src/main/res/drawable/settings.xml        |  19 +-
 app/src/main/res/drawable/warning.xml         |  33 +-
 app/src/main/res/drawable/world.xml           |   9 +-
 .../main/res/layout/about_linearlayout.xml    |  45 +++
 app/src/main/res/layout/about_tab_version.xml | 319 ++++++++++++++++++
 app/src/main/res/layout/about_tab_webview.xml |  26 ++
 app/src/main/res/menu/menu_navigation.xml     |  20 +-
 app/src/main/res/values/colors.xml            |   2 +
 app/src/main/res/values/strings.xml           |  32 +-
 30 files changed, 917 insertions(+), 196 deletions(-)
 create mode 100644 app/src/main/assets/about_changelog.html
 create mode 100644 app/src/main/assets/about_contributors.html
 rename app/src/main/assets/{about_text.html => about_license.html} (99%)
 create mode 100644 app/src/main/assets/about_permissions.html
 create mode 100644 app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java
 delete mode 100644 app/src/main/java/com/stoutner/privacybrowser/AboutDialog.java
 create mode 100644 app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java
 create mode 100644 app/src/main/res/drawable/guide.xml
 create mode 100644 app/src/main/res/layout/about_linearlayout.xml
 create mode 100644 app/src/main/res/layout/about_tab_version.xml
 create mode 100644 app/src/main/res/layout/about_tab_webview.xml

diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml
index bf739fc8..1dca8f52 100644
--- a/.idea/dictionaries/soren.xml
+++ b/.idea/dictionaries/soren.xml
@@ -1,7 +1,21 @@
 <component name="ProjectDictionaryState">
   <dictionary name="soren">
     <words>
-      <w>wisen</w>
+      <w>androidversion</w>
+      <w>aren</w>
+      <w>buildapi</w>
+      <w>buildversion</w>
+      <w>chromeversion</w>
+      <w>khtml</w>
+      <w>konqueror</w>
+      <w>linearlayout</w>
+      <w>mozilla</w>
+      <w>nojs</w>
+      <w>relativelayout</w>
+      <w>securitypatch</w>
+      <w>snackbar</w>
+      <w>textview</w>
+      <w>webkitversion</w>
     </words>
   </dictionary>
 </component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 494ac839..58992cc7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,6 @@
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.10" />
-        <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/build.gradle b/app/build.gradle
index 25c47811..4c0ec4d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,5 +55,5 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:design:23.4.0'
     // Only compile com.google.android.gms:play-services-ads for the free version.
-    freeCompile 'com.google.android.gms:play-services-ads:9.0.0'
+    freeCompile 'com.google.android.gms:play-services-ads:9.0.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d137b34b..8a622224 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,8 +65,8 @@
             </intent-filter>
         </activity>
 
+        <!-- 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. -->
-        <!-- android:configChanges="orientation|screenSize" makes the activity not reload when the orientation changes.  -->
         <activity
             android:name=".SettingsActivity"
             android:label="@string/privacy_browser_settings"
@@ -80,6 +80,21 @@
                 android:value=".MainWebViewActivity" />
         </activity>
 
+        <!-- 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. -->
+        <activity
+            android:name=".AboutActivity"
+            android:label="@string/about_privacy_browser"
+            android:parentActivityName=".MainWebViewActivity"
+            android:configChanges="orientation|screenSize"
+            android:persistableMode="persistNever" >
+
+            <!-- android.support.PARENT_ACTIVITY is necessary for API <= 15. -->
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainWebViewActivity" />
+        </activity>
+
     </application>
 
 </manifest>
diff --git a/app/src/main/assets/about_changelog.html b/app/src/main/assets/about_changelog.html
new file mode 100644
index 00000000..7ec2764e
--- /dev/null
+++ b/app/src/main/assets/about_changelog.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p>Changelog</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/app/src/main/assets/about_contributors.html b/app/src/main/assets/about_contributors.html
new file mode 100644
index 00000000..aea151cd
--- /dev/null
+++ b/app/src/main/assets/about_contributors.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p>Contributors</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/app/src/main/assets/about_text.html b/app/src/main/assets/about_license.html
similarity index 99%
rename from app/src/main/assets/about_text.html
rename to app/src/main/assets/about_license.html
index 4a425dd9..3cb90b46 100644
--- a/app/src/main/assets/about_text.html
+++ b/app/src/main/assets/about_license.html
@@ -1,5 +1,7 @@
 <html>
 <body>
+<p>License</p>
+
 <p>Privacy Browser Copyright &copy; 2015-2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a></p>
 
 <p>Detailed information about Privacy Browser, including changelogs and a bug tracker, is available at <a href=https://www.stoutner.com/privacy-browser>www.stoutner.com</a>.</p>
@@ -41,6 +43,9 @@
 <p>app/src/main/res/drawable/about.xml is part of the Android Material icon set, where it is named ic_info_outline.
     It is released under the <a href=https://creativecommons.org/licenses/by/4.0/>CC-BY license</a>.</p>
 
+<p>app/src/main/res/drawable/guide.xml is part of the Android Material icon set, where it is named ic_import_contacts.
+    It is released under the <a href=https://creativecommons.org/licenses/by/4.0/>CC-BY license</a>.</p>
+
 <br/>
 <hr/>
 <br/>
diff --git a/app/src/main/assets/about_permissions.html b/app/src/main/assets/about_permissions.html
new file mode 100644
index 00000000..3a8d7f4f
--- /dev/null
+++ b/app/src/main/assets/about_permissions.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p>Permissions</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java b/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java
new file mode 100644
index 00000000..c5d7bf77
--- /dev/null
+++ b/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java
@@ -0,0 +1,90 @@
+/**
+ * Copyright 2016 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;
+
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
+
+public class AboutActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.about_linearlayout);
+
+        //  Setup the ViewPager.
+        ViewPager aboutViewPager = (ViewPager) findViewById(R.id.about_viewpager);
+        assert aboutViewPager != null; // This assert removes the incorrect warning on the following line that aboutViewPager might be null.
+        aboutViewPager.setAdapter(new aboutPagerAdapter(getSupportFragmentManager()));
+
+        // Setup the TabLayout and connect it to the ViewPager.
+        TabLayout aboutTabLayout = (TabLayout) findViewById(R.id.about_tablayout);
+        assert aboutTabLayout != null; // This assert removes the incorrect warning on the following line that aboutTabLayout might be null.
+        aboutTabLayout.setupWithViewPager(aboutViewPager);
+    }
+
+    public class aboutPagerAdapter extends FragmentPagerAdapter {
+        public aboutPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        // Get the count of the number of tabs.
+        public int getCount() {
+            return 5;
+        }
+
+        @Override
+        // Get the name of each tab.
+        public CharSequence getPageTitle(int tab) {
+            switch (tab) {
+                case 0:
+                    return getString(R.string.version);
+
+                case 1:
+                    return getString(R.string.permissions);
+
+                case 2:
+                    return getString(R.string.changelog);
+
+                case 3:
+                    return getString(R.string.license);
+
+                case 4:
+                    return getString(R.string.contributors);
+
+                default:
+                    return "";
+            }
+        }
+
+        @Override
+        // Setup each tab.
+        public Fragment getItem(int tab) {
+            return AboutTabFragment.createTab(tab);
+        }
+    }
+
+
+}
diff --git a/app/src/main/java/com/stoutner/privacybrowser/AboutDialog.java b/app/src/main/java/com/stoutner/privacybrowser/AboutDialog.java
deleted file mode 100644
index 4fa3fb2f..00000000
--- a/app/src/main/java/com/stoutner/privacybrowser/AboutDialog.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright 2015-2016 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;
-
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatDialogFragment;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-public class AboutDialog extends AppCompatDialogFragment {
-    @Override
-    // onCreateDialog requires @NonNull.
-    @NonNull
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        // Create a WebView to display about_text.html
-        final WebView aboutDialogWebView = new WebView(getContext());
-        aboutDialogWebView.loadUrl("file:///android_asset/about_text.html");
-
-        // Use AlertDialog.Builder to create the AlertDialog
-        final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity());
-        alertDialogBuilder.setTitle(R.string.about_privacy_browser);
-        alertDialogBuilder.setView(aboutDialogWebView);
-        alertDialogBuilder.setPositiveButton(R.string.dismiss, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                // Do nothing.  The dialog will automatically be dismissed.
-            }
-        });
-
-        // Assign alertDialogBuilder to an AlertDialog and show it on the screen.
-        final AlertDialog alertDialog = alertDialogBuilder.create();
-        alertDialog.show();
-
-        aboutDialogWebView.setWebViewClient(new WebViewClient() {
-            // shouldOverrideUrlLoading lets us close AboutDialog when a link is touched.  Otherwise the dialog covers the website that loads beneath in Privacy Browser.
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                MainWebViewActivity.mainWebView.loadUrl(url);
-                alertDialog.dismiss();
-                return true;
-            }
-        });
-
-        // onCreateDialog requires the return of an AlertDialog.
-        return alertDialog;
-    }
-}
diff --git a/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java
new file mode 100644
index 00000000..eda3e30a
--- /dev/null
+++ b/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java
@@ -0,0 +1,163 @@
+/**
+ * Copyright 2016 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;
+
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.widget.TextView;
+
+public class AboutTabFragment extends Fragment {
+    private int tabNumber;
+
+    // AboutTabFragment.createTab stores the tab number in the bundle arguments so it can be referenced from onCreate().
+    public static AboutTabFragment createTab(int tab) {
+        Bundle thisTabArguments = new Bundle();
+        thisTabArguments.putInt("Tab", tab);
+        AboutTabFragment thisTab = new AboutTabFragment();
+        thisTab.setArguments(thisTabArguments);
+        return thisTab;
+    }
+
+    @Override
+    public void onCreate (Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Store the tab number in tabNumber.
+        tabNumber = getArguments().getInt("Tab");
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View tabLayout;
+
+        // Load the about tab layout.
+        if (tabNumber == 0) {
+            // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container.
+            // The fragment will take care of attaching the root automatically.
+            tabLayout = inflater.inflate(R.layout.about_tab_version, container, false);
+
+            // Version.
+            TextView versionNumberText = (TextView) tabLayout.findViewById(R.id.about_version_number_text);
+            String version = getString(R.string.version) + " " + BuildConfig.VERSION_NAME + " (" + getString(R.string.version_code) + " " + Integer.toString(BuildConfig.VERSION_CODE) + ")";
+            versionNumberText.setText(version);
+
+            // Brand.
+            TextView versionBrandText = (TextView) tabLayout.findViewById(R.id.about_version_brand_text);
+            versionBrandText.setText(Build.BRAND);
+
+            // Manufacturer.
+            TextView versionManufacturerText = (TextView) tabLayout.findViewById(R.id.about_version_manufacturer_text);
+            versionManufacturerText.setText(Build.MANUFACTURER);
+
+            // Model.
+            TextView versionModelText = (TextView) tabLayout.findViewById(R.id.about_version_model_text);
+            versionModelText.setText(Build.MODEL);
+
+            // Device.
+            TextView versionDeviceText = (TextView) tabLayout.findViewById(R.id.about_version_device_text);
+            versionDeviceText.setText(Build.DEVICE);
+
+            // Bootloader.
+            TextView versionBootloaderText = (TextView) tabLayout.findViewById(R.id.about_version_bootloader_text);
+            versionBootloaderText.setText(Build.BOOTLOADER);
+
+            // Radio.
+            TextView versionRadioText = (TextView) tabLayout.findViewById(R.id.about_version_radio_text);
+            // Hide versionRadioTextView if there is no radio.
+            if (Build.getRadioVersion().equals("")) {
+                TextView versionRadioTitle = (TextView) tabLayout.findViewById(R.id.about_version_radio_title);
+                versionRadioTitle.setVisibility(View.GONE);
+                versionRadioText.setVisibility(View.GONE);
+            } else { // Else, set the text.
+                versionRadioText.setText(Build.getRadioVersion());
+            }
+
+            // Android.
+            TextView versionAndroidText = (TextView) tabLayout.findViewById(R.id.about_version_android_text);
+            String android = Build.VERSION.RELEASE + " (" + getString(R.string.api) + " " + Integer.toString(Build.VERSION.SDK_INT) + ")";
+            versionAndroidText.setText(android);
+
+            // Build.
+            TextView versionBuildText = (TextView) tabLayout.findViewById(R.id.about_version_build_text);
+            versionBuildText.setText(Build.DISPLAY);
+
+            // Security Patch.
+            TextView versionSecurityPatchText = (TextView) tabLayout.findViewById(R.id.about_version_securitypatch_text);
+            // Build.VERSION.SECURITY_PATCH is only available for SDK_INT >= 23.
+            if (Build.VERSION.SDK_INT >= 23) {
+                versionSecurityPatchText.setText(Build.VERSION.SECURITY_PATCH);
+            } else { // Hide versionSecurityPatchTextView.
+                TextView versionSecurityPatchTitle = (TextView) tabLayout.findViewById(R.id.about_version_securitypatch_title);
+                versionSecurityPatchTitle.setVisibility(View.GONE);
+                versionSecurityPatchText.setVisibility(View.GONE);
+            }
+
+            // webViewLayout is only used to get the default user agent from about_tab_webview.  It is not used to render content on the screen.
+            View webViewLayout = inflater.inflate(R.layout.about_tab_webview, container, false);
+            WebView tabLayoutWebView = (WebView) webViewLayout.findViewById(R.id.about_tab_webview);
+            String userAgentString =  tabLayoutWebView.getSettings().getUserAgentString();
+
+            // WebKit.
+            TextView versionWebKitText = (TextView) tabLayout.findViewById(R.id.about_version_webkit_text);
+            // Select the substring that begins after "Safari/" and goes to the end of the string.
+            String webkitVersion = userAgentString.substring(userAgentString.indexOf("Safari/") + 7);
+            versionWebKitText.setText(webkitVersion);
+
+            // Chrome.
+            TextView versionChromeText = (TextView) tabLayout.findViewById(R.id.about_version_chrome_text);
+            // Select the substring that begins after "Chrome/" and goes until the next " ".
+            String chromeVersion = userAgentString.substring(userAgentString.indexOf("Chrome/") + 7, userAgentString.indexOf(" ", userAgentString.indexOf("Chrome/")));
+            versionChromeText.setText(chromeVersion);
+        } else { // load a WebView for all the other tabs.
+            // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container.
+            // The fragment will take care of attaching the root automatically.
+            tabLayout = inflater.inflate(R.layout.about_tab_webview, container, false);
+            WebView tabWebView = (WebView) tabLayout;
+
+            switch (tabNumber) {
+                case 1:
+                    tabWebView.loadUrl("file:///android_asset/about_permissions.html");
+                    break;
+
+                case 2:
+                    tabWebView.loadUrl("file:///android_asset/about_changelog.html");
+                    break;
+
+                case 3:
+                    tabWebView.loadUrl("file:///android_asset/about_license.html");
+                    break;
+
+                case 4:
+                    tabWebView.loadUrl("file:///android_asset/about_contributors.html");
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        return tabLayout;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
index 3c442d1c..c7dddad3 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
@@ -67,7 +67,7 @@ import java.net.URLEncoder;
 public class MainWebViewActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, CreateHomeScreenShortcut.CreateHomeScreenSchortcutListener {
     // favoriteIcon is public static so it can be accessed from CreateHomeScreenShortcut.
     public static Bitmap favoriteIcon;
-    // mainWebView is public static so it can be accessed from AboutDialog and SettingsFragment.  It is also used in onCreate(), onOptionsItemSelected(), onNavigationItemSelected(), and loadUrlFromTextBox().
+    // mainWebView is public static so it can be accessed from SettingsFragment.  It is also used in onCreate(), onOptionsItemSelected(), onNavigationItemSelected(), and loadUrlFromTextBox().
     public static WebView mainWebView;
 
     // mainMenu is public static so it can be accessed from SettingsFragment.  It is also used in onCreateOptionsMenu() and onOptionsItemSelected().
@@ -78,7 +78,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
     public static boolean javaScriptEnabled;
     // firstPartyCookiesEnabled is public static so it can be accessed from SettingsFragment.  It is also used in onCreate(), onCreateOptionsMenu(), onPrepareOptionsMenu(), and onOptionsItemSelected().
     public static boolean firstPartyCookiesEnabled;
-    // thirdPartyCookiesEnabled is uesd in onCreate(), onCreateOptionsMenu(), onPrepareOptionsMenu(), and onOptionsItemSelected().
+    // thirdPartyCookiesEnabled is used in onCreate(), onCreateOptionsMenu(), onPrepareOptionsMenu(), and onOptionsItemSelected().
     public static boolean thirdPartyCookiesEnabled;
     // domStorageEnabled is public static so it can be accessed from SettingsFragment.  It is also used in onCreate(), onCreateOptionsMenu(), and onOptionsItemSelected().
     public static boolean domStorageEnabled;
@@ -124,6 +124,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
 
         // Implement swipe to refresh
         swipeToRefresh = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayout);
+        assert swipeToRefresh != null; //This assert removes the incorrect warning on the following line that swipeToRefresh might be null.
         swipeToRefresh.setColorSchemeResources(R.color.blue);
         swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
@@ -168,6 +169,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
 
         // Listen for touches on the navigation menu.
         final NavigationView navigationView = (NavigationView) findViewById(R.id.navigationView);
+        assert navigationView != null; // This assert removes the incorrect warning on the following line that navigationView might be null.
         navigationView.setNavigationItemSelectedListener(this);
 
         // drawerToggle creates the hamburger icon at the start of the AppBar.
@@ -239,6 +241,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
                 }
 
                 // Show the fullScreenVideoFrameLayout.
+                assert fullScreenVideoFrameLayout != null; //This assert removes the incorrect warning on the following line that fullScreenVideoFrameLayout might be null.
                 fullScreenVideoFrameLayout.addView(view);
                 fullScreenVideoFrameLayout.setVisibility(View.VISIBLE);
 
@@ -249,9 +252,9 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
                 BannerAd.hideAd(adView);
 
                 /* SYSTEM_UI_FLAG_HIDE_NAVIGATION hides the navigation bars on the bottom or right of the screen.
-                ** SYSTEM_UI_FLAG_FULLSCREEN hides the status bar across the top of the screen.
-                ** SYSTEM_UI_FLAG_IMMERSIVE_STICKY makes the navigation and status bars ghosted overlays and automatically rehides them.
-                */
+                 * SYSTEM_UI_FLAG_FULLSCREEN hides the status bar across the top of the screen.
+                 * SYSTEM_UI_FLAG_IMMERSIVE_STICKY makes the navigation and status bars ghosted overlays and automatically rehides them.
+                 */
 
                 // Set the one flag supported by API >= 14.
                 view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
@@ -280,6 +283,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
                 BannerAd.showAd(adView);
 
                 // Hide the fullScreenVideoFrameLayout.
+                assert fullScreenVideoFrameLayout != null; //This assert removes the incorrect warning on the following line that fullScreenVideoFrameLayout might be null.
                 fullScreenVideoFrameLayout.removeAllViews();
                 fullScreenVideoFrameLayout.setVisibility(View.GONE);
             }
@@ -445,9 +449,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
         MenuItem toggleFirstPartyCookies = menu.findItem(R.id.toggleFirstPartyCookies);
         MenuItem toggleThirdPartyCookies = menu.findItem(R.id.toggleThirdPartyCookies);
         MenuItem toggleDomStorage = menu.findItem(R.id.toggleDomStorage);
-        /* toggleSaveFormData does nothing until database storage is implemented.
-        MenuItem toggleSaveFormData = menu.findItem(R.id.toggleSaveFormData);
-        */
 
         // Set the initial status of the privacy icon.
         updatePrivacyIcon();
@@ -456,9 +457,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
         toggleFirstPartyCookies.setChecked(firstPartyCookiesEnabled);
         toggleThirdPartyCookies.setChecked(thirdPartyCookiesEnabled);
         toggleDomStorage.setChecked(domStorageEnabled);
-        /* toggleSaveFormData does nothing until database storage is implemented.
-        toggleSaveFormData.setChecked(saveFormDataEnabled);
-        */
 
         return true;
     }
@@ -492,9 +490,6 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
     public boolean onOptionsItemSelected(MenuItem menuItem) {
         int menuItemId = menuItem.getItemId();
 
-        // Some options need to update the drawable for toggleJavaScript.
-        MenuItem toggleJavaScript = mainMenu.findItem(R.id.toggleJavaScript);
-
         // Set the commands that relate to the menu entries.
         switch (menuItemId) {
             case R.id.toggleJavaScript:
@@ -647,15 +642,15 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
                 break;
 
             case R.id.settings:
-                // Launch PreferenceFragment.
-                Intent intent = new Intent(this, SettingsActivity.class);
-                startActivity(intent);
+                // Launch SettingsActivity.
+                Intent settingsIntent = new Intent(this, SettingsActivity.class);
+                startActivity(settingsIntent);
                 break;
 
             case R.id.about:
-                // Show the AboutDialog AlertDialog and name this instance aboutDialog.
-                AppCompatDialogFragment aboutDialog = new AboutDialog();
-                aboutDialog.show(getSupportFragmentManager(), "aboutDialog");
+                // Launch AboutActivity.
+                Intent aboutIntent = new Intent(this, AboutActivity.class);
+                startActivity(aboutIntent);
                 break;
 
             case R.id.clearAndExit:
@@ -705,7 +700,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
         // Reload the ad if this is the free flavor.
         BannerAd.reloadAfterRotate(adView, getApplicationContext(), getString(R.string.ad_id));
 
-        // Reinitialize the adView variable, as the View will have been removed and readded in the free flavor by BannerAd.reloadAfterRotate().
+        // Reinitialize the adView variable, as the View will have been removed and re-added in the free flavor by BannerAd.reloadAfterRotate().
         adView = findViewById(R.id.adView);
     }
 
@@ -743,6 +738,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
             drawerLayout.closeDrawer(GravityCompat.START);
         } else {
             // Load the previous URL if available.
+            assert mainWebView != null; //This assert removes the incorrect warning on the following line that mainWebView might be null.
             if (mainWebView.canGoBack()) {
                 mainWebView.goBack();
             } else {
diff --git a/app/src/main/res/drawable/about.xml b/app/src/main/res/drawable/about.xml
index 433078c8..55884c12 100644
--- a/app/src/main/res/drawable/about.xml
+++ b/app/src/main/res/drawable/about.xml
@@ -1,11 +1,14 @@
-<!-- about.xml comes from the Android Material icon set, where it is called ic_info_outline.  It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>. -->
+<!-- about.xml comes from the Android Material icon set, where it is called ic_info_outline.
+  It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>. -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/back.xml b/app/src/main/res/drawable/back.xml
index 765fdf87..28da543b 100644
--- a/app/src/main/res/drawable/back.xml
+++ b/app/src/main/res/drawable/back.xml
@@ -1,11 +1,14 @@
-<!-- back.xml comes from the Android Material icon set, where it is called ic_arrow_back.  It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>. -->
+<!-- back.xml comes from the Android Material icon set, where it is called ic_arrow_back.
+  It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>. -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
-</vector>
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/downloads.xml b/app/src/main/res/drawable/downloads.xml
index 611c9c60..cd7c5e89 100644
--- a/app/src/main/res/drawable/downloads.xml
+++ b/app/src/main/res/drawable/downloads.xml
@@ -1,13 +1,14 @@
-<!--
-  downloads.xml comes from the Android Material icon set, where it is called ic_file_download.
+<!-- downloads.xml comes from the Android Material icon set, where it is called ic_file_download.
   It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>. -->
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
     <path
         android:fillColor="#FF000000"
-        android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
-</vector>
+        android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/exit.xml b/app/src/main/res/drawable/exit.xml
index 113b284f..f50586d2 100644
--- a/app/src/main/res/drawable/exit.xml
+++ b/app/src/main/res/drawable/exit.xml
@@ -1,11 +1,14 @@
-<!-- exit.xml comes from the Android Material icon set, where it is called ic_exit_to_app.  It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>. -->
+<!-- exit.xml comes from the Android Material icon set, where it is called ic_exit_to_app.
+  It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>. -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
+        android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/forward.xml b/app/src/main/res/drawable/forward.xml
index 0691d10b..af4e5176 100644
--- a/app/src/main/res/drawable/forward.xml
+++ b/app/src/main/res/drawable/forward.xml
@@ -1,13 +1,14 @@
-<!--
-  forward.xml comes from the Android Material icon set, where it is called ic_arrow_forward.
+<!-- forward.xml comes from the Android Material icon set, where it is called ic_arrow_forward.
   It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>. -->
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
-</vector>
+        android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/guide.xml b/app/src/main/res/drawable/guide.xml
new file mode 100644
index 00000000..b060597a
--- /dev/null
+++ b/app/src/main/res/drawable/guide.xml
@@ -0,0 +1,15 @@
+<!-- guide.xml comes from the Android Material icon set, where it is called ic_import_contacts.
+  It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>. -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21,5c-1.11,-0.35 -2.33,-0.5 -3.5,-0.5 -1.95,0 -4.05,0.4 -5.5,1.5 -1.45,-1.1 -3.55,-1.5 -5.5,-1.5S2.45,4.9 1,6v14.65c0,0.25 0.25,0.5 0.5,0.5 0.1,0 0.15,-0.05 0.25,-0.05C3.1,20.45 5.05,20 6.5,20c1.95,0 4.05,0.4 5.5,1.5 1.35,-0.85 3.8,-1.5 5.5,-1.5 1.65,0 3.35,0.3 4.75,1.05 0.1,0.05 0.15,0.05 0.25,0.05 0.25,0 0.5,-0.25 0.5,-0.5L23,6c-0.6,-0.45 -1.25,-0.75 -2,-1zM21,18.5c-1.1,-0.35 -2.3,-0.5 -3.5,-0.5 -1.7,0 -4.15,0.65 -5.5,1.5L12,8c1.35,-0.85 3.8,-1.5 5.5,-1.5 1.2,0 2.4,0.15 3.5,0.5v11.5z" />
+</vector>
diff --git a/app/src/main/res/drawable/home.xml b/app/src/main/res/drawable/home.xml
index 8b60d3ba..a0696a3e 100644
--- a/app/src/main/res/drawable/home.xml
+++ b/app/src/main/res/drawable/home.xml
@@ -1,11 +1,14 @@
-<!-- home.xml comes from the Android Material icon set, where it is called ic_home.  It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>. -->
+<!-- home.xml comes from the Android Material icon set, where it is called ic_home.
+  It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>. -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
-</vector>
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/javascript_enabled.xml b/app/src/main/res/drawable/javascript_enabled.xml
index 5e6359d9..49db0f5d 100644
--- a/app/src/main/res/drawable/javascript_enabled.xml
+++ b/app/src/main/res/drawable/javascript_enabled.xml
@@ -1,12 +1,25 @@
-<!--
-  javascript_enabled.xml is derived from ic_security and ic_language, which are part of the Android Material icon set.
+<!-- javascript_enabled.xml is derived from ic_security and ic_language, which are part of the Android Material icon set.
   They are released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>.  Modifications were made by Soren Stoutner <soren@stoutner.com> in 2016. -->
 
-<vector android:height="26dp" android:viewportHeight="256.0"
-    android:viewportWidth="256.0" android:width="26dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#b71c1c"
-        android:pathData="m128,12.8 l-94.25,41.89 0,62.84c0,58.12 40.22,112.48 94.25,125.67 54.04,-13.2 94.25,-67.55 94.25,-125.67l0,-62.84z" android:strokeColor="#00000000"/>
-    <path android:fillAlpha="1" android:fillColor="#d32f2f"
-        android:pathData="m128,0 l-104.73,46.55 0,69.82C23.27,180.95 67.96,241.34 128,256 188.04,241.34 232.73,180.95 232.73,116.36l0,-69.82L128,0ZM128,127.88 L209.45,127.88C203.29,175.83 171.29,218.53 128,231.91l0,-103.91 -81.45,0 0,-66.33L128,25.48l0,102.4z" android:strokeColor="#00000000"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff" android:pathData="m127.92,48.21c-44.04,0 -79.71,35.74 -79.71,79.79 0,44.04 35.66,79.79 79.71,79.79 44.12,0 79.87,-35.74 79.87,-79.79 0,-44.04 -35.74,-79.79 -79.87,-79.79zM183.21,96.09 L159.67,96.09c-2.55,-9.97 -6.22,-19.55 -11.01,-28.4 14.68,5.03 26.89,15.24 34.55,28.4zM128,64.49c6.62,9.57 11.81,20.19 15.24,31.6l-30.48,0c3.43,-11.41 8.62,-22.02 15.24,-31.6zM66.25,143.96C64.97,138.85 64.17,133.51 64.17,128c0,-5.51 0.8,-10.85 2.07,-15.96l26.97,0c-0.64,5.27 -1.12,10.53 -1.12,15.96 0,5.43 0.48,10.69 1.12,15.96l-26.97,0zM72.79,159.91 L96.33,159.91c2.55,9.97 6.22,19.55 11.01,28.4 -14.68,-5.03 -26.89,-15.16 -34.55,-28.4zM96.33,96.09 L72.79,96.09c7.66,-13.24 19.87,-23.38 34.55,-28.4 -4.79,8.86 -8.46,18.43 -11.01,28.4zM128,191.51c-6.62,-9.57 -11.81,-20.19 -15.24,-31.6l30.48,0C139.81,171.32 134.62,181.94 128,191.51ZM146.67,143.96 L109.33,143.96c-0.72,-5.27 -1.28,-10.53 -1.28,-15.96 0,-5.43 0.56,-10.77 1.28,-15.96l37.34,0c0.72,5.19 1.28,10.53 1.28,15.96 0,5.43 -0.56,10.69 -1.28,15.96zM148.66,188.32c4.79,-8.86 8.46,-18.43 11.01,-28.4l23.54,0c-7.66,13.16 -19.87,23.38 -34.55,28.4zM162.79,143.96c0.64,-5.27 1.12,-10.53 1.12,-15.96 0,-5.43 -0.48,-10.69 -1.12,-15.96l26.97,0c1.28,5.11 2.07,10.45 2.07,15.96 0,5.51 -0.8,10.85 -2.07,15.96l-26.97,0z"/>
-</vector>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="256.0"
+    android:viewportWidth="256.0" >
+
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#b71c1c"
+        android:pathData="m128,12.8 l-94.25,41.89 0,62.84c0,58.12 40.22,112.48 94.25,125.67 54.04,-13.2 94.25,-67.55 94.25,-125.67l0,-62.84z" android:strokeColor="#00000000" />
+
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#d32f2f"
+        android:pathData="m128,0 l-104.73,46.55 0,69.82C23.27,180.95 67.96,241.34 128,256 188.04,241.34 232.73,180.95 232.73,116.36l0,-69.82L128,0ZM128,127.88 L209.45,127.88C203.29,175.83 171.29,218.53 128,231.91l0,-103.91 -81.45,0 0,-66.33L128,25.48l0,102.4z" android:strokeColor="#00000000" />
+
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
+        android:pathData="m127.92,48.21c-44.04,0 -79.71,35.74 -79.71,79.79 0,44.04 35.66,79.79 79.71,79.79 44.12,0 79.87,-35.74 79.87,-79.79 0,-44.04 -35.74,-79.79 -79.87,-79.79zM183.21,96.09 L159.67,96.09c-2.55,-9.97 -6.22,-19.55 -11.01,-28.4 14.68,5.03 26.89,15.24 34.55,28.4zM128,64.49c6.62,9.57 11.81,20.19 15.24,31.6l-30.48,0c3.43,-11.41 8.62,-22.02 15.24,-31.6zM66.25,143.96C64.97,138.85 64.17,133.51 64.17,128c0,-5.51 0.8,-10.85 2.07,-15.96l26.97,0c-0.64,5.27 -1.12,10.53 -1.12,15.96 0,5.43 0.48,10.69 1.12,15.96l-26.97,0zM72.79,159.91 L96.33,159.91c2.55,9.97 6.22,19.55 11.01,28.4 -14.68,-5.03 -26.89,-15.16 -34.55,-28.4zM96.33,96.09 L72.79,96.09c7.66,-13.24 19.87,-23.38 34.55,-28.4 -4.79,8.86 -8.46,18.43 -11.01,28.4zM128,191.51c-6.62,-9.57 -11.81,-20.19 -15.24,-31.6l30.48,0C139.81,171.32 134.62,181.94 128,191.51ZM146.67,143.96 L109.33,143.96c-0.72,-5.27 -1.28,-10.53 -1.28,-15.96 0,-5.43 0.56,-10.77 1.28,-15.96l37.34,0c0.72,5.19 1.28,10.53 1.28,15.96 0,5.43 -0.56,10.69 -1.28,15.96zM148.66,188.32c4.79,-8.86 8.46,-18.43 11.01,-28.4l23.54,0c-7.66,13.16 -19.87,23.38 -34.55,28.4zM162.79,143.96c0.64,-5.27 1.12,-10.53 1.12,-15.96 0,-5.43 -0.48,-10.69 -1.12,-15.96l26.97,0c1.28,5.11 2.07,10.45 2.07,15.96 0,5.51 -0.8,10.85 -2.07,15.96l-26.97,0z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/privacy_mode.xml b/app/src/main/res/drawable/privacy_mode.xml
index b79759b8..01a0891e 100644
--- a/app/src/main/res/drawable/privacy_mode.xml
+++ b/app/src/main/res/drawable/privacy_mode.xml
@@ -1,12 +1,25 @@
-<!--
-  privacy_mode.xml is derived from ic_security and ic_language, which are part of the Android Material icon set.
+<!-- privacy_mode.xml is derived from ic_security and ic_language, which are part of the Android Material icon set.
   They are released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>.  Modifications were made by Soren Stoutner <soren@stoutner.com> in 2016. -->
 
-<vector android:height="26dp" android:viewportHeight="256.0"
-    android:viewportWidth="256.0" android:width="26dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#0d4781"
-        android:pathData="m128,12.8 l-94.25,41.89 0,62.84c0,58.12 40.22,112.48 94.25,125.67 54.04,-13.2 94.25,-67.55 94.25,-125.67l0,-62.84z" android:strokeColor="#00000000"/>
-    <path android:fillAlpha="1" android:fillColor="#1976d2"
-        android:pathData="m128,0 l-104.73,46.55 0,69.82C23.27,180.95 67.96,241.34 128,256 188.04,241.34 232.73,180.95 232.73,116.36l0,-69.82L128,0ZM128,127.88 L209.45,127.88C203.29,175.83 171.29,218.53 128,231.91l0,-103.91 -81.45,0 0,-66.33L128,25.48l0,102.4z" android:strokeColor="#00000000"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff" android:pathData="m127.92,48.21c-44.04,0 -79.71,35.74 -79.71,79.79 0,44.04 35.66,79.79 79.71,79.79 44.12,0 79.87,-35.74 79.87,-79.79 0,-44.04 -35.74,-79.79 -79.87,-79.79zM183.21,96.09 L159.67,96.09c-2.55,-9.97 -6.22,-19.55 -11.01,-28.4 14.68,5.03 26.89,15.24 34.55,28.4zM128,64.49c6.62,9.57 11.81,20.19 15.24,31.6l-30.48,0c3.43,-11.41 8.62,-22.02 15.24,-31.6zM66.25,143.96C64.97,138.85 64.17,133.51 64.17,128c0,-5.51 0.8,-10.85 2.07,-15.96l26.97,0c-0.64,5.27 -1.12,10.53 -1.12,15.96 0,5.43 0.48,10.69 1.12,15.96l-26.97,0zM72.79,159.91 L96.33,159.91c2.55,9.97 6.22,19.55 11.01,28.4 -14.68,-5.03 -26.89,-15.16 -34.55,-28.4zM96.33,96.09 L72.79,96.09c7.66,-13.24 19.87,-23.38 34.55,-28.4 -4.79,8.86 -8.46,18.43 -11.01,28.4zM128,191.51c-6.62,-9.57 -11.81,-20.19 -15.24,-31.6l30.48,0C139.81,171.32 134.62,181.94 128,191.51ZM146.67,143.96 L109.33,143.96c-0.72,-5.27 -1.28,-10.53 -1.28,-15.96 0,-5.43 0.56,-10.77 1.28,-15.96l37.34,0c0.72,5.19 1.28,10.53 1.28,15.96 0,5.43 -0.56,10.69 -1.28,15.96zM148.66,188.32c4.79,-8.86 8.46,-18.43 11.01,-28.4l23.54,0c-7.66,13.16 -19.87,23.38 -34.55,28.4zM162.79,143.96c0.64,-5.27 1.12,-10.53 1.12,-15.96 0,-5.43 -0.48,-10.69 -1.12,-15.96l26.97,0c1.28,5.11 2.07,10.45 2.07,15.96 0,5.51 -0.8,10.85 -2.07,15.96l-26.97,0z"/>
-</vector>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="256.0"
+    android:viewportWidth="256.0" >
+
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#0d4781"
+        android:pathData="m128,12.8 l-94.25,41.89 0,62.84c0,58.12 40.22,112.48 94.25,125.67 54.04,-13.2 94.25,-67.55 94.25,-125.67l0,-62.84z" android:strokeColor="#00000000" />
+
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#1976d2"
+        android:pathData="m128,0 l-104.73,46.55 0,69.82C23.27,180.95 67.96,241.34 128,256 188.04,241.34 232.73,180.95 232.73,116.36l0,-69.82L128,0ZM128,127.88 L209.45,127.88C203.29,175.83 171.29,218.53 128,231.91l0,-103.91 -81.45,0 0,-66.33L128,25.48l0,102.4z" android:strokeColor="#00000000" />
+
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
+        android:pathData="m127.92,48.21c-44.04,0 -79.71,35.74 -79.71,79.79 0,44.04 35.66,79.79 79.71,79.79 44.12,0 79.87,-35.74 79.87,-79.79 0,-44.04 -35.74,-79.79 -79.87,-79.79zM183.21,96.09 L159.67,96.09c-2.55,-9.97 -6.22,-19.55 -11.01,-28.4 14.68,5.03 26.89,15.24 34.55,28.4zM128,64.49c6.62,9.57 11.81,20.19 15.24,31.6l-30.48,0c3.43,-11.41 8.62,-22.02 15.24,-31.6zM66.25,143.96C64.97,138.85 64.17,133.51 64.17,128c0,-5.51 0.8,-10.85 2.07,-15.96l26.97,0c-0.64,5.27 -1.12,10.53 -1.12,15.96 0,5.43 0.48,10.69 1.12,15.96l-26.97,0zM72.79,159.91 L96.33,159.91c2.55,9.97 6.22,19.55 11.01,28.4 -14.68,-5.03 -26.89,-15.16 -34.55,-28.4zM96.33,96.09 L72.79,96.09c7.66,-13.24 19.87,-23.38 34.55,-28.4 -4.79,8.86 -8.46,18.43 -11.01,28.4zM128,191.51c-6.62,-9.57 -11.81,-20.19 -15.24,-31.6l30.48,0C139.81,171.32 134.62,181.94 128,191.51ZM146.67,143.96 L109.33,143.96c-0.72,-5.27 -1.28,-10.53 -1.28,-15.96 0,-5.43 0.56,-10.77 1.28,-15.96l37.34,0c0.72,5.19 1.28,10.53 1.28,15.96 0,5.43 -0.56,10.69 -1.28,15.96zM148.66,188.32c4.79,-8.86 8.46,-18.43 11.01,-28.4l23.54,0c-7.66,13.16 -19.87,23.38 -34.55,28.4zM162.79,143.96c0.64,-5.27 1.12,-10.53 1.12,-15.96 0,-5.43 -0.48,-10.69 -1.12,-15.96l26.97,0c1.28,5.11 2.07,10.45 2.07,15.96 0,5.51 -0.8,10.85 -2.07,15.96l-26.97,0z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/settings.xml
index 84f4dbb3..3b26c788 100644
--- a/app/src/main/res/drawable/settings.xml
+++ b/app/src/main/res/drawable/settings.xml
@@ -1,11 +1,14 @@
-<!-- settings.xml comes from the Android Material icon set, where it is called ic_settings.  It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>. -->
+<!-- settings.xml comes from the Android Material icon set, where it is called ic_settings.
+  It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>. -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
-</vector>
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/warning.xml b/app/src/main/res/drawable/warning.xml
index fe774a08..ff5c18de 100644
--- a/app/src/main/res/drawable/warning.xml
+++ b/app/src/main/res/drawable/warning.xml
@@ -1,12 +1,25 @@
-<!--
-  warning.xml is derived from ic_security and ic_language, which are part of the Android Material icon set.
+<!-- warning.xml is derived from ic_security and ic_language, which are part of the Android Material icon set.
   They are released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>.  Modifications were made by Soren Stoutner <soren@stoutner.com> in 2016. -->
 
-<vector android:height="26dp" android:viewportHeight="256.0"
-    android:viewportWidth="256.0" android:width="26dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#f57f17"
-        android:pathData="m128,12.8 l-94.25,41.89 0,62.84c0,58.12 40.22,112.48 94.25,125.67 54.04,-13.2 94.25,-67.55 94.25,-125.67l0,-62.84z" android:strokeColor="#00000000"/>
-    <path android:fillAlpha="1" android:fillColor="#fbc02d"
-        android:pathData="m128,0 l-104.73,46.55 0,69.82C23.27,180.95 67.96,241.34 128,256 188.04,241.34 232.73,180.95 232.73,116.36l0,-69.82L128,0ZM128,127.88 L209.45,127.88C203.29,175.83 171.29,218.53 128,231.91l0,-103.91 -81.45,0 0,-66.33L128,25.48l0,102.4z" android:strokeColor="#00000000"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff" android:pathData="m127.92,48.21c-44.04,0 -79.71,35.74 -79.71,79.79 0,44.04 35.66,79.79 79.71,79.79 44.12,0 79.87,-35.74 79.87,-79.79 0,-44.04 -35.74,-79.79 -79.87,-79.79zM183.21,96.09 L159.67,96.09c-2.55,-9.97 -6.22,-19.55 -11.01,-28.4 14.68,5.03 26.89,15.24 34.55,28.4zM128,64.49c6.62,9.57 11.81,20.19 15.24,31.6l-30.48,0c3.43,-11.41 8.62,-22.02 15.24,-31.6zM66.25,143.96C64.97,138.85 64.17,133.51 64.17,128c0,-5.51 0.8,-10.85 2.07,-15.96l26.97,0c-0.64,5.27 -1.12,10.53 -1.12,15.96 0,5.43 0.48,10.69 1.12,15.96l-26.97,0zM72.79,159.91 L96.33,159.91c2.55,9.97 6.22,19.55 11.01,28.4 -14.68,-5.03 -26.89,-15.16 -34.55,-28.4zM96.33,96.09 L72.79,96.09c7.66,-13.24 19.87,-23.38 34.55,-28.4 -4.79,8.86 -8.46,18.43 -11.01,28.4zM128,191.51c-6.62,-9.57 -11.81,-20.19 -15.24,-31.6l30.48,0C139.81,171.32 134.62,181.94 128,191.51ZM146.67,143.96 L109.33,143.96c-0.72,-5.27 -1.28,-10.53 -1.28,-15.96 0,-5.43 0.56,-10.77 1.28,-15.96l37.34,0c0.72,5.19 1.28,10.53 1.28,15.96 0,5.43 -0.56,10.69 -1.28,15.96zM148.66,188.32c4.79,-8.86 8.46,-18.43 11.01,-28.4l23.54,0c-7.66,13.16 -19.87,23.38 -34.55,28.4zM162.79,143.96c0.64,-5.27 1.12,-10.53 1.12,-15.96 0,-5.43 -0.48,-10.69 -1.12,-15.96l26.97,0c1.28,5.11 2.07,10.45 2.07,15.96 0,5.51 -0.8,10.85 -2.07,15.96l-26.97,0z"/>
-</vector>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="26dp"
+    android:width="26dp"
+    android:viewportHeight="256.0"
+    android:viewportWidth="256.0" >
+
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#f57f17"
+        android:pathData="m128,12.8 l-94.25,41.89 0,62.84c0,58.12 40.22,112.48 94.25,125.67 54.04,-13.2 94.25,-67.55 94.25,-125.67l0,-62.84z" android:strokeColor="#00000000" />
+
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#fbc02d"
+        android:pathData="m128,0 l-104.73,46.55 0,69.82C23.27,180.95 67.96,241.34 128,256 188.04,241.34 232.73,180.95 232.73,116.36l0,-69.82L128,0ZM128,127.88 L209.45,127.88C203.29,175.83 171.29,218.53 128,231.91l0,-103.91 -81.45,0 0,-66.33L128,25.48l0,102.4z" android:strokeColor="#00000000" />
+
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#ffffff"
+        android:pathData="m127.92,48.21c-44.04,0 -79.71,35.74 -79.71,79.79 0,44.04 35.66,79.79 79.71,79.79 44.12,0 79.87,-35.74 79.87,-79.79 0,-44.04 -35.74,-79.79 -79.87,-79.79zM183.21,96.09 L159.67,96.09c-2.55,-9.97 -6.22,-19.55 -11.01,-28.4 14.68,5.03 26.89,15.24 34.55,28.4zM128,64.49c6.62,9.57 11.81,20.19 15.24,31.6l-30.48,0c3.43,-11.41 8.62,-22.02 15.24,-31.6zM66.25,143.96C64.97,138.85 64.17,133.51 64.17,128c0,-5.51 0.8,-10.85 2.07,-15.96l26.97,0c-0.64,5.27 -1.12,10.53 -1.12,15.96 0,5.43 0.48,10.69 1.12,15.96l-26.97,0zM72.79,159.91 L96.33,159.91c2.55,9.97 6.22,19.55 11.01,28.4 -14.68,-5.03 -26.89,-15.16 -34.55,-28.4zM96.33,96.09 L72.79,96.09c7.66,-13.24 19.87,-23.38 34.55,-28.4 -4.79,8.86 -8.46,18.43 -11.01,28.4zM128,191.51c-6.62,-9.57 -11.81,-20.19 -15.24,-31.6l30.48,0C139.81,171.32 134.62,181.94 128,191.51ZM146.67,143.96 L109.33,143.96c-0.72,-5.27 -1.28,-10.53 -1.28,-15.96 0,-5.43 0.56,-10.77 1.28,-15.96l37.34,0c0.72,5.19 1.28,10.53 1.28,15.96 0,5.43 -0.56,10.69 -1.28,15.96zM148.66,188.32c4.79,-8.86 8.46,-18.43 11.01,-28.4l23.54,0c-7.66,13.16 -19.87,23.38 -34.55,28.4zM162.79,143.96c0.64,-5.27 1.12,-10.53 1.12,-15.96 0,-5.43 -0.48,-10.69 -1.12,-15.96l26.97,0c1.28,5.11 2.07,10.45 2.07,15.96 0,5.51 -0.8,10.85 -2.07,15.96l-26.97,0z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/world.xml b/app/src/main/res/drawable/world.xml
index 9e06879d..a472dca2 100644
--- a/app/src/main/res/drawable/world.xml
+++ b/app/src/main/res/drawable/world.xml
@@ -1,5 +1,4 @@
-<!--
-  world.xml is part of the Android Material icon set, where it is named ic_language.
+<!-- world.xml is part of the Android Material icon set, where it is named ic_language.
   It is released under the CC-BY license <https://creativecommons.org/licenses/by/4.0/>.
   Changes to fill color and size were made by Soren Stoutner <soren@stoutner.com> in 2016. -->
 
@@ -10,5 +9,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <path android:fillColor="#FF9E9E9E" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zm6.93,6h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2H4.26zm0.82,2h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zm2.95,-8H5.08c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14H9.66c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zm0.25,5.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
-</vector>
+    <path
+        android:fillColor="#FF9E9E9E"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zm6.93,6h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2H4.26zm0.82,2h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zm2.95,-8H5.08c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14H9.66c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zm0.25,5.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/about_linearlayout.xml b/app/src/main/res/layout/about_linearlayout.xml
new file mode 100644
index 00000000..84f63f15
--- /dev/null
+++ b/app/src/main/res/layout/about_linearlayout.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2016 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/>. -->
+
+<LinearLayout
+    android:id="@+id/about_linearlayout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:orientation="vertical" >
+
+    <android.support.design.widget.TabLayout
+        android:id="@+id/about_tablayout"
+        xmlns:android.support.design="http://schemas.android.com/apk/res-auto"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android.support.design:tabBackground="@color/blue"
+        android.support.design:tabTextColor="@color/light_blue"
+        android.support.design:tabSelectedTextColor="@color/white"
+        android.support.design:tabIndicatorColor="@color/white"
+        android.support.design:tabMode="scrollable" />
+
+    <!-- android:layout_weight="1" makes about_viewpager fill all the remaining space. -->
+    <android.support.v4.view.ViewPager
+        android:id="@+id/about_viewpager"
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_weight="1" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/about_tab_version.xml b/app/src/main/res/layout/about_tab_version.xml
new file mode 100644
index 00000000..81ef0cc7
--- /dev/null
+++ b/app/src/main/res/layout/about_tab_version.xml
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2016 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/>. -->
+
+<!-- The ScrollView allows the LinearLayout to scroll if it exceeds the height of the page. -->
+<ScrollView
+    android:id="@+id/about_version_scrollview"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
+
+    <LinearLayout
+        android:id="@+id/about_version_linearlayout"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:orientation="vertical"
+        android:padding="16dp">
+
+        <!-- The RelativeLayout contains the header. -->
+        <RelativeLayout
+            android:id="@+id/about_version_relativelayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            xmlns:tools="http://schemas.android.com/tools">
+
+            <!--tools:ignore="ContentDescription" suppresses the lint warning about supplying a content description for the ImageView,
+              which isn't needed in this case because the ImageView because is only decorative. -->
+            <ImageView
+                android:id="@+id/about_version_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/privacy_browser"
+                android:paddingTop="10dp"
+                tools:ignore="ContentDescription" />
+
+            <!-- We need to include android:layout_toRightOf until API>=17. -->
+            <TextView
+                android:id="@+id/about_version_privacy_browser_textview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/privacy_browser"
+                android:textStyle="bold"
+                android:textSize="22sp"
+                android:textColor="@color/black"
+                android:layout_toEndOf="@id/about_version_icon"
+                android:layout_toRightOf="@id/about_version_icon" />
+
+            <!-- We need to include android:layout_toRightOf until API>=17. -->
+            <TextView
+                android:id="@+id/about_version_number_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/blue"
+                android:layout_below="@id/about_version_privacy_browser_textview"
+                android:layout_toEndOf="@id/about_version_icon"
+                android:layout_toRightOf="@id/about_version_icon" />
+        </RelativeLayout>
+
+        <!-- The purpose of this LinearLayout is to provide padding on the start of the TextViews to make them line up with about_version_icon.
+          We have to use android:paddingLeft in addition to android:paddingStart until API>=17.
+          Although we don't need them, we have to include android:paddingEnd and android:paddingRight to make lint happy. -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingTop="16dp"
+            android:paddingStart="4dp"
+            android:paddingEnd="0dp"
+            android:paddingLeft="4dp"
+            android:paddingRight="4dp">
+
+            <!-- Hardware. -->
+            <TextView
+                android:id="@+id/about_version_hardware"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/hardware"
+                android:textStyle="bold"
+                android:textSize="18sp"
+                android:textColor="@color/black" />
+
+            <!-- Brand. -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/about_version_brand_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/brand"/>
+
+                <TextView
+                    android:id="@+id/about_version_brand_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/blue" />
+            </LinearLayout>
+
+            <!-- Manufacturer. -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/about_version_manufacturer_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/manufacturer" />
+
+                <TextView
+                    android:id="@+id/about_version_manufacturer_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/blue" />
+            </LinearLayout>
+
+            <!-- Model. -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/about_version_model_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/model" />
+
+                <TextView
+                    android:id="@+id/about_version_model_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/blue" />
+            </LinearLayout>
+
+            <!-- Device. -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/about_version_device_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/device" />
+
+                <TextView
+                    android:id="@+id/about_version_device_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/blue" />
+            </LinearLayout>
+
+            <!-- Bootloader. -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/about_version_bootloader_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/bootloader" />
+
+                <TextView
+                    android:id="@+id/about_version_bootloader_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/blue" />
+            </LinearLayout>
+
+            <!-- Radio. -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/about_version_radio_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/radio" />
+
+                <TextView
+                    android:id="@+id/about_version_radio_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/blue" />
+            </LinearLayout>
+
+            <!-- Software. -->
+            <TextView
+                android:id="@+id/about_version_software"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/software"
+                android:textStyle="bold"
+                android:textSize="18sp"
+                android:textColor="@color/black"
+                android:paddingTop="12dp" />
+
+            <!-- Android. -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/about_version_android_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/android" />
+
+                <TextView
+                    android:id="@+id/about_version_android_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/blue" />
+            </LinearLayout>
+
+            <!-- Build. -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/about_version_build_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/build" />
+
+                <TextView
+                    android:id="@+id/about_version_build_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/blue" />
+            </LinearLayout>
+
+            <!-- Security Patch. -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/about_version_securitypatch_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/security_patch" />
+
+                <TextView
+                    android:id="@+id/about_version_securitypatch_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/blue" />
+                </LinearLayout>
+
+            <!-- WebKit. -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/about_version_webkit_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/webkit" />
+
+                <TextView
+                    android:id="@+id/about_version_webkit_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/blue" />
+            </LinearLayout>
+
+            <!-- Chrome. -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/about_version_chrome_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/chrome" />
+
+                <TextView
+                    android:id="@+id/about_version_chrome_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/blue" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/about_tab_webview.xml b/app/src/main/res/layout/about_tab_webview.xml
new file mode 100644
index 00000000..135df5e7
--- /dev/null
+++ b/app/src/main/res/layout/about_tab_webview.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2016 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/>. -->
+
+<!-- This WebView displays inside of the tabs in AboutActivity. -->
+<WebView
+    android:id="@+id/about_tab_webview"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_navigation.xml b/app/src/main/res/menu/menu_navigation.xml
index 6e5a31f3..6b2761a8 100644
--- a/app/src/main/res/menu/menu_navigation.xml
+++ b/app/src/main/res/menu/menu_navigation.xml
@@ -24,19 +24,19 @@
         android:id="@+id/home"
         android:title="@string/home"
         android:icon="@drawable/home"
-        android:orderInCategory="11" />
+        android:orderInCategory="10" />
 
     <item
         android:id="@+id/back"
         android:title="@string/back"
         android:icon="@drawable/back"
-        android:orderInCategory="12" />
+        android:orderInCategory="20" />
 
     <item
         android:id="@+id/forward"
         android:title="@string/forward"
         android:icon="@drawable/forward"
-        android:orderInCategory="13" />
+        android:orderInCategory="30" />
 
     <!-- If a group has an id, a line is drawn above it in the navigation view. -->
     <group
@@ -45,19 +45,25 @@
             android:id="@+id/downloads"
             android:title="@string/downloads"
             android:icon="@drawable/downloads"
-            android:orderInCategory="20" />
+            android:orderInCategory="40" />
+
+        <item
+            android:id="@+id/guide"
+            android:title="@string/guide"
+            android:icon="@drawable/guide"
+            android:orderInCategory="50" />
 
         <item
             android:id="@+id/settings"
             android:title="@string/settings"
             android:icon="@drawable/settings"
-            android:orderInCategory="30" />
+            android:orderInCategory="60" />
 
         <item
             android:id="@+id/about"
             android:title="@string/about"
             android:icon="@drawable/about"
-            android:orderInCategory="40" />
+            android:orderInCategory="70" />
     </group>
 
     <!-- If a group has an id, a line is drawn above it in the navigation view. -->
@@ -67,6 +73,6 @@
             android:id="@+id/clearAndExit"
             android:title="@string/clear_and_exit"
             android:icon="@drawable/exit"
-            android:orderInCategory="50" />
+            android:orderInCategory="80" />
     </group>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 44c2db3c..dad5ef3f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,7 +22,9 @@
 <resources>
     <color name="black">#FF000000</color>
     <color name="blue">#FF1976D2</color>
+    <color name="dark_blue">#FF0D4781</color>
     <color name="green">#FF64DD17</color>
+    <color name="light_blue">#FFBBDEFB</color>
     <color name="red">#FFD50000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="yellow">#FFFFD600</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6795393d..6cd912e1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,6 +43,7 @@
     <string name="back">Back</string>
     <string name="forward">Forward</string>
     <string name="downloads">Downloads</string>
+    <string name="guide">Guide</string>
     <string name="settings">Settings</string>
     <string name="about">About</string>
     <string name="clear_and_exit">Clear and Exit</string>
@@ -92,7 +93,7 @@
         <item>Edge 13 on Windows 10</item>
         <item>Custom</item>
     </string-array>
-    <string-array name="user_agent_entry_values">
+    <string-array name="user_agent_entry_values">  <!-- None of the items in this string-array should be translated. -->
         <item>Default user agent</item>  <!-- This item must not be translated into other languages because it is referenced in code.  It is never displayed on the screen. -->
         <item>PrivacyBrowser/1.0</item>
         <item>Mozilla/5.0 (Android 6.0.1; Mobile; rv:46.0) Gecko/46.0 Firefox/46.0</item>
@@ -116,7 +117,7 @@
         <item>Yahoo</item>
         <item>Custom</item>
     </string-array>
-    <string-array name="javascript_disabled_search_entry_values">
+    <string-array name="javascript_disabled_search_entry_values">  <!-- None of the items in this string-array should be translated. -->
         <item>https://duckduckgo.com/html/?q=</item>
         <item>https://www.google.com/search?q=</item>
         <item>https://www.bing.com/search?q=</item>
@@ -132,7 +133,7 @@
         <item>Yahoo</item>
         <item>Custom</item>
     </string-array>
-    <string-array name="javascript_enabled_search_entry_values">
+    <string-array name="javascript_enabled_search_entry_values">  <!-- None of the items in this string-array should be translated. -->
         <item>https://duckduckgo.com/?q=</item>
         <item>https://www.google.com/search?q=</item>
         <item>https://www.bing.com/search?q=</item>
@@ -146,10 +147,31 @@
     <string name="swipe_to_refresh_enabled">Swipe to refresh</string>
     <string name="swipe_to_refresh_enabled_summary">Some websites don\'t work well if swipe to refresh is enabled.</string>
 
-    <!-- About Dialog. -->
+    <!-- About Activity. -->
     <string name="about_privacy_browser">About Privacy Browser</string>
+    <string name="version">Version</string>
+        <string name="version_code">Version Code</string>
+        <string name="hardware">Hardware</string>
+            <!-- Blank spaces at the end of strings are stripped out, so you have to replace them with the Unicode literal \u00A0. -->
+            <string name="brand">Brand:\u00A0</string>
+            <string name="manufacturer">Manufacturer:\u00A0</string>
+            <string name="model">Model:\u00A0</string>
+            <string name="device">Device:\u00A0</string>
+            <string name="bootloader">Bootloader:\u00A0</string>
+            <string name="radio">Radio:\u00A0</string>
+        <string name="software">Software</string>
+            <string name="android">Android:\u00A0</string>
+            <string name="api">API</string>
+            <string name="build">Build:\u00A0</string>
+            <string name="security_patch">Security Patch:\u00A0</string>
+            <string name="webkit">WebKit:\u00A0</string>
+            <string name="chrome">Chrome:\u00A0</string>
+    <string name="permissions">Permissions</string>
+    <string name="changelog">Changelog</string>
+    <string name="license">License</string>
+    <string name="contributors">Contributors</string>
     <string name="dismiss">Dismiss</string>
 
-    <!-- Ad control. -->
+    <!-- Ad Control. -->
     <string name="ad_id">Null</string>  <!-- There are no ads in the standard flavor, but this string must exist because it is referenced in the code. -->
 </resources>
-- 
2.45.2