feat: Set correct colors in TopSeachBar (152499b6) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/ui/compose/screens/SearchScreen.kt

+25 −20

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ import androidx.compose.foundation.layout.Column
		import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.foundation.layout.fillMaxWidth
		import androidx.compose.foundation.layout.padding
		import androidx.compose.material3.HorizontalDivider
		import androidx.compose.material3.MaterialTheme
		import androidx.compose.material3.Scaffold
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.LaunchedEffect
		@@ -108,6 +110,7 @@ fun SearchScreen(
		Scaffold(
		modifier = modifier,
		topBar = {
		Column {
		SearchTopBar(
		uiState = uiState,
		expanded = isSearchExpanded,
		@@ -128,6 +131,8 @@ fun SearchScreen(
		},
		onBack = onBackClick,
		)
		HorizontalDivider(color = MaterialTheme.colorScheme.tertiary)
		}
		},
		) { innerPadding ->
		Column(

app/src/main/java/foundation/e/apps/ui/compose/screens/SearchTopBar.kt

+15 −10

Original line number	Diff line number	Diff line
		@@ -21,12 +21,12 @@ package foundation.e.apps.ui.compose.screens
		import androidx.compose.foundation.background
		import androidx.compose.foundation.clickable
		import androidx.compose.foundation.layout.fillMaxWidth
		import androidx.compose.foundation.layout.size
		import androidx.compose.foundation.lazy.LazyColumn
		import androidx.compose.foundation.lazy.itemsIndexed
		import androidx.compose.material.icons.Icons
		import androidx.compose.material.icons.automirrored.filled.ArrowBack
		import androidx.compose.material.icons.filled.Close
		import androidx.compose.material.icons.filled.Search
		import androidx.compose.material3.ExperimentalMaterial3Api
		import androidx.compose.material3.Icon
		import androidx.compose.material3.IconButton
		@@ -35,7 +35,6 @@ import androidx.compose.material3.MaterialTheme
		import androidx.compose.material3.SearchBar
		import androidx.compose.material3.SearchBarDefaults
		import androidx.compose.material3.Text
		import androidx.compose.material3.surfaceColorAtElevation
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.getValue
		import androidx.compose.runtime.mutableStateOf
		@@ -45,6 +44,7 @@ import androidx.compose.ui.Modifier
		import androidx.compose.ui.focus.FocusManager
		import androidx.compose.ui.focus.FocusRequester
		import androidx.compose.ui.focus.focusRequester
		import androidx.compose.ui.graphics.RectangleShape
		import androidx.compose.ui.platform.LocalFocusManager
		import androidx.compose.ui.platform.testTag
		import androidx.compose.ui.res.stringResource
		@@ -75,9 +75,12 @@ fun SearchTopBar(
		modifier = modifier
		.fillMaxWidth()
		.testTag(SearchTopBarTestTags.SEARCH_BAR),
		shape = RectangleShape,
		shadowElevation = 0.dp,
		tonalElevation = 0.dp,
		colors = SearchBarDefaults.colors(
		containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.dp),
		dividerColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f),
		containerColor = MaterialTheme.colorScheme.surface,
		dividerColor = MaterialTheme.colorScheme.tertiary,
		),
		expanded = expanded,
		onExpandedChange = { isExpanded ->
		@@ -103,6 +106,11 @@ fun SearchTopBar(
		onExpandedChange = { isExpanded ->
		onExpandedChange(isExpanded)
		},
		colors = SearchBarDefaults.inputFieldColors(
		unfocusedContainerColor = MaterialTheme.colorScheme.surface,
		focusedContainerColor = MaterialTheme.colorScheme.surface,
		cursorColor = MaterialTheme.colorScheme.tertiary,
		),
		placeholder = { Text(text = stringResource(id = R.string.search_hint)) },
		leadingIcon = {
		IconButton(
		@@ -115,6 +123,7 @@ fun SearchTopBar(
		Icon(
		imageVector = Icons.AutoMirrored.Filled.ArrowBack,
		contentDescription = stringResource(id = R.string.search_back_button),
		modifier = Modifier.size(28.dp),
		)
		}
		},
		@@ -148,7 +157,7 @@ fun SearchTopBar(
		},
		modifier = Modifier
		.fillMaxWidth()
		.background(MaterialTheme.colorScheme.surfaceColorAtElevation(3.dp)),
		.background(MaterialTheme.colorScheme.surface),
		)
		}
		}
		@@ -174,11 +183,7 @@ private fun SuggestionList(
		.testTag("${SearchTopBarTestTags.SUGGESTION_ITEM_PREFIX}$index"),
		headlineContent = { Text(text = suggestion) },
		leadingContent = {
		Icon(
		imageVector = Icons.Filled.Search,
		contentDescription = stringResource(id = R.string.menu_search),
		tint = MaterialTheme.colorScheme.onSurfaceVariant,
		)
		// No-op but we like the space :)
		},
		)
		}