merge: #6

app/src/main/java/chat/revolt/components/generic/FormTextField.kt

@@ -5,6 +5,7 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
@@ -19,6 +20,7 @@ fun FormTextField(
     onChange: (it: String) -> Unit,
     modifier: Modifier = Modifier,
     type: KeyboardType = KeyboardType.Text,
+    action: ImeAction = ImeAction.Done,
     supportingText: @Composable (() -> Unit)? = null,
     singleLine: Boolean = true,
     enabled: Boolean = true
@@ -27,7 +29,7 @@ fun FormTextField(
         value = value,
         onValueChange = onChange,
         singleLine = singleLine,
-        keyboardOptions = KeyboardOptions(keyboardType = type),
+        keyboardOptions = KeyboardOptions(keyboardType = type, imeAction = action),
         visualTransformation = if (type == KeyboardType.Password) PasswordVisualTransformation() else VisualTransformation.None,
         label = { Text(label) },
         supportingText = supportingText,

app/src/main/java/chat/revolt/screens/login/LoginScreen.kt

@@ -28,6 +28,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 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.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -200,6 +201,8 @@ fun LoginScreen(navController: NavController, viewModel: LoginViewModel = hiltVi
                 FormTextField(
                     value = viewModel.email,
                     label = stringResource(R.string.email),
+                    type = KeyboardType.Email,
+                    action = ImeAction.Next,
                     onChange = viewModel::setEmail,
                     modifier = Modifier.padding(vertical = 25.dp)
                 )

app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt

@@ -25,6 +25,7 @@ import androidx.compose.ui.Modifier
 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.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -161,7 +162,9 @@ fun RegisterDetailsScreen(
                 FormTextField(
                     value = viewModel.email,
                     onChange = { viewModel.email = it },
-                    label = stringResource(R.string.register_email)
+                    label = stringResource(R.string.register_email),
+                    type = KeyboardType.Email,
+                    action = ImeAction.Next
                 )
                 Text(
                     text = stringResource(R.string.register_email_verification_hint),