X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_coordinatorlayout.xml;h=0dba1f956852a28b8211221d1f93e1e8b2af5665;hb=a45494e763affaa93f42927ee58f45803e1ee9db;hp=b59aeb4591209aa1e861b22f0821140fe83bf017;hpb=c6907b02eb70e1a4bde274e66101f9f54f77a660;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/main_coordinatorlayout.xml b/app/src/main/res/layout/main_coordinatorlayout.xml
index b59aeb45..0dba1f95 100644
--- a/app/src/main/res/layout/main_coordinatorlayout.xml
+++ b/app/src/main/res/layout/main_coordinatorlayout.xml
@@ -26,8 +26,8 @@
     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"
@@ -50,20 +50,29 @@
                 android:id="@+id/appBarLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:theme="@style/PrivacyBrowser.AppBarOverlay" >
+                android:theme="@style/AppBarOverlay" >
 
                 <android.support.v7.widget.Toolbar
                     android:id="@+id/appBar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="?attr/colorPrimary"
-                    app:popupTheme="@style/PrivacyBrowser.PopupOverlay" />
+                    app:popupTheme="@style/LightPopupOverlay" />
             </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_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        android:background="@color/black" />
+
     <!-- The navigation drawer. -->
     <android.support.design.widget.NavigationView
         android:id="@+id/navigationView"
@@ -71,13 +80,6 @@
         android:layout_height="match_parent"
         android:layout_gravity="start"
         app:headerLayout="@layout/navigation_header"
-        app:menu="@menu/webview_navigation_menu"/>
-
-    <!-- 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_grey" />
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file