[optimize|fix] Optimize TextFieldDialog.kt; fix ProxyFragment.kt inpu…

…t dialog bug; rename BaseSettingsItem's dropdownMenu to extraContent
SkyD666 · Aug 6, 2024 · e761863 · e761863
1 parent 652ec8c
commit e761863
Show file tree

Hide file tree

Showing 11 changed files with 117 additions and 94 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -22,7 +22,7 @@ android {
         minSdk = 24
         targetSdk = 34
         versionCode = 20
-        versionName = "2.1-alpha06"
+        versionName = "2.1-alpha07"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/src/main/java/com/skyd/anivu/ui/component/ClipboardTextField.kt b/app/src/main/java/com/skyd/anivu/ui/component/ClipboardTextField.kt
@@ -33,6 +33,7 @@ fun ClipboardTextField(
     isPassword: Boolean = false,
     errorText: String = "",
     imeAction: ImeAction = ImeAction.Done,
+    keyboardOptions: KeyboardOptions = KeyboardOptions(imeAction = imeAction),
     keyboardAction: (KeyboardActionScope.(focusManager: FocusManager?, value: String) -> Unit)? = null,
     focusManager: FocusManager? = null,
     onConfirm: (String) -> Unit = {},
@@ -89,9 +90,7 @@ fun ClipboardTextField(
                     }
                 } else null,
             ),
-            keyboardOptions = KeyboardOptions(
-                imeAction = imeAction
-            ),
+            keyboardOptions = keyboardOptions,
         )
         if (errorText.isNotEmpty()) {
             SelectionContainer {

diff --git a/app/src/main/java/com/skyd/anivu/ui/component/SettingsItem.kt b/app/src/main/java/com/skyd/anivu/ui/component/SettingsItem.kt
@@ -303,7 +303,7 @@ fun BaseSettingsItem(
     enabled: Boolean = true,
     onClick: (() -> Unit)? = null,
     onLongClick: (() -> Unit)? = null,
-    dropdownMenu: (@Composable () -> Unit)? = null,
+    extraContent: (@Composable () -> Unit)? = null,
     content: (@Composable () -> Unit)? = null,
 ) {
     BaseSettingsItem(
@@ -323,7 +323,7 @@ fun BaseSettingsItem(
         enabled = enabled,
         onClick = if (enabled) onClick else null,
         onLongClick = if (enabled) onLongClick else null,
-        dropdownMenu = dropdownMenu,
+        extraContent = extraContent,
         content = content,
     )
 }
@@ -337,7 +337,7 @@ fun BaseSettingsItem(
     enabled: Boolean = true,
     onClick: (() -> Unit)? = null,
     onLongClick: (() -> Unit)? = null,
-    dropdownMenu: (@Composable () -> Unit)? = null,
+    extraContent: (@Composable () -> Unit)? = null,
     content: (@Composable () -> Unit)? = null
 ) {
     CompositionLocalProvider(
@@ -388,7 +388,7 @@ fun BaseSettingsItem(
                     maxLines = 3,
                     overflow = TextOverflow.Ellipsis,
                 )
-                dropdownMenu?.invoke()
+                extraContent?.invoke()
                 if (description != null) {
                     Box(modifier = Modifier.padding(top = 4.dp)) {
                         description.invoke()

diff --git a/app/src/main/java/com/skyd/anivu/ui/component/dialog/TextFieldDialog.kt b/app/src/main/java/com/skyd/anivu/ui/component/dialog/TextFieldDialog.kt
@@ -1,6 +1,7 @@
 package com.skyd.anivu.ui.component.dialog
 
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -33,11 +34,12 @@ fun TextFieldDialog(
     errorText: String = "",
     dismissText: String = stringResource(R.string.cancel),
     confirmText: String = stringResource(R.string.ok),
-    enableConfirm: (String) -> Boolean = { it.isNotBlank() },
+    enableConfirm: (String) -> Boolean = { it.isNotBlank() && errorText.isEmpty() },
     onValueChange: (String) -> Unit = {},
     onDismissRequest: () -> Unit = {},
     onConfirm: (String) -> Unit = {},
     imeAction: ImeAction = if (maxLines == 1) ImeAction.Done else ImeAction.Default,
+    keyboardOptions: KeyboardOptions = KeyboardOptions(imeAction = imeAction),
 ) {
     TextFieldDialog(
         modifier = modifier,
@@ -61,6 +63,7 @@ fun TextFieldDialog(
         onDismissRequest = onDismissRequest,
         onConfirm = onConfirm,
         imeAction = imeAction,
+        keyboardOptions = keyboardOptions,
     )
 }
 
@@ -80,11 +83,12 @@ fun TextFieldDialog(
     errorText: String = "",
     dismissText: String = stringResource(R.string.cancel),
     confirmText: String = stringResource(R.string.ok),
-    enableConfirm: (String) -> Boolean = { it.isNotBlank() },
+    enableConfirm: (String) -> Boolean = { it.isNotBlank() && errorText.isEmpty() },
     onValueChange: (String) -> Unit = {},
     onDismissRequest: () -> Unit = {},
     onConfirm: (String) -> Unit = {},
     imeAction: ImeAction = if (maxLines == 1) ImeAction.Done else ImeAction.Default,
+    keyboardOptions: KeyboardOptions = KeyboardOptions(imeAction = imeAction),
 ) {
     val focusManager = LocalFocusManager.current
 
@@ -107,6 +111,7 @@ fun TextFieldDialog(
                 isPassword = isPassword,
                 errorText = errorText,
                 imeAction = imeAction,
+                keyboardOptions = keyboardOptions,
                 focusManager = focusManager,
                 onConfirm = onConfirm,
             )

diff --git a/app/src/main/java/com/skyd/anivu/ui/fragment/settings/appearance/AppearanceFragment.kt b/app/src/main/java/com/skyd/anivu/ui/fragment/settings/appearance/AppearanceFragment.kt
@@ -175,7 +175,7 @@ fun AppearanceScreen() {
                     descriptionText = TextFieldStylePreference.toDisplayName(
                         context, LocalTextFieldStyle.current,
                     ),
-                    dropdownMenu = {
+                    extraContent = {
                         TextFieldStyleMenu(
                             expanded = expandTextFieldStyleMenu,
                             onDismissRequest = { expandTextFieldStyleMenu = false }
@@ -191,7 +191,7 @@ fun AppearanceScreen() {
                     descriptionText = DateStylePreference.toDisplayName(
                         context, LocalDateStyle.current,
                     ),
-                    dropdownMenu = {
+                    extraContent = {
                         DateStyleStyleMenu(
                             expanded = expandDateStyleMenu,
                             onDismissRequest = { expandDateStyleMenu = false }
@@ -207,7 +207,7 @@ fun AppearanceScreen() {
                     descriptionText = NavigationBarLabelPreference.toDisplayName(
                         context, LocalNavigationBarLabel.current,
                     ),
-                    dropdownMenu = {
+                    extraContent = {
                         NavigationBarLabelStyleMenu(
                             expanded = expandNavigationBarLabelMenu,
                             onDismissRequest = { expandNavigationBarLabelMenu = false }

diff --git a/app/src/main/java/com/skyd/anivu/ui/fragment/settings/behavior/BehaviorFragment.kt b/app/src/main/java/com/skyd/anivu/ui/fragment/settings/behavior/BehaviorFragment.kt
@@ -130,7 +130,7 @@ fun BehaviorScreen() {
                         context = context,
                         value = LocalArticleTapAction.current,
                     ),
-                    dropdownMenu = {
+                    extraContent = {
                         ArticleTapActionMenu(
                             expanded = expandArticleTapActionMenu,
                             onDismissRequest = { expandArticleTapActionMenu = false }
@@ -147,7 +147,7 @@ fun BehaviorScreen() {
                         context = context,
                         value = LocalArticleSwipeLeftAction.current,
                     ),
-                    dropdownMenu = {
+                    extraContent = {
                         ArticleSwipeActionMenu(
                             expanded = expandArticleSwipeLeftActionMenu,
                             onDismissRequest = { expandArticleSwipeLeftActionMenu = false },
@@ -170,7 +170,7 @@ fun BehaviorScreen() {
                         context = context,
                         value = LocalArticleSwipeRightAction.current,
                     ),
-                    dropdownMenu = {
+                    extraContent = {
                         ArticleSwipeActionMenu(
                             expanded = expandArticleSwipeRightActionMenu,
                             onDismissRequest = { expandArticleSwipeRightActionMenu = false },

diff --git a/app/src/main/java/com/skyd/anivu/ui/fragment/settings/playerconfig/PlayerConfigFragment.kt b/app/src/main/java/com/skyd/anivu/ui/fragment/settings/playerconfig/PlayerConfigFragment.kt
@@ -89,7 +89,7 @@ fun PlayerConfigScreen() {
                         context,
                         LocalPlayerDoubleTap.current,
                     ),
-                    dropdownMenu = {
+                    extraContent = {
                         DoubleTapMenu(
                             expanded = expandDoubleTapMenu,
                             onDismissRequest = { expandDoubleTapMenu = false }

diff --git a/app/src/main/java/com/skyd/anivu/ui/fragment/settings/rssconfig/RssConfigFragment.kt b/app/src/main/java/com/skyd/anivu/ui/fragment/settings/rssconfig/RssConfigFragment.kt
@@ -88,7 +88,7 @@ fun RssConfigScreen() {
                     descriptionText = RssSyncFrequencyPreference.toDisplayName(
                         context, LocalRssSyncFrequency.current,
                     ),
-                    dropdownMenu = {
+                    extraContent = {
                         RssSyncFrequencyMenu(
                             expanded = expandRssSyncFrequencyMenu,
                             onDismissRequest = { expandRssSyncFrequencyMenu = false }