diff options
author | Allan Wang <me@allanwang.ca> | 2018-02-02 21:05:26 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-02 21:05:26 -0500 |
commit | d68ea6d7eb8cadf687308fa3204386b79df0556b (patch) | |
tree | 0797c5c53e09b6af5eb996ab42e1f814ee615561 /app/src/main/kotlin/com/pitchedapps/frost/web/NestedWebView.kt | |
parent | f36e0fff23abb5c892b40d1a9fb70776078976c4 (diff) | |
download | frost-1.8.1.tar.gz frost-1.8.1.tar.bz2 frost-1.8.1.zip |
Feature/post (#696)v1.8.1
* Reorder final override
* Add initial fab bindings
* Update scripts
* Optimize and use js header hider
* Remove old header hider
* Use method for generating clicker
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web/NestedWebView.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/NestedWebView.kt | 20 |
1 files changed, 10 insertions, 10 deletions
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 f0bb6137..8fd4c0b4 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/NestedWebView.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/NestedWebView.kt @@ -41,7 +41,7 @@ open class NestedWebView @JvmOverloads constructor( * https://github.com/takahirom/webview-in-coordinatorlayout/blob/master/app/src/main/java/com/github/takahirom/webview_in_coodinator_layout/NestedWebView.java */ @SuppressLint("ClickableViewAccessibility") - override final fun onTouchEvent(ev: MotionEvent): Boolean { + final override fun onTouchEvent(ev: MotionEvent): Boolean { val event = MotionEvent.obtain(ev) val action = event.action if (action == MotionEvent.ACTION_DOWN) @@ -87,27 +87,27 @@ open class NestedWebView @JvmOverloads constructor( * --------------------------------------------- */ - override final fun setNestedScrollingEnabled(enabled: Boolean) { + final override fun setNestedScrollingEnabled(enabled: Boolean) { childHelper.isNestedScrollingEnabled = enabled } - override final fun isNestedScrollingEnabled() = childHelper.isNestedScrollingEnabled + final override fun isNestedScrollingEnabled() = childHelper.isNestedScrollingEnabled - override final fun startNestedScroll(axes: Int) = childHelper.startNestedScroll(axes) + final override fun startNestedScroll(axes: Int) = childHelper.startNestedScroll(axes) - override final fun stopNestedScroll() = childHelper.stopNestedScroll() + final override fun stopNestedScroll() = childHelper.stopNestedScroll() - override final fun hasNestedScrollingParent() = childHelper.hasNestedScrollingParent() + final override fun hasNestedScrollingParent() = childHelper.hasNestedScrollingParent() - override final fun dispatchNestedScroll(dxConsumed: Int, dyConsumed: Int, dxUnconsumed: Int, dyUnconsumed: Int, offsetInWindow: IntArray?) + final override fun dispatchNestedScroll(dxConsumed: Int, dyConsumed: Int, dxUnconsumed: Int, dyUnconsumed: Int, offsetInWindow: IntArray?) = childHelper.dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, offsetInWindow) - override final fun dispatchNestedPreScroll(dx: Int, dy: Int, consumed: IntArray?, offsetInWindow: IntArray?) + final override fun dispatchNestedPreScroll(dx: Int, dy: Int, consumed: IntArray?, offsetInWindow: IntArray?) = childHelper.dispatchNestedPreScroll(dx, dy, consumed, offsetInWindow) - override final fun dispatchNestedFling(velocityX: Float, velocityY: Float, consumed: Boolean) + final override fun dispatchNestedFling(velocityX: Float, velocityY: Float, consumed: Boolean) = childHelper.dispatchNestedFling(velocityX, velocityY, consumed) - override final fun dispatchNestedPreFling(velocityX: Float, velocityY: Float) + final override fun dispatchNestedPreFling(velocityX: Float, velocityY: Float) = childHelper.dispatchNestedPreFling(velocityX, velocityY) }
\ No newline at end of file |