Added start and expiration date validation format MM/YY VisualTransformation on payment card form screen, worked on browse screen enum class, change bg_color to white and remove searchbar

app/src/main/java/com/fastest/pass/app/Utils.kt

@@ -69,7 +69,7 @@ class Utils {
         fun customSaltKey(userinfo: UserInfo) : String {
             val id = userinfo.id
             val email = userinfo.email
-            val saltKey = "${id}_${email}"
+            val saltKey = "${id}_${email}_${id}"
             val filterSaltKey = saltKey.replace("[@.]".toRegex(), "")
             return filterSaltKey
         }

app/src/main/java/com/fastest/pass/browse/presentation/ui/components/BrowseScreen.kt

@@ -40,15 +40,15 @@ import com.fastest.pass.home.domain.model.AddNewItem
 import com.fastest.pass.home.presentation.ui.components.AddNewItemRow
 import com.fastest.pass.home.presentation.ui.components.GapLine
 
-enum class ClickTypeItemBrowse {
-    Password,
-    Bank,
-    Payment,
-    Wifi,
-    Note,
-    Contact,
-    Driver,
-    Passport,
+enum class ClickTypeItemBrowse(val value: String, val vaultKey: String) {
+    Password("Password", "passwords"),
+    Bank("Bank", "bank-accounts"),
+    Payment("Payment", "payment-cards"),
+    Wifi("Wifi", "wifi-password"),
+    Note("Note", "notes"),
+    Contact("Contact", "address"),
+    Driver("Driver", "drivers-license"),
+    Passport("Passport", "passports"),
 }
 
 @Composable
@@ -67,11 +67,12 @@ fun BrowseScreen(clickTypeItemBrowse: (ClickTypeItemBrowse) -> Unit) {
                     .background(colorResource(id = R.color.blue_login))
             ) { }
 
-            Spacer(modifier = Modifier.height(20.dp))
-            SearchBarRowBS()
-            Spacer(modifier = Modifier.height(20.dp))
-            GapLine()
-            Spacer(modifier = Modifier.height(0.dp))
+//            Spacer(modifier = Modifier.height(20.dp))
+//            SearchBarRowBS()
+//            Spacer(modifier = Modifier.height(20.dp))
+//            GapLine()
+
+            Spacer(modifier = Modifier.height(10.dp))
             AddNewItemListBS { clickTypeItemBrowseId ->
                 clickTypeItemBrowse(clickTypeItemBrowseId)
             }
@@ -177,7 +178,7 @@ fun AddNewItemListBS(clickType: (ClickTypeItemBrowse) -> Unit) {
         modifier = Modifier
             .fillMaxSize()
             .padding(horizontal = 30.dp)
-            .padding(vertical = 15.dp)
+            .padding(bottom = 20.dp)
             .background(Color.Transparent)
     ) {
         LazyColumn(

app/src/main/java/com/fastest/pass/browse/presentation/ui/fragment/BrowseFragment.kt

@@ -51,11 +51,11 @@ class BrowseFragment : BaseFragment() {
                         Box(
                             modifier = Modifier
                                 .fillMaxSize()
-                                .background(colorResource(id = R.color.home_background_color))
+                                .background(colorResource(id = R.color.white))
                                 .padding(paddingValues.calculateBottomPadding())
                         ) {
                             BrowseScreen { clickTypeItemBrowse ->
-                                Log.d("screenNameBrowse", "clickTypeItemBrowseBF = ${clickTypeItemBrowse.name} ,,")
+                                Log.d("screenNameBrowse", "clickTypeItemBrowseBF = ${clickTypeItemBrowse.name} , ${clickTypeItemBrowse.value}, ${clickTypeItemBrowse.vaultKey}")
 
                                 when (clickTypeItemBrowse) {
                                     ClickTypeItemBrowse.Password -> {

app/src/main/java/com/fastest/pass/home/presentation/ui/components/AddPaymentCardFormScreen.kt

@@ -40,8 +40,12 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.platform.SoftwareKeyboardController
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.OffsetMapping
+import androidx.compose.ui.text.input.TransformedText
+import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -71,29 +75,60 @@ fun AddPaymentCardFormScreen() {
                 .verticalScroll(rememberScrollState())
         ) {
             Spacer(modifier = Modifier.height(20.dp))
-            NameTextFieldAPCFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.title)
+            NameTextFieldAPCFS(
+                keyboardController = keyboardController,
+                focusManager = focusManager,
+                labelText = R.string.title
+            )
             Spacer(modifier = Modifier.height(20.dp))
-            NameTextFieldAPCFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.name_on_card)
+            NameTextFieldAPCFS(
+                keyboardController = keyboardController,
+                focusManager = focusManager,
+                labelText = R.string.name_on_card
+            )
             Spacer(modifier = Modifier.height(20.dp))
-            NameTextFieldAPCFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.type)
+            NameTextFieldAPCFS(
+                keyboardController = keyboardController,
+                focusManager = focusManager,
+                labelText = R.string.type
+            )
             Spacer(modifier = Modifier.height(20.dp))
-            NumberTextFieldAPCFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.number, placeholder = "1234 1234 1234 1234")
+            NumberTextFieldAPCFS(
+                keyboardController = keyboardController,
+                focusManager = focusManager,
+                labelText = R.string.number,
+                placeholder = "1234 1234 1234 1234"
+            )
             Spacer(modifier = Modifier.height(20.dp))
-            NumberTextFieldAPCFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.security_code, placeholder = "CVV")
+            NumberTextFieldAPCFS(
+                keyboardController = keyboardController,
+                focusManager = focusManager,
+                labelText = R.string.security_code,
+                placeholder = "CVV"
+            )
             Spacer(modifier = Modifier.height(20.dp))
-            NumberTextFieldAPCFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.start_date, placeholder = "MM/YYYY")
+            NumberDateFieldAPCFS(
+                keyboardController = keyboardController,
+                focusManager = focusManager,
+                labelText = R.string.start_date,
+                placeholder = "MM/YY"
+            )
             Spacer(modifier = Modifier.height(20.dp))
-            NumberTextFieldAPCFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.expiration_date, placeholder = "MM/YYYY")
+            NumberDateFieldAPCFS(
+                keyboardController = keyboardController,
+                focusManager = focusManager,
+                labelText = R.string.expiration_date,
+                placeholder = "MM/YY"
+            )
             Spacer(modifier = Modifier.height(20.dp))
             NotesTextFieldAPCFS(keyboardController, focusManager)
 //        Spacer(modifier = Modifier.height(25.dp))
 //        SaveButtonAPCFS(buttonText = R.string.save)
         }
     }
-
-
 }
 
