From b2155fe5d42059e3ca96f10258928b680a7c91f0 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sun, 3 Dec 2023 01:12:04 +0800 Subject: [PATCH] refactor: use VerticalContentSpacingRatio in vertical contentSpacing --- .../kotlin/com/highcapable/flexiui/component/ActionBar.kt | 6 ++++-- .../kotlin/com/highcapable/flexiui/component/Navigation.kt | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ActionBar.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ActionBar.kt index 34f42b4..0ab8e4b 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ActionBar.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ActionBar.kt @@ -268,7 +268,7 @@ private class ActionBarImpl( private fun CenterContent() { Column( horizontalAlignment = Alignment.Start, - verticalArrangement = Arrangement.spacedBy(style.contentSpacing / 2) + verticalArrangement = Arrangement.spacedBy(style.contentSpacing / VerticalContentSpacingRatio) ) { ContentStyle( color = colors.titleTextColor, @@ -360,4 +360,6 @@ private fun defaultActionBarStyle() = ActionBarStyle( actionContentMaxWidth = DefaultActionContentMaxWidth ) -private val DefaultActionContentMaxWidth = 170.dp \ No newline at end of file +private val DefaultActionContentMaxWidth = 170.dp + +private const val VerticalContentSpacingRatio = 1.6f \ No newline at end of file diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Navigation.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Navigation.kt index 77c7212..22fdf8e 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Navigation.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Navigation.kt @@ -181,7 +181,7 @@ fun NavigationItem( ) { icon() text?.also { content -> - Box(modifier = Modifier.height(currentContentSpacing / 2)) + Box(modifier = Modifier.height(currentContentSpacing / VerticalContentSpacingRatio)) content() } } @@ -253,4 +253,6 @@ private fun defaultNavigationStyle() = NavigationStyle( vertical = LocalSizes.current.spacingSecondary ), contentShape = withAreaBoxShape() -) \ No newline at end of file +) + +private const val VerticalContentSpacingRatio = 1.6f \ No newline at end of file