From 01f7d306d1ebc07519f6db36ea46b66316df2c14 Mon Sep 17 00:00:00 2001 From: Super12138 <70494801+Super12138@users.noreply.github.com> Date: Sat, 24 May 2025 12:08:53 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=AF=B9=E6=96=B0=20API=20=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 2 +- .../cn/super12138/todo/ui/theme/ThemeExt.kt | 58 +++++++++++-------- 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a9de246..6b31918 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -34,7 +34,7 @@ android { applicationId = "cn.super12138.todo" minSdk = 24 targetSdk = 36 - versionCode = 678 + versionCode = 690 versionName = "2.1.2" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/theme/ThemeExt.kt b/app/src/main/kotlin/cn/super12138/todo/ui/theme/ThemeExt.kt index 6389357..dba667a 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/theme/ThemeExt.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/theme/ThemeExt.kt @@ -42,42 +42,54 @@ fun dynamicColorScheme( } return ColorScheme( - background = scheme.background.toColor().animate(animationSpec), - error = scheme.error.toColor().animate(animationSpec), - errorContainer = scheme.errorContainer.toColor().animate(animationSpec), - inverseOnSurface = scheme.inverseOnSurface.toColor().animate(animationSpec), - inversePrimary = scheme.inversePrimary.toColor().animate(animationSpec), - inverseSurface = scheme.inverseSurface.toColor().animate(animationSpec), - onBackground = scheme.onBackground.toColor().animate(animationSpec), - onError = scheme.onError.toColor().animate(animationSpec), - onErrorContainer = scheme.onErrorContainer.toColor().animate(animationSpec), + primary = scheme.primary.toColor().animate(animationSpec), onPrimary = scheme.onPrimary.toColor().animate(animationSpec), + primaryContainer = scheme.primaryContainer.toColor().animate(animationSpec), onPrimaryContainer = scheme.onPrimaryContainer.toColor().animate(animationSpec), + inversePrimary = scheme.inversePrimary.toColor().animate(animationSpec), + secondary = scheme.secondary.toColor().animate(animationSpec), onSecondary = scheme.onSecondary.toColor().animate(animationSpec), + secondaryContainer = scheme.secondaryContainer.toColor().animate(animationSpec), onSecondaryContainer = scheme.onSecondaryContainer.toColor().animate(animationSpec), - onSurface = scheme.onSurface.toColor().animate(animationSpec), - onSurfaceVariant = scheme.onSurfaceVariant.toColor().animate(animationSpec), + tertiary = scheme.tertiary.toColor().animate(animationSpec), onTertiary = scheme.onTertiary.toColor().animate(animationSpec), + tertiaryContainer = scheme.tertiaryContainer.toColor().animate(animationSpec), onTertiaryContainer = scheme.onTertiaryContainer.toColor().animate(animationSpec), + background = scheme.background.toColor().animate(animationSpec), + onBackground = scheme.onBackground.toColor().animate(animationSpec), + surface = scheme.surface.toColor().animate(animationSpec), + onSurface = scheme.onSurface.toColor().animate(animationSpec), + surfaceVariant = scheme.surfaceVariant.toColor().animate(animationSpec), + onSurfaceVariant = scheme.onSurfaceVariant.toColor().animate(animationSpec), + surfaceTint = scheme.surfaceTint.toColor().animate(animationSpec), + inverseSurface = scheme.inverseSurface.toColor().animate(animationSpec), + inverseOnSurface = scheme.inverseOnSurface.toColor().animate(animationSpec), + error = scheme.error.toColor().animate(animationSpec), + onError = scheme.onError.toColor().animate(animationSpec), + errorContainer = scheme.errorContainer.toColor().animate(animationSpec), + onErrorContainer = scheme.onErrorContainer.toColor().animate(animationSpec), outline = scheme.outline.toColor().animate(animationSpec), outlineVariant = scheme.outlineVariant.toColor().animate(animationSpec), - primary = scheme.primary.toColor().animate(animationSpec), - primaryContainer = scheme.primaryContainer.toColor().animate(animationSpec), scrim = scheme.scrim.toColor().animate(animationSpec), - secondary = scheme.secondary.toColor().animate(animationSpec), - secondaryContainer = scheme.secondaryContainer.toColor().animate(animationSpec), - surface = scheme.surface.toColor().animate(animationSpec), surfaceBright = scheme.surfaceBright.toColor().animate(animationSpec), + surfaceDim = scheme.surfaceDim.toColor().animate(animationSpec), surfaceContainer = scheme.surfaceContainer.toColor().animate(animationSpec), - surfaceContainerLow = scheme.surfaceContainerLow.toColor().animate(animationSpec), - surfaceContainerLowest = scheme.surfaceContainerLowest.toColor().animate(animationSpec), surfaceContainerHigh = scheme.surfaceContainerHigh.toColor().animate(animationSpec), surfaceContainerHighest = scheme.surfaceContainerHighest.toColor().animate(animationSpec), - surfaceDim = scheme.surfaceDim.toColor().animate(animationSpec), - surfaceTint = scheme.surfaceTint.toColor().animate(animationSpec), - surfaceVariant = scheme.surfaceVariant.toColor().animate(animationSpec), - tertiary = scheme.tertiary.toColor().animate(animationSpec), - tertiaryContainer = scheme.tertiaryContainer.toColor().animate(animationSpec), + surfaceContainerLow = scheme.surfaceContainerLow.toColor().animate(animationSpec), + surfaceContainerLowest = scheme.surfaceContainerLowest.toColor().animate(animationSpec), + primaryFixed = scheme.primaryFixed.toColor().animate(animationSpec), + primaryFixedDim = scheme.primaryFixedDim.toColor().animate(animationSpec), + onPrimaryFixed = scheme.onPrimaryFixed.toColor().animate(animationSpec), + onPrimaryFixedVariant = scheme.onPrimaryFixedVariant.toColor().animate(animationSpec), + secondaryFixed = scheme.secondaryFixed.toColor().animate(animationSpec), + secondaryFixedDim = scheme.secondaryFixedDim.toColor().animate(animationSpec), + onSecondaryFixed = scheme.onSecondaryFixed.toColor().animate(animationSpec), + onSecondaryFixedVariant = scheme.onSecondaryFixedVariant.toColor().animate(animationSpec), + tertiaryFixed = scheme.tertiaryFixed.toColor().animate(animationSpec), + tertiaryFixedDim = scheme.tertiaryFixedDim.toColor().animate(animationSpec), + onTertiaryFixed = scheme.onTertiaryFixed.toColor().animate(animationSpec), + onTertiaryFixedVariant = scheme.onTertiaryFixedVariant.toColor().animate(animationSpec), ) }