diff --git a/app/src/main/java/hu/bbara/purefin/app/home/ui/DefaultTopBar.kt b/app/src/main/java/hu/bbara/purefin/app/home/ui/DefaultTopBar.kt index 37032e2e..80368723 100644 --- a/app/src/main/java/hu/bbara/purefin/app/home/ui/DefaultTopBar.kt +++ b/app/src/main/java/hu/bbara/purefin/app/home/ui/DefaultTopBar.kt @@ -11,6 +11,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Person import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -81,13 +82,10 @@ fun DefaultTopBar( .size(56.dp) .clip(CircleShape), ) { - HomeAvatar( - size = 56.dp, - borderWidth = 1.dp, - borderColor = scheme.outlineVariant, - backgroundColor = scheme.secondaryContainer, - icon = Icons.Outlined.Person, - iconTint = scheme.onSecondaryContainer + Icon( + imageVector = Icons.Outlined.Person, + contentDescription = "Profile", + modifier = Modifier.size(30.dp), ) } DropdownMenu( diff --git a/app/src/main/java/hu/bbara/purefin/app/home/ui/HomeAvatar.kt b/app/src/main/java/hu/bbara/purefin/app/home/ui/HomeAvatar.kt deleted file mode 100644 index cee05c71..00000000 --- a/app/src/main/java/hu/bbara/purefin/app/home/ui/HomeAvatar.kt +++ /dev/null @@ -1,41 +0,0 @@ -package hu.bbara.purefin.app.home.ui - -import androidx.compose.foundation.background -import androidx.compose.foundation.border -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.Icon -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.unit.Dp - -@Composable -fun HomeAvatar( - size: Dp, - borderWidth: Dp, - borderColor: Color, - backgroundColor: Color, - icon: ImageVector, - iconTint: Color, - modifier: Modifier = Modifier -) { - Box( - modifier = modifier - .size(size) - .clip(CircleShape) - .border(borderWidth, borderColor, CircleShape) - .background(backgroundColor), - contentAlignment = Alignment.Center - ) { - Icon( - imageVector = icon, - contentDescription = null, - tint = iconTint - ) - } -} diff --git a/app/src/main/java/hu/bbara/purefin/app/home/ui/HomeTopBar.kt b/app/src/main/java/hu/bbara/purefin/app/home/ui/HomeTopBar.kt index edd7bda2..d2230d1f 100644 --- a/app/src/main/java/hu/bbara/purefin/app/home/ui/HomeTopBar.kt +++ b/app/src/main/java/hu/bbara/purefin/app/home/ui/HomeTopBar.kt @@ -2,6 +2,7 @@ package hu.bbara.purefin.app.home.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons @@ -72,26 +73,31 @@ fun HomeTopBar( containerColor = scheme.secondary, contentColor = scheme.onSecondary, disabledContainerColor = scheme.secondary, - disabledContentColor = scheme.onSecondary) + disabledContentColor = scheme.onSecondary), + modifier = Modifier.size(50.dp), ) { Icon( imageVector = Icons.Outlined.Search, contentDescription = "Search", + modifier = Modifier.size(30.dp), ) } + Spacer(modifier = Modifier.size(12.dp)) IconButton( onClick = { isProfileMenuExpanded = true }, + colors = IconButtonColors( + containerColor = scheme.secondary, + contentColor = scheme.onSecondary, + disabledContainerColor = scheme.secondary, + disabledContentColor = scheme.onSecondary), modifier = Modifier - .size(48.dp) + .size(50.dp) .clip(CircleShape), ) { - HomeAvatar( - size = 40.dp, - borderWidth = 1.dp, - borderColor = scheme.outlineVariant, - backgroundColor = scheme.secondaryContainer, - icon = Icons.Outlined.Person, - iconTint = scheme.onSecondaryContainer + Icon( + imageVector = Icons.Outlined.Person, + contentDescription = "Profile", + modifier = Modifier.size(30.dp), ) } DropdownMenu(