Merge pull request #49 from snuhcs-course/feat/disable-autofill-password

feat: Add keyboardOptions to text field
snuhcs-course · Nov 21, 2023 · 5fb94ce · 5fb94ce
2 parents 489289a + 5eb5e25
commit 5fb94ce
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 6 deletions.
diff --git a/...rc/main/java/com/example/speechbuddy/compose/emailverification/EmailVerificationScreen.kt b/...rc/main/java/com/example/speechbuddy/compose/emailverification/EmailVerificationScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -18,6 +19,7 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.example.speechbuddy.R
@@ -98,6 +100,10 @@ fun EmailVerificationScreen(
                 },
                 isError = isError,
                 isValid = uiState.isValidEmail,
+                keyboardOptions = KeyboardOptions(
+                    keyboardType = KeyboardType.Email,
+                    autoCorrect = true
+                )
             )
 
             TextFieldUi(

diff --git a/frontend/app/src/main/java/com/example/speechbuddy/compose/login/LoginScreen.kt b/frontend/app/src/main/java/com/example/speechbuddy/compose/login/LoginScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -15,6 +16,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.example.speechbuddy.R
@@ -64,7 +66,11 @@ fun LoginScreen(
                     }
                 },
                 isError = isError,
-                isValid = uiState.isValidEmail
+                isValid = uiState.isValidEmail,
+                keyboardOptions = KeyboardOptions(
+                    keyboardType = KeyboardType.Email,
+                    autoCorrect = true
+                )
             )
 
             TextFieldUi(
@@ -80,7 +86,11 @@ fun LoginScreen(
                 },
                 isError = isError,
                 isValid = uiState.isValidPassword,
-                isHidden = true
+                isHidden = true,
+                keyboardOptions = KeyboardOptions(
+                    keyboardType = KeyboardType.Password,
+                    autoCorrect = false
+                )
             )
 
             Spacer(modifier = Modifier.height(20.dp))

diff --git a/frontend/app/src/main/java/com/example/speechbuddy/compose/signup/SignupScreen.kt b/frontend/app/src/main/java/com/example/speechbuddy/compose/signup/SignupScreen.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -15,6 +16,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.example.speechbuddy.R
@@ -61,7 +63,11 @@ fun SignupScreen(
                 value = email,
                 onValueChange = {},
                 label = { Text(text = stringResource(id = R.string.email)) },
-                isEnabled = false
+                isEnabled = false,
+                keyboardOptions = KeyboardOptions(
+                    keyboardType = KeyboardType.Email,
+                    autoCorrect = true
+                )
             )
 
             TextFieldUi(
@@ -92,7 +98,11 @@ fun SignupScreen(
                 },
                 isError = isPasswordError,
                 isValid = uiState.isValidPassword,
-                isHidden = true
+                isHidden = true,
+                keyboardOptions = KeyboardOptions(
+                    keyboardType = KeyboardType.Password,
+                    autoCorrect = false
+                )
             )
 
             TextFieldUi(

diff --git a/frontend/app/src/main/java/com/example/speechbuddy/compose/utils/TextFieldUi.kt b/frontend/app/src/main/java/com/example/speechbuddy/compose/utils/TextFieldUi.kt
@@ -3,6 +3,7 @@ package com.example.speechbuddy.compose.utils
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
@@ -11,6 +12,7 @@ import androidx.compose.material3.TextFieldColors
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+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.tooling.preview.Preview
@@ -43,7 +45,11 @@ fun TextFieldUi(
     supportingText: @Composable (() -> Unit)? = null,
     isError: Boolean = false,
     isValid: Boolean = false,
-    isHidden: Boolean = false
+    isHidden: Boolean = false,
+    keyboardOptions: KeyboardOptions = KeyboardOptions(
+        keyboardType = KeyboardType.Text,
+        autoCorrect = true
+    )
 ) {
     OutlinedTextField(
         value = value,
@@ -64,7 +70,8 @@ fun TextFieldUi(
         },
         singleLine = true,
         shape = RoundedCornerShape(10.dp),
-        colors = getTextFieldColors(isValid)
+        colors = getTextFieldColors(isValid),
+        keyboardOptions = keyboardOptions
     )
 }