From 485caba5f8497f617f2266dfdfcbeaaf8bea26ed Mon Sep 17 00:00:00 2001
From: omer358 <omermaki358@gmail.com>
Date: Sun, 23 Jun 2024 03:10:01 +0400
Subject: [PATCH] resolves #6

---
 .idea/appInsightsSettings.xml                 |   8 +-
 .idea/deploymentTargetSelector.xml            |  17 +-
 .../repository/PeopleRepositoryImplTest.kt    |   8 +-
 .../rememberme/data/PeopleRepositoryImpl.kt   |   2 +-
 .../com/example/rememberme/di/AppModule.kt    |   4 +-
 .../domain/repository/PeopleRepository.kt     |   2 +-
 .../domain/usecases/people/InsertNewPerson.kt |  13 ++
 .../domain/usecases/people/PeopleUseCases.kt  |   3 +-
 .../presentation/addperson/AddPersonEvents.kt |  11 ++
 .../presentation/addperson/AddPersonScreen.kt | 175 ++++++++++++++++++
 .../addperson/AddPersonUiState.kt             |  11 ++
 .../addperson/AddPersonViewModel.kt           |  76 ++++++++
 .../common/composables/CustomButton.kt        |  40 ++++
 .../composables/CustomOutLinedTextField.kt    |  46 +++++
 .../composables}/PeopleListItem.kt            |   2 +-
 .../presentation/navgraph/NavGraph.kt         |  10 +-
 .../peopleList/PeopleListScreen.kt            |  15 +-
 17 files changed, 417 insertions(+), 26 deletions(-)
 create mode 100644 app/src/main/java/com/example/rememberme/domain/usecases/people/InsertNewPerson.kt
 create mode 100644 app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonEvents.kt
 create mode 100644 app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonScreen.kt
 create mode 100644 app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonUiState.kt
 create mode 100644 app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonViewModel.kt
 create mode 100644 app/src/main/java/com/example/rememberme/presentation/common/composables/CustomButton.kt
 create mode 100644 app/src/main/java/com/example/rememberme/presentation/common/composables/CustomOutLinedTextField.kt
 rename app/src/main/java/com/example/rememberme/presentation/{composable => common/composables}/PeopleListItem.kt (97%)

diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
index 371f2e2..130bcfc 100644
--- a/.idea/appInsightsSettings.xml
+++ b/.idea/appInsightsSettings.xml
@@ -8,10 +8,10 @@
             <InsightsFilterSettings>
               <option name="connection">
                 <ConnectionSetting>
-                  <option name="appId" value="PLACEHOLDER" />
-                  <option name="mobileSdkAppId" value="" />
-                  <option name="projectId" value="" />
-                  <option name="projectNumber" value="" />
+                  <option name="appId" value="com.example.rememberme" />
+                  <option name="mobileSdkAppId" value="1:567382024079:android:797e9faec882ed07ec75fa" />
+                  <option name="projectId" value="remember-me-bcd80" />
+                  <option name="projectNumber" value="567382024079" />
                 </ConnectionSetting>
               </option>
               <option name="signal" value="SIGNAL_UNSPECIFIED" />
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b88c95b..38ec7dd 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -13,18 +13,23 @@
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
-      <SelectionState runConfigName="PeopleScreenContentPreview">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
-      <SelectionState runConfigName="PeopleDatabaseTest">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
       <SelectionState runConfigName="All Tests">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
       <SelectionState runConfigName="NavGraphTest">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
+      <SelectionState runConfigName="AddPersonContentPreview">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2024-06-22T18:55:32.587695394Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=/home/omer358/.android/avd/Pixel_7_Pro_API_TiramisuPrivacySandbox.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/example/rememberme/data/repository/PeopleRepositoryImplTest.kt b/app/src/androidTest/java/com/example/rememberme/data/repository/PeopleRepositoryImplTest.kt
index a4270e8..3c14bcd 100644
--- a/app/src/androidTest/java/com/example/rememberme/data/repository/PeopleRepositoryImplTest.kt
+++ b/app/src/androidTest/java/com/example/rememberme/data/repository/PeopleRepositoryImplTest.kt
@@ -34,8 +34,8 @@
 //                1, "John", secondName = "Doe", place = "", time = "", gender = "",avatar= R.drawable.ic_m3,),
 //            People(1, "John", secondName = "Doe", place = "", time = "", gender = "",avatar= R.drawable.ic_m3,)
 //        )
