X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_drawerlayout.xml;h=5a52bcdcb59cb5a0cb44a57925a617e39dde3b1d;hb=65ff2d87f3a8fd1c26a26678498a7451e76ebb16;hp=c616f68e4a75fe9033fc4d925d7a0502095c345a;hpb=7f8620e81518589f44c8517edbfc8989a5f04845;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/main_drawerlayout.xml b/app/src/main/res/layout/main_drawerlayout.xml
index c616f68e..5a52bcdc 100644
--- a/app/src/main/res/layout/main_drawerlayout.xml
+++ b/app/src/main/res/layout/main_drawerlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2015-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>>.
 
@@ -25,9 +25,9 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent" >
 
-    <!-- android:fitsSystemWindows="true" moves rootCoordinatorLayout below the system status bar.
-        When it is specified the theme should include <item name="android:windowTranslucentStatus">true</item>.
-        Setting the layout root to be focusableInTouchMode prevents urlTextBox from stealing focus on launch and opening the keyboard. -->
+    <!-- `android:fitsSystemWindows="true"` moves `root_coordinatorlayout` below the system status bar.
+         When it is specified, the theme should include `<item name="android:windowTranslucentStatus">true</item>`.
+         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/root_coordinatorlayout"
         xmlns:tools="http://schemas.android.com/tools"
@@ -38,17 +38,18 @@
         android:focusable="true"
         android:focusableInTouchMode="true" >
 
-        <!-- The purpose of the LinearLayout is to place the included main_webview below appBarLayout. -->
+        <!-- The purpose of the `LinearLayout` is to place the included `main_webview` below `app_bar_layout`. -->
         <LinearLayout
             android:layout_height="match_parent"
             android:layout_width="match_parent"
             android:orientation="vertical" >
 
+            <!-- The `AppBarLayout` theme has to be defined here because the activity uses a `NoActionBar` theme. -->
             <android.support.design.widget.AppBarLayout
                 android:id="@+id/app_bar_layout"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-                android:theme="@style/AppBarOverlay" >
+                android:theme="@style/PrivacyBrowserAppBarLight" >
 
                 <!-- The `FrameLayout` allows `appBar` and `find_on_page_app_bar` to occupy the same space. -->
                 <FrameLayout
@@ -58,9 +59,7 @@
                     <android.support.v7.widget.Toolbar
                         android:id="@+id/app_bar"
                         android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:background="@color/gray_100"
-                        app:popupTheme="@style/LightPopupOverlay" />
+                        android:layout_width="match_parent" />
 
                     <!-- `android:max` changes the maximum `ProgressBar` value from 10000 to 100 to match progress percentage.
                         `android:layout_height="2dp"` works best for API >= 23, but `3dp` is required for visibility on API <= 22.
@@ -72,7 +71,7 @@
                         android:layout_height="3dp"
                         android:layout_gravity="bottom"
                         android:max="100"
-                        android:progressTint="@color/blue_700"
+                        android:progressTint="?attr/progressTintColor"
                         android:progressBackgroundTint="@color/transparent"
                         android:visibility="gone"
                         tools:ignore="UnusedAttribute" />
@@ -101,5 +100,63 @@
         android:layout_gravity="start"
         app:headerLayout="@layout/navigation_header"
         app:menu="@menu/webview_navigation_menu"
-        app:itemIconTint="@color/blue_800" />
+        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="15dp"
+                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>
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file