mirror of
https://github.com/bbara04/Purefin.git
synced 2026-07-23 19:26:50 +00:00
Replace HomeAvatar with standard Icon and update top bar layout
- Remove HomeAvatar.kt and replace usages with standard Material Icons - Update search and profile button sizes to 50dp and icon sizes to 30dp - Add spacing between top bar actions in HomeTopBar
This commit is contained in:
@@ -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(
|
||||
|
||||
@@ -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
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user