fix: Do not dynamically change between ime actions #434

common/src/androidMain/kotlin/com/artemchep/keyguard/android/PasskeyGetActivity.kt

@@ -446,10 +446,7 @@ fun UserVerificationScreen(
                     testTag = "field:password",
                     value = content.password,
                     keyboardOptions = KeyboardOptions(
-                        imeAction = when {
+                        imeAction = ImeAction.Go,
-                            keyboardOnGo != null -> ImeAction.Go
-                            else -> ImeAction.Default
-                        },
                     ),
                     keyboardActions = KeyboardActions(
                         onGo = keyboardOnGo,

common/src/androidMain/kotlin/com/artemchep/keyguard/feature/apppicker/AppPickerScreen.kt

@@ -175,7 +175,6 @@ fun ChangePasswordScreen(
                         leading = {},
                         trailing = {},
                         onTextChange = query?.onChange,
-                        onGoClick = null,
                     )
                 }
             }

common/src/commonMain/kotlin/com/artemchep/keyguard/feature/auth/login/LoginScreen.kt

@@ -332,8 +332,7 @@ fun LoginContent(
             keyboardOptions = KeyboardOptions(
                 imeAction = when {
                     !passwordIsLastField -> ImeAction.Next
-                    keyboardOnGo != null -> ImeAction.Go
+                    else -> ImeAction.Go
-                    else -> ImeAction.Default
                 },
             ),
             keyboardActions = KeyboardActions(
@@ -363,8 +362,7 @@ fun LoginContent(
                     keyboardOptions = KeyboardOptions(
                         imeAction = when {
                             !clientSecretIsLastField -> ImeAction.Next
-                            keyboardOnGo != null -> ImeAction.Go
+                            else -> ImeAction.Go
-                            else -> ImeAction.Default
                         },
                     ),
                     keyboardActions = KeyboardActions(

common/src/commonMain/kotlin/com/artemchep/keyguard/feature/auth/login/otp/LoginTwofaScreen.kt

@@ -418,10 +418,7 @@ private fun ColumnScope.LoginOtpScreenContentAuthenticator(
         keyboardOptions = KeyboardOptions(
             autoCorrect = false,
             keyboardType = KeyboardType.Number,
-            imeAction = when {
+            imeAction = ImeAction.Go,
-                keyboardOnGo != null -> ImeAction.Go
-                else -> ImeAction.Default
-            },
         ),
         keyboardActions = KeyboardActions(
             onGo = keyboardOnGo,
@@ -493,10 +490,7 @@ private fun ColumnScope.LoginOtpScreenContentEmail(
         keyboardOptions = KeyboardOptions(
             autoCorrect = false,
             keyboardType = KeyboardType.Number,
-            imeAction = when {
+            imeAction = ImeAction.Go,
-                keyboardOnGo != null -> ImeAction.Go
-                else -> ImeAction.Default
-            },
         ),
         keyboardActions = KeyboardActions(
             onGo = keyboardOnGo,

common/src/commonMain/kotlin/com/artemchep/keyguard/feature/confirmation/elevatedaccess/ElevatedAccessScreen.kt

@@ -162,10 +162,7 @@ private fun ColumnScope.ElevatedAccessContent(
         testTag = "field:password",
         value = content.password,
         keyboardOptions = KeyboardOptions(
-            imeAction = when {
+            imeAction = ImeAction.Go,
-                keyboardOnGo != null -> ImeAction.Go
-                else -> ImeAction.Default
-            },
         ),
         keyboardActions = KeyboardActions(
             onGo = keyboardOnGo,

common/src/commonMain/kotlin/com/artemchep/keyguard/feature/filter/list/CipherFiltersListScreen.kt

@@ -175,7 +175,6 @@ fun CipherFiltersListScreen(
                         leading = {},
                         trailing = {},
                         onTextChange = query?.onChange,
-                        onGoClick = null,
                     )
                 }
             }

common/src/commonMain/kotlin/com/artemchep/keyguard/feature/generator/wordlist/view/WordlistViewScreen.kt

@@ -199,7 +199,6 @@ fun WordlistViewScreen(
                         leading = {},
                         trailing = {},
                         onTextChange = query?.onChange,
-                        onGoClick = null,
                     )
                 }
             }

common/src/commonMain/kotlin/com/artemchep/keyguard/feature/home/settings/search/SearchSettingsScreen.kt

@@ -121,7 +121,6 @@ fun SearchSettingsScreenContent(
                         leading = {},
                         trailing = {},
                         onTextChange = state.query.onChange,
-                        onGoClick = null,
                     )
                 }
             }

common/src/commonMain/kotlin/com/artemchep/keyguard/feature/home/vault/component/SearchTextField.kt

@@ -62,7 +62,6 @@ fun SearchTextField(
     leading: @Composable () -> Unit,
     trailing: @Composable () -> Unit,
     onTextChange: ((String) -> Unit)?,
-    onGoClick: (() -> Unit)?,
 ) {
     val interactionSource = remember {
         MutableInteractionSource()
@@ -143,14 +142,9 @@ fun SearchTextField(
                 },
                 keyboardOptions = KeyboardOptions(
                     keyboardType = KeyboardType.Text,
-                    imeAction = if (onGoClick != null) ImeAction.Go else ImeAction.Done,
+                    imeAction = ImeAction.Done,
                     autoCorrect = false,
                 ),
-                keyboardActions = KeyboardActions(
-                    onGo = {
-                        onGoClick?.invoke()
-                    },
-                ),
                 singleLine = true,
             )
             if (count != null) {

common/src/commonMain/kotlin/com/artemchep/keyguard/feature/justdeleteme/directory/JustDeleteMeServiceListScreen.kt

@@ -173,7 +173,6 @@ fun JustDeleteMeListScreen(
                         leading = {},
                         trailing = {},
                         onTextChange = query?.onChange,
-                        onGoClick = null,
                     )
                 }
             }

common/src/commonMain/kotlin/com/artemchep/keyguard/feature/justgetdata/directory/JustGetMyDataListScreen.kt

@@ -174,7 +174,6 @@ fun JustGetMyDataListScreen(
                         leading = {},
                         trailing = {},
                         onTextChange = query?.onChange,
-                        onGoClick = null,
                     )
                 }
             }

common/src/commonMain/kotlin/com/artemchep/keyguard/feature/keyguard/setup/SetupScreen.kt

@@ -186,10 +186,7 @@ fun ColumnScope.SetupContent(
         label = stringResource(Res.string.setup_field_app_password_label),
         value = setupState.password,
         keyboardOptions = KeyboardOptions(
-            imeAction = when {
+            imeAction = ImeAction.Go,
-                keyboardOnGo != null -> ImeAction.Go
-                else -> ImeAction.Default
-            },
         ),
         keyboardActions = KeyboardActions(
             onGo = keyboardOnGo,

common/src/commonMain/kotlin/com/artemchep/keyguard/feature/keyguard/unlock/UnlockScreen.kt

@@ -176,10 +176,7 @@ private fun UnlockScreen(
                     testTag = "field:password",
                     value = unlockState.password,
                     keyboardOptions = KeyboardOptions(
-                        imeAction = when {
+                        imeAction = ImeAction.Go,
-                            keyboardOnGo != null -> ImeAction.Go
-                            else -> ImeAction.Default
-                        },
                     ),
                     keyboardActions = KeyboardActions(
                         onGo = keyboardOnGo,

common/src/commonMain/kotlin/com/artemchep/keyguard/feature/passkeys/directory/PasskeysServiceListScreen.kt

@@ -171,7 +171,6 @@ fun PasskeysListScreen(
                         leading = {},
                         trailing = {},
                         onTextChange = query?.onChange,
-                        onGoClick = null,
                     )
                 }
             }

common/src/commonMain/kotlin/com/artemchep/keyguard/feature/tfa/directory/TwoFaServiceListScreen.kt

@@ -171,7 +171,6 @@ fun TwoFaServiceListScreen(
                         leading = {},
                         trailing = {},
                         onTextChange = query?.onChange,
-                        onGoClick = null,
                     )
                 }
             }

common/src/commonMain/kotlin/com/artemchep/keyguard/ui/toolbar/content/ContentSearchbar.kt

@@ -49,7 +49,6 @@ fun CustomSearchbarContent(
                 }
             },
             onTextChange = searchFieldModel.onChange,
-            onGoClick = null,
         )
     }
 }