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

refactor: merge style.actionIconMaxSize to LocalIconStyle in ActionBar

Browse Source
This commit is contained in:
fankesyooni
2023-12-02 21:48:16 +08:00
parent 5ea0c7db42
commit ddc5590a57
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,8 +179,9 @@ class BasicActionBar internal constructor(
val iconInflateSize = style.actionIconMaxSize + style.actionIconPadding val iconInflateSize = style.actionIconMaxSize + style.actionIconPadding
IconButton( IconButton(
onClick = onClick, onClick = onClick,
modifier = Modifier.size(iconInflateSize).then(modifier) modifier = Modifier.size(iconInflateSize).then(modifier),
) { Box(modifier = Modifier.size(style.actionIconMaxSize)) { content() } } content = content
)
} }
@Composable @Composable
@@ -261,7 +262,7 @@ class BasicActionBar internal constructor(
content: @Composable () -> Unit content: @Composable () -> Unit
) { ) {
CompositionLocalProvider( CompositionLocalProvider(
LocalIconStyle provides LocalIconStyle.current.copy(tint = color), LocalIconStyle provides LocalIconStyle.current.copy(size = style.actionIconMaxSize, 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
) )