Fixed deprecated calls.

This commit is contained in:
Erik C. Thauvin 2017-08-22 21:37:28 -07:00
parent c55053648e
commit 3b257fb15b

View file

@ -22,25 +22,28 @@ import android.support.design.widget.FloatingActionButton
import android.support.v4.view.ViewCompat import android.support.v4.view.ViewCompat
import android.view.View import android.view.View
class ScrollAwareFABBehavior() : FloatingActionButton.Behavior() { class ScrollAwareFABBehavior : FloatingActionButton.Behavior() {
override fun onStartNestedScroll(coordinatorLayout: CoordinatorLayout?, override fun onStartNestedScroll(coordinatorLayout: CoordinatorLayout,
child: FloatingActionButton?, child: FloatingActionButton,
directTargetChild: View?, directTargetChild: View,
target: View?, target: View,
nestedScrollAxes: Int): Boolean { nestedScrollAxes: Int,
return nestedScrollAxes == ViewCompat.SCROLL_AXIS_VERTICAL || type: Int): Boolean =
super.onStartNestedScroll(coordinatorLayout, child, directTargetChild, target, nestedScrollAxes) nestedScrollAxes == ViewCompat.SCROLL_AXIS_VERTICAL ||
} super.onStartNestedScroll(coordinatorLayout, child, directTargetChild, target,
nestedScrollAxes, type)
override fun onNestedScroll(coordinatorLayout: CoordinatorLayout?, override fun onNestedScroll(coordinatorLayout: CoordinatorLayout,
child: FloatingActionButton?, child: FloatingActionButton,
target: View?, target: View,
dxConsumed: Int, dxConsumed: Int,
dyConsumed: Int, dyConsumed: Int,
dxUnconsumed: Int, dxUnconsumed: Int,
dyUnconsumed: Int) { dyUnconsumed: Int,
super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed) type: Int) {
if (dyConsumed > 0 && child!!.visibility == View.VISIBLE) { super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed,
dxUnconsumed, dyUnconsumed, type)
if (dyConsumed > 0 && child.visibility == View.VISIBLE) {
// see: https://stackoverflow.com/a/42082313/5640587 // see: https://stackoverflow.com/a/42082313/5640587
child.hide(object : FloatingActionButton.OnVisibilityChangedListener() { child.hide(object : FloatingActionButton.OnVisibilityChangedListener() {
override fun onHidden(fab: FloatingActionButton?) { override fun onHidden(fab: FloatingActionButton?) {
@ -48,7 +51,7 @@ class ScrollAwareFABBehavior() : FloatingActionButton.Behavior() {
fab!!.visibility = View.INVISIBLE fab!!.visibility = View.INVISIBLE
} }
}) })
} else if (dyConsumed < 0 && child!!.visibility != View.VISIBLE) { } else if (dyConsumed < 0 && child.visibility != View.VISIBLE) {
child.show() child.show()
} }
} }