X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Factivity_webview.xml;h=4eb9901b616b962c764b7a3bf7ec816ad9d68152;hb=b0c8d9ec536bf5ce9ed832f46254fbb3125419bd;hp=2e4bc6035eff1565121ad26e5352c88e6fc5295d;hpb=8ee8e28f3ea0b1cbab0e792fb065475953bb0b55;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index 2e4bc603..4eb9901b 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -1,38 +1,71 @@
-<RelativeLayout
+<android.support.v4.widget.SwipeRefreshLayout
+    android:id="@+id/swipeRefreshLayoutContainer"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".Webview" >
+    android:layout_height="match_parent">
+    // SwipeRefreshLayout allows the user to swipe down to refresh.
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:id="@+id/topBarLayout">
-
-        <EditText
-            android:id="@+id/urlTextBox"
-            android:layout_width="wrap_content"
-            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="loadUrl"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
-
-    <WebView
-        android:id="@+id/mainWebView"
+    <RelativeLayout
+        android:id="@+id/relativeLayoutContainer"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/topBarLayout"
-        android:focusable="true"
-        android:focusableInTouchMode="true" />
-</RelativeLayout>
+        tools:context=".Webview" >
+
+        // FrameLayout lets the ProgressBar float on top of the LinearLayout.
+        <FrameLayout
+            android:id="@+id/addressBarFrameLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:id="@+id/addressBarLinearLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                // 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="#FF0097FF"
+                android:progressBackgroundTint="#FFFFFFFF"
+                android:visibility="gone" />
+        </FrameLayout>
+
+
+        <WebView
+            android:id="@+id/mainWebView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/addressBarFrameLayout"
+            android:focusable="true"
+            android:focusableInTouchMode="true" />
+
+    </RelativeLayout>
+
+</android.support.v4.widget.SwipeRefreshLayout>