From: Soren Stoutner <soren@stoutner.com>
Date: Thu, 15 Oct 2015 17:12:34 +0000 (-0700)
Subject: Move the progress bar from the top of the WebView to the bottom of the address bar.
X-Git-Tag: v1.0~46
X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=4a4b7dcb93d79b7ab729e41d67be694630da217e;p=PrivacyBrowserAndroid.git

Move the progress bar from the top of the WebView to the bottom of the address bar.
---

diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index d214b1b4..2b701ae0 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -5,44 +5,35 @@
     android:layout_height="match_parent"
     tools:context=".Webview" >
 
-    <LinearLayout
+    // FrameLayout lets the ProgressBar float on top of the LinearLayout.
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:id="@+id/topBarLayout">
+        android:id="@+id/topFrameLayout">
 
-        // android:inputType="textUri" sets the keyboard to have a go arrow.
-        <EditText
-            android:id="@+id/urlTextBox"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="textUri"
-            android:imeOptions="actionGo"
-            android:layout_weight="1"/>
+            android:orientation="horizontal"
+            android:id="@+id/topBarLayout">
 
-        <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: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"/>
 
-    // FrameLayout lets the ProgressBar float on top of the WebView.
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/topBarLayout"
-        tools:context=".MainActivity"
-        android:id="@+id/relativeLayout">
-
-        <WebView
-            android:id="@+id/mainWebView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:focusable="true"
-            android:focusableInTouchMode="true" />
+            <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
@@ -50,10 +41,18 @@
             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_width="match_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@id/topFrameLayout"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
 </RelativeLayout>