+
 @Composable
 fun ColumnScope.NameTextFieldAPCFS(
     keyboardController: SoftwareKeyboardController?,
@@ -237,6 +272,114 @@ fun ColumnScope.NumberTextFieldAPCFS(
 }
 
 @Composable
+fun ColumnScope.NumberDateFieldAPCFS(
+    keyboardController: SoftwareKeyboardController?,
+    focusManager: FocusManager,
+    labelText: Int,
+    placeholder: String
+) {
+    var text by remember { mutableStateOf("") }
+    val maxLength = 4
+
+    TextField(
+        value = text,
+        onValueChange = { input ->
+            if (input.length <= maxLength) {
+                text = input.filter { it.isDigit() }
+            }
+        },
+        textStyle = MaterialTheme.typography.displayMedium,
+        modifier = Modifier
+            .align(Alignment.Start)
+            .fillMaxWidth()
+            .defaultMinSize(minHeight = 60.dp)
+            .wrapContentHeight()
+            .border(
+                1.dp,
+                color = colorResource(id = R.color.gray_border_textfield),
+                shape = RoundedCornerShape(16.dp)
+            )
+            .background(color = colorResource(id = R.color.transparent)),
+        shape = RoundedCornerShape(16.dp),
+        placeholder = {
+            Text(
+                text = placeholder,
+                style = MaterialTheme.typography.titleSmall.copy(
+                    color = colorResource(id = R.color.gray_text)
+                )
+            )
+        },
+        label = {
+            Text(text = stringResource(id = labelText),
+                style = MaterialTheme.typography.titleSmall.copy(
+                    color = colorResource(id = R.color.gray_text)
+                )
+            )
+        },
+        colors = TextFieldDefaults.colors(
+            focusedLabelColor = colorResource(id = R.color.gray_splash),
+            unfocusedContainerColor = colorResource(id = R.color.transparent),
+            focusedContainerColor = colorResource(id = R.color.transparent),
+            focusedIndicatorColor = colorResource(id = R.color.transparent),
+            disabledIndicatorColor = colorResource(id = R.color.transparent),
+            unfocusedIndicatorColor = colorResource(id = R.color.transparent),
+            cursorColor = colorResource(id = R.color.gray_splash),
+        ),
+        keyboardOptions = KeyboardOptions(
+            keyboardType = KeyboardType.Number,
+            imeAction = ImeAction.Next
+        ),
+        keyboardActions = KeyboardActions(
+            onDone = {
+                focusManager.clearFocus()
+                keyboardController?.hide()
+            }
+        ),
+        visualTransformation = DateTransformation()
+    )
+}
+
+fun validateMMYY(input: String): Boolean {
+    val parts = input.split("/")
+    if (parts.size != 2) return false
+    val month = parts[0].toIntOrNull() ?: return false
+    val year = parts[1].toIntOrNull() ?: return false
+    return month in 1..12 && parts[1].length == 2
+}
+
+class DateTransformation() : VisualTransformation {
+    override fun filter(text: AnnotatedString): TransformedText {
+        return dateFilter(text)
+    }
+}
+
+fun dateFilter(text: AnnotatedString): TransformedText {
+
+    val trimmed = if (text.text.length >= 4) text.text.substring(0..3) else text.text
+    var out = ""
+    for (i in trimmed.indices) {
+        out += trimmed[i]
+        if (i == 1 && trimmed.length > 2) out += "/"
+    }
+
+    val numberOffsetTranslator = object : OffsetMapping {
+        override fun originalToTransformed(offset: Int): Int {
+            if (offset <= 2) return offset
+            if (offset <= 4) return offset +1
+            return 5
+        }
+
+        override fun transformedToOriginal(offset: Int): Int {
+            if (offset <=2) return offset
+            if (offset <=5) return offset -1
+            return 4
+        }
+    }
+
+    return TransformedText(AnnotatedString(out), numberOffsetTranslator)
+}
+
+@Composable
 fun ColumnScope.NotesTextFieldAPCFS(
     keyboardController: SoftwareKeyboardController?,
     focusManager: FocusManager