From a8804a78a084ef4f019adf6708e963cea7de6146 Mon Sep 17 00:00:00 2001 From: austinried <4966622+austinried@users.noreply.github.com> Date: Thu, 24 Sep 2026 00:37:36 +0000 Subject: [PATCH] animate only the accent roles during a theme fade --- .../ui/theme/AnimatedArtworkColors.kt | 37 +------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/app/src/main/kotlin/com/subtracks/ui/theme/AnimatedArtworkColors.kt b/app/src/main/kotlin/com/subtracks/ui/theme/AnimatedArtworkColors.kt index 6831bc5c..d7bb1a2c 100644 --- a/app/src/main/kotlin/com/subtracks/ui/theme/AnimatedArtworkColors.kt +++ b/app/src/main/kotlin/com/subtracks/ui/theme/AnimatedArtworkColors.kt @@ -65,7 +65,7 @@ private fun lerpScheme( b: ColorScheme, t: Float, ): ColorScheme = - a.copy( + b.copy( primary = lerp(a.primary, b.primary, t), onPrimary = lerp(a.onPrimary, b.onPrimary, t), primaryContainer = lerp(a.primaryContainer, b.primaryContainer, t), @@ -79,39 +79,4 @@ private fun lerpScheme( onTertiary = lerp(a.onTertiary, b.onTertiary, t), tertiaryContainer = lerp(a.tertiaryContainer, b.tertiaryContainer, t), onTertiaryContainer = lerp(a.onTertiaryContainer, b.onTertiaryContainer, t), - background = lerp(a.background, b.background, t), - onBackground = lerp(a.onBackground, b.onBackground, t), - surface = lerp(a.surface, b.surface, t), - onSurface = lerp(a.onSurface, b.onSurface, t), - surfaceVariant = lerp(a.surfaceVariant, b.surfaceVariant, t), - onSurfaceVariant = lerp(a.onSurfaceVariant, b.onSurfaceVariant, t), - surfaceTint = lerp(a.surfaceTint, b.surfaceTint, t), - inverseSurface = lerp(a.inverseSurface, b.inverseSurface, t), - inverseOnSurface = lerp(a.inverseOnSurface, b.inverseOnSurface, t), - error = lerp(a.error, b.error, t), - onError = lerp(a.onError, b.onError, t), - errorContainer = lerp(a.errorContainer, b.errorContainer, t), - onErrorContainer = lerp(a.onErrorContainer, b.onErrorContainer, t), - outline = lerp(a.outline, b.outline, t), - outlineVariant = lerp(a.outlineVariant, b.outlineVariant, t), - scrim = lerp(a.scrim, b.scrim, t), - surfaceBright = lerp(a.surfaceBright, b.surfaceBright, t), - surfaceDim = lerp(a.surfaceDim, b.surfaceDim, t), - surfaceContainer = lerp(a.surfaceContainer, b.surfaceContainer, t), - surfaceContainerHigh = lerp(a.surfaceContainerHigh, b.surfaceContainerHigh, t), - surfaceContainerHighest = lerp(a.surfaceContainerHighest, b.surfaceContainerHighest, t), - surfaceContainerLow = lerp(a.surfaceContainerLow, b.surfaceContainerLow, t), - surfaceContainerLowest = lerp(a.surfaceContainerLowest, b.surfaceContainerLowest, t), - primaryFixed = lerp(a.primaryFixed, b.primaryFixed, t), - primaryFixedDim = lerp(a.primaryFixedDim, b.primaryFixedDim, t), - onPrimaryFixed = lerp(a.onPrimaryFixed, b.onPrimaryFixed, t), - onPrimaryFixedVariant = lerp(a.onPrimaryFixedVariant, b.onPrimaryFixedVariant, t), - secondaryFixed = lerp(a.secondaryFixed, b.secondaryFixed, t), - secondaryFixedDim = lerp(a.secondaryFixedDim, b.secondaryFixedDim, t), - onSecondaryFixed = lerp(a.onSecondaryFixed, b.onSecondaryFixed, t), - onSecondaryFixedVariant = lerp(a.onSecondaryFixedVariant, b.onSecondaryFixedVariant, t), - tertiaryFixed = lerp(a.tertiaryFixed, b.tertiaryFixed, t), - tertiaryFixedDim = lerp(a.tertiaryFixedDim, b.tertiaryFixedDim, t), - onTertiaryFixed = lerp(a.onTertiaryFixed, b.onTertiaryFixed, t), - onTertiaryFixedVariant = lerp(a.onTertiaryFixedVariant, b.onTertiaryFixedVariant, t), )