From e9fbdb660bfc22ffa3f2528427434c8caf62dd2a Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 13 Jun 2020 15:56:40 -0400
Subject: [PATCH] Fix webview height issue

Collapsing toolbar doesn't work currently.
---
 .../tachiyomi/ui/webview/WebViewActivity.kt   | 16 ++++-----
 app/src/main/res/layout/webview_activity.xml  | 36 +++++++------------
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
index af9ea3e59e..2bcd8953a2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
@@ -98,6 +98,11 @@ class WebViewActivity : BaseActivity<WebviewActivityBinding>() {
                     return true
                 }
 
+                override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
+                    super.onPageStarted(view, url, favicon)
+                    invalidateOptionsMenu()
+                }
+
                 override fun onPageFinished(view: WebView?, url: String?) {
                     super.onPageFinished(view, url)
                     invalidateOptionsMenu()
@@ -105,18 +110,9 @@ class WebViewActivity : BaseActivity<WebviewActivityBinding>() {
                     supportActionBar?.subtitle = url
                     binding.swipeRefresh.isEnabled = true
                     binding.swipeRefresh.isRefreshing = false
-                }
-
-                override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
-                    super.onPageStarted(view, url, favicon)
-                    invalidateOptionsMenu()
-                }
-
-                override fun onPageCommitVisible(view: WebView, url: String) {
-                    super.onPageCommitVisible(view, url)
 
                     // Reset to top when page refreshes
-                    binding.nestedView.scrollTo(0, 0)
+                    view?.scrollTo(0, 0)
                 }
             }
 
diff --git a/app/src/main/res/layout/webview_activity.xml b/app/src/main/res/layout/webview_activity.xml
index ff2b723254..ef6cea3c02 100644
--- a/app/src/main/res/layout/webview_activity.xml
+++ b/app/src/main/res/layout/webview_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -15,7 +15,6 @@
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             android:theme="?attr/actionBarTheme"
-            app:layout_scrollFlags="scroll|enterAlways|snap"
             app:navigationIcon="@drawable/ic_close_24dp" />
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -23,32 +22,23 @@
     <eu.kanade.tachiyomi.widget.ThemedSwipeRefreshLayout
         android:id="@id/swipe_refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        android:layout_height="match_parent">
 
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/nested_view"
+        <WebView
+            android:id="@+id/webview"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+            android:layout_height="match_parent">
 
-            <WebView
-                android:id="@+id/webview"
+            <ProgressBar
+                android:id="@+id/progress_bar"
+                style="?android:attr/progressBarStyleHorizontal"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="2dp"
+                android:progressBackgroundTint="@color/colorPrimary"
+                android:progressTint="@color/colorPrimary" />
 
-                <ProgressBar
-                    android:id="@+id/progress_bar"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="2dp"
-                    android:progressBackgroundTint="@color/colorPrimary"
-                    android:progressTint="@color/colorPrimary" />
-
-            </WebView>
-
-        </androidx.core.widget.NestedScrollView>
+        </WebView>
 
     </eu.kanade.tachiyomi.widget.ThemedSwipeRefreshLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>