From 1a0ee24c6395b6c95d669420a53b10d4197dd6f7 Mon Sep 17 00:00:00 2001
From: Ahmad Ansori Palembani <palembani@gmail.com>
Date: Mon, 10 Jun 2024 19:18:40 +0700
Subject: [PATCH] style: Make compose topAppBar consistent with legacy

---
 app/src/main/java/dev/yokai/presentation/Scaffold.kt            | 2 +-
 .../dev/yokai/presentation/settings/SettingsCommonWidget.kt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/dev/yokai/presentation/Scaffold.kt b/app/src/main/java/dev/yokai/presentation/Scaffold.kt
index 3eb04a58fa..9c1b75cb9a 100644
--- a/app/src/main/java/dev/yokai/presentation/Scaffold.kt
+++ b/app/src/main/java/dev/yokai/presentation/Scaffold.kt
@@ -108,7 +108,7 @@ fun YokaiScaffold(
 fun getTopAppBarColor(title: String): Color {
     return when (title.isEmpty()) {
         true -> Color.Transparent
-        false -> MaterialTheme.colorScheme.surface.copy(alpha = .7f)
+        false -> MaterialTheme.colorScheme.surface
     }
 }
 
diff --git a/app/src/main/java/dev/yokai/presentation/settings/SettingsCommonWidget.kt b/app/src/main/java/dev/yokai/presentation/settings/SettingsCommonWidget.kt
index 4fd49f0976..25cdb97570 100644
--- a/app/src/main/java/dev/yokai/presentation/settings/SettingsCommonWidget.kt
+++ b/app/src/main/java/dev/yokai/presentation/settings/SettingsCommonWidget.kt
@@ -48,7 +48,7 @@ fun SettingsScaffold(
         title = title,
         appBarType = appBarType ?: if (useLargeAppBar) AppBarType.LARGE else AppBarType.SMALL,
         actions = appBarActions,
-        scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(
+        scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(
             state = rememberTopAppBarState(),
             canScroll = { listState.firstVisibleItemIndex > 0 || listState.firstVisibleItemScrollOffset > 0 },
         ),