diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/AppBar.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/AppBar.kt index eb74e60..a094d7b 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/AppBar.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/AppBar.kt @@ -52,7 +52,7 @@ import com.highcapable.betterandroid.compose.extension.ui.ComponentPadding import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.LocalTypography -import com.highcapable.flexiui.resources.Icons +import com.highcapable.flexiui.resources.FlexiIcons import com.highcapable.flexiui.resources.icon.ArrowNaviUp import com.highcapable.flexiui.resources.icon.FinishClose @@ -222,7 +222,7 @@ interface AppBarScope { style = style, enabled = enabled, interactionSource = interactionSource - ) { Icon(imageVector = Icons.FinishClose) } + ) { Icon(imageVector = FlexiIcons.FinishClose) } } /** @@ -250,7 +250,7 @@ interface AppBarScope { style = style, enabled = enabled, interactionSource = interactionSource - ) { Icon(imageVector = Icons.ArrowNaviUp) } + ) { Icon(imageVector = FlexiIcons.ArrowNaviUp) } } /** 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 e3cec94..3df5771 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 @@ -57,7 +57,7 @@ import com.highcapable.betterandroid.compose.extension.ui.clickable import com.highcapable.betterandroid.compose.extension.ui.componentState import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalSizes -import com.highcapable.flexiui.resources.Icons +import com.highcapable.flexiui.resources.FlexiIcons import com.highcapable.flexiui.resources.icon.CheckMark /** @@ -145,7 +145,7 @@ fun CheckBox( scaleX = animatedContentLayer, scaleY = animatedContentLayer ), - imageVector = Icons.CheckMark, + imageVector = FlexiIcons.CheckMark, style = IconDefaults.style.copy(tint = colors.contentColor) ) } 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 530bf0d..29040bc 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 @@ -112,7 +112,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.resources.Icons +import com.highcapable.flexiui.resources.FlexiIcons import com.highcapable.flexiui.resources.icon.Dropdown import kotlin.math.max import kotlin.math.min @@ -264,7 +264,7 @@ fun DropdownList( modifier = Modifier.graphicsLayer { rotationZ = animatedDirection }.size(style.endIconSize), - imageVector = Icons.Dropdown, + imageVector = FlexiIcons.Dropdown, style = IconDefaults.style.copy(tint = animatedEndIconTint) ) } diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ItemBox.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ItemBox.kt index 3a39e14..cc08179 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ItemBox.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ItemBox.kt @@ -45,7 +45,7 @@ import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.LocalTypography import com.highcapable.flexiui.interaction.rippleClickable -import com.highcapable.flexiui.resources.Icons +import com.highcapable.flexiui.resources.FlexiIcons import com.highcapable.flexiui.resources.icon.ArrowForward /** @@ -133,7 +133,7 @@ fun HorizontalItemBox( ) } if (showArrowIcon) Icon( - imageVector = Icons.ArrowForward, + imageVector = FlexiIcons.ArrowForward, style = IconDefaults.style.copy( size = DefaultArrowIconSize, tint = colors.arrowIconTint 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 7b4b91a..3f027aa 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,7 +92,7 @@ import com.highcapable.betterandroid.compose.extension.ui.orNull import com.highcapable.betterandroid.compose.extension.ui.solidColor import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalSizes -import com.highcapable.flexiui.resources.Icons +import com.highcapable.flexiui.resources.FlexiIcons import com.highcapable.flexiui.resources.icon.Backspace import com.highcapable.flexiui.resources.icon.ViewerClose import com.highcapable.flexiui.resources.icon.ViewerOpen @@ -483,7 +483,7 @@ fun PasswordTextField( }, enabled = enabled, interactionSource = cInteractionSource - ) { Icon(imageVector = if (passwordVisible) Icons.ViewerOpen else Icons.ViewerClose) } + ) { Icon(imageVector = if (passwordVisible) FlexiIcons.ViewerOpen else FlexiIcons.ViewerClose) } } } ) @@ -650,7 +650,7 @@ fun BackspaceTextField( style = IconButtonDefaults.style.copy(padding = TextDecorIconPadding), enabled = enabled, interactionSource = cInteractionSource - ) { Icon(imageVector = Icons.Backspace) } + ) { Icon(imageVector = FlexiIcons.Backspace) } } } ) diff --git a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/Icons.kt b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/FlexiIcons.kt similarity index 98% rename from flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/Icons.kt rename to flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/FlexiIcons.kt index 9d27b57..a67bf70 100644 --- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/Icons.kt +++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/FlexiIcons.kt @@ -26,4 +26,4 @@ package com.highcapable.flexiui.resources /** * The default icon resources for Flexi UI. */ -object Icons \ No newline at end of file +object FlexiIcons \ No newline at end of file diff --git a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ArrowForward.kt b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ArrowForward.kt index e839986..a29efb8 100644 --- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ArrowForward.kt +++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ArrowForward.kt @@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.unit.dp import com.highcapable.betterandroid.compose.extension.ui.ImageVector -import com.highcapable.flexiui.resources.Icons +import com.highcapable.flexiui.resources.FlexiIcons -val Icons.ArrowForward by lazy { +val FlexiIcons.ArrowForward by lazy { ImageVector( name = "arrow_forward", defaultWidth = 32.dp, diff --git a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ArrowNaviUp.kt b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ArrowNaviUp.kt index 3be2d36..5f505e4 100644 --- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ArrowNaviUp.kt +++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ArrowNaviUp.kt @@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.unit.dp import com.highcapable.betterandroid.compose.extension.ui.ImageVector -import com.highcapable.flexiui.resources.Icons +import com.highcapable.flexiui.resources.FlexiIcons -val Icons.ArrowNaviUp by lazy { +val FlexiIcons.ArrowNaviUp by lazy { ImageVector( name = "arrow_navi_up", defaultWidth = 32.dp, diff --git a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/Backspace.kt b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/Backspace.kt index a672174..e520445 100644 --- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/Backspace.kt +++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/Backspace.kt @@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.unit.dp import com.highcapable.betterandroid.compose.extension.ui.ImageVector -import com.highcapable.flexiui.resources.Icons +import com.highcapable.flexiui.resources.FlexiIcons -val Icons.Backspace by lazy { +val FlexiIcons.Backspace by lazy { ImageVector( name = "backspace", defaultWidth = 32.dp, diff --git a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/CheckMark.kt b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/CheckMark.kt index 39e1292..63d44f3 100644 --- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/CheckMark.kt +++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/CheckMark.kt @@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.unit.dp import com.highcapable.betterandroid.compose.extension.ui.ImageVector -import com.highcapable.flexiui.resources.Icons +import com.highcapable.flexiui.resources.FlexiIcons -val Icons.CheckMark by lazy { +val FlexiIcons.CheckMark by lazy { ImageVector( name = "check_mark", defaultWidth = 32.dp, diff --git a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/Dropdown.kt b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/Dropdown.kt index b0ea1d2..f4289fc 100644 --- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/Dropdown.kt +++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/Dropdown.kt @@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.unit.dp import com.highcapable.betterandroid.compose.extension.ui.ImageVector -import com.highcapable.flexiui.resources.Icons +import com.highcapable.flexiui.resources.FlexiIcons -val Icons.Dropdown by lazy { +val FlexiIcons.Dropdown by lazy { ImageVector( name = "dropdown", defaultWidth = 24.dp, diff --git a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/FinishClose.kt b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/FinishClose.kt index 9f8d930..6e7c2c5 100644 --- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/FinishClose.kt +++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/FinishClose.kt @@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.unit.dp import com.highcapable.betterandroid.compose.extension.ui.ImageVector -import com.highcapable.flexiui.resources.Icons +import com.highcapable.flexiui.resources.FlexiIcons -val Icons.FinishClose by lazy { +val FlexiIcons.FinishClose by lazy { ImageVector( name = "finish_close", defaultWidth = 32.dp, diff --git a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ViewerClose.kt b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ViewerClose.kt index 61517f3..84190b3 100644 --- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ViewerClose.kt +++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ViewerClose.kt @@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.unit.dp import com.highcapable.betterandroid.compose.extension.ui.ImageVector -import com.highcapable.flexiui.resources.Icons +import com.highcapable.flexiui.resources.FlexiIcons -val Icons.ViewerClose by lazy { +val FlexiIcons.ViewerClose by lazy { ImageVector( name = "viewer_close", defaultWidth = 32.dp, diff --git a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ViewerOpen.kt b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ViewerOpen.kt index 3c438eb..ec2dd35 100644 --- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ViewerOpen.kt +++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ViewerOpen.kt @@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.unit.dp import com.highcapable.betterandroid.compose.extension.ui.ImageVector -import com.highcapable.flexiui.resources.Icons +import com.highcapable.flexiui.resources.FlexiIcons -val Icons.ViewerOpen by lazy { +val FlexiIcons.ViewerOpen by lazy { ImageVector( name = "viewer_open", defaultWidth = 32.dp,