Fixed the input text fields of Auth screens

uncrack-vault · May 26, 2024 · fa38524 · fa38524
1 parent 0ae7fd1
commit fa38524
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -59,6 +59,11 @@
             android:theme="@style/Theme.UnCrack">
         </activity>
 
+        <activity android:name=".presentation.auth.forgotPassword.ForgotPasswordScreen"
+            android:exported="true"
+            android:theme="@style/Theme.UnCrack">
+        </activity>
+
         <activity android:name=".presentation.masterKey.createMasterKey.CreateMasterKeyScreen"
             android:exported="true"
             android:theme="@style/Theme.UnCrack">

diff --git a/...java/com/geekymusketeers/uncrack/presentation/auth/forgotPassword/ForgotPasswordScreen.kt b/...java/com/geekymusketeers/uncrack/presentation/auth/forgotPassword/ForgotPasswordScreen.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -29,6 +30,8 @@ import androidx.compose.ui.graphics.toArgb
 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.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -108,6 +111,8 @@ fun ForgotPasswordContent(
                 modifier = Modifier
                     .fillMaxWidth(),
                 headerText = stringResource(R.string.enter_your_registered_mail),
+                maxLines = 1,
+                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email, imeAction = ImeAction.Done),
                 value = email,
                 onValueChange = { email = it }
             )

diff --git a/app/src/main/java/com/geekymusketeers/uncrack/presentation/auth/login/LoginScreens.kt b/app/src/main/java/com/geekymusketeers/uncrack/presentation/auth/login/LoginScreens.kt
@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -37,6 +38,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 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.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
@@ -49,6 +52,7 @@ import com.geekymusketeers.uncrack.components.UCTextField
 import com.geekymusketeers.uncrack.presentation.auth.AuthViewModel
 import com.geekymusketeers.uncrack.presentation.auth.forgotPassword.ForgotPasswordScreen
 import com.geekymusketeers.uncrack.presentation.auth.signup.SignupScreen
+import com.geekymusketeers.uncrack.presentation.masterKey.createMasterKey.CreateMasterKeyScreen
 import com.geekymusketeers.uncrack.ui.theme.DMSansFontFamily
 import com.geekymusketeers.uncrack.ui.theme.OnPrimaryContainerLight
 import com.geekymusketeers.uncrack.ui.theme.PrimaryLight
@@ -137,6 +141,8 @@ fun LoginContent(
                     .fillMaxWidth(),
                 headerText = stringResource(R.string.email_header),
                 hintText = stringResource(R.string.email_hint),
+                maxLines = 1,
+                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email, imeAction = ImeAction.Next),
                 value = email,
                 onValueChange = { viewModel.setEmail(it) }
             )
@@ -148,6 +154,8 @@ fun LoginContent(
                     .fillMaxWidth(),
                 headerText = stringResource(R.string.password_header),
                 hintText = stringResource(R.string.password_hint),
+                maxLines = 1,
+                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Done),
                 value = password,
                 onValueChange = { viewModel.setPassword(it) },
                 visualTransformation = if (passwordVisibility) VisualTransformation.None else PasswordVisualTransformation(),
@@ -204,7 +212,7 @@ fun LoginContent(
                         }
                     )
                     context.findActivity()?.apply {
-                        startActivity(Intent(activity, MainActivity::class.java))
+                        startActivity(Intent(activity, CreateMasterKeyScreen::class.java))
                     }
                 },
                 enabled = isSignInEnable

diff --git a/app/src/main/java/com/geekymusketeers/uncrack/presentation/auth/signup/SignupScreen.kt b/app/src/main/java/com/geekymusketeers/uncrack/presentation/auth/signup/SignupScreen.kt
@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
@@ -35,6 +36,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 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.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
@@ -131,6 +134,8 @@ fun SignupContent(
                     .fillMaxWidth(),
                 headerText = stringResource(R.string.name_header),
                 hintText = stringResource(R.string.name_hint),
+                maxLines = 1,
+                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text, imeAction = ImeAction.Next),
                 value = name,
                 onValueChange = { authViewModel.setUserName(it) }
             )
@@ -143,6 +148,8 @@ fun SignupContent(
                     .fillMaxWidth(),
                 headerText = stringResource(R.string.email_header),
                 hintText = stringResource(R.string.email_hint),
+                maxLines = 1,
+                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email, imeAction = ImeAction.Next),
                 value = email,
                 onValueChange = { authViewModel.setEmail(it) }
             )
@@ -154,6 +161,8 @@ fun SignupContent(
                     .fillMaxWidth(),
                 headerText = stringResource(R.string.password_header),
                 hintText = stringResource(R.string.password_hint),
+                maxLines = 1,
+                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Done),
                 value = password,
                 onValueChange = { authViewModel.setPassword(it) },
                 visualTransformation = if (passwordVisibility) VisualTransformation.None else PasswordVisualTransformation(),