RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge: #6

This commit is contained in:
aisu 2024-06-16 13:10:29 -04:00 committed by GitHub
parent 25eae779e6
commit 641dc27f44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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,

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

@ -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)
)

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

@ -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),