From 4128fa550582b62d750404a8621c3b1483321e96 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sun, 26 Nov 2023 10:59:59 +0800 Subject: [PATCH] style: optimize enum named --- .../kotlin/com/highcapable/flexiui/component/TextField.kt | 8 ++++---- .../highcapable/flexiui/component/TextField.desktop.kt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) 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 37cfef2..fab64ee 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 @@ -186,7 +186,7 @@ fun TextField( enabled = enabled, interactionSource = interactionSource, then = modifier - ).pointerHoverState(TextFieldPointerState.TEXT) + ).pointerHoverState(TextFieldPointerState.Text) ) { // Note: If minWidth is not 0, a constant width is currently set. // At this time, the child layout must be completely filled into the parent layout. @@ -364,7 +364,7 @@ fun PasswordTextField( if (pressed) focusRequester.requestFocus() if (value.text.isEmpty() && animatedSize == 0.dp) passwordVisible = defaultPasswordVisible IconToggleButton( - modifier = Modifier.size(animatedSize).pointerHoverState(TextFieldPointerState.NORMAL), + modifier = Modifier.size(animatedSize).pointerHoverState(TextFieldPointerState.Common), style = IconButton.style.copy(paddings = DefaultDecorIconPaddings), checked = passwordVisible, onCheckedChange = { @@ -491,7 +491,7 @@ fun BackspaceTextField( } focusRequester.requestFocus() }, - modifier = Modifier.width(animatedSize).pointerHoverState(TextFieldPointerState.NORMAL), + modifier = Modifier.width(animatedSize).pointerHoverState(TextFieldPointerState.Common), style = IconButton.style.copy(paddings = DefaultDecorIconPaddings), enabled = enabled, interactionSource = cInteractionSource @@ -704,7 +704,7 @@ private fun TextFieldStyle(colors: TextFieldColors, content: @Composable () -> U internal expect fun Modifier.pointerHoverState(state: TextFieldPointerState): Modifier @Stable -internal enum class TextFieldPointerState { NORMAL, TEXT } +internal enum class TextFieldPointerState { Common, Text } @Stable private class TextFieldKeyEventFactory { diff --git a/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/TextField.desktop.kt b/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/TextField.desktop.kt index c660a4b..763cd7b 100644 --- a/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/TextField.desktop.kt +++ b/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/TextField.desktop.kt @@ -33,8 +33,8 @@ internal actual fun Modifier.pointerHoverState(state: TextFieldPointerState) = c pointerHoverIcon( PointerIcon( Cursor.getPredefinedCursor(when (state) { - TextFieldPointerState.NORMAL -> Cursor.DEFAULT_CURSOR - TextFieldPointerState.TEXT -> Cursor.TEXT_CURSOR + TextFieldPointerState.Common -> Cursor.DEFAULT_CURSOR + TextFieldPointerState.Text -> Cursor.TEXT_CURSOR }) ) )