mirror of
https://github.com/AllanWang/Frost-for-Facebook.git
synced 2024-11-08 12:02:33 +01:00
Support horizontal swipes for overlays
This commit is contained in:
parent
4c551386b1
commit
64fd7736eb
@ -28,6 +28,7 @@ import android.webkit.WebChromeClient
|
||||
import android.widget.FrameLayout
|
||||
import androidx.appcompat.widget.Toolbar
|
||||
import androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||
import ca.allanwang.kau.swipe.SwipeBackContract
|
||||
import ca.allanwang.kau.swipe.kauSwipeOnCreate
|
||||
import ca.allanwang.kau.swipe.kauSwipeOnDestroy
|
||||
import ca.allanwang.kau.utils.ContextHelper
|
||||
@ -168,6 +169,8 @@ open class WebOverlayActivityBase(private val forceDesktopAgent: Boolean) : Base
|
||||
private inline val urlTest: String?
|
||||
get() = intent.getStringExtra(ARG_URL) ?: intent.dataString
|
||||
|
||||
lateinit var swipeBack: SwipeBackContract
|
||||
|
||||
/**
|
||||
* Nonnull variant; verify by checking [urlTest]
|
||||
*/
|
||||
@ -235,7 +238,7 @@ open class WebOverlayActivityBase(private val forceDesktopAgent: Boolean) : Base
|
||||
FrostRunnable.propagate(this, intent)
|
||||
L.v { "Done propagation" }
|
||||
|
||||
kauSwipeOnCreate {
|
||||
swipeBack = kauSwipeOnCreate {
|
||||
if (!Prefs.overlayFullScreenSwipe) edgeSize = 20.dpToPx
|
||||
transitionSystemBars = false
|
||||
}
|
||||
|
@ -19,6 +19,7 @@ package com.pitchedapps.frost.web
|
||||
import android.content.Context
|
||||
import android.webkit.JavascriptInterface
|
||||
import com.pitchedapps.frost.activities.MainActivity
|
||||
import com.pitchedapps.frost.activities.WebOverlayActivityBase
|
||||
import com.pitchedapps.frost.contracts.MainActivityContract
|
||||
import com.pitchedapps.frost.contracts.VideoViewHolder
|
||||
import com.pitchedapps.frost.db.CookieEntity
|
||||
@ -144,5 +145,6 @@ class FrostJSI(val web: FrostWebView) {
|
||||
@JavascriptInterface
|
||||
fun allowHorizontalScrolling(enable: Boolean) {
|
||||
activity?.viewPager?.enableSwipe = enable
|
||||
(context as? WebOverlayActivityBase)?.swipeBack?.disallowIntercept = !enable
|
||||
}
|
||||
}
|
||||
|
@ -16,7 +16,7 @@ org.gradle.daemon = true
|
||||
APP_ID=Frost
|
||||
APP_GROUP=com.pitchedapps
|
||||
|
||||
KAU=d91d734
|
||||
KAU=00ba1bc
|
||||
|
||||
android.useAndroidX=true
|
||||
android.enableJetifier=true
|
||||
|
Loading…
Reference in New Issue
Block a user