curiosite/Biblib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix home toolbar padding.

Browse source
This commit is contained in:
Thomas Andres Gomez 2023-03-29 16:34:52 +02:00
parent bb056c55e7
commit d7cb0221a4
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/pixelized/biblib/ui/screen/home/HomeScreen.kt
View file

@ -465,7 +465,7 @@ private fun HomeScreenLayout(
@Composable @Composable
private fun HomeToolbar( private fun HomeToolbar(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
contentPadding: PaddingValues = remember { PaddingValues(all = 0.dp) }, contentPadding: PaddingValues = remember { PaddingValues(start = 16.dp, end = 8.dp) },
search: State<String?>, search: State<String?>,
onSearch: (String) -> Unit, onSearch: (String) -> Unit,
avatar: String? = null, avatar: String? = null,
@ -491,7 +491,6 @@ private fun HomeToolbar(
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Icon( Icon(
modifier = Modifier.padding(all = 16.dp),
imageVector = Icons.Default.Search, imageVector = Icons.Default.Search,
tint = MaterialTheme.colors.onSurface, tint = MaterialTheme.colors.onSurface,
contentDescription = null contentDescription = null
@ -518,12 +517,11 @@ private fun HomeToolbar(
IconButton( IconButton(
onClick = onAvatarTap, onClick = onAvatarTap,
) { ) {
val imageModifier = Modifier
.clip(CircleShape)
.size(MaterialTheme.bibLib.dimen.avatar.small)
if (avatar != null) { if (avatar != null) {
GlideImage( GlideImage(
modifier = imageModifier, modifier = Modifier
.clip(CircleShape)
.size(MaterialTheme.bibLib.dimen.avatar.medium),
previewPlaceholder = R.drawable.ic_google, previewPlaceholder = R.drawable.ic_google,
placeHolder = painterResource(id = R.drawable.ic_google), placeHolder = painterResource(id = R.drawable.ic_google),
contentScale = ContentScale.Fit, contentScale = ContentScale.Fit,
@ -531,7 +529,6 @@ private fun HomeToolbar(
) )
} else { } else {
Icon( Icon(
modifier = imageModifier,
tint = MaterialTheme.colors.onSurface, tint = MaterialTheme.colors.onSurface,
imageVector = Icons.Default.Person, imageVector = Icons.Default.Person,
contentDescription = null, contentDescription = null,

2
app/src/main/java/com/pixelized/biblib/ui/theme/dimen/BibLibDimen.kt
View file

@ -46,7 +46,7 @@ data class BibLibDimen(
@Stable @Stable
@Immutable @Immutable
data class Avatar( data class Avatar(
val small: Dp = 24.dp val medium: Dp = 32.dp,
) )
@Stable @Stable