Lemmy/Raccoon
1
0
Fork 0
mirror of https://github.com/LiveFastEatTrashRaccoon/RaccoonForLemmy.git synced 2025-02-10 03:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

enhancement: FAB text/icon sizes (#1167)

Browse Source
This commit is contained in:
Diego Beraldin 2024-07-25 13:50:52 +02:00 committed by GitHub
parent 8d936f0f80
commit 4069a1904f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/commonui/components/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/components/FloatingActionButtonMenu.kt
View File

@ -39,7 +39,6 @@ import com.github.diegoberaldin.raccoonforlemmy.core.appearance.data.UiTheme
import com.github.diegoberaldin.raccoonforlemmy.core.appearance.di.getColorSchemeProvider import com.github.diegoberaldin.raccoonforlemmy.core.appearance.di.getColorSchemeProvider
import com.github.diegoberaldin.raccoonforlemmy.core.appearance.di.getThemeRepository import com.github.diegoberaldin.raccoonforlemmy.core.appearance.di.getThemeRepository
import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.CornerSize import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.CornerSize
import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.IconSize
import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.Spacing import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.Spacing
import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.onClick import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.onClick
@ -112,12 +111,13 @@ fun FloatingActionButtonMenu(
) { ) {
Row( Row(
modifier = modifier =
Modifier.onClick( Modifier
onClick = { .onClick(
fabExpanded = false onClick = {
item.onSelected?.invoke() fabExpanded = false
}, item.onSelected?.invoke()
).padding(end = 15.dp), },
).padding(end = 6.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(Spacing.xxs), horizontalArrangement = Arrangement.spacedBy(Spacing.xxs),
) { ) {
@ -129,21 +129,21 @@ fun FloatingActionButtonMenu(
color = MaterialTheme.colorScheme.surfaceVariant, color = MaterialTheme.colorScheme.surfaceVariant,
shape = RoundedCornerShape(CornerSize.s), shape = RoundedCornerShape(CornerSize.s),
).padding( ).padding(
vertical = Spacing.xs, vertical = Spacing.s,
horizontal = Spacing.s, horizontal = Spacing.m,
), ),
text = item.text, text = item.text,
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyLarge,
color = MaterialTheme.colorScheme.onBackground, color = MaterialTheme.colorScheme.onBackground,
) )
Icon( Icon(
modifier = modifier =
Modifier Modifier
.size(IconSize.l) .size(42.dp)
.background( .background(
color = MaterialTheme.colorScheme.primaryContainer, color = MaterialTheme.colorScheme.primaryContainer,
shape = CircleShape, shape = CircleShape,
).padding(6.dp), ).padding(10.dp),
imageVector = item.icon, imageVector = item.icon,
contentDescription = null, contentDescription = null,
tint = MaterialTheme.colorScheme.onPrimaryContainer, tint = MaterialTheme.colorScheme.onPrimaryContainer,
@ -157,11 +157,12 @@ fun FloatingActionButtonMenu(
val fabContainerColor = val fabContainerColor =
when (theme) { when (theme) {
UiTheme.Black -> UiTheme.Black ->
schemeProvider.getColorScheme( schemeProvider
theme = UiTheme.Dark, .getColorScheme(
dynamic = dynamicColors, theme = UiTheme.Dark,
customSeed = seedColor, dynamic = dynamicColors,
).primaryContainer customSeed = seedColor,
).primaryContainer
else -> MaterialTheme.colorScheme.primaryContainer else -> MaterialTheme.colorScheme.primaryContainer
} }