From 8366efd6bd48448d2b67c30ac5ceb321111d9c4c Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Wed, 23 Mar 2016 20:12:27 -0700
Subject: [PATCH] Create a blank navigation drawer.

---
 .../layout/{ad_view.xml => main_webview.xml}  |  1 -
 .../privacybrowser/MainWebViewActivity.java   | 19 ++++-
 app/src/main/res/layout/activity_webview.xml  | 56 --------------
 .../main/res/layout/coordinator_layout.xml    | 76 +++++++++++++++++++
 .../layout/{ad_view.xml => main_webview.xml}  |  6 +-
 .../res/{values-v11 => values-v19}/styles.xml | 12 ++-
 app/src/main/res/values/colors.xml            |  2 +-
 app/src/main/res/values/strings.xml           |  2 +
 app/src/main/res/values/styles.xml            |  5 +-
 9 files changed, 111 insertions(+), 68 deletions(-)
 rename app/src/free/res/layout/{ad_view.xml => main_webview.xml} (97%)
 delete mode 100644 app/src/main/res/layout/activity_webview.xml
 create mode 100644 app/src/main/res/layout/coordinator_layout.xml
 rename app/src/main/res/layout/{ad_view.xml => main_webview.xml} (90%)
 rename app/src/main/res/{values-v11 => values-v19}/styles.xml (70%)

diff --git a/app/src/free/res/layout/ad_view.xml b/app/src/free/res/layout/main_webview.xml
similarity index 97%
rename from app/src/free/res/layout/ad_view.xml
rename to app/src/free/res/layout/main_webview.xml
index 22c17deb..c7bf4b0f 100644
--- a/app/src/free/res/layout/ad_view.xml
+++ b/app/src/free/res/layout/main_webview.xml
@@ -30,7 +30,6 @@
     tools:context="com.stoutner.privacybrowser.MainWebViewActivity"
     tools:showIn="@layout/activity_webview">
 
-    <!-- Set to visibility="gone" in the standard flavor. -->
     <com.google.android.gms.ads.AdView
         android:id="@+id/adView"
         android:layout_width="wrap_content"
diff --git a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
index 64dd8dbf..96f49b5b 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
@@ -20,7 +20,6 @@
 package com.stoutner.privacybrowser;
 
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.DownloadManager;
 import android.content.Intent;
@@ -32,8 +31,10 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.DialogFragment;
+import android.support.v4.widget.DrawerLayout;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.app.AppCompatDialogFragment;
 import android.support.v7.widget.Toolbar;
@@ -53,7 +54,6 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
-import android.widget.Toast;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
@@ -67,6 +67,8 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
     // mainWebView is public static so it can be accessed from AboutDialog.  It is also used in onCreate(), onOptionsItemSelected(), and loadUrlFromTextBox().
     public static WebView mainWebView;
 
+    // DrawerTottle is use in onCrate() and onPostCreate().
+    private ActionBarDrawerToggle drawerToggle;
     // mainMenu is used in onCreateOptionsMenu() and onOptionsItemSelected().
     private Menu mainMenu;
     // formattedUrlString is used in onCreate(), onOptionsItemSelected(), onCreateHomeScreenShortcutCreate(), and loadUrlFromTextBox().
@@ -96,7 +98,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
     @SuppressLint("SetJavaScriptEnabled")
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_webview);
+        setContentView(R.layout.coordinator_layout);
 
         // We need to use the SupportActionBar from android.support.v7.app.ActionBar until the minimum API is >= 21.
         Toolbar supportAppBar = (Toolbar) findViewById(R.id.appBar);
@@ -149,6 +151,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
             });
         }
 
+        DrawerLayout drawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout);
+        drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, supportAppBar, R.string.open_navigation, R.string.close_navigation);
+
         mainWebView.setWebViewClient(new WebViewClient() {
             // shouldOverrideUrlLoading makes this WebView the default handler for URLs inside the app, so that links are not kicked out to other apps.
             @Override
@@ -629,6 +634,14 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateHome
         }
     }
 
