BetterAndroid/FlexiUI
5
0
Fork 0
mirror of https://github.com/BetterAndroid/FlexiUI.git synced 2025-09-08 11:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: rename actionIconMaxSize to actionIconSize and some tweaks in ActionBar

Browse Source
This commit is contained in:
fankesyooni
2023-12-02 22:33:09 +08:00
parent 718d24d308
commit 123ee05fe2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ActionBar.kt
View File

@@ -69,8 +69,8 @@ data class ActionBarStyle(
val contentSpacing: Dp, val contentSpacing: Dp,
val titleTextStyle: TextStyle, val titleTextStyle: TextStyle,
val subTextStyle: TextStyle, val subTextStyle: TextStyle,
val actionIconSize: Dp,
val actionIconPadding: Dp, val actionIconPadding: Dp,
val actionIconMaxSize: Dp,
val actionContentMaxWidth: Dp val actionContentMaxWidth: Dp
) )
@@ -210,7 +210,7 @@ class BasicActionBar internal constructor(
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
content: @Composable () -> Unit content: @Composable () -> Unit
) { ) {
val iconInflateSize = this.style.actionIconMaxSize + this.style.actionIconPadding val iconInflateSize = this.style.actionIconSize + this.style.actionIconPadding
IconButton( IconButton(
onClick = onClick, onClick = onClick,
modifier = Modifier.size(iconInflateSize).then(modifier), modifier = Modifier.size(iconInflateSize).then(modifier),
@@ -300,7 +300,7 @@ class BasicActionBar internal constructor(
content: @Composable () -> Unit content: @Composable () -> Unit
) { ) {
CompositionLocalProvider( CompositionLocalProvider(
LocalIconStyle provides LocalIconStyle.current.copy(size = style.actionIconMaxSize, tint = color), LocalIconStyle provides LocalIconStyle.current.copy(size = style.actionIconSize, tint = color),
LocalTextStyle provides LocalTextStyle.current.merge(textStyle ?: LocalTextStyle.current).copy(color = color), LocalTextStyle provides LocalTextStyle.current.merge(textStyle ?: LocalTextStyle.current).copy(color = color),
content = content content = content
) )
@@ -345,12 +345,12 @@ private fun defaultActionBarStyle() = ActionBarStyle(
ActionBarType.MIDDLE -> LocalTypography.current.titleSecondary ActionBarType.MIDDLE -> LocalTypography.current.titleSecondary
}, },
subTextStyle = LocalTypography.current.subtitle, subTextStyle = LocalTypography.current.subtitle,
actionContentMaxWidth = DefaultActionContentMaxWidth, actionIconSize = when (LocalActionBarType.current) {
actionIconPadding = LocalSizes.current.spacingTertiary,
actionIconMaxSize = when (LocalActionBarType.current) {
ActionBarType.LARGE -> LocalSizes.current.iconSizePrimary ActionBarType.LARGE -> LocalSizes.current.iconSizePrimary
ActionBarType.MIDDLE -> LocalSizes.current.iconSizeSecondary ActionBarType.MIDDLE -> LocalSizes.current.iconSizeSecondary
} },
actionIconPadding = LocalSizes.current.spacingTertiary,
actionContentMaxWidth = DefaultActionContentMaxWidth
) )
private val DefaultActionContentMaxWidth = 170.dp private val DefaultActionContentMaxWidth = 170.dp