From 4c551386b100ea4b694c1e8f44596ba369e6b068 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 2 Jul 2019 16:29:28 -0700
Subject: Prevent horizontal swipes if html element can scroll horizontally

---
 .../kotlin/com/pitchedapps/frost/injectors/JsAssets.kt |  2 +-
 .../main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt  |  5 +++++
 .../com/pitchedapps/frost/web/FrostWebViewClients.kt   |  1 +
 .../kotlin/com/pitchedapps/frost/web/NestedWebView.kt  | 18 ++++++++++++++----
 4 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
index ad42418e..d46422b8 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
@@ -34,7 +34,7 @@ import java.util.Locale
  */
 enum class JsAssets : InjectorContract {
     MENU, CLICK_A, CONTEXT_A, MEDIA, HEADER_BADGES, TEXTAREA_LISTENER, NOTIF_MSG,
-    DOCUMENT_WATCHER
+    DOCUMENT_WATCHER, HORIZONTAL_SCROLLING
     ;
 
     @VisibleForTesting
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
index 0d980ba0..d75a4f1f 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
@@ -140,4 +140,9 @@ class FrostJSI(val web: FrostWebView) {
         html ?: return
         header?.offer(html)
     }
+
+    @JavascriptInterface
+    fun allowHorizontalScrolling(enable: Boolean) {
+        activity?.viewPager?.enableSwipe = enable
+    }
 }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
index 003ed7f9..85914f33 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
@@ -102,6 +102,7 @@ open class FrostWebViewClient(val web: FrostWebView) : BaseWebViewClient() {
                         Prefs.aggressiveRecents
                 ),
                 JsAssets.DOCUMENT_WATCHER,
+                JsAssets.HORIZONTAL_SCROLLING,
                 JsAssets.CLICK_A,
                 CssHider.ADS.maybe(!Prefs.showFacebookAds),
                 JsAssets.CONTEXT_A,
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/NestedWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/NestedWebView.kt
index 7c3c48e7..da0ebf0d 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/NestedWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/NestedWebView.kt
@@ -120,10 +120,20 @@ open class NestedWebView @JvmOverloads constructor(
         dxUnconsumed: Int,
         dyUnconsumed: Int,
         offsetInWindow: IntArray?
-    ) = childHelper.dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, offsetInWindow)
-
-    final override fun dispatchNestedPreScroll(dx: Int, dy: Int, consumed: IntArray?, offsetInWindow: IntArray?) =
-        childHelper.dispatchNestedPreScroll(dx, dy, consumed, offsetInWindow)
+    ) = childHelper.dispatchNestedScroll(
+        dxConsumed,
+        dyConsumed,
+        dxUnconsumed,
+        dyUnconsumed,
+        offsetInWindow
+    )
+
+    final override fun dispatchNestedPreScroll(
+        dx: Int,
+        dy: Int,
+        consumed: IntArray?,
+        offsetInWindow: IntArray?
+    ) = childHelper.dispatchNestedPreScroll(dx, dy, consumed, offsetInWindow)
 
     final override fun dispatchNestedFling(velocityX: Float, velocityY: Float, consumed: Boolean) =
         childHelper.dispatchNestedFling(velocityX, velocityY, consumed)
-- 
cgit v1.2.3