From d7cb0221a448d31842abd4b5c095d422cefc2540 Mon Sep 17 00:00:00 2001 From: Thomas Andres Gomez Date: Wed, 29 Mar 2023 16:34:52 +0200 Subject: [PATCH] fix home toolbar padding. --- .../com/pixelized/biblib/ui/screen/home/HomeScreen.kt | 11 ++++------- .../pixelized/biblib/ui/theme/dimen/BibLibDimen.kt | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/pixelized/biblib/ui/screen/home/HomeScreen.kt b/app/src/main/java/com/pixelized/biblib/ui/screen/home/HomeScreen.kt index 1d83391..edb8012 100644 --- a/app/src/main/java/com/pixelized/biblib/ui/screen/home/HomeScreen.kt +++ b/app/src/main/java/com/pixelized/biblib/ui/screen/home/HomeScreen.kt @@ -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, 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, diff --git a/app/src/main/java/com/pixelized/biblib/ui/theme/dimen/BibLibDimen.kt b/app/src/main/java/com/pixelized/biblib/ui/theme/dimen/BibLibDimen.kt index 199f691..0a4b3b4 100644 --- a/app/src/main/java/com/pixelized/biblib/ui/theme/dimen/BibLibDimen.kt +++ b/app/src/main/java/com/pixelized/biblib/ui/theme/dimen/BibLibDimen.kt @@ -46,7 +46,7 @@ data class BibLibDimen( @Stable @Immutable data class Avatar( - val small: Dp = 24.dp + val medium: Dp = 32.dp, ) @Stable