Worked on Add passport screen and completed its UI

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

@@ -0,0 +1,458 @@
+package com.fastest.pass.home.presentation.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+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.layout.wrapContentHeight
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.DateRange
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.DatePicker
+import androidx.compose.material3.DatePickerDefaults
+import androidx.compose.material3.DatePickerDialog
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.material3.rememberDatePickerState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusManager
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalFocusManager
+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.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.fastest.pass.R
+
+@Composable
+fun AddPassportFormScreen() {
+    val keyboardController = LocalSoftwareKeyboardController.current
+    val focusManager = LocalFocusManager.current
+
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(horizontal = 30.dp)
+            .padding(bottom = 20.dp)
+            .background(Color.Transparent)
+    ) {
+        SaveButtonAPFS(buttonText = R.string.save)
+
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = 0.dp)
+                .padding(bottom = 80.dp)
+                .background(Color.Transparent)
+                .verticalScroll(rememberScrollState())
+        ) {
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.title)
+
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.type)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.name)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.country)
+            Spacer(modifier = Modifier.height(20.dp))
+            TextNumberTextFieldAPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.number, placeholder = "P12345678")
+
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.sex)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.nationality)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.issuing_authority)
+
+            Spacer(modifier = Modifier.height(20.dp))
+            DatePickerAPFS(labelText = R.string.date_of_birth) {}
+            Spacer(modifier = Modifier.height(20.dp))
+            DatePickerAPFS(labelText = R.string.issued_date) {}
+            Spacer(modifier = Modifier.height(20.dp))
+            DatePickerAPFS(labelText = R.string.expiration_date) {}
+
+            Spacer(modifier = Modifier.height(20.dp))
+            NotesTextFieldAPFS(keyboardController = keyboardController, focusManager = focusManager)
+
+        }
+    }
+}
+
+@Composable
+fun BoxScope.SaveButtonAPFS(buttonText: Int) {
+    Button(
+        modifier = Modifier
+            .background(colorResource(id = R.color.transparent))
+            .fillMaxWidth()
+            .height(60.dp)
+            .align(Alignment.BottomCenter)
+            .clickable() { },
+        onClick = {},
+        shape = RoundedCornerShape(15.dp),
+//            border = BorderStroke(25.dp, colorResource(id = R.color.black)),
+        colors = ButtonDefaults.buttonColors(
+            contentColor = colorResource(id = R.color.white),
+            containerColor = colorResource(id = R.color.red_login_button),
+        ),
+    )
+    {
+        Text(
+            text = stringResource(id = buttonText),
+            style = MaterialTheme.typography.bodyMedium.copy(
+                fontSize = 20.sp,
+                color = colorResource(id = R.color.white)
+            ),
+            textAlign = TextAlign.Center
+        )
+    }
+}
+
+@Composable
+fun ColumnScope.NameTextFieldAPFS(
+    keyboardController: SoftwareKeyboardController?,
+    focusManager: FocusManager,
+    labelText: Int
+) {
+    var text by remember { mutableStateOf("") }
+
+    TextField(
+        value = text,
+        onValueChange = {
+            text = it
+        },
+        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 = stringResource(id = R.string.enter_email_address),
+//                color = colorResource(id = R.color.gray_splash),
+//                style = MaterialTheme.typography.displayMedium
+//            )
+//        },
+        label = {
+            Text(text = stringResource(id = labelText),
+                style = MaterialTheme.typography.titleSmall.copy(
+                    color = colorResource(id = R.color.gray_text)
+                )
+            )
+        },
+//        leadingIcon = {
+//            Image(
+//                painter = painterResource(id = R.drawable.profile_circle),
+//                contentDescription = "Title Logo",
+//                modifier = Modifier
+//                    .size(24.dp, 24.dp)
+//            )
+//        },
+        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.Text,
+            imeAction = ImeAction.Next
+        ),
+        keyboardActions = KeyboardActions(
+            onDone = {
+                focusManager.clearFocus()
+                keyboardController?.hide()
+            }
+        ),
+    )
+}
+
+@Composable
+fun ColumnScope.TextNumberTextFieldAPFS(
+    keyboardController: SoftwareKeyboardController?,
+    focusManager: FocusManager,
+    labelText: Int,
+    placeholder: String
+) {
+    var text by remember { mutableStateOf("") }
+
+    TextField(
+        value = text,
+        onValueChange = {
+            text = it
+        },
+        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)
+                )
+            )
+        },
+//        leadingIcon = {
+//            Image(
+//                painter = painterResource(id = R.drawable.profile_circle),
+//                contentDescription = "Title Logo",
+//                modifier = Modifier
+//                    .size(24.dp, 24.dp)
+//            )
+//        },
+        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.Text,
+            imeAction = ImeAction.Next
+        ),
+        keyboardActions = KeyboardActions(
+            onDone = {
+                focusManager.clearFocus()
+                keyboardController?.hide()
+            }
+        ),
+    )
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ColumnScope.DatePickerAPFS(
+    labelText: Int,
+    onDateSelected: (String) -> Unit
+) {
+    var selectedDate by remember { mutableStateOf("Select Date") }
+    var selectedDateMillis by remember { mutableStateOf<Long?>(null) }
+    var showDatePicker by remember { mutableStateOf(false) }
+
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .background(color = colorResource(id = R.color.white)),
+    ) {
+        TextField(
+            value = selectedDate,
+            onValueChange = {},
+            textStyle = MaterialTheme.typography.displayMedium.copy(
+                color = colorResource(id = R.color.blue_text)
+            ),
+            readOnly = true,
+            label = { Text(
+                stringResource(id = labelText),
+                style = MaterialTheme.typography.titleSmall.copy(
+                    color = colorResource(id = R.color.gray_text)
+                )
+            ) },
+            leadingIcon = {
+                Icon(
+                    imageVector = Icons.Default.DateRange,
+                    contentDescription = "Calendar",
+                    tint = colorResource(id = R.color.blue_text)
+                )
+            },
+            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))
+                .clickable {
+                    showDatePicker = true
+                },
+            shape = RoundedCornerShape(16.dp),
+            enabled = false,
+            colors = TextFieldDefaults.colors(
+                disabledContainerColor = colorResource(id = R.color.transparent),
+                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.Password
+            )
+        )
+
+        if (showDatePicker) {
+            val datePickerState = rememberDatePickerState(
+                initialSelectedDateMillis = selectedDateMillis ?: System.currentTimeMillis()
+            )
+
+            DatePickerDialog(
+                onDismissRequest = {
+                    showDatePicker = false
+                },
+                confirmButton = {
+                    TextButton(onClick = {
+                        val selectedMillis = datePickerState.selectedDateMillis
+                        if (selectedMillis != null) {
+                            val formattedDate = convertMillisToFormattedDate(selectedMillis)
+                            selectedDate = formattedDate
+                            onDateSelected(selectedDate)
+                            selectedDateMillis = selectedMillis
+                            showDatePicker = false
+                        }
+
+                    }) {
+                        Text(text = "OK")
+                    }
+                },
+                dismissButton = {
+                    TextButton(onClick = { showDatePicker = false }) {
+                        Text(text = "Cancel")
+                    }
+                },
+                colors = DatePickerDefaults.colors(
+                    containerColor = colorResource(id = R.color.white)
+                )
+            ) {
+                DatePicker(state = datePickerState)
+            }
+        }
+    }
+
+}
+
+@Composable
+fun ColumnScope.NotesTextFieldAPFS(
+    keyboardController: SoftwareKeyboardController?,
+    focusManager: FocusManager
+) {
+    var notesText by remember { mutableStateOf("") }
+
+    TextField(
+        value = notesText,
+        onValueChange = {
+            notesText = it
+        },
+        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 = stringResource(id = R.string.enter_email_address),
+//                color = colorResource(id = R.color.gray_splash),
+//                style = MaterialTheme.typography.displayMedium
+//            )
+//        },
+        label = {
+            Text(text = stringResource(R.string.notes),
+                style = MaterialTheme.typography.titleSmall.copy(
+                    color = colorResource(id = R.color.gray_text)
+                )
+            )
+        },
+//        leadingIcon = {
+//            Image(
+//                painter = painterResource(id = R.drawable.profile_circle),
+//                contentDescription = "Title Logo",
+//                modifier = Modifier
+//                    .size(24.dp, 24.dp)
+//            )
+//        },
+        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.Text,
+            imeAction = ImeAction.Done
+        ),
+        keyboardActions = KeyboardActions(
+            onDone = {
+                focusManager.clearFocus()
+                keyboardController?.hide()
+            }
+        ),
+    )
+}

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

