X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_coordinatorlayout.xml;h=4016d722357d6b9ddaa767aff9f2ae0a3931776a;hb=dff8b7116c12a739b8f1136e90d107897a6e61fd;hp=07a5874f9b9c62391afbe615fdd78e4bdf4eadcd;hpb=44014ce1673cb4cbfcdaeceac59c067a5074b35c;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/main_coordinatorlayout.xml b/app/src/main/res/layout/main_coordinatorlayout.xml
index 07a5874f..4016d722 100644
--- a/app/src/main/res/layout/main_coordinatorlayout.xml
+++ b/app/src/main/res/layout/main_coordinatorlayout.xml
@@ -26,58 +26,68 @@
     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. -->
+        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/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:layout_width="match_parent"
         android:fitsSystemWindows="true"
         android:focusable="true"
         android:focusableInTouchMode="true" >
 
         <!-- The purpose of the LinearLayout is to place the included main_webview below appBarLayout. -->
         <LinearLayout
-            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_width="match_parent"
+            android:orientation="vertical" >
 
             <android.support.design.widget.AppBarLayout
                 android:id="@+id/appBarLayout"
-                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:theme="@style/PrivacyBrowser.AppBarOverlay" >
+                android:layout_width="match_parent"
+                android:theme="@style/AppBarOverlay" >
 
-                <android.support.v7.widget.Toolbar
-                    android:id="@+id/appBar"
-                    android:layout_width="match_parent"
+                <!-- The `FrameLayout` allows `appBar` and `find_on_page_app_bar` to occupy the same space. -->
+                <FrameLayout
                     android:layout_height="wrap_content"
-                    android:background="?attr/colorPrimary"
-                    app:popupTheme="@style/PrivacyBrowser.PopupOverlay" />
+                    android:layout_width="match_parent" >
+
+                    <android.support.v7.widget.Toolbar
+                        android:id="@+id/appBar"
+                        android:layout_height="wrap_content"
+                        android:layout_width="match_parent"
+                        android:background="@color/grey_100"
+                        app:popupTheme="@style/LightPopupOverlay" />
+
+                    <include layout="@layout/find_on_page_app_bar" />
+                </FrameLayout>
             </android.support.design.widget.AppBarLayout>
 
             <include layout="@layout/main_webview" />
         </LinearLayout>
     </android.support.design.widget.CoordinatorLayout>
 
+    <!-- `fullScreenVideoFrameLayout` is used to display full screen videos.  It is initially `android:visibility="gone"` to hide it from view.
+        The `FrameLayout` needs to be before the `NavigationView` or touches on the navigation drawer will not work after exiting full screen video using the back button.-->
+    <FrameLayout
+        android:id="@+id/fullScreenVideoFrameLayout"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:visibility="gone"
+        android:background="@color/black" />
+
     <!-- The navigation drawer. -->
     <android.support.design.widget.NavigationView
         android:id="@+id/navigationView"
-        android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:layout_width="wrap_content"
         android:layout_gravity="start"
         app:headerLayout="@layout/navigation_header"
-        app:menu="@menu/menu_navigation"/>
-
-    <!-- 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" />
+        app:menu="@menu/webview_navigation_menu"
+        app:itemIconTint="@color/blue_800" />
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file