+    @Override
+    public void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+
+        // Sync the state of the DrawerToggle after onRestoreInstanceState has finished.
+        drawerToggle.syncState();
+    }
+
     @Override
     public void onCreateHomeScreenShortcutCancel(DialogFragment dialog) {
         // Do nothing because the user selected "Cancel".
diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
deleted file mode 100644
index 5be88fef..00000000
--- a/app/src/main/res/layout/activity_webview.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  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/>. -->
-
-<!-- Setting the layout root to be focusableInTouchMode prevents urlTextBox from stealing focus on launch and opening the keyboard. -->
-<android.support.design.widget.CoordinatorLayout
-    android:id="@+id/rootCoordinatorLayout"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.stoutner.privacybrowser.MainWebViewActivity"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true" >
-
-    <android.support.design.widget.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay" >
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/appBar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
-    </android.support.design.widget.AppBarLayout>
-
-    <include layout="@layout/ad_view" />
-
-    <!-- fullScreenVideoFrameLayout is used to display full screen videos.  It is initially android:visibility="gone" to hide it from view. -->
-    <FrameLayout
-        android:id="@+id/fullScreenVideoFrameLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        android:background="@color/black" />
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/coordinator_layout.xml b/app/src/main/res/layout/coordinator_layout.xml
new file mode 100644
index 00000000..4f11f609
--- /dev/null
+++ b/app/src/main/res/layout/coordinator_layout.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  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/>. -->
+
+<android.support.v4.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawerLayout"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent" >
+
+    <!-- The main content view. -->
+    <!-- android:fitsSystemWindows="true" moves rootCoordinatorLayout below the system status bar. -->
+    <!-- Setting the layout root to be focusableInTouchMode prevents urlTextBox from stealing focus on launch and opening the keyboard. -->
+    <android.support.design.widget.CoordinatorLayout
+        android:id="@+id/rootCoordinatorLayout"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        tools:context="com.stoutner.privacybrowser.MainWebViewActivity"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
+        android:focusable="true"
+        android:focusableInTouchMode="true" >
+
+        <android.support.design.widget.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:theme="@style/AppTheme.AppBarOverlay" >
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/appBar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/colorPrimary"
+                app:popupTheme="@style/AppTheme.PopupOverlay" />
+        </android.support.design.widget.AppBarLayout>
+
+        <include layout="@layout/main_webview" />
+
+        <!-- fullScreenVideoFrameLayout is used to display full screen videos.  It is initially android:visibility="gone" to hide it from view. -->
+        <FrameLayout
+            android:id="@+id/fullScreenVideoFrameLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            android:background="@color/black" />
+    </android.support.design.widget.CoordinatorLayout>
+
+    <!-- The navigation drawer. -->
+    <ListView
+        android:id="@+id/navigationDrawer"
+        android:layout_width="240dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:choiceMode="singleChoice"
+        android:background="@color/white"/>
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/ad_view.xml b/app/src/main/res/layout/main_webview.xml
similarity index 90%
rename from app/src/main/res/layout/ad_view.xml
rename to app/src/main/res/layout/main_webview.xml
index dc61e6b1..ed8bcc68 100644
--- a/app/src/main/res/layout/ad_view.xml
+++ b/app/src/main/res/layout/main_webview.xml
@@ -18,7 +18,7 @@
   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:layout_martinTop="?attr/actionBarSize" moves adRelativeLayout below the appBarLayout, which otherwise would cover the top of mainWebView. -->
+<!-- android:layout_martinTop="?attr/actionBarSize" moves the RelativeLayout below the appBarLayout, which otherwise would cover the top of mainWebView. -->
 <!-- the RelativeLayout has an id of adView in the standard flavor so that the ad commands (which do nothing in the standard flavor) don't produce errors. -->
 <RelativeLayout
     android:id="@+id/adView"
@@ -28,7 +28,7 @@
     android:layout_height="match_parent"
     android:layout_marginTop="?attr/actionBarSize"
     tools:context="com.stoutner.privacybrowser.MainWebViewActivity"
-    tools:showIn="@layout/activity_webview" >
+    tools:showIn="@layout/coordinator_layout" >
 
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/swipeRefreshLayout"
@@ -43,4 +43,4 @@
             android:focusable="true"
             android:focusableInTouchMode="true"/>
     </android.support.v4.widget.SwipeRefreshLayout>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/values-v11/styles.xml b/app/src/main/res/values-v19/styles.xml
similarity index 70%
rename from app/src/main/res/values-v11/styles.xml
rename to app/src/main/res/values-v19/styles.xml
index dfc0cacf..96ec9d69 100644
--- a/app/src/main/res/values-v11/styles.xml
+++ b/app/src/main/res/values-v19/styles.xml
@@ -20,11 +20,21 @@
 
 <resources>
 
-    <!-- android:actionBarSize is supported by API >= 11.  actionBarSize is for older versions. -->
     <!-- The default actionBarSize is 56dp.  53dp is the smallest that doesn't cause the urlTextBox to scroll vertically with a font size of Huge. -->
+    <!-- android:windowTranslucentStatus requires API >= 19.  It makes the system status bar transparent. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light">
         <item name="colorAccent">@color/blue</item>
         <item name="android:actionBarSize">53dp</item>
     </style>
 
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
 </resources>
\ 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 8115fe4d..44c2db3c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,7 +21,7 @@
 <!-- These color resources are hardcoded for vector drawables.  Once the minimum API is >= 22 we can remove the hardcoded colors and reference these entries. -->
 <resources>
     <color name="black">#FF000000</color>
-    <color name="blue">#1e88e5</color>
+    <color name="blue">#FF1976D2</color>
     <color name="green">#FF64DD17</color>
     <color name="red">#FFD50000</color>
     <color name="white">#FFFFFFFF</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 920d468d..6cf2bf62 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,6 +34,8 @@
     <string name="both_still_enabled">JavaScript disabled, DOM Storage and Cookies still enabled</string>
     <string name="dom_storage_deleted">DOM Storage deleted</string>
     <string name="cookies_deleted">Cookies deleted</string>
+    <string name="open_navigation">Open Navigation Drawer</string>
+    <string name="close_navigation">Close Navigation Drawer</string>
 
     <!-- Custom App Bar. -->
     <string name="favorite_icon">Favorite Icon</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d7e8ecd7..c9d97d92 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -20,11 +20,10 @@
 
 <resources>
 
-    <!-- android:actionBarSize is supported by API >= 11.  actionBarSize is for older versions. -->
     <!-- The default actionBarSize is 56dp.  53dp is the smallest that doesn't cause the urlTextBox to scroll vertically with a font size of Huge. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light">
         <item name="colorAccent">@color/blue</item>
-        <item name="actionBarSize">53dp</item>
+        <item name="android:actionBarSize">53dp</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -36,4 +35,4 @@
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
-</resources>
+</resources>
\ No newline at end of file
-- 
2.45.2