X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_drawerlayout.xml;h=f87741caa35074450591605956fac070956f7f2a;hb=96b6cf681cf89d18b4e950a43dfdaaad2cc67f85;hp=2d409d81245ff38324a9f0be6204569da38fe256;hpb=6259613515169e6dfa7e311acdbf7083a0effa27;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/main_drawerlayout.xml b/app/src/main/res/layout/main_drawerlayout.xml
index 2d409d81..f87741ca 100644
--- a/app/src/main/res/layout/main_drawerlayout.xml
+++ b/app/src/main/res/layout/main_drawerlayout.xml
@@ -25,9 +25,9 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent" >
 
-    <!-- `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: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 CoordinatorLayout to be `focusableInTouchMode` prevents the URL text box from stealing focus on launch and opening the keyboard.
+         `android:background` sets the background color of the status bar, which is then overlaid with a scrim. -->
     <android.support.design.widget.CoordinatorLayout
         android:id="@+id/root_coordinatorlayout"
         xmlns:tools="http://schemas.android.com/tools"
@@ -36,7 +36,8 @@
         android:layout_width="match_parent"
         android:fitsSystemWindows="true"
         android:focusable="true"
-        android:focusableInTouchMode="true" >
+        android:focusableInTouchMode="true"
+        android:background="?attr/mainStatusBarBackground" >
 
         <!-- The purpose of the `LinearLayout` is to place the included `main_webview` below `app_bar_layout`. -->
         <LinearLayout
@@ -63,12 +64,12 @@
 
                     <!-- `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.
-                        `tools:ignore="UnusedAttribute"` removes the lint waring about `progressTint` and `progressBackgroundTint` not applying to API < 21. -->
+                        `tools:ignore="UnusedAttribute"` removes the lint warning about `progressTint` and `progressBackgroundTint` not applying to API < 21. -->
                     <ProgressBar
                         android:id="@+id/progress_bar"
                         style="?android:attr/progressBarStyleHorizontal"
-                        android:layout_width="fill_parent"
                         android:layout_height="3dp"
+                        android:layout_width="match_parent"
                         android:layout_gravity="bottom"
                         android:max="100"
                         android:progressTint="?attr/progressTintColor"
@@ -76,10 +77,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 +105,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