null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add back progress animation to reader chapter sheet

Browse source
This commit is contained in:
Jays2Kings 2023-10-07 13:27:32 -07:00
parent cd550d545a
commit cbd6003aba
2 changed files with 67 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View file

@ -35,6 +35,7 @@ import android.view.Window
import android.view.WindowManager
import android.view.animation.AnimationUtils
import android.widget.TextView
import androidx.activity.BackEventCompat
import androidx.activity.OnBackPressedCallback
import androidx.activity.addCallback
import androidx.activity.viewModels
@ -225,12 +226,6 @@ class ReaderActivity : BaseActivity<ReaderActivityBinding>() {
private var didTransitionFromChapter = false
private var visibleChapterRange = longArrayOf()
private var backPressedCallback: OnBackPressedCallback? = null
private val backCallback = {
if (binding.chaptersSheet.chaptersBottomSheet.sheetBehavior.isExpanded()) {
binding.chaptersSheet.chaptersBottomSheet.sheetBehavior?.collapse()
}
reEnableBackPressedCallBack()
}
var isScrollingThroughPagesOrChapters = false
private var hingeGapSize = 0
@ -307,7 +302,34 @@ class ReaderActivity : BaseActivity<ReaderActivityBinding>() {
ColorStateList.valueOf(contextCompatColor(R.color.surface_alpha)),
)
backPressedCallback = onBackPressedDispatcher.addCallback { backCallback() }
backPressedCallback = object : OnBackPressedCallback(enabled = true) {
override fun handleOnBackPressed() {
if (binding.chaptersSheet.root.sheetBehavior.isExpanded()) {
binding.chaptersSheet.root.lastScale = binding.chaptersSheet.root.scaleX
binding.chaptersSheet.root.sheetBehavior?.collapse()
}
reEnableBackPressedCallBack()
}
override fun handleOnBackStarted(backEvent: BackEventCompat) {
if (binding.chaptersSheet.root.sheetBehavior.isExpanded()) {
binding.chaptersSheet.root.sheetBehavior?.startBackProgress(backEvent)
}
}
override fun handleOnBackProgressed(backEvent: BackEventCompat) {
if (binding.chaptersSheet.root.sheetBehavior.isExpanded()) {
binding.chaptersSheet.root.sheetBehavior?.updateBackProgress(backEvent)
}
}
override fun handleOnBackCancelled() {
if (binding.chaptersSheet.root.sheetBehavior.isExpanded()) {
binding.chaptersSheet.root.sheetBehavior?.cancelBackProgress()
}
}
}
onBackPressedDispatcher.addCallback(backPressedCallback!!)
if (viewModel.needsInit()) {
fromUrl = handleIntentAction(intent)
if (!fromUrl) {

42
app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt
View file

@ -46,6 +46,7 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr
var loadingPos = 0
lateinit var binding: ReaderChaptersSheetBinding
var lastScale = 1f
override fun onFinishInflate() {
super.onFinishInflate()
@ -100,6 +101,15 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr
activity.window.navigationBarColor =
lerpColor(ColorUtils.setAlphaComponent(navPrimary, if (hasLightNav) 0 else 179), navPrimary, trueProgress)
}
if (lastScale != 1f && scaleY != 1f) {
val scaleProgress = ((1f - progress) * (1f - lastScale)) + lastScale
scaleX = scaleProgress
scaleY = scaleProgress
for (i in 0 until childCount) {
val childView = getChildAt(i)
childView.scaleY = scaleProgress
}
}
}
override fun onStateChanged(p0: View, state: Int) {
@ -107,7 +117,8 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr
if (state == BottomSheetBehavior.STATE_COLLAPSED) {
sheetBehavior?.isHideable = false
(binding.chapterRecycler.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(
adapter?.getPosition(viewModel.getCurrentChapter()?.chapter?.id ?: 0L) ?: 0,
adapter?.getPosition(viewModel.getCurrentChapter()?.chapter?.id ?: 0L)
?: 0,
binding.chapterRecycler.height / 2 - 30.dpToPx,
)
if (canShowNav) {
@ -126,7 +137,10 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr
}
activity.binding.readerNav.root.alpha = 0f
binding.chapterRecycler.alpha = 1f
if (activity.sheetManageNavColor) activity.window.navigationBarColor = navPrimary
if (activity.sheetManageNavColor) {
activity.window.navigationBarColor =
navPrimary
}
}
if (state == BottomSheetBehavior.STATE_HIDDEN) {
activity.binding.readerNav.root.alpha = 0f
@ -137,9 +151,29 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr
} else if (binding.root.isVisible) {
binding.root.isVisible = true
}
binding.chapterRecycler.isClickable = state == BottomSheetBehavior.STATE_EXPANDED
binding.chapterRecycler.isFocusable = state == BottomSheetBehavior.STATE_EXPANDED
binding.chapterRecycler.isClickable =
state == BottomSheetBehavior.STATE_EXPANDED
binding.chapterRecycler.isFocusable =
state == BottomSheetBehavior.STATE_EXPANDED
activity.reEnableBackPressedCallBack()
if ((
state == BottomSheetBehavior.STATE_COLLAPSED ||
state == BottomSheetBehavior.STATE_EXPANDED ||
state == BottomSheetBehavior.STATE_HIDDEN
) &&
scaleY != 1f
) {
scaleX = 1f
scaleY = 1f
pivotY = 0f
translationX = 0f
for (i in 0 until childCount) {
val childView = getChildAt(i)
childView.scaleY = 1f
}
lastScale = 1f
}
}
},
)