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

Fade in/out search toolbar when using expanded tb

Browse source
This commit is contained in:
Jays2Kings 2022-04-26 21:20:41 -04:00
parent e2a519cc7a
commit 8ac86c9b37
2 changed files with 44 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt
View file

@ -2,6 +2,8 @@ package eu.kanade.tachiyomi.ui.base
import android.content.Context
import android.content.res.Configuration
import android.graphics.drawable.ColorDrawable
import android.graphics.drawable.Drawable
import android.util.AttributeSet
import android.view.View
import android.view.ViewPropertyAnimator
@ -380,6 +382,26 @@ class ExpandedAppBarLayout@JvmOverloads constructor(context: Context, attrs: Att
}
}
override fun setBackgroundColor(color: Int) {
if (color != context.getResourceColor(R.attr.colorSurface)) {
super.setBackgroundColor(color)
}
mainToolbar?.setBackgroundColor(color)
bigView?.setBackgroundColor(color)
cardFrame?.setBackgroundColor(color)
tabsFrameLayout?.setBackgroundColor(color)
}
override fun setBackground(background: Drawable?) {
if (background == null || background is ColorDrawable) {
super.setBackground(background)
}
mainToolbar?.background = background
bigView?.background = background
cardFrame?.background = background
tabsFrameLayout?.background = background
}
fun useSearchToolbarForMenu(showCardTB: Boolean) {
val mainActivity = mainActivity ?: return
if (lockYPos) return

23
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View file

@ -117,6 +117,7 @@ import java.util.concurrent.TimeUnit
import kotlin.math.abs
import kotlin.math.max
import kotlin.math.min
import kotlin.math.roundToLong
open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceListener {
@ -140,6 +141,7 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
private val updateChecker by lazy { AppUpdateChecker() }
private val isUpdaterEnabled = BuildConfig.INCLUDE_UPDATER
private var tabAnimation: ValueAnimator? = null
private var searchBarAnimation: ValueAnimator? = null
private var overflowDialog: Dialog? = null
var currentToolbar: Toolbar? = null
var ogWidth: Int = Int.MAX_VALUE
@ -520,7 +522,26 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
binding.toolbar
}
binding.toolbar.isVisible = !(onSmallerController && onSearchController)
binding.cardFrame.isVisible = (show || showSearchAnyway) && onSearchController
val showSearchBar = (show || showSearchAnyway) && onSearchController
val needsAnim = if (showSearchBar) !binding.cardFrame.isVisible || binding.cardFrame.alpha < 1f
else binding.cardFrame.isVisible || binding.cardFrame.alpha > 0f
if (needsAnim && binding.appBar.useLargeToolbar) {
searchBarAnimation?.cancel()
if (showSearchBar && !binding.cardFrame.isVisible) {
binding.cardFrame.alpha = 0f
binding.cardFrame.isVisible = true
}
val endValue = if (showSearchBar) 1f else 0f
val tA = ValueAnimator.ofFloat(binding.cardFrame.alpha, endValue)
tA.addUpdateListener { binding.cardFrame.alpha = it.animatedValue as Float }
tA.addListener(EndAnimatorListener { binding.cardFrame.isVisible = showSearchBar })
tA.duration = (abs(binding.cardFrame.alpha - endValue) * 150).roundToLong()
searchBarAnimation = tA
tA.start()
} else if (!binding.appBar.useLargeToolbar) {
binding.cardFrame.alpha = 1f
binding.cardFrame.isVisible = showSearchBar
}
val bgColor = binding.appBar.backgroundColor ?: Color.TRANSPARENT
if (changeBG && (if (solidBG) bgColor == Color.TRANSPARENT else false)) {
binding.appBar.setBackgroundColor(