refactor: change Icons to FlexiIcons

This commit is contained in:
2024-01-07 01:13:35 +08:00
parent c94d734cfa
commit c150b45bab
14 changed files with 29 additions and 29 deletions

View File

@@ -52,7 +52,7 @@ import com.highcapable.betterandroid.compose.extension.ui.ComponentPadding
import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalColors
import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.LocalSizes
import com.highcapable.flexiui.LocalTypography 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.ArrowNaviUp
import com.highcapable.flexiui.resources.icon.FinishClose import com.highcapable.flexiui.resources.icon.FinishClose
@@ -222,7 +222,7 @@ interface AppBarScope {
style = style, style = style,
enabled = enabled, enabled = enabled,
interactionSource = interactionSource interactionSource = interactionSource
) { Icon(imageVector = Icons.FinishClose) } ) { Icon(imageVector = FlexiIcons.FinishClose) }
} }
/** /**
@@ -250,7 +250,7 @@ interface AppBarScope {
style = style, style = style,
enabled = enabled, enabled = enabled,
interactionSource = interactionSource interactionSource = interactionSource
) { Icon(imageVector = Icons.ArrowNaviUp) } ) { Icon(imageVector = FlexiIcons.ArrowNaviUp) }
} }
/** /**

View File

@@ -57,7 +57,7 @@ import com.highcapable.betterandroid.compose.extension.ui.clickable
import com.highcapable.betterandroid.compose.extension.ui.componentState import com.highcapable.betterandroid.compose.extension.ui.componentState
import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalColors
import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.LocalSizes
import com.highcapable.flexiui.resources.Icons import com.highcapable.flexiui.resources.FlexiIcons
import com.highcapable.flexiui.resources.icon.CheckMark import com.highcapable.flexiui.resources.icon.CheckMark
/** /**
@@ -145,7 +145,7 @@ fun CheckBox(
scaleX = animatedContentLayer, scaleX = animatedContentLayer,
scaleY = animatedContentLayer scaleY = animatedContentLayer
), ),
imageVector = Icons.CheckMark, imageVector = FlexiIcons.CheckMark,
style = IconDefaults.style.copy(tint = colors.contentColor) style = IconDefaults.style.copy(tint = colors.contentColor)
) )
} }

View File

@@ -112,7 +112,7 @@ import com.highcapable.flexiui.LocalColors
import com.highcapable.flexiui.LocalShapes import com.highcapable.flexiui.LocalShapes
import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.LocalSizes
import com.highcapable.flexiui.interaction.rippleClickable 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 com.highcapable.flexiui.resources.icon.Dropdown
import kotlin.math.max import kotlin.math.max
import kotlin.math.min import kotlin.math.min
@@ -264,7 +264,7 @@ fun DropdownList(
modifier = Modifier.graphicsLayer { modifier = Modifier.graphicsLayer {
rotationZ = animatedDirection rotationZ = animatedDirection
}.size(style.endIconSize), }.size(style.endIconSize),
imageVector = Icons.Dropdown, imageVector = FlexiIcons.Dropdown,
style = IconDefaults.style.copy(tint = animatedEndIconTint) style = IconDefaults.style.copy(tint = animatedEndIconTint)
) )
} }

View File

@@ -45,7 +45,7 @@ import com.highcapable.flexiui.LocalColors
import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.LocalSizes
import com.highcapable.flexiui.LocalTypography import com.highcapable.flexiui.LocalTypography
import com.highcapable.flexiui.interaction.rippleClickable 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 import com.highcapable.flexiui.resources.icon.ArrowForward
/** /**
@@ -133,7 +133,7 @@ fun HorizontalItemBox(
) )
} }
if (showArrowIcon) Icon( if (showArrowIcon) Icon(
imageVector = Icons.ArrowForward, imageVector = FlexiIcons.ArrowForward,
style = IconDefaults.style.copy( style = IconDefaults.style.copy(
size = DefaultArrowIconSize, size = DefaultArrowIconSize,
tint = colors.arrowIconTint tint = colors.arrowIconTint

View File

@@ -92,7 +92,7 @@ import com.highcapable.betterandroid.compose.extension.ui.orNull
import com.highcapable.betterandroid.compose.extension.ui.solidColor import com.highcapable.betterandroid.compose.extension.ui.solidColor
import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalColors
import com.highcapable.flexiui.LocalSizes 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.Backspace
import com.highcapable.flexiui.resources.icon.ViewerClose import com.highcapable.flexiui.resources.icon.ViewerClose
import com.highcapable.flexiui.resources.icon.ViewerOpen import com.highcapable.flexiui.resources.icon.ViewerOpen
@@ -483,7 +483,7 @@ fun PasswordTextField(
}, },
enabled = enabled, enabled = enabled,
interactionSource = cInteractionSource 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), style = IconButtonDefaults.style.copy(padding = TextDecorIconPadding),
enabled = enabled, enabled = enabled,
interactionSource = cInteractionSource interactionSource = cInteractionSource
) { Icon(imageVector = Icons.Backspace) } ) { Icon(imageVector = FlexiIcons.Backspace) }
} }
} }
) )

View File

@@ -26,4 +26,4 @@ package com.highcapable.flexiui.resources
/** /**
* The default icon resources for Flexi UI. * The default icon resources for Flexi UI.
*/ */
object Icons object FlexiIcons

View File

@@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin
import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.highcapable.betterandroid.compose.extension.ui.ImageVector 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( ImageVector(
name = "arrow_forward", name = "arrow_forward",
defaultWidth = 32.dp, defaultWidth = 32.dp,

View File

@@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin
import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.highcapable.betterandroid.compose.extension.ui.ImageVector 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( ImageVector(
name = "arrow_navi_up", name = "arrow_navi_up",
defaultWidth = 32.dp, defaultWidth = 32.dp,

View File

@@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin
import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.highcapable.betterandroid.compose.extension.ui.ImageVector 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( ImageVector(
name = "backspace", name = "backspace",
defaultWidth = 32.dp, defaultWidth = 32.dp,

View File

@@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin
import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.highcapable.betterandroid.compose.extension.ui.ImageVector 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( ImageVector(
name = "check_mark", name = "check_mark",
defaultWidth = 32.dp, defaultWidth = 32.dp,

View File

@@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin
import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.highcapable.betterandroid.compose.extension.ui.ImageVector 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( ImageVector(
name = "dropdown", name = "dropdown",
defaultWidth = 24.dp, defaultWidth = 24.dp,

View File

@@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin
import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.highcapable.betterandroid.compose.extension.ui.ImageVector 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( ImageVector(
name = "finish_close", name = "finish_close",
defaultWidth = 32.dp, defaultWidth = 32.dp,

View File

@@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin
import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.highcapable.betterandroid.compose.extension.ui.ImageVector 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( ImageVector(
name = "viewer_close", name = "viewer_close",
defaultWidth = 32.dp, defaultWidth = 32.dp,

View File

@@ -31,9 +31,9 @@ import androidx.compose.ui.graphics.StrokeJoin
import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.highcapable.betterandroid.compose.extension.ui.ImageVector 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( ImageVector(
name = "viewer_open", name = "viewer_open",
defaultWidth = 32.dp, defaultWidth = 32.dp,