From 60ef9482c86bf63486a09692519ee4f4084f244b Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Thu, 26 Dec 2024 13:55:43 +0700 Subject: [PATCH] style(AppBar): Scrolled container color --- app/src/main/java/yokai/presentation/Scaffold.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/yokai/presentation/Scaffold.kt b/app/src/main/java/yokai/presentation/Scaffold.kt index 3d588ccd54..6d411f5a91 100644 --- a/app/src/main/java/yokai/presentation/Scaffold.kt +++ b/app/src/main/java/yokai/presentation/Scaffold.kt @@ -44,7 +44,7 @@ fun YokaiScaffold( ) { val view = LocalView.current val useDarkIcons = MaterialTheme.colorScheme.surface.luminance() > .5 - val color = getTopAppBarColor(title) + val (color, scrolledColor) = getTopAppBarColor(title) SideEffect { val activity = view.context as Activity @@ -66,7 +66,7 @@ fun YokaiScaffold( // modifier = Modifier.statusBarsPadding(), colors = topAppBarColors( containerColor = color, - scrolledContainerColor = color, + scrolledContainerColor = scrolledColor, ), navigationIcon = { ToolTipButton( @@ -85,7 +85,7 @@ fun YokaiScaffold( // modifier = Modifier.statusBarsPadding(), colors = topAppBarColors( containerColor = color, - scrolledContainerColor = color, + scrolledContainerColor = scrolledColor, ), navigationIcon = { ToolTipButton( @@ -104,10 +104,10 @@ fun YokaiScaffold( } @Composable -fun getTopAppBarColor(title: String): Color { +fun getTopAppBarColor(title: String): Pair { return when (title.isEmpty()) { - true -> Color.Transparent - false -> MaterialTheme.colorScheme.surface + true -> Color.Transparent to Color.Transparent + false -> MaterialTheme.colorScheme.surface to MaterialTheme.colorScheme.surfaceContainer } }