X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Factivity_webview.xml;h=0efd90f684470dd0d7347dc4271b5812e0b7c1af;hb=13af786f465d2893b650cf848b65524dda58ade5;hp=2b701ae033cad6edcf1c8e3cd7a34e37e33a9f80;hpb=4a4b7dcb93d79b7ab729e41d67be694630da217e;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index 2b701ae0..0efd90f6 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -1,58 +1,56 @@
-<RelativeLayout
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://privacybrowser.stoutner.com/>.
+
+  Privacy Browser is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Privacy Browser is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+
+<!-- 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"
-    tools:context=".Webview" >
+    android:focusable="true"
+    android:focusableInTouchMode="true" >
 
-    // FrameLayout lets the ProgressBar float on top of the LinearLayout.
-    <FrameLayout
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/topFrameLayout">
+        android:theme="@style/AppTheme.AppBarOverlay" >
 
-        <LinearLayout
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/appBar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:id="@+id/topBarLayout">
-
-            // android:inputType="textUri" sets the keyboard to have a go arrow.
-            <EditText
-                android:id="@+id/urlTextBox"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:inputType="textUri"
-                android:imeOptions="actionGo"
-                android:layout_weight="1"/>
-
-            <Button
-                android:id="@+id/goButton"
-                android:text="@string/go_button"
-                android:onClick="loadUrlFromTextBox"
-                style="?android:attr/buttonStyleSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-            </LinearLayout>
-
-        // android:max changes the maximum ProgressBar value from 10000 to 100 to match progress percentage.
-        <ProgressBar
-            android:id="@+id/progressBar"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="7dp"
-            android:layout_gravity="bottom"
-            android:max="100"
-            android:progressTint="#FF29A8FF"
-            android:progressBackgroundTint="#FFFFFFFF"
-            android:visibility="gone" />
-    </FrameLayout>
-
-    <WebView
-        android:id="@+id/mainWebView"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/ad_view" />
+
+    <!-- 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="fill_parent"
-        android:layout_below="@id/topFrameLayout"
-        android:focusable="true"
-        android:focusableInTouchMode="true" />
-</RelativeLayout>
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        android:background="@color/black" />
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file