From 6bced884ef9ac7faf56d982f9af69323c33965f0 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Mon, 27 Nov 2023 02:57:34 +0800 Subject: [PATCH] refactor: rename utils to extension --- .../com/highcapable/flexiui/component/AreaBox.kt | 2 +- .../com/highcapable/flexiui/component/Button.kt | 6 +++--- .../com/highcapable/flexiui/component/CheckBox.kt | 4 ++-- .../com/highcapable/flexiui/component/Dropdown.kt | 10 +++++----- .../flexiui/component/ProgressIndicator.kt | 2 +- .../com/highcapable/flexiui/component/RadioButton.kt | 2 +- .../com/highcapable/flexiui/component/Slider.kt | 4 ++-- .../com/highcapable/flexiui/component/Switch.kt | 4 ++-- .../kotlin/com/highcapable/flexiui/component/Text.kt | 2 +- .../com/highcapable/flexiui/component/TextField.kt | 12 ++++++------ .../{utils/Extension.kt => extension/Foundation.kt} | 2 +- .../flexiui/{utils => extension}/Modifier.kt | 2 +- .../flexiui/{utils => extension}/PaddingValues.kt | 2 +- .../flexiui/component/DesktopContextMenu.kt | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) rename flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/{utils/Extension.kt => extension/Foundation.kt} (95%) rename flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/{utils => extension}/Modifier.kt (96%) rename flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/{utils => extension}/PaddingValues.kt (96%) diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/AreaBox.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/AreaBox.kt index dbde315..28b8039 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/AreaBox.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/AreaBox.kt @@ -52,7 +52,7 @@ import com.highcapable.flexiui.DefaultShapes import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalShapes import com.highcapable.flexiui.LocalSizes -import com.highcapable.flexiui.utils.borderOrNot +import com.highcapable.flexiui.extension.borderOrNot @Immutable data class AreaBoxStyle( diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt index 7a8ef90..472c92c 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt @@ -49,9 +49,9 @@ import com.highcapable.flexiui.LocalShapes import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.interaction.rippleClickable import com.highcapable.flexiui.interaction.rippleToggleable -import com.highcapable.flexiui.utils.borderOrNot -import com.highcapable.flexiui.utils.orElse -import com.highcapable.flexiui.utils.status +import com.highcapable.flexiui.extension.borderOrNot +import com.highcapable.flexiui.extension.orElse +import com.highcapable.flexiui.extension.status @Immutable data class ButtonColors( diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/CheckBox.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/CheckBox.kt index 3d924d1..7e4ec41 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/CheckBox.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/CheckBox.kt @@ -55,8 +55,8 @@ import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.interaction.clickable import com.highcapable.flexiui.resources.Icons import com.highcapable.flexiui.resources.icon.CheckMark -import com.highcapable.flexiui.utils.borderOrNot -import com.highcapable.flexiui.utils.status +import com.highcapable.flexiui.extension.borderOrNot +import com.highcapable.flexiui.extension.status @Immutable data class CheckBoxColors( diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Dropdown.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Dropdown.kt index 2bf1f68..1bdb639 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Dropdown.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Dropdown.kt @@ -108,11 +108,11 @@ import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.interaction.rippleClickable import com.highcapable.flexiui.resources.Icons import com.highcapable.flexiui.resources.icon.Dropdown -import com.highcapable.flexiui.utils.borderOrNot -import com.highcapable.flexiui.utils.horizontal -import com.highcapable.flexiui.utils.orElse -import com.highcapable.flexiui.utils.solidColor -import com.highcapable.flexiui.utils.status +import com.highcapable.flexiui.extension.borderOrNot +import com.highcapable.flexiui.extension.horizontal +import com.highcapable.flexiui.extension.orElse +import com.highcapable.flexiui.extension.solidColor +import com.highcapable.flexiui.extension.status import kotlin.math.max import kotlin.math.min diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ProgressIndicator.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ProgressIndicator.kt index cb03a93..04d13a9 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ProgressIndicator.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ProgressIndicator.kt @@ -54,7 +54,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import com.highcapable.flexiui.LocalColors -import com.highcapable.flexiui.utils.orElse +import com.highcapable.flexiui.extension.orElse import kotlin.math.PI import kotlin.math.abs import kotlin.math.max diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/RadioButton.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/RadioButton.kt index ff819ce..4ea2d33 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/RadioButton.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/RadioButton.kt @@ -54,7 +54,7 @@ import androidx.compose.ui.unit.dp import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.interaction.clickable -import com.highcapable.flexiui.utils.status +import com.highcapable.flexiui.extension.status @Immutable data class RadioButtonColors( diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Slider.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Slider.kt index 100196b..38c860d 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Slider.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Slider.kt @@ -65,8 +65,8 @@ import androidx.compose.ui.unit.dp import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalShapes import com.highcapable.flexiui.LocalSizes -import com.highcapable.flexiui.utils.borderOrNot -import com.highcapable.flexiui.utils.status +import com.highcapable.flexiui.extension.borderOrNot +import com.highcapable.flexiui.extension.status import kotlin.math.abs import kotlin.math.roundToInt diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Switch.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Switch.kt index 6d01c7c..b9647d0 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Switch.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Switch.kt @@ -62,8 +62,8 @@ import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalShapes import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.interaction.clickable -import com.highcapable.flexiui.utils.borderOrNot -import com.highcapable.flexiui.utils.status +import com.highcapable.flexiui.extension.borderOrNot +import com.highcapable.flexiui.extension.status import kotlin.math.roundToInt @Immutable diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Text.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Text.kt index df0782b..2d6354c 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Text.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Text.kt @@ -42,7 +42,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.TextUnit import com.highcapable.flexiui.DefaultTypography import com.highcapable.flexiui.LocalColors -import com.highcapable.flexiui.utils.orElse +import com.highcapable.flexiui.extension.orElse @Composable fun Text( diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/TextField.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/TextField.kt index 7c2553f..e7c9df6 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/TextField.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/TextField.kt @@ -92,12 +92,12 @@ import com.highcapable.flexiui.resources.Icons import com.highcapable.flexiui.resources.icon.Backspace import com.highcapable.flexiui.resources.icon.ViewerClose import com.highcapable.flexiui.resources.icon.ViewerOpen -import com.highcapable.flexiui.utils.borderOrNot -import com.highcapable.flexiui.utils.calculateEnd -import com.highcapable.flexiui.utils.calculateStart -import com.highcapable.flexiui.utils.orElse -import com.highcapable.flexiui.utils.solidColor -import com.highcapable.flexiui.utils.status +import com.highcapable.flexiui.extension.borderOrNot +import com.highcapable.flexiui.extension.calculateEnd +import com.highcapable.flexiui.extension.calculateStart +import com.highcapable.flexiui.extension.orElse +import com.highcapable.flexiui.extension.solidColor +import com.highcapable.flexiui.extension.status @Immutable data class TextFieldColors( diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/Extension.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/extension/Foundation.kt similarity index 95% rename from flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/Extension.kt rename to flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/extension/Foundation.kt index 9493b6e..f0ccc0a 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/Extension.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/extension/Foundation.kt @@ -19,7 +19,7 @@ * * This file is created by fankes on 2023/11/5. */ -package com.highcapable.flexiui.utils +package com.highcapable.flexiui.extension import androidx.compose.foundation.BorderStroke import androidx.compose.runtime.Stable diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/Modifier.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/extension/Modifier.kt similarity index 96% rename from flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/Modifier.kt rename to flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/extension/Modifier.kt index 6974af5..d8f9f4b 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/Modifier.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/extension/Modifier.kt @@ -21,7 +21,7 @@ */ @file:Suppress("unused") -package com.highcapable.flexiui.utils +package com.highcapable.flexiui.extension import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.border diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/PaddingValues.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/extension/PaddingValues.kt similarity index 96% rename from flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/PaddingValues.kt rename to flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/extension/PaddingValues.kt index c92d11e..60b03f7 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/PaddingValues.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/extension/PaddingValues.kt @@ -21,7 +21,7 @@ */ @file:Suppress("unused") -package com.highcapable.flexiui.utils +package com.highcapable.flexiui.extension import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.calculateEndPadding diff --git a/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/DesktopContextMenu.kt b/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/DesktopContextMenu.kt index a66f963..f295e5a 100644 --- a/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/DesktopContextMenu.kt +++ b/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/DesktopContextMenu.kt @@ -65,7 +65,7 @@ import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalShapes import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.interaction.rippleClickable -import com.highcapable.flexiui.utils.orElse +import com.highcapable.flexiui.extension.orElse import java.awt.event.KeyEvent @Immutable