X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_webview.xml;h=4b5b5b399a27a86aabb7c9db7037606d22b8c1d3;hp=ed8bcc6850dddb61d69cd72a13747bef0b2f6897;hb=ba40295dffd761ccdc95d3b46ca7acbad1f00d5e;hpb=8366efd6bd48448d2b67c30ac5ceb321111d9c4c

diff --git a/app/src/main/res/layout/main_webview.xml b/app/src/main/res/layout/main_webview.xml
index ed8bcc68..4b5b5b39 100644
--- a/app/src/main/res/layout/main_webview.xml
+++ b/app/src/main/res/layout/main_webview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017,2019 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -18,29 +18,37 @@
   You should have received a copy of the GNU General Public License
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<!-- android:layout_martinTop="?attr/actionBarSize" moves the RelativeLayout below the appBarLayout, which otherwise would cover the top of mainWebView. -->
-<!-- the RelativeLayout has an id of adView in the standard flavor so that the ad commands (which do nothing in the standard flavor) don't produce errors. -->
+<!-- `android:layout_weight="1"` sets the `RelativeLayout` to fill the rest of the screen because it is encapsulated in a `LinearLayout` with `android:orientation="vertical"`. -->
+<!-- `android:background=@color/gray_900` sets the background color that is displayed when a website is loading in night mode. -->
 <RelativeLayout
-    android:id="@+id/adView"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:layout_height="0dp"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginTop="?attr/actionBarSize"
-    tools:context="com.stoutner.privacybrowser.MainWebViewActivity"
-    tools:showIn="@layout/coordinator_layout" >
-
-    <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/swipeRefreshLayout"
+    android:layout_weight="1"
+    android:background="@color/gray_900"
+    tools:context="com.stoutner.privacybrowser.activities.MainWebViewActivity"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <!-- This `TextView` has an id of `adView` so that the ad commands (which do nothing in the standard flavor) don't produce errors. -->
+    <TextView
+        android:id="@+id/adview"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:visibility="gone" />
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swiperefreshlayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
         <!-- Google does not currently want to support hiding the AppBar on scroll for a WebView child with the Support Toolbar.  https://code.google.com/p/android/issues/detail?id=200394 -->
-        <WebView
-            android:id="@+id/mainWebView"
-            android:layout_width="match_parent"
+        <com.stoutner.privacybrowser.views.NestedScrollWebView
+            android:id="@+id/main_webview"
             android:layout_height="match_parent"
+            android:layout_width="match_parent"
             android:focusable="true"
-            android:focusableInTouchMode="true"/>
-    </android.support.v4.widget.SwipeRefreshLayout>
-</RelativeLayout>
+            android:focusableInTouchMode="true"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+</RelativeLayout>
\ No newline at end of file