From b09237c914d895be51bd5e90ac705a3a04383066 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Thu, 4 Jul 2024 15:07:39 -0600 Subject: [PATCH] playback: more standard queue sheet fading --- app/src/main/java/org/oxycblt/auxio/MainFragment.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt index c2dfe0d11..f96d5b45c 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt @@ -275,11 +275,13 @@ class MainFragment : val queueBackRatio = max(1 - ((1 - binding.queueSheet.scaleX) / queueMaxXScaleDelta), 0f) - val queueBarEdgeRatio = max(queueRatio - 0.9f, 0f) / 0.1f + val queueEdgeRatio = max(queueRatio - 0.9f, 0f) / 0.1f + + val queueBarEdgeRatio = max(queueEdgeRatio - 0.5f, 0f) * 2 val queueBarBackRatio = max(queueBackRatio - 0.5f, 0f) * 2 val queueBarRatio = min(queueBarEdgeRatio * queueBarBackRatio, 1f) - val queuePanelEdgeRatio = min(max(queueRatio - 0.8f, 0f) / 0.1f, 1f) + val queuePanelEdgeRatio = min(queueEdgeRatio * 2, 1f) val queuePanelBackRatio = min(queueBackRatio * 2, 1f) val queuePanelRatio = 1 - min(queuePanelEdgeRatio * queuePanelBackRatio, 1f)