chore: 对新 API 进行适配
This commit is contained in:
parent
2c31e2d521
commit
01f7d306d1
2 changed files with 36 additions and 24 deletions
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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),
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue