feat: Update cat seed input

hushenghao · hushenghao · commit fa210d53cca7 · 2025-05-28T11:44:43.000+08:00
Signed-off-by: Hu Shenghao &lt;dede.hu@qq.com&gt;
diff --git a/core/resources/src/main/res/values-zh/strings.xml b/core/resources/src/main/res/values-zh/strings.xml
@@ -47,4 +47,5 @@
     <string name="animator_disabled_alert_message">由于系统动画被禁用，可能导致一些功能无法正常使用。请进入“开发者选项”并启用“Animator 时长缩放”选项以开启动画。</string>
     <string name="action_goto_settings">去设置</string>
     <string name="cat_editor">Cat Editor</string>
+    <string name="cat_editor_input_seed">输入猫种子</string>
 </resources>
diff --git a/core/resources/src/main/res/values/strings.xml b/core/resources/src/main/res/values/strings.xml
@@ -55,5 +55,5 @@
     <string name="action_goto_settings">Go to Settings</string>
 
     <string name="cat_editor">Cat Editor</string>
-    <string name="cat_editor_input_seed">Input Cat Seed</string>
+    <string name="cat_editor_input_seed">Input cat\'s seed</string>
 </resources>
diff --git a/feature/cat-editor/src/main/java/com/dede/android_eggs/cat_editor/CatEditorScreen.kt b/feature/cat-editor/src/main/java/com/dede/android_eggs/cat_editor/CatEditorScreen.kt
@@ -10,19 +10,15 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.background
-import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.ArrowBack
 import androidx.compose.material.icons.automirrored.rounded.ArrowForward
-import androidx.compose.material.icons.rounded.Clear
 import androidx.compose.material.icons.rounded.ContentCopy
 import androidx.compose.material.icons.rounded.Edit
 import androidx.compose.material.icons.rounded.GridOff
@@ -31,7 +27,6 @@ import androidx.compose.material.icons.rounded.MoreVert
 import androidx.compose.material.icons.rounded.Palette
 import androidx.compose.material.icons.rounded.Refresh
 import androidx.compose.material.icons.rounded.Save
-import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.BottomAppBar
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -41,8 +36,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.TextField
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -60,24 +53,18 @@ import androidx.compose.ui.graphics.asAndroidBitmap
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.intl.LocaleList
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.dede.android_eggs.cat_editor.CaptureControllerDelegate.Companion.rememberCaptureControllerDelegate
 import com.dede.android_eggs.cat_editor.CatEditorRecords.Companion.rememberCatEditorRecords
 import com.dede.android_eggs.navigation.EasterEggsDestination
 import com.dede.android_eggs.navigation.LocalNavController
-import com.dede.android_eggs.ui.composes.icons.rounded.Cat
 import com.dede.basic.copy
 import com.dede.basic.toast
 import com.dede.basic.utils.ShareCatUtils
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import kotlinx.coroutines.launch
 import androidx.appcompat.R as AppCompatR
-import com.dede.android_eggs.resources.R as StringR
 
 object CatEditorScreen : EasterEggsDestination {
     override val route: String = "cat_editor"
@@ -109,8 +96,6 @@ fun CatEditorScreen() {
     }
 
     var moreOptionsVisible by remember { mutableStateOf(false) }
-    var inputSeedDialog by remember { mutableStateOf(false) }
-    var inputSeedText by remember { mutableStateOf("") }
 
     Scaffold(
         topBar = {
@@ -290,82 +275,17 @@ fun CatEditorScreen() {
                 }
             )
 
+            val inputSeedDialogState = remember { mutableStateOf(false) }
+
             fun updateCatSeed(seed: Long) {
                 catSeed = seed
                 catEditorController.updateColors(catSeed)
                 catEditorRecords.addRecord(CatEditorRecords.seed(catSeed))
             }
 
-            if (inputSeedDialog) {
-
-                fun onInputDone() {
-                    if (inputSeedText.isBlank()) {
-                        return
-                    }
-                    val seed = Utilities.string2Seed(inputSeedText)
-                    updateCatSeed(seed)
-                }
-
-                AlertDialog(
-                    onDismissRequest = {
-                        inputSeedDialog = false
-                    },
-                    title = {
-                        Text(text = stringResource(StringR.string.cat_editor))
-                    },
-                    text = {
-                        TextField(
-                            modifier = Modifier.focusable(true),
-                            value = inputSeedText,
-                            onValueChange = { inputSeedText = it },
-                            placeholder = {
-                                Text(text = "XXX")
-                            },
-                            leadingIcon = {
-                                Icon(imageVector = Icons.Rounded.Cat, contentDescription = null)
-                            },
-                            trailingIcon = {
-                                IconButton(onClick = {
-                                    inputSeedText = ""
-                                }) {
-                                    Icon(
-                                        imageVector = Icons.Rounded.Clear,
-                                        contentDescription = null
-                                    )
-                                }
-                            },
-                            label = { Text(text = stringResource(StringR.string.cat_editor_input_seed)) },
-                            keyboardOptions = KeyboardOptions(
-                                autoCorrectEnabled = false,
-                                keyboardType = KeyboardType.Text,
-                                imeAction = ImeAction.Done,
-                                showKeyboardOnFocus = true,
-                                hintLocales = LocaleList("en"),
-                                capitalization = KeyboardCapitalization.None,
-                            ),
-                            keyboardActions = KeyboardActions {
-                                onInputDone()
-                                inputSeedDialog = false
-                            }
-                        )
-                    },
-                    dismissButton = {
-                        TextButton(onClick = {
-                            inputSeedDialog = false
-                        }) {
-                            Text(text = stringResource(android.R.string.cancel))
-                        }
-                    },
-                    confirmButton = {
-                        TextButton(onClick = {
-                            onInputDone()
-                            inputSeedDialog = false
-                        }) {
-                            Text(text = stringResource(android.R.string.ok))
-                        }
-                    },
-                )
-            }
+            CatSeedInputDialog(inputSeedDialogState, onConfirm = { seed ->
+                updateCatSeed(seed)
+            })
 
             AnimatedVisibility(
                 visible = moreOptionsVisible,
@@ -391,7 +311,7 @@ fun CatEditorScreen() {
                     }
 
                     IconButton(onClick = {
-                        inputSeedDialog = true
+                        inputSeedDialogState.value = true
                     }) {
                         Icon(imageVector = Icons.Rounded.Edit, contentDescription = null)
                     }
diff --git a/feature/cat-editor/src/main/java/com/dede/android_eggs/cat_editor/CatSeedInputDialog.kt b/feature/cat-editor/src/main/java/com/dede/android_eggs/cat_editor/CatSeedInputDialog.kt
@@ -0,0 +1,146 @@
+package com.dede.android_eggs.cat_editor
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Clear
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.intl.LocaleList
+import com.dede.android_eggs.resources.R
+import com.dede.android_eggs.ui.composes.icons.rounded.Cat
+
+/**
+ * A dialog for inputting a cat seed.
+ */
+@Composable
+fun CatSeedInputDialog(
+    visibleState: MutableState<Boolean>,
+    onConfirm: (seed: Long) -> Unit,
+    onDismiss: () -> Unit = {},
+) {
+    var visible by visibleState
+    if (!visible) {
+        return
+    }
+
+    var inputSeedText by remember { mutableStateOf("") }
+    var inputError by remember { mutableStateOf(false) }
+
+    fun dismiss() {
+        visible = false
+        inputSeedText = ""
+        inputError = false
+        onDismiss()
+    }
+
+    fun done() {
+        if (inputSeedText.isBlank()) {
+            inputError = true
+            return
+        }
+
+        val seed = Utilities.string2Seed(inputSeedText)
+        onConfirm(seed)
+        dismiss()
+    }
+
+    AlertDialog(
+        onDismissRequest = {
+            dismiss()
+        },
+        title = {
+            Text(text = stringResource(R.string.cat_editor))
+        },
+        text = {
+            val focusRequester = remember { FocusRequester() }
+            val keyboardController = LocalSoftwareKeyboardController.current
+            LaunchedEffect(Unit) {
+                focusRequester.requestFocus()
+                keyboardController?.show()
+            }
+
+            TextField(
+                modifier = Modifier.focusRequester(focusRequester),
+                value = inputSeedText,
+                onValueChange = {
+                    inputSeedText = it
+                    inputError = false
+                },
+                placeholder = {
+                    Text(text = "XXX")
+                },
+                leadingIcon = {
+                    Icon(imageVector = Icons.Rounded.Cat, contentDescription = null)
+                },
+                trailingIcon = {
+                    AnimatedVisibility(
+                        visible = inputSeedText.isNotEmpty(),
+                        enter = fadeIn() + scaleIn(),
+                        exit = fadeOut() + scaleOut(),
+                    ) {
+                        IconButton(onClick = { inputSeedText = "" }) {
+                            Icon(
+                                imageVector = Icons.Rounded.Clear,
+                                contentDescription = null
+                            )
+                        }
+                    }
+                },
+                isError = inputError,
+                label = {
+                    Text(text = stringResource(R.string.cat_editor_input_seed))
+                },
+                keyboardOptions = KeyboardOptions(
+                    autoCorrectEnabled = false,
+                    keyboardType = KeyboardType.Text,
+                    imeAction = ImeAction.Done,
+                    showKeyboardOnFocus = true,
+                    hintLocales = LocaleList("en"),
+                    capitalization = KeyboardCapitalization.None,
+                ),
+                keyboardActions = KeyboardActions {
+                    done()
+                }
+            )
+        },
+        dismissButton = {
+            TextButton(onClick = {
+                dismiss()
+            }) {
+                Text(text = stringResource(android.R.string.cancel))
+            }
+        },
+        confirmButton = {
+            TextButton(onClick = {
+                done()
+            }) {
+                Text(text = stringResource(android.R.string.ok))
+            }
+        },
+    )
+}
diff --git a/feature/cat-editor/src/main/java/com/dede/android_eggs/cat_editor/OpenSimplex2S.java b/feature/cat-editor/src/main/java/com/dede/android_eggs/cat_editor/OpenSimplex2S.java
@@ -1,6 +1,6 @@
 package com.dede.android_eggs.cat_editor;
 
-// https://github.com/KdotJPG/OpenSimplex2
+// OpenSimplex2 (https://github.com/KdotJPG/OpenSimplex2)
 //
 // Creative Commons Legal Code
 //