@@ -4,6 +4,8 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Row
@@ -60,31 +62,42 @@ fun AddPasswordFormScreen() {
     val keyboardController = LocalSoftwareKeyboardController.current
     val focusManager = LocalFocusManager.current
 
-    Column(
+    Box(
         modifier = Modifier
             .fillMaxSize()
             .padding(horizontal = 30.dp)
-            .padding(bottom = 15.dp)
+            .padding(bottom = 20.dp)
             .background(Color.Transparent)
-            .verticalScroll(rememberScrollState())
     ) {
-        Spacer(modifier = Modifier.height(20.dp))
-        TitleTextFieldAPS(keyboardController = keyboardController, focusManager = focusManager)
-        Spacer(modifier = Modifier.height(20.dp))
-        UrlTextFieldAPS(keyboardController = keyboardController, focusManager = focusManager)
-        Spacer(modifier = Modifier.height(20.dp))
-        UsernameTextFieldAPS(keyboardController = keyboardController, focusManager = focusManager)
-        Spacer(modifier = Modifier.height(20.dp))
-        PasswordTextFieldAPS(keyboardController = keyboardController, focusManager = focusManager)
-        Spacer(modifier = Modifier.height(20.dp))
-        NotesTextFieldAPS(keyboardController = keyboardController, focusManager = focusManager)
-        Spacer(modifier = Modifier.height(25.dp))
-        OptionsText()
-        Spacer(modifier = Modifier.height(25.dp))
-        AutoFillOption()
-        Spacer(modifier = Modifier.height(25.dp))
-        SaveButtonAPFS(buttonText = R.string.save)
+        SaveButtonAPWFS(buttonText = R.string.save)
+
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = 0.dp)
+                .padding(bottom = 80.dp)
+                .background(Color.Transparent)
+                .verticalScroll(rememberScrollState())
+        ) {
+            Spacer(modifier = Modifier.height(20.dp))
+            TitleTextFieldAPS(keyboardController = keyboardController, focusManager = focusManager)
+            Spacer(modifier = Modifier.height(20.dp))
+            UrlTextFieldAPS(keyboardController = keyboardController, focusManager = focusManager)
+            Spacer(modifier = Modifier.height(20.dp))
+            UsernameTextFieldAPS(keyboardController = keyboardController, focusManager = focusManager)
+            Spacer(modifier = Modifier.height(20.dp))
+            PasswordTextFieldAPS(keyboardController = keyboardController, focusManager = focusManager)
+            Spacer(modifier = Modifier.height(20.dp))
+            NotesTextFieldAPS(keyboardController = keyboardController, focusManager = focusManager)
+            Spacer(modifier = Modifier.height(25.dp))
+            OptionsText()
+            Spacer(modifier = Modifier.height(25.dp))
+            AutoFillOption()
+//            Spacer(modifier = Modifier.height(25.dp))
+//            SaveButtonAPFS(buttonText = R.string.save)
+        }
     }
