X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Factivity_webview.xml;h=d214b1b456b7bcdd07744058f4331ab4e66a3e4e;hb=405b0fa00eef8a6239f1f7ae6b0db06edb23ccb9;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..d214b1b4 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -11,9 +11,10 @@
         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="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:inputType="textUri"
             android:imeOptions="actionGo"
@@ -22,17 +23,37 @@
         <Button
             android:id="@+id/goButton"
             android:text="@string/go_button"
-            android:onClick="loadUrl"
+            android:onClick="loadUrlFromTextBox"
             style="?android:attr/buttonStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
     </LinearLayout>
 
-    <WebView
-        android:id="@+id/mainWebView"
+    // 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"
-        android:focusable="true"
-        android:focusableInTouchMode="true" />
+        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" />
+
+        // 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:max="100"
+            android:progressTint="#FF29A8FF"
+            android:progressBackgroundTint="#FFFFFFFF"
+            android:visibility="gone" />
+    </FrameLayout>
+
 </RelativeLayout>