Bump the target API to 28.

[PrivacyBrowserAndroid.git] / app / src / main / res / layout / main_drawerlayout.xml

diff --git a/app/src/main/res/layout/main_drawerlayout.xml b/app/src/main/res/layout/main_drawerlayout.xml
index d28351578b183b49f25533070d61792547afb179..f87741caa35074450591605956fac070956f7f2a 100644 (file)
--- 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 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 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,19 +36,21 @@
         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 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,29 +60,29 @@
                     <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.
-                        `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="@color/blue_700"
+                        android:progressTint="?attr/progressTintColor"
                         android:progressBackgroundTint="@color/transparent"
                         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>
 
@@ -101,5 +103,8 @@
         android:layout_gravity="start"
         app:headerLayout="@layout/navigation_header"
         app:menu="@menu/webview_navigation_menu"
-        app:itemIconTint="@color/blue_800" />
+        app:itemIconTint="?attr/navigationIconTintColor" />
+
+    <!-- Include the bookmarks drawer. -->
+    <include layout="@layout/bookmarks_drawer" />
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file