diff options
| author | Allan Wang <me@allanwang.ca> | 2018-02-16 21:51:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-16 21:51:02 -0500 |
| commit | fec23276e8290d4600ef79c54b5fcb00673daa83 (patch) | |
| tree | c1e7710e91b4152bf40f736294aef12a635535b2 /app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt | |
| parent | d68ea6d7eb8cadf687308fa3204386b79df0556b (diff) | |
| download | frost-fec23276e8290d4600ef79c54b5fcb00673daa83.tar.gz frost-fec23276e8290d4600ef79c54b5fcb00673daa83.tar.bz2 frost-fec23276e8290d4600ef79c54b5fcb00673daa83.zip | |
Update/misc (#728)
* Update basic agent check; fixes #714
* Disable swipe on long click
* Remove duplicate code
* Update dependencies
* Update dependencies 2
* Add debug keystore
* Update versions
* Fix duplicate notification
* Fix duplicate notification sound; addreesses #725
* Update changelog
* Clean up
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt | 8 |
1 files changed, 7 insertions, 1 deletions
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 4a3fa2a2..564b0e04 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt @@ -2,6 +2,7 @@ package com.pitchedapps.frost.web import android.webkit.JavascriptInterface import com.pitchedapps.frost.activities.MainActivity +import com.pitchedapps.frost.contracts.MainActivityContract import com.pitchedapps.frost.contracts.VideoViewHolder import com.pitchedapps.frost.facebook.FbCookie import com.pitchedapps.frost.utils.* @@ -63,6 +64,7 @@ class FrostJSI(val web: FrostWebView) { @JavascriptInterface fun longClick(start: Boolean) { activity?.viewPager?.enableSwipe = !start + web.parent.swipeEnabled = !start } /** @@ -70,7 +72,11 @@ class FrostJSI(val web: FrostWebView) { */ @JavascriptInterface fun disableSwipeRefresh(disable: Boolean) { - web.post { web.parent.swipeEnabled = !disable } + web.parent.swipeEnabled = !disable + if (disable) { + // locked onto an input field; ensure content is visible + (context as? MainActivityContract)?.collapseAppBar() + } } @JavascriptInterface |