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

[PrivacyBrowserAndroid.git] / app / src / main / res / layout / activity_webview.xml

diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index 2e4bc6035eff1565121ad26e5352c88e6fc5295d..2b701ae033cad6edcf1c8e3cd7a34e37e33a9f80 100644 (file)
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -5,34 +5,54 @@
     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">
 
-        <EditText
-            android:id="@+id/urlTextBox"
-            android:layout_width="wrap_content"
+        <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="loadUrl"
-            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"/>
+
+            <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_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/topBarLayout"
+        android:layout_height="fill_parent"
+        android:layout_below="@id/topFrameLayout"
         android:focusable="true"
         android:focusableInTouchMode="true" />
 </RelativeLayout>