Skip to content

Commit

Permalink
Merge pull request #1047 from Yamaton0827/yamaton0827/replace-hex-col…
Browse files Browse the repository at this point in the history
…or-code-with-theme

Replaced hex color code with theme.
  • Loading branch information
takahirom authored Sep 12, 2024
2 parents c2a3bcf + 8de163e commit 6a30659
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -115,8 +116,7 @@ fun GlassLikeBottomNavigation(
)

val animatedColor by animateColorAsState(
// FIXME: apply theme
targetValue = Color(0xFF67FF8D),
targetValue = MaterialTheme.colorScheme.primaryFixed,
label = "animatedColor",
animationSpec =
spring(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 6a30659

Please sign in to comment.