+
 }
 
 @Composable
@@ -559,3 +572,32 @@ fun ColumnScope.SaveButtonAPFS(buttonText: Int) {
         )
     }
 }
+
+@Composable
+fun BoxScope.SaveButtonAPWFS(buttonText: Int) {
+    Button(
+        modifier = Modifier
+            .background(colorResource(id = R.color.transparent))
+            .fillMaxWidth()
+            .height(60.dp)
+            .align(Alignment.BottomCenter)
+            .clickable() { },
+        onClick = {},
+        shape = RoundedCornerShape(15.dp),
+//            border = BorderStroke(25.dp, colorResource(id = R.color.black)),
+        colors = ButtonDefaults.buttonColors(
+            contentColor = colorResource(id = R.color.white),
+            containerColor = colorResource(id = R.color.red_login_button),
+        ),
+    )
+    {
+        Text(
+            text = stringResource(id = buttonText),
+            style = MaterialTheme.typography.bodyMedium.copy(
+                fontSize = 20.sp,
+                color = colorResource(id = R.color.white)
+            ),
+            textAlign = TextAlign.Center
+        )
+    }
+}

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

@@ -3,6 +3,8 @@ package com.fastest.pass.home.presentation.ui.components
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Spacer
@@ -49,42 +51,52 @@ fun AddWifiPasswordFormScreen() {
     val keyboardController = LocalSoftwareKeyboardController.current
     val focusManager = LocalFocusManager.current
 
-    Column(
+    Box(
         modifier = Modifier
             .fillMaxSize()
             .padding(horizontal = 30.dp)
-            .padding(bottom = 15.dp)
+            .padding(bottom = 20.dp)
             .background(Color.Transparent)
-            .verticalScroll(rememberScrollState())
     ) {
-        Spacer(modifier = Modifier.height(20.dp))
-        NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.title)
-        Spacer(modifier = Modifier.height(20.dp))
-        NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.ssid)
-        Spacer(modifier = Modifier.height(20.dp))
-        NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.password)
-        Spacer(modifier = Modifier.height(20.dp))
-        NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.connection_type)
-        Spacer(modifier = Modifier.height(20.dp))
-        NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.connection_mode)
-        Spacer(modifier = Modifier.height(20.dp))
-        NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.authentication)
-        Spacer(modifier = Modifier.height(20.dp))
-        NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.encryption)
-        Spacer(modifier = Modifier.height(20.dp))
-        NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.use_802_1x)
-        Spacer(modifier = Modifier.height(20.dp))
-        NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.fips_mode)
-        Spacer(modifier = Modifier.height(20.dp))
-        NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.key_type)
-        Spacer(modifier = Modifier.height(20.dp))
-        NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.protected_text)
-        Spacer(modifier = Modifier.height(20.dp))
-        NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.key_index)
-        Spacer(modifier = Modifier.height(20.dp))
-        NotesTextFieldAWFFS(keyboardController, focusManager)
-        Spacer(modifier = Modifier.height(25.dp))
         SaveButtonAWPFS(buttonText = R.string.save)
