feat: Sync SearchTopBar and Empty State with mocks (506d08c5) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/ui/compose/components/SearchEmptyState.kt

+8 −11

Original line number	Diff line number	Diff line
		@@ -18,11 +18,9 @@

		package foundation.e.apps.ui.compose.components

		import androidx.compose.foundation.layout.Arrangement
		import androidx.compose.foundation.layout.Box
		import androidx.compose.foundation.layout.Column
		import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.foundation.layout.padding
		import androidx.compose.foundation.layout.size
		import androidx.compose.material.icons.Icons
		import androidx.compose.material.icons.outlined.Search
		@@ -33,34 +31,33 @@ import androidx.compose.runtime.Composable
		import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.res.stringResource
		import androidx.compose.ui.text.style.TextAlign
		import androidx.compose.ui.tooling.preview.Preview
		import androidx.compose.ui.unit.dp
		import androidx.compose.ui.unit.sp
		import foundation.e.apps.R
		import foundation.e.apps.ui.compose.theme.AppTheme

		@Composable
		fun SearchEmptyState(modifier: Modifier = Modifier) {
		Box(
		modifier = modifier
		.fillMaxSize(),
		modifier = modifier.fillMaxSize(),
		contentAlignment = Alignment.Center,
		) {
		Column(
		horizontalAlignment = Alignment.CenterHorizontally,
		verticalArrangement = Arrangement.spacedBy(12.dp),
		) {
		Icon(
		imageVector = Icons.Outlined.Search,
		contentDescription = null,
		tint = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.45f),
		modifier = Modifier
		.padding(bottom = 4.dp)
		.size(72.dp),
		tint = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.5f),
		modifier = Modifier.size(64.dp),
		)
		Text(
		text = stringResource(id = R.string.search_hint),
		style = MaterialTheme.typography.bodyMedium,
		color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.72f),
		fontSize = 18.sp,
		color = MaterialTheme.colorScheme.onBackground,
		textAlign = TextAlign.Center,
		)
		}
		}

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

+77 −66

Original line number	Diff line number	Diff line
		@@ -19,18 +19,20 @@
		package foundation.e.apps.ui.compose.components

		import androidx.compose.foundation.layout.Arrangement
		import androidx.compose.foundation.layout.Column
		import androidx.compose.foundation.layout.Row
		import androidx.compose.foundation.layout.fillMaxWidth
		import androidx.compose.foundation.layout.padding
		import androidx.compose.foundation.text.KeyboardActions
		import androidx.compose.foundation.text.KeyboardOptions
		import androidx.compose.material.icons.Icons
		import androidx.compose.material.icons.automirrored.filled.ArrowBack
		import androidx.compose.material.icons.filled.Cancel
		import androidx.compose.material.icons.outlined.Search
		import androidx.compose.material3.HorizontalDivider
		import androidx.compose.material3.Icon
		import androidx.compose.material3.IconButton
		import androidx.compose.material3.MaterialTheme
		import androidx.compose.material3.Text
		import androidx.compose.material3.TextField
		import androidx.compose.material3.TextFieldDefaults
		import androidx.compose.runtime.Composable
		@@ -69,8 +71,7 @@ fun SearchTopBar(
		}

		Row(
		modifier = modifier
		.fillMaxWidth(),
		modifier = modifier.fillMaxWidth(),
		verticalAlignment = Alignment.CenterVertically,
		horizontalArrangement = Arrangement.SpaceEvenly
		) {
		@@ -82,14 +83,17 @@ fun SearchTopBar(
		)
		}

		TextField(
		Column(
		modifier = Modifier
		.padding(end = 16.dp)
		.weight(1f)
		) {
		TextField(
		modifier = Modifier
		.fillMaxWidth()
		.focusRequester(focusRequester),
		value = query,
		onValueChange = onQueryChange,
		placeholder = { Text(text = stringResource(id = R.string.search_hint)) },
		singleLine = true,
		textStyle = MaterialTheme.typography.bodyLarge,
		leadingIcon = {
		@@ -124,7 +128,7 @@ fun SearchTopBar(
		capitalization = KeyboardCapitalization.Sentences,
		imeAction = ImeAction.Search,
		),
		keyboardActions = androidx.compose.foundation.text.KeyboardActions(
		keyboardActions = KeyboardActions(
		onSearch = {
		val trimmedQuery = query.trim()
		if (trimmedQuery.isEmpty()) {
		@@ -136,10 +140,10 @@ fun SearchTopBar(
		},
		),
		colors = TextFieldDefaults.colors(
		focusedIndicatorColor = MaterialTheme.colorScheme.primary,
		unfocusedIndicatorColor = MaterialTheme.colorScheme.primary,
		disabledIndicatorColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.5f),
		cursorColor = MaterialTheme.colorScheme.primary,
		focusedIndicatorColor = Color.Transparent,
		unfocusedIndicatorColor = Color.Transparent,
		disabledIndicatorColor = Color.Transparent,
		cursorColor = MaterialTheme.colorScheme.tertiary,
		focusedTextColor = MaterialTheme.colorScheme.onBackground,
		unfocusedTextColor = MaterialTheme.colorScheme.onBackground,
		disabledTextColor = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.5f),
		@@ -154,6 +158,13 @@ fun SearchTopBar(
		disabledContainerColor = Color.Transparent,
		),
		)

		HorizontalDivider(
		modifier = Modifier.padding(start = 12.dp),
		thickness = 2.dp,
		color = MaterialTheme.colorScheme.tertiary
		)
		}
		}
		}