github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleaner animation when going to manga details

Browse source 
The view behind the toolbar is no longer quickly visible when going to manga details
This commit is contained in:
Jay 2020-04-30 02:22:31 -04:00
parent 770595bbd5
commit 3270962249
1 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt
View file

@ -4,6 +4,7 @@ import android.R
import android.animation.ValueAnimator import android.animation.ValueAnimator
import android.content.Context import android.content.Context
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.view.ViewGroup
import android.view.WindowInsets import android.view.WindowInsets
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.SearchView
@ -73,9 +74,11 @@ fun Controller.scrollViewWith(
} }
} }
val randomTag = Random.nextLong() val randomTag = Random.nextLong()
var headerHeight = 0
var lastY = 0f
recycler.doOnApplyWindowInsets { view, insets, _ -> recycler.doOnApplyWindowInsets { view, insets, _ ->
val headerHeight = insets.systemWindowInsetTop + appBarHeight headerHeight = insets.systemWindowInsetTop + appBarHeight
if (!customPadding) view.updatePaddingRelative( if (!customPadding) view.updatePaddingRelative(
top = headerHeight, top = headerHeight,
bottom = if (padBottom) insets.systemWindowInsetBottom else view.paddingBottom bottom = if (padBottom) insets.systemWindowInsetBottom else view.paddingBottom
@ -112,6 +115,17 @@ fun Controller.scrollViewWith(
super.onChangeStart(controller, changeHandler, changeType) super.onChangeStart(controller, changeHandler, changeType)
if (changeType.isEnter) { if (changeType.isEnter) {
elevateFunc(elevate) elevateFunc(elevate)
if (!customPadding && changeType == ControllerChangeType.POP_ENTER &&
recycler.marginTop > 0) {
recycler.updatePaddingRelative(
top = headerHeight
)
recycler.updateLayoutParams<ViewGroup.MarginLayoutParams> {
topMargin = 0
}
recycler.scrollBy(0, -headerHeight)
}
lastY = 0f
activity!!.toolbar.tag = randomTag activity!!.toolbar.tag = randomTag
activity!!.toolbar.setOnClickListener { activity!!.toolbar.setOnClickListener {
if ((this@scrollViewWith as? BottomSheetController)?.sheetIsExpanded() != true) { if ((this@scrollViewWith as? BottomSheetController)?.sheetIsExpanded() != true) {
@ -121,6 +135,15 @@ fun Controller.scrollViewWith(
} }
} }
} else { } else {
if (!customPadding && lastY == 0f) {
recycler.updatePaddingRelative(
top = 0
)
recycler.updateLayoutParams<ViewGroup.MarginLayoutParams> {
topMargin = headerHeight
}
recycler.scrollBy(0, headerHeight)
}
elevationAnim?.cancel() elevationAnim?.cancel()
if (activity!!.toolbar.tag == randomTag) if (activity!!.toolbar.tag == randomTag)
activity!!.toolbar.setOnClickListener(null) activity!!.toolbar.setOnClickListener(null)
@ -140,6 +163,7 @@ fun Controller.scrollViewWith(
) ?: 0 ) ?: 0
activity!!.appbar.animate().y(0f).setDuration(shortAnimationDuration.toLong()) activity!!.appbar.animate().y(0f).setDuration(shortAnimationDuration.toLong())
.start() .start()
lastY = 0f
if (elevate) elevateFunc(false) if (elevate) elevateFunc(false)
} else { } else {
activity!!.appbar.y -= dy activity!!.appbar.y -= dy
@ -149,6 +173,7 @@ fun Controller.scrollViewWith(
if ((activity!!.appbar.y <= -activity!!.appbar.height.toFloat() || if ((activity!!.appbar.y <= -activity!!.appbar.height.toFloat() ||
dy == 0 && activity!!.appbar.y == 0f) && !elevate) dy == 0 && activity!!.appbar.y == 0f) && !elevate)
elevateFunc(true) elevateFunc(true)
lastY = activity!!.appbar.y
} }
} }
} }
@ -165,14 +190,10 @@ fun Controller.scrollViewWith(
) ?: 0 ) ?: 0
val closerToTop = abs(activity!!.appbar.y) - halfWay > 0 val closerToTop = abs(activity!!.appbar.y) - halfWay > 0
val atTop = !recycler.canScrollVertically(-1) val atTop = !recycler.canScrollVertically(-1)
activity!!.appbar.animate().y( lastY = if (closerToTop && !atTop) (-activity!!.appbar.height.toFloat()) else 0f
if (closerToTop && !atTop) (-activity!!.appbar.height.toFloat()) activity!!.appbar.animate().y(lastY).setDuration(shortAnimationDuration.toLong()).start()
else 0f if (recycler.canScrollVertically(-1) && !elevate) elevateFunc(true)
).setDuration(shortAnimationDuration.toLong()).start() else if (!recycler.canScrollVertically(-1) && elevate) elevateFunc(false)
if (recycler.canScrollVertically(-1) && !elevate)
elevateFunc(true)
else if (!recycler.canScrollVertically(-1) && elevate)
elevateFunc(false)
} }
} }
} }