Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 23:01:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adopt tab/controller transitions from SY

Browse Source 
Original author: @jobobby04
This commit is contained in:
arkon 2020-08-22 13:03:39 -04:00
parent 9920ff617b
commit 9ba11a585f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt
View File

@ -28,8 +28,8 @@ fun Controller.requestPermissionsSafe(permissions: Array<String>, requestCode: I
} }
} }
fun Controller.withFadeTransaction(duration: Long = 150L): RouterTransaction { fun Controller.withFadeTransaction(): RouterTransaction {
return RouterTransaction.with(this) return RouterTransaction.with(this)
.pushChangeHandler(FadeChangeHandler(duration)) .pushChangeHandler(FadeChangeHandler())
.popChangeHandler(FadeChangeHandler(duration)) .popChangeHandler(FadeChangeHandler())
} }

4
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@ -86,7 +86,7 @@ class MainActivity : BaseActivity<MainActivityBinding>() {
setSupportActionBar(binding.toolbar) setSupportActionBar(binding.toolbar)
tabAnimator = ViewHeightAnimator(binding.tabs) tabAnimator = ViewHeightAnimator(binding.tabs, 0L)
bottomNavAnimator = ViewHeightAnimator(binding.bottomNav) bottomNavAnimator = ViewHeightAnimator(binding.bottomNav)
// Set behavior of bottom nav // Set behavior of bottom nav
@ -312,7 +312,7 @@ class MainActivity : BaseActivity<MainActivityBinding>() {
} }
private fun setRoot(controller: Controller, id: Int) { private fun setRoot(controller: Controller, id: Int) {
router.setRoot(RouterTransaction.with(controller).tag(id.toString())) router.setRoot(controller.withFadeTransaction().tag(id.toString()))
} }
private fun syncActivityViewWithController(to: Controller?, from: Controller? = null) { private fun syncActivityViewWithController(to: Controller?, from: Controller? = null) {

4
app/src/main/java/eu/kanade/tachiyomi/ui/main/ViewHeightAnimator.kt
View File

@ -6,7 +6,7 @@ import android.view.ViewTreeObserver
import android.view.animation.DecelerateInterpolator import android.view.animation.DecelerateInterpolator
import androidx.annotation.Keep import androidx.annotation.Keep
class ViewHeightAnimator(val view: View) { class ViewHeightAnimator(val view: View, val duration: Long = 250L) {
/** /**
* The default height of the view. It's unknown until the view is layout. * The default height of the view. It's unknown until the view is layout.
@ -23,7 +23,7 @@ class ViewHeightAnimator(val view: View) {
*/ */
private val animation by lazy { private val animation by lazy {
ObjectAnimator.ofInt(this, "height", height).apply { ObjectAnimator.ofInt(this, "height", height).apply {
duration = 250L duration = this@ViewHeightAnimator.duration
interpolator = DecelerateInterpolator() interpolator = DecelerateInterpolator()
} }
} }