fix home toolbar padding.
This commit is contained in:
parent
bb056c55e7
commit
d7cb0221a4
2 changed files with 5 additions and 8 deletions
|
|
@ -465,7 +465,7 @@ private fun HomeScreenLayout(
|
|||
@Composable
|
||||
private fun HomeToolbar(
|
||||
modifier: Modifier = Modifier,
|
||||
contentPadding: PaddingValues = remember { PaddingValues(all = 0.dp) },
|
||||
contentPadding: PaddingValues = remember { PaddingValues(start = 16.dp, end = 8.dp) },
|
||||
search: State<String?>,
|
||||
onSearch: (String) -> Unit,
|
||||
avatar: String? = null,
|
||||
|
|
@ -491,7 +491,6 @@ private fun HomeToolbar(
|
|||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
modifier = Modifier.padding(all = 16.dp),
|
||||
imageVector = Icons.Default.Search,
|
||||
tint = MaterialTheme.colors.onSurface,
|
||||
contentDescription = null
|
||||
|
|
@ -518,12 +517,11 @@ private fun HomeToolbar(
|
|||
IconButton(
|
||||
onClick = onAvatarTap,
|
||||
) {
|
||||
val imageModifier = Modifier
|
||||
.clip(CircleShape)
|
||||
.size(MaterialTheme.bibLib.dimen.avatar.small)
|
||||
if (avatar != null) {
|
||||
GlideImage(
|
||||
modifier = imageModifier,
|
||||
modifier = Modifier
|
||||
.clip(CircleShape)
|
||||
.size(MaterialTheme.bibLib.dimen.avatar.medium),
|
||||
previewPlaceholder = R.drawable.ic_google,
|
||||
placeHolder = painterResource(id = R.drawable.ic_google),
|
||||
contentScale = ContentScale.Fit,
|
||||
|
|
@ -531,7 +529,6 @@ private fun HomeToolbar(
|
|||
)
|
||||
} else {
|
||||
Icon(
|
||||
modifier = imageModifier,
|
||||
tint = MaterialTheme.colors.onSurface,
|
||||
imageVector = Icons.Default.Person,
|
||||
contentDescription = null,
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ data class BibLibDimen(
|
|||
@Stable
|
||||
@Immutable
|
||||
data class Avatar(
|
||||
val small: Dp = 24.dp
|
||||
val medium: Dp = 32.dp,
|
||||
)
|
||||
|
||||
@Stable
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue