From 314fbe8cf7e187b0dc57715a19e675445a6fe41e Mon Sep 17 00:00:00 2001 From: YuKongA <70465933+YuKongA@users.noreply.github.com> Date: Thu, 27 Nov 2025 08:36:51 +0800 Subject: [PATCH] manager: fix SearchPager color --- .../com/sukisu/ultra/ui/component/SuperSearchBar.kt | 10 +++++----- .../main/java/com/sukisu/ultra/ui/screen/SuperUser.kt | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/component/SuperSearchBar.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/component/SuperSearchBar.kt index 667689e5..24a5361c 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/component/SuperSearchBar.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/component/SuperSearchBar.kt @@ -128,7 +128,7 @@ class SearchStatus(val label: String) { noiseFactor = 0f } } else { - Modifier.background(colorScheme.background) + Modifier.background(colorScheme.surface) } ) ) @@ -228,7 +228,7 @@ fun SearchStatus.SearchPager( ) { searchStatus.onAnimationComplete() } - val backgroundAlpha by animateFloatAsState( + val surfaceAlpha by animateFloatAsState( if (searchStatus.shouldExpand()) 1f else 0f, animationSpec = tween(200, easing = FastOutSlowInEasing) ) @@ -237,7 +237,7 @@ fun SearchStatus.SearchPager( modifier = Modifier .fillMaxSize() .zIndex(5f) - .background(colorScheme.background.copy(alpha = backgroundAlpha)) + .background(colorScheme.surface.copy(alpha = surfaceAlpha)) .semantics { onClick { false } } .then( if (!searchStatus.isCollapsed()) Modifier.pointerInput(Unit) { } else Modifier @@ -248,7 +248,7 @@ fun SearchStatus.SearchPager( .fillMaxWidth() .padding(top = topPadding) .then( - if (!searchStatus.isCollapsed()) Modifier.background(colorScheme.background) + if (!searchStatus.isCollapsed()) Modifier.background(colorScheme.surface) else Modifier ), horizontalArrangement = Arrangement.Start, @@ -258,7 +258,7 @@ fun SearchStatus.SearchPager( Box( modifier = Modifier .weight(1f) - .background(colorScheme.background) + .background(colorScheme.surface) ) { expandBar(searchStatus, searchBarTopPadding) } diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt index 29cc402b..d680c04f 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt @@ -212,6 +212,9 @@ fun SuperUserPager( defaultResult = {}, searchBarTopPadding = dynamicTopPadding, ) { + item { + Spacer(Modifier.height(6.dp)) + } items(searchGroups, key = { it.uid }) { group -> val expanded = expandedSearchUids.value.contains(group.uid) AnimatedVisibility( @@ -219,9 +222,7 @@ fun SuperUserPager( enter = fadeIn() + expandVertically(), exit = fadeOut() + shrinkVertically() ) { - Column( - Modifier.padding(top = 6.dp) - ) { + Column { GroupItem( group = group, onToggleExpand = {