From bd685f1f9cfd25b27d4b863375bcc3bf118afe37 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Tue, 22 Oct 2024 21:45:01 -0600 Subject: [PATCH] ui: change materialfader anim sepcs Probably a little more in-line w/the docs. --- .../auxio/home/fastscroll/FastScrollRecyclerView.kt | 2 +- .../main/java/org/oxycblt/auxio/image/CoverView.kt | 2 +- app/src/main/java/org/oxycblt/auxio/ui/Animations.kt | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/oxycblt/auxio/home/fastscroll/FastScrollRecyclerView.kt b/app/src/main/java/org/oxycblt/auxio/home/fastscroll/FastScrollRecyclerView.kt index 535d47fb8..4a0e35873 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/fastscroll/FastScrollRecyclerView.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/fastscroll/FastScrollRecyclerView.kt @@ -111,7 +111,7 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr } } - private val fader = MaterialFader.forSmallComponent(context) + private val fader = MaterialFader.quickLopsided(context) private var thumbAnimator: Animator? = null private var popupAnimator: Animator? = null diff --git a/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt b/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt index 29248f195..f8c4ee328 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt @@ -93,7 +93,7 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr private val selectionBadge: ImageView? private val iconSize: Int? - private val fader = MaterialFader.forSmallComponent(context) + private val fader = MaterialFader.quickLopsided(context) private var fadeAnimator: Animator? = null private val indicatorMatrix = Matrix() private val indicatorMatrixSrc = RectF() diff --git a/app/src/main/java/org/oxycblt/auxio/ui/Animations.kt b/app/src/main/java/org/oxycblt/auxio/ui/Animations.kt index 86d2f06fd..1d889c5a6 100644 --- a/app/src/main/java/org/oxycblt/auxio/ui/Animations.kt +++ b/app/src/main/java/org/oxycblt/auxio/ui/Animations.kt @@ -163,7 +163,7 @@ private constructor( } companion object { - fun forSmallComponent(context: Context) = + fun quickLopsided(context: Context) = MaterialFader( context, 0.6f, @@ -174,21 +174,21 @@ private constructor( AnimConfig.SHORT1, AnimConfig.MEDIUM3) - fun forLargeComponent(context: Context) = + fun symmetric(context: Context) = MaterialFader( context, 0.9f, AnimConfig.EMPHASIZED_ACCELERATE, AnimConfig.SHORT3, AnimConfig.MEDIUM1, - AnimConfig.EMPHASIZED, - AnimConfig.LONG2, - AnimConfig.LONG2) + AnimConfig.EMPHASIZED_DECELERATE, + AnimConfig.SHORT3, + AnimConfig.MEDIUM1) } } class MaterialFlipper(context: Context) { - private val fader = MaterialFader.forLargeComponent(context) + private val fader = MaterialFader.symmetric(context) fun jump(from: View) { fader.jumpToFadeOut(from)