Replaced hex color codes with themes.

DroidKaigi · Sep 12, 2024 · 8de163e · 8de163e
1 parent fc8059e
commit 8de163e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...ommonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeBottomNavigation.kt b/...ommonMain/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/...ain/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt b/...ain/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,