Remove swipe to refresh and add app bar scrolling (which appear to not be compatible...

[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 4eb9901b616b962c764b7a3bf7ec816ad9d68152..d085905f54cc039cae26715eaf794b2e5845955d 100644 (file)
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -1,71 +1,18 @@
-<android.support.v4.widget.SwipeRefreshLayout
-    android:id="@+id/swipeRefreshLayoutContainer"
+<!-- nextedScrollingEnabled is required to enable scrolling of the actionBar. -->
+<ScrollView
+    android:id="@+id/scrollView"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    // SwipeRefreshLayout allows the user to swipe down to refresh.
-
-    <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"
-        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>
-
+    android:layout_height="match_parent"
+    android:nestedScrollingEnabled="true" >
 
+        <!-- layout_marginTop is required to force the top of the website below the overlayed actionBar. -->
         <WebView
             android:id="@+id/mainWebView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/addressBarFrameLayout"
+            android:layout_height="wrap_content"
             android:focusable="true"
-            android:focusableInTouchMode="true" />
-
-    </RelativeLayout>
+            android:focusableInTouchMode="true"
+            android:layout_marginTop="?attr/actionBarSize"/>
 
-</android.support.v4.widget.SwipeRefreshLayout>
+</ScrollView>