From 8de163e7c5ef4332baa642aafbdaabb869f94104 Mon Sep 17 00:00:00 2001 From: yamaton Date: Thu, 12 Sep 2024 22:57:17 +0900 Subject: [PATCH] Replaced hex color codes with themes. --- .../confsched/main/section/GlassLikeBottomNavigation.kt | 4 ++-- .../droidkaigi/confsched/main/section/GlassLikeNavRail.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeBottomNavigation.kt b/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeBottomNavigation.kt index f50e3450c..b9d4e17b5 100644 --- a/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeBottomNavigation.kt +++ b/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeBottomNavigation.kt @@ -59,6 +59,7 @@ import androidx.compose.ui.unit.sp import dev.chrisbanes.haze.HazeState import dev.chrisbanes.haze.hazeChild import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme +import io.github.droidkaigi.confsched.designsystem.theme.primaryFixed import io.github.droidkaigi.confsched.droidkaigiui.animation.onGloballyPositionedWithFavoriteAnimationScope import io.github.droidkaigi.confsched.droidkaigiui.useIf import io.github.droidkaigi.confsched.main.MainScreenTab @@ -115,8 +116,7 @@ fun GlassLikeBottomNavigation( ) val animatedColor by animateColorAsState( - // FIXME: apply theme - targetValue = Color(0xFF67FF8D), + targetValue = MaterialTheme.colorScheme.primaryFixed, label = "animatedColor", animationSpec = spring( diff --git a/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt b/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt index b7907cff7..2cefdd274 100644 --- a/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt +++ b/feature/main/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt @@ -58,6 +58,7 @@ import androidx.compose.ui.unit.sp import dev.chrisbanes.haze.HazeState import dev.chrisbanes.haze.hazeChild import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme +import io.github.droidkaigi.confsched.designsystem.theme.primaryFixed import io.github.droidkaigi.confsched.droidkaigiui.animation.onGloballyPositionedWithFavoriteAnimationScope import io.github.droidkaigi.confsched.droidkaigiui.useIf import io.github.droidkaigi.confsched.main.MainScreenTab @@ -108,8 +109,7 @@ fun GlassLikeNavRail( ) val animatedColor by animateColorAsState( - // FIXME: apply theme - targetValue = Color(0xFF67FF8D), + targetValue = MaterialTheme.colorScheme.primaryFixed, label = "animatedColor", animationSpec = spring( stiffness = Spring.StiffnessLow,