+
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = 0.dp)
+                .padding(bottom = 80.dp)
+                .background(Color.Transparent)
+                .verticalScroll(rememberScrollState())
+        ) {
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.title)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.ssid)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.password)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.connection_type)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.connection_mode)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.authentication)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.encryption)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.use_802_1x)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.fips_mode)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.key_type)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.protected_text)
+            Spacer(modifier = Modifier.height(20.dp))
+            NameTextFieldAWPFS(keyboardController = keyboardController, focusManager = focusManager, labelText = R.string.key_index)
+            Spacer(modifier = Modifier.height(20.dp))
+            NotesTextFieldAWFFS(keyboardController, focusManager)
+//            Spacer(modifier = Modifier.height(25.dp))
+//            SaveButtonAWPFS(buttonText = R.string.save)
+        }
     }
 }
 
@@ -229,12 +241,13 @@ fun ColumnScope.NotesTextFieldAWFFS(
 }
 
 @Composable
-fun ColumnScope.SaveButtonAWPFS(buttonText: Int) {
+fun BoxScope.SaveButtonAWPFS(buttonText: Int) {
     Button(
         modifier = Modifier
             .background(colorResource(id = R.color.transparent))
             .fillMaxWidth()
             .height(60.dp)
+            .align(Alignment.BottomCenter)
             .clickable() { },
         onClick = {},
         shape = RoundedCornerShape(15.dp),

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

@@ -79,7 +79,7 @@ fun NewItemFormScreen(screenName: String, screenNameType: ClickTypeAddNewItem, c
                 AddDriverLicenseFormScreen()
             }
             ClickTypeAddNewItem.Passport -> {
-
+                AddPassportFormScreen()
             }
             ClickTypeAddNewItem.GOTO_HOME -> {}
         }

app/src/main/res/values/strings.xml

@@ -118,5 +118,8 @@
     <string name="date_of_birth">Date of Birth</string>
     <string name="sex">Sex</string>
     <string name="height">Height</string>
+    <string name="nationality">Nationality</string>
+    <string name="issuing_authority">Issuing Authority</string>
+    <string name="issued_date">Issued Date</string>
 
 </resources>