-//        peopleRepository.insertPeople(peopleList[0])
-//        peopleRepository.insertPeople(peopleList[1])
+//        peopleRepository.insertNewPerson(peopleList[0])
+//        peopleRepository.insertNewPerson(peopleList[1])
 //
 //        // Act
 //        val result = peopleRepository.getAllPeople()
@@ -52,10 +52,10 @@
 ////        val person = People(1, "John", secondName = "Doe", place = "", time = "", gender = "",avatar= R.drawable.ic_m3,)
 ////
 ////        // Act
-////        peopleRepository.insertPeople(person)
+////        peopleRepository.insertNewPerson(person)
 ////
 ////        // Assert
-////        Mockito.verify(peopleDao, Mockito.times(1)).insertPeople(person)
+////        Mockito.verify(peopleDao, Mockito.times(1)).insertNewPerson(person)
 ////    }
 ////
 ////    @Test
diff --git a/app/src/main/java/com/example/rememberme/data/PeopleRepositoryImpl.kt b/app/src/main/java/com/example/rememberme/data/PeopleRepositoryImpl.kt
index 2b0ca05..917de4c 100644
--- a/app/src/main/java/com/example/rememberme/data/PeopleRepositoryImpl.kt
+++ b/app/src/main/java/com/example/rememberme/data/PeopleRepositoryImpl.kt
@@ -12,7 +12,7 @@ class PeopleRepositoryImpl(
         return peopleDao.getAllPeople()
     }
 
-    override suspend fun insertPeople(people: People) {
+    override suspend fun insertNewPerson(people: People) {
         peopleDao.insert(people)
     }
 
diff --git a/app/src/main/java/com/example/rememberme/di/AppModule.kt b/app/src/main/java/com/example/rememberme/di/AppModule.kt
index 598afb3..9949015 100644
--- a/app/src/main/java/com/example/rememberme/di/AppModule.kt
+++ b/app/src/main/java/com/example/rememberme/di/AppModule.kt
@@ -7,6 +7,7 @@ import com.example.rememberme.data.local.PeopleDatabase
 import com.example.rememberme.domain.repository.PeopleRepository
 import com.example.rememberme.domain.usecases.people.GetAllPeople
 import com.example.rememberme.domain.usecases.people.GetPersonById
+import com.example.rememberme.domain.usecases.people.InsertNewPerson
 import com.example.rememberme.domain.usecases.people.PeopleUseCases
 import com.example.rememberme.utils.Constants.PEOPLE_DATABASE_NAME
 import com.example.remindme.database.PeopleDao
@@ -54,7 +55,8 @@ object AppModule {
     ): PeopleUseCases {
         return PeopleUseCases(
             getAllPeople = GetAllPeople(peopleRepository),
-            getPersonById = GetPersonById(peopleRepository)
+            getPersonById = GetPersonById(peopleRepository),
+            insertPerson = InsertNewPerson(peopleRepository)
         )
     }
 
diff --git a/app/src/main/java/com/example/rememberme/domain/repository/PeopleRepository.kt b/app/src/main/java/com/example/rememberme/domain/repository/PeopleRepository.kt
index 5b09295..2b964db 100644
--- a/app/src/main/java/com/example/rememberme/domain/repository/PeopleRepository.kt
+++ b/app/src/main/java/com/example/rememberme/domain/repository/PeopleRepository.kt
@@ -5,7 +5,7 @@ import kotlinx.coroutines.flow.Flow
 
 interface PeopleRepository {
     fun getAllPeople(): Flow<List<People>>
-    suspend fun insertPeople(people: People)
+    suspend fun insertNewPerson(people: People)
     suspend fun deletePeople(people: People)
     suspend fun updatePeople(people: People)
     suspend fun deleteAllPeople()
diff --git a/app/src/main/java/com/example/rememberme/domain/usecases/people/InsertNewPerson.kt b/app/src/main/java/com/example/rememberme/domain/usecases/people/InsertNewPerson.kt
new file mode 100644
index 0000000..20b37db
--- /dev/null
+++ b/app/src/main/java/com/example/rememberme/domain/usecases/people/InsertNewPerson.kt
@@ -0,0 +1,13 @@
+package com.example.rememberme.domain.usecases.people
+
+import com.example.rememberme.domain.model.People
+import com.example.rememberme.domain.repository.PeopleRepository
+
+class InsertNewPerson(
+    private val peopleRepository: PeopleRepository
+) {
+    suspend operator fun invoke(person: People) {
+        peopleRepository.insertNewPerson(person)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rememberme/domain/usecases/people/PeopleUseCases.kt b/app/src/main/java/com/example/rememberme/domain/usecases/people/PeopleUseCases.kt
index 9386838..76cdffb 100644
--- a/app/src/main/java/com/example/rememberme/domain/usecases/people/PeopleUseCases.kt
+++ b/app/src/main/java/com/example/rememberme/domain/usecases/people/PeopleUseCases.kt
@@ -2,5 +2,6 @@ package com.example.rememberme.domain.usecases.people
 
 data class PeopleUseCases(
     val getAllPeople: GetAllPeople,
-    val getPersonById: GetPersonById
+    val getPersonById: GetPersonById,
+    val insertPerson: InsertNewPerson
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonEvents.kt b/app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonEvents.kt
new file mode 100644
index 0000000..2a9ced2
--- /dev/null
+++ b/app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonEvents.kt
@@ -0,0 +1,11 @@
+package com.example.rememberme.presentation.addperson
+sealed class AddPersonEvents {
+    data class OnFirstNameChange(val firstName: String) : AddPersonEvents()
+    data class OnSecondNameChange(val secondName: String) : AddPersonEvents()
+    data class OnPlaceChange(val place: String) : AddPersonEvents()
+    data class OnTimeChange(val time: String) : AddPersonEvents()
+    data class OnNoteChange(val note: String?) : AddPersonEvents()
+    data class OnGenderChange(val gender: String) : AddPersonEvents()
+    data class OnAvatarChange(val avatar: String) : AddPersonEvents()
+    data object OnSavePerson : AddPersonEvents()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonScreen.kt b/app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonScreen.kt
new file mode 100644
index 0000000..50c2466
--- /dev/null
+++ b/app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonScreen.kt
@@ -0,0 +1,175 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
+package com.example.rememberme.presentation.addperson
+
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.example.rememberme.presentation.common.composables.CustomButton
+import com.example.rememberme.presentation.common.composables.CustomOutlinedTextField
+import com.example.rememberme.ui.theme.RememberMeTheme
+
+@Composable
+fun AddPersonScreen(
+    viewModel: AddPersonViewModel = hiltViewModel(),
+    popUp: () -> Unit,
+) {
+    val uiState = viewModel.uiState.collectAsState().value
+
+    AddPersonContent(
+        uiState,
+        onFirstNameChange = { viewModel.onEvent(AddPersonEvents.OnFirstNameChange(it)) },
+        onSecondNameChange = { viewModel.onEvent(AddPersonEvents.OnSecondNameChange(it)) },
+        onPlaceChange = { viewModel.onEvent(AddPersonEvents.OnPlaceChange(it)) },
+        onTimeChange = { viewModel.onEvent(AddPersonEvents.OnTimeChange(it)) },
+        onNoteChange = { viewModel.onEvent(AddPersonEvents.OnNoteChange(it)) },
+        onGenderChange = { viewModel.onEvent(AddPersonEvents.OnGenderChange(it)) },
+        onAvatarChange = { viewModel.onEvent(AddPersonEvents.OnAvatarChange(it)) },
+        onSavePerson = { viewModel.onEvent(AddPersonEvents.OnSavePerson) },
+        popUp = popUp
+        )
+}
+
+@Composable
+fun AddPersonContent(
+    uiState: AddPersonUiState,
+    onFirstNameChange: (String) -> Unit,
+    onSecondNameChange: (String) -> Unit,
+    onPlaceChange: (String) -> Unit,
+    onTimeChange: (String) -> Unit,
+    onNoteChange: (String) -> Unit,
+    onGenderChange: (String) -> Unit,
+    onAvatarChange: (String) -> Unit,
+    onSavePerson: () -> Unit,
+    popUp: () -> Unit
+) {
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(text = "Add Person")
+                },
+                navigationIcon = {
+                    IconButton(onClick = { popUp() }) {
+                        Icon(imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = null)
+                    }
+                }
+            )
+        }
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = 8.dp)
+                .padding(paddingValues = it)
+        ) {
+            CustomOutlinedTextField(
+                value = uiState.firstName,
+                onValueChange = onFirstNameChange,
+                label = "First Name"
+            )
+            CustomOutlinedTextField(
+                value = uiState.secondName,
+                onValueChange = onSecondNameChange,
+                label = "Second Name"
+            )
+            CustomOutlinedTextField(
+                value = uiState.place,
+                onValueChange = onPlaceChange,
+                label = "Meeting Place"
+            )
+            CustomOutlinedTextField(
+                value = uiState.time,
+                onValueChange = onTimeChange,
+                label = "Meeting Time"
+            )
+            GenderRadioButton(
+                selectedGender = uiState.gender,
+                onGenderSelected = onGenderChange
+            )
+            CustomOutlinedTextField(
+                value = uiState.avatar.toString(),
+                onValueChange = onAvatarChange,
+                label = "Avatar"
+            )
+            CustomOutlinedTextField(
+                value = uiState.note ?: "",
+                onValueChange = onNoteChange,
+                label = "Note"
+            )
+            CustomButton(
+                onClick = onSavePerson,
+                text = "Save"
+            )
+        }
+    }
+}
+
+
+@Composable
+fun GenderRadioButton(
+    selectedGender: String,
+    onGenderSelected: (String) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val genderOptions = listOf("Male", "Female")
+    Column(modifier = modifier) {
+        Text("Gender", modifier = Modifier.padding(bottom = 4.dp))
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(16.dp),
+            modifier = Modifier.fillMaxWidth()
+        ){
+        genderOptions.forEach { gender ->
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                RadioButton(
+                    selected = (gender == selectedGender),
+                    onClick = { onGenderSelected(gender) }
+                )
+                Text(text = gender, modifier = Modifier.padding(start = 4.dp))
+            }
+        }
+    }
+        }
+}
+
+@Preview(showBackground = true)
+@Preview(uiMode = UI_MODE_NIGHT_YES)
+@Composable
+fun AddPersonContentPreview() {
+    RememberMeTheme {
+        AddPersonContent(
+            uiState = AddPersonUiState(),
+            onFirstNameChange = {},
+            onSecondNameChange = {},
+            onPlaceChange = {},
+            onTimeChange = {},
+            onNoteChange = {},
+            onGenderChange = {},
+            onAvatarChange = {},
+            onSavePerson = {},
+            popUp = {}
+        )
+    }
+}
diff --git a/app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonUiState.kt b/app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonUiState.kt
new file mode 100644
index 0000000..9141b8f
--- /dev/null
+++ b/app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonUiState.kt
@@ -0,0 +1,11 @@
+package com.example.rememberme.presentation.addperson
+
+data class AddPersonUiState(
+    val firstName: String = "",
+    val secondName: String = "",
+    val place: String = "",
+    val time: String = "",
+    val note: String? = null,
+    val gender: String = "",
+    val avatar: String = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonViewModel.kt b/app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonViewModel.kt
new file mode 100644
index 0000000..205c79a
--- /dev/null
+++ b/app/src/main/java/com/example/rememberme/presentation/addperson/AddPersonViewModel.kt
@@ -0,0 +1,76 @@
+package com.example.rememberme.presentation.addperson
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.rememberme.R
+import com.example.rememberme.domain.model.People
+import com.example.rememberme.domain.usecases.people.PeopleUseCases
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+@HiltViewModel
+class AddPersonViewModel @Inject constructor(
+    private val peopleUseCases: PeopleUseCases
+) : ViewModel() {
+    private val _uiState = MutableStateFlow(AddPersonUiState())
+    val uiState: StateFlow<AddPersonUiState> = _uiState
+
+    fun onEvent(event: AddPersonEvents) {
+        when (event) {
+            is AddPersonEvents.OnFirstNameChange -> {
+                _uiState.value = _uiState.value.copy(firstName = event.firstName)
+            }
+
+            is AddPersonEvents.OnSecondNameChange -> {
+                _uiState.value = _uiState.value.copy(secondName = event.secondName)
+            }
+
+            is AddPersonEvents.OnPlaceChange -> {
+                _uiState.value = _uiState.value.copy(place = event.place)
+            }
+
+            is AddPersonEvents.OnTimeChange -> {
+                _uiState.value = _uiState.value.copy(time = event.time)
+            }
+
+            is AddPersonEvents.OnNoteChange -> {
+                _uiState.value = _uiState.value.copy(note = event.note)
+            }
+
+            is AddPersonEvents.OnGenderChange -> {
+                _uiState.value = _uiState.value.copy(gender = event.gender)
+            }
+
+            is AddPersonEvents.OnAvatarChange -> {
+                _uiState.value = _uiState.value.copy(avatar = event.avatar)
+            }
+
+            AddPersonEvents.OnSavePerson -> {
+                savePerson()
+            }
+        }
+    }
+
+    private fun savePerson() {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                val person = People(
+                    firstName = _uiState.value.firstName,
+                    secondName = _uiState.value.secondName,
+                    place = _uiState.value.place,
+                    time = _uiState.value.time,
+                    note = _uiState.value.note,
+                    gender = _uiState.value.gender,
+                    // TODO: get avatar from the ui
+                    avatar = R.drawable.ic_m1
+                )
+                peopleUseCases.insertPerson(person)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rememberme/presentation/common/composables/CustomButton.kt b/app/src/main/java/com/example/rememberme/presentation/common/composables/CustomButton.kt
new file mode 100644
index 0000000..2f52a90
--- /dev/null
+++ b/app/src/main/java/com/example/rememberme/presentation/common/composables/CustomButton.kt
@@ -0,0 +1,40 @@
+package com.example.rememberme.presentation.common.composables
+
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.example.rememberme.ui.theme.RememberMeTheme
+
+@Composable
+fun CustomButton(
+    onClick: () -> Unit,
+    text: String,
+    modifier: Modifier = Modifier
+) {
+    Button(
+        onClick = onClick,
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(vertical = 8.dp)
+    ) {
+        Text(text)
+    }
+}
+
+@Preview
+@Preview(uiMode = UI_MODE_NIGHT_YES)
+@Composable
+fun CustomButtonPreview() {
+    RememberMeTheme {
+        Surface {
+            CustomButton(onClick = { /*TODO*/ }, text = "Click")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rememberme/presentation/common/composables/CustomOutLinedTextField.kt b/app/src/main/java/com/example/rememberme/presentation/common/composables/CustomOutLinedTextField.kt
new file mode 100644
index 0000000..8d67bf7
--- /dev/null
+++ b/app/src/main/java/com/example/rememberme/presentation/common/composables/CustomOutLinedTextField.kt
@@ -0,0 +1,46 @@
+package com.example.rememberme.presentation.common.composables
+
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.example.rememberme.ui.theme.RememberMeTheme
+
+@Composable
+fun CustomOutlinedTextField(
+    value: String,
+    onValueChange: (String) -> Unit,
+    label: String,
+    modifier: Modifier = Modifier
+) {
+    OutlinedTextField(
+        value = value,
+        onValueChange = onValueChange,
+        label = { Text(label) },
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(vertical = 4.dp)
+    )
+}
+
+@Preview(showBackground = true)
+@Preview(uiMode = UI_MODE_NIGHT_YES)
+@Composable
+fun CustomOutlinedTextFieldPreview() {
+    RememberMeTheme {
+        Surface {
+            CustomOutlinedTextField(
+                value = "",
+                onValueChange = {},
+                label = "Label",
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/rememberme/presentation/composable/PeopleListItem.kt b/app/src/main/java/com/example/rememberme/presentation/common/composables/PeopleListItem.kt
similarity index 97%
rename from app/src/main/java/com/example/rememberme/presentation/composable/PeopleListItem.kt
rename to app/src/main/java/com/example/rememberme/presentation/common/composables/PeopleListItem.kt
index 33643c8..8856937 100644
--- a/app/src/main/java/com/example/rememberme/presentation/composable/PeopleListItem.kt
+++ b/app/src/main/java/com/example/rememberme/presentation/common/composables/PeopleListItem.kt
@@ -1,4 +1,4 @@
-package com.example.rememberme.presentation.composable
+package com.example.rememberme.presentation.common.composables
 
 import android.content.res.Configuration
 import androidx.compose.foundation.Image
diff --git a/app/src/main/java/com/example/rememberme/presentation/navgraph/NavGraph.kt b/app/src/main/java/com/example/rememberme/presentation/navgraph/NavGraph.kt
index 6986211..7677ac7 100644
--- a/app/src/main/java/com/example/rememberme/presentation/navgraph/NavGraph.kt
+++ b/app/src/main/java/com/example/rememberme/presentation/navgraph/NavGraph.kt
@@ -8,6 +8,7 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import androidx.navigation.navigation
+import com.example.rememberme.presentation.addperson.AddPersonScreen
 import com.example.rememberme.presentation.details.PersonDetailsScreen
 import com.example.rememberme.presentation.onboarding.OnBoardingScreen
 import com.example.rememberme.presentation.peopleList.PeopleScreen
@@ -42,12 +43,19 @@ fun NavGraph(
             ) {
                 PeopleScreen(navigateToDetailScreen = { personId ->
                     navController.navigate(Routes.PersonDetailsScreen.route + "/$personId")
+                },
+                    navigateToAddNewPersonScreen = {
+                        navController.navigate(Routes.AddPersonScreen.route)
                 })
             }
             composable(
                 route = Routes.AddPersonScreen.route,
             ) {
-                //TODO add person screen
+                AddPersonScreen(
+                    popUp = {
+                        navController.navigateUp()
+                    }
+                )
             }
             composable(
                 route = Routes.PersonDetailsScreen.route + "/{personId}",
diff --git a/app/src/main/java/com/example/rememberme/presentation/peopleList/PeopleListScreen.kt b/app/src/main/java/com/example/rememberme/presentation/peopleList/PeopleListScreen.kt
index 58df5fb..3851a66 100644
--- a/app/src/main/java/com/example/rememberme/presentation/peopleList/PeopleListScreen.kt
+++ b/app/src/main/java/com/example/rememberme/presentation/peopleList/PeopleListScreen.kt
@@ -25,17 +25,18 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import com.example.rememberme.R
 import com.example.rememberme.data.FakeDataSource
 import com.example.rememberme.domain.model.People
-import com.example.rememberme.presentation.composable.PeopleListItem
+import com.example.rememberme.presentation.common.composables.PeopleListItem
 import com.example.rememberme.ui.theme.RememberMeTheme
 
 @Composable
 fun PeopleScreen(
     modifier: Modifier = Modifier,
     viewModel: PeopleViewModel = hiltViewModel(),
-    navigateToDetailScreen: (Long) -> Unit
+    navigateToDetailScreen: (Long) -> Unit,
+    navigateToAddNewPersonScreen:() -> Unit
 ) {
     val people = viewModel.people.collectAsState(initial = emptyList())
-    PeopleScreenContent(people, modifier, navigateToDetailScreen)
+    PeopleScreenContent(people, modifier, navigateToDetailScreen, navigateToAddNewPersonScreen)
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -43,7 +44,8 @@ fun PeopleScreen(
 fun PeopleScreenContent(
     peopleState: State<List<People>>,
     modifier: Modifier = Modifier,
-    navigateToDetailScreen: (Long) -> Unit
+    navigateToDetailScreen: (Long) -> Unit,
+    navigateToAddNewPersonScreen: () -> Unit
 ) {
 
     Scaffold(
@@ -57,7 +59,7 @@ fun PeopleScreenContent(
         floatingActionButton = {
             FloatingActionButton(
                 onClick = {
-
+                    navigateToAddNewPersonScreen()
                 }
             ) {
                 Icon(
@@ -91,7 +93,8 @@ fun PeopleScreenContentPreview() {
             peopleState = remember {
                 mutableStateOf(FakeDataSource.getPeopleList())
             },
-            navigateToDetailScreen = {}
+            navigateToDetailScreen = {},
+            navigateToAddNewPersonScreen = {}
         )
     }
 }