From 3c19cff9af88a91b63363b0d7278ac3cfbd9f85a Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Mon, 23 Oct 2017 14:10:32 -0700
Subject: [PATCH] Set the bookmarks drawer to not use the full screen on
 tablets.

---
 .../res/layout-w900dp/bookmarks_drawer.xml    | 78 +++++++++++++++++++
 app/src/main/res/layout/bookmarks_drawer.xml  | 77 ++++++++++++++++++
 app/src/main/res/layout/main_drawerlayout.xml | 61 +--------------
 3 files changed, 159 insertions(+), 57 deletions(-)
 create mode 100644 app/src/main/res/layout-w900dp/bookmarks_drawer.xml
 create mode 100644 app/src/main/res/layout/bookmarks_drawer.xml

diff --git a/app/src/main/res/layout-w900dp/bookmarks_drawer.xml b/app/src/main/res/layout-w900dp/bookmarks_drawer.xml
new file mode 100644
index 00000000..e5e9d919
--- /dev/null
+++ b/app/src/main/res/layout-w900dp/bookmarks_drawer.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+
+This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>>.
+
+Privacy Browser is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Privacy Browser is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+
+<!-- `android:layout_width="400dp"` keeps the bookmarks drawer from filling the whole screen on a tablet. -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/bookmarks_framelayout"
+    android:layout_height="match_parent"
+    android:layout_width="400dp"
+    android:layout_gravity="end" >
+
+    <LinearLayout
+        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/bookmarks_title_textview"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:paddingTop="35dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="15dp"
+            android:paddingEnd="35dp"
+            android:textStyle="bold"
+            android:textSize="20sp"
+            android:background="?attr/navigationHeaderBackground"
+            android:textColor="?attr/navigationHeaderTextColor" />
+
+        <ListView
+            android:id="@+id/bookmarks_drawer_listview"
+            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:layout_weight="1"
+            android:divider="@color/transparent"
+            android:dividerHeight="0dp" />
+    </LinearLayout>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/launch_bookmarks_activity_fab"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="155dp" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/create_bookmark_folder_fab"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="85dp" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/create_bookmark_fab"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bookmarks_drawer.xml b/app/src/main/res/layout/bookmarks_drawer.xml
new file mode 100644
index 00000000..165d0766
--- /dev/null
+++ b/app/src/main/res/layout/bookmarks_drawer.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+
+This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>>.
+
+Privacy Browser is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Privacy Browser is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/bookmarks_framelayout"
+    android:layout_height="match_parent"
+    android:layout_width="wrap_content"
+    android:layout_gravity="end" >
+
+    <LinearLayout
+        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/bookmarks_title_textview"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:paddingTop="35dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="15dp"
+            android:paddingEnd="35dp"
+            android:textStyle="bold"
+            android:textSize="20sp"
+            android:background="?attr/navigationHeaderBackground"
+            android:textColor="?attr/navigationHeaderTextColor" />
+
+        <ListView
+            android:id="@+id/bookmarks_drawer_listview"
+            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:layout_weight="1"
+            android:divider="@color/transparent"
+            android:dividerHeight="0dp" />
+    </LinearLayout>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/launch_bookmarks_activity_fab"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="155dp" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/create_bookmark_folder_fab"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="85dp" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/create_bookmark_fab"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_drawerlayout.xml b/app/src/main/res/layout/main_drawerlayout.xml
index 2d409d81..6f1a839a 100644
--- a/app/src/main/res/layout/main_drawerlayout.xml
+++ b/app/src/main/res/layout/main_drawerlayout.xml
@@ -76,10 +76,12 @@
                         android:visibility="gone"
                         tools:ignore="UnusedAttribute" />
 
+                    <!-- Include the Find on Page search bar. -->
                     <include layout="@layout/find_on_page_app_bar" />
                 </FrameLayout>
             </android.support.design.widget.AppBarLayout>
 
+            <!-- Include the main `WebView`. -->
             <include layout="@layout/main_webview" />
         </LinearLayout>
 
@@ -102,61 +104,6 @@
         app:menu="@menu/webview_navigation_menu"
         app:itemIconTint="?attr/navigationIconTintColor" />
 
-    <!-- The bookmarks drawer. -->
-    <FrameLayout
-        android:id="@+id/bookmarks_framelayout"
-        android:layout_height="match_parent"
-        android:layout_width="wrap_content"
-        android:layout_gravity="end" >
-
-        <LinearLayout
-            android:layout_height="match_parent"
-            android:layout_width="wrap_content"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/bookmarks_title_textview"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:paddingTop="35dp"
-                android:paddingBottom="8dp"
-                android:paddingStart="15dp"
-                android:paddingEnd="35dp"
-                android:textStyle="bold"
-                android:textSize="20sp"
-                android:background="?attr/navigationHeaderBackground"
-                android:textColor="?attr/navigationHeaderTextColor" />
-
-            <ListView
-                android:id="@+id/bookmarks_drawer_listview"
-                android:layout_height="0dp"
-                android:layout_width="match_parent"
-                android:layout_weight="1"
-                android:divider="@color/transparent"
-                android:dividerHeight="0dp" />
-        </LinearLayout>
-
-        <android.support.design.widget.FloatingActionButton
-            android:id="@+id/launch_bookmarks_activity_fab"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="155dp" />
-
-        <android.support.design.widget.FloatingActionButton
-            android:id="@+id/create_bookmark_folder_fab"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="85dp" />
-
-        <android.support.design.widget.FloatingActionButton
-            android:id="@+id/create_bookmark_fab"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="16dp" />
-    </FrameLayout>
+    <!-- Include the bookmarks drawer. -->
+    <include layout="@layout/bookmarks_drawer" />
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
-- 
2.43.0