X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Factivity_webview.xml;h=5613cef023a5c805024daf0042d7061372fb1275;hb=3756702edf3e068e3a3977cecb55c3bfd766e6d0;hp=deb2b7452ab05b5e6dc51a640d239df5f56d6e3a;hpb=fda0da47d78471ff653a84832723a52551d32a21;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index deb2b745..5613cef0 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -1,56 +1,69 @@
-<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="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="loadUrl"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
-
-    <FrameLayout
+    <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"
-        tools:context=".MainActivity"
-        android:id="@+id/relativeLayout">
+        tools:context=".Webview" >
+
+        <!-- FrameLayout lets the ProgressBar float on top of urlTextBox. -->
+        <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">
+
+                <ImageView
+                    android:id="@+id/favoriteIcon"
+                    android:src="@drawable/ic_language_black_24dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center" />
+
+                <!-- android:inputType="textUri" sets the keyboard to have a go arrow. -->
+                <!-- android:layout_weight="1" makes urlTextBox take up all the remaining space. -->
+                <EditText
+                    android:id="@+id/urlTextBox"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:inputType="textUri"
+                    android:imeOptions="actionGo" />
+            </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" />
 
-        <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>
+    </RelativeLayout>
+
+</android.support.v4.widget.SwipeRefreshLayout>