[feat] #4 review

NOW-SOPT-ANDROID · May 1, 2024 · cbab27e · cbab27e
1 parent af20a1e
commit cbab27e
Show file tree

Hide file tree

Showing 18 changed files with 91 additions and 53 deletions.
diff --git a/core/model/src/main/java/org/sopt/model/Friend.kt b/core/model/src/main/java/org/sopt/model/Friend.kt
@@ -1,7 +1,7 @@
 package org.sopt.model
 
 data class Friend(
-    val id: Int?,
+    val id: Int? = null,
     val name: String,
     val hobby: String,
 )
diff --git a/feature/home/src/main/java/org/sopt/home/AddFriendBottomSheet.kt b/feature/home/src/main/java/org/sopt/home/AddFriendBottomSheet.kt
@@ -1,6 +1,7 @@
 package org.sopt.home
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -24,15 +25,14 @@ import org.sopt.designsystem.ui.theme.NOWSOPTAndroidTheme
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AddFriendBottomSheet(
-    modifier: Modifier = Modifier,
-    sheetState: SheetState,
-    onDismissRequest: () -> Unit = {},
     onClickSave: () -> Unit,
     onNameValueChange: (String) -> Unit,
     onHobbyValueChange: (String) -> Unit,
     state: HomeState,
+    modifier: Modifier = Modifier,
+    onDismissRequest: () -> Unit = {},
 ) {
-    ModalBottomSheet(sheetState = sheetState, onDismissRequest = onDismissRequest) {
+    ModalBottomSheet(onDismissRequest = onDismissRequest) {
         AddFriendContent(
             onClickSave = onClickSave,
             onNameValueChange = onNameValueChange,
@@ -55,26 +55,24 @@ fun AddFriendContent(
             .background(color = Color.White)
             .padding(horizontal = 20.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(40.dp)
     ) {
         Spacer(modifier = Modifier.height(20.dp))
         Text(
             text = "친구 추가",
             fontSize = 20.sp,
         )
-        Spacer(modifier = Modifier.height(40.dp))
         RegularTextField(
             value = state.savingName,
             placeholder = "이름을 입력하세요",
             onValueChange = onNameValueChange
 
         )
-        Spacer(modifier = Modifier.height(40.dp))
         RegularTextField(
             value = state.savingHobby,
             placeholder = "취미를 입력하세요",
             onValueChange = onHobbyValueChange
         )
-        Spacer(modifier = Modifier.height(40.dp))
         RegularButton(
             modifier = Modifier.padding(horizontal = 40.dp),
             text = "저장",

diff --git a/feature/home/src/main/java/org/sopt/home/HomeContract.kt b/feature/home/src/main/java/org/sopt/home/HomeContract.kt
@@ -1,9 +1,11 @@
 package org.sopt.home
 
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 import org.sopt.model.Friend
 
 data class HomeState(
-    val friendList: List<Friend> = emptyList(),
+    val friendList: ImmutableList<Friend> = persistentListOf(),
     val query: String = "",
     val registeredHobby: String = "",
     val registeredName: String = "",

diff --git a/feature/home/src/main/java/org/sopt/home/HomeFriendContainer.kt b/feature/home/src/main/java/org/sopt/home/HomeFriendContainer.kt
@@ -1,5 +1,6 @@
 package org.sopt.home
 
+import androidx.annotation.DrawableRes
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -27,15 +28,16 @@ import org.sopt.designsystem.ui.theme.NOWSOPTAndroidTheme
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun HomeFriendContainer(
-    id: Int? = 0,
-    modifier: Modifier = Modifier,
-    painter: Painter = painterResource(R.drawable.ic_launcher_background),
     title: String,
-    subTitle: String = "",
     containerHeight: Dp,
+    modifier: Modifier = Modifier,
+    id: Int? = 0,
+    @DrawableRes imageId: Int = R.drawable.ic_launcher_background,
+    subTitle: String = "",
     onClick: () -> Unit = {},
     onLongClick: () -> Unit = {},
 ) {
+    val painter = painterResource(id = imageId)
     Row(
         modifier = modifier
             .fillMaxWidth()

diff --git a/feature/home/src/main/java/org/sopt/home/HomeScreen.kt b/feature/home/src/main/java/org/sopt/home/HomeScreen.kt
@@ -11,43 +11,40 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
-import androidx.compose.material3.SheetState
-import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color.Companion.White
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import kotlinx.collections.immutable.persistentListOf
 import org.orbitmvi.orbit.compose.collectAsState
 import org.sopt.designsystem.component.dialog.SoptAlertDialog
 import org.sopt.designsystem.component.textfield.RegularTextField
 import org.sopt.designsystem.ui.theme.NOWSOPTAndroidTheme
 import org.sopt.model.Friend
 
-@OptIn(ExperimentalMaterial3Api::class)
+
 @Composable
 fun HomeRoute(
+    modifier: Modifier = Modifier,
     viewModel: HomeViewModel = hiltViewModel(),
     label: String,
 ) {
-    val state = viewModel.collectAsState().value
-    val listState = rememberLazyListState()
-    val sheetState = rememberModalBottomSheetState()
+    val state by viewModel.collectAsState()
 
     HomeScreen(
+        modifier = modifier,
         state = state,
-        listState = listState,
-        sheetState = sheetState,
         onQueryValueChange = viewModel::updateQuery,
         onLongClickItem = viewModel::showDeleteDialog,
         onClickFloatingButton = viewModel::showAddFriendBottomSheet,
@@ -60,12 +57,11 @@ fun HomeRoute(
     )
 }
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun HomeScreen(
+    modifier: Modifier = Modifier,
     state: HomeState = HomeState(),
-    listState: LazyListState = rememberLazyListState(),
-    sheetState: SheetState = rememberModalBottomSheetState(),
     onQueryValueChange: (String) -> Unit = {},
     onLongClickItem: (Int) -> Unit = {},
     onClickFloatingButton: () -> Unit = {},
@@ -76,7 +72,10 @@ fun HomeScreen(
     onClickDialogPositiveButton: (Int) -> Unit = {},
     onClickDialogNegativeButton: () -> Unit = {},
 ) {
-    Box {
+    val listState = rememberLazyListState()
+    Box (
+        modifier = modifier
+    ) {
         if (state.showDeleteDialog.first) {
             SoptAlertDialog(
                 title = "삭제?",
@@ -105,13 +104,7 @@ fun HomeScreen(
                 state = listState
             ) {
                 items(
-                    items = listOf(
-                        Friend(
-                            id = 0,
-                            name = state.registeredName,
-                            hobby = state.registeredHobby
-                        )
-                    ) + state.friendList,
+                    items = state.friendList,
                     key = { it.id!! }
                 ) { friend ->
                     HomeFriendContainer(
@@ -142,7 +135,6 @@ fun HomeScreen(
         }
         if (state.showBottomSheet) {
             AddFriendBottomSheet(
-                sheetState = sheetState,
                 onClickSave = onClickSave,
                 onDismissRequest = onDismissRequest,
                 onNameValueChange = onBottomSheetNameChange,
@@ -161,7 +153,7 @@ fun preview() {
     NOWSOPTAndroidTheme {
         HomeScreen(
             state = HomeState(
-                friendList = listOf(
+                friendList = persistentListOf(
                     Friend(1, "asd", "asd"),
                     Friend(2, "asd", "asd"),
                     Friend(3, "asd", "asd"),

diff --git a/feature/home/src/main/java/org/sopt/home/navigation/HomeNavigation.kt b/feature/home/src/main/java/org/sopt/home/navigation/HomeNavigation.kt
@@ -1,5 +1,6 @@
 package org.sopt.home.navigation
 
+import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
@@ -13,9 +14,12 @@ fun NavController.navigateHome(navOptions: NavOptions? = null) {
         navigate(HomeRoute.route, navOptions)
 }
 
-fun NavGraphBuilder.homeNavGraph() {
+fun NavGraphBuilder.homeNavGraph(
+    modifier: Modifier = Modifier,
+) {
     composable(route = HomeRoute.route) {
         HomeRoute(
+            modifier = modifier,
             label = ""
         )
     }

diff --git a/feature/main/src/main/java/org/sopt/main/login/LoginScreen.kt b/feature/main/src/main/java/org/sopt/main/login/LoginScreen.kt
@@ -14,6 +14,7 @@ import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
@@ -31,11 +32,12 @@ import org.sopt.designsystem.ui.theme.NOWSOPTAndroidTheme
 
 @Composable
 fun LoginRoute(
+    modifier: Modifier = Modifier,
     viewModel: LoginViewModel = hiltViewModel(),
     navigateHome: () -> Unit,
     navigateSignup: () -> Unit,
 ) {
-    val state = viewModel.collectAsState().value
+    val state by viewModel.collectAsState()
     val snackBarHostState = remember { SnackbarHostState() }
     val scope = rememberCoroutineScope()
 
@@ -67,6 +69,7 @@ fun LoginRoute(
 
     LoginScreen(
         snackBarHostState = snackBarHostState,
+        modifier = modifier,
         state = state,
         onClickLoginBtn = viewModel::login,
         onClickSignupBtn = viewModel::signup,
@@ -79,6 +82,7 @@ fun LoginRoute(
 @Composable
 fun LoginScreen(
     snackBarHostState: SnackbarHostState,
+    modifier: Modifier = Modifier,
     state: LoginState = LoginState(),
     onClickLoginBtn: () -> Unit = {},
     onClickSignupBtn: () -> Unit = {},
@@ -89,7 +93,7 @@ fun LoginScreen(
         snackbarHost = { SnackbarHost(hostState = snackBarHostState) }
     ) {
         Box(
-            modifier = Modifier
+            modifier = modifier
                 .fillMaxSize()
                 .padding(
                     top = 50.dp,

diff --git a/feature/main/src/main/java/org/sopt/main/login/LoginViewModel.kt b/feature/main/src/main/java/org/sopt/main/login/LoginViewModel.kt
@@ -50,7 +50,9 @@ class LoginViewModel @Inject constructor(
     fun login() = intent {
         with(state) {
             when {
-                checkRegister() -> postSideEffect(LoginSideEffect.showSnackbar("회원가입 먼저하셈"))
+                checkRegister() -> {
+                    postSideEffect(LoginSideEffect.showSnackbar("회원가입 먼저하셈"))
+                }
                 matchesUserInfo(state.id, state.password) -> {
                     userDataRepository.setAutoLogin(true)
                 }

diff --git a/feature/main/src/main/java/org/sopt/main/login/navigation/LoginNavigation.kt b/feature/main/src/main/java/org/sopt/main/login/navigation/LoginNavigation.kt
@@ -1,5 +1,6 @@
 package org.sopt.main.login.navigation
 
+import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
@@ -15,6 +16,7 @@ fun NavController.navigateLogin() {
 }
 
 fun NavGraphBuilder.loginNavGraph(
+    modifier: Modifier = Modifier,
     navigateSignup: () -> Unit = {},
     navigateHome: () -> Unit = {},
 ) {

diff --git a/feature/main/src/main/java/org/sopt/main/model/UserModel.kt b/feature/main/src/main/java/org/sopt/main/model/UserModel.kt
@@ -1,16 +1,13 @@
 package org.sopt.main.model
 
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
 import org.sopt.model.User
 
-@Parcelize
 data class UserModel(
     val id: String = "",
     val pw: String = "",
     val name: String = "",
     val hobby: String = "",
-) : Parcelable
+)
 
 fun UserModel.toUser() = User(
     id = id,

diff --git a/feature/main/src/main/java/org/sopt/main/navigator/MainScreen.kt b/feature/main/src/main/java/org/sopt/main/navigator/MainScreen.kt
@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Scaffold
@@ -25,7 +26,7 @@ import androidx.compose.ui.graphics.Color.Companion.White
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.compose.NavHost
-import okhttp3.internal.toImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import org.sopt.home.navigation.homeNavGraph
 import org.sopt.main.login.navigation.loginNavGraph
 import org.sopt.main.signup.navigation.signupNavGraph
@@ -40,27 +41,34 @@ fun MainScreen(
 ) {
     Scaffold(
         modifier = modifier,
-        content = {
+        content = { innerPadding ->
             NavHost(
                 navController = navigator.navController,
                 startDestination = navigator.startDestination,
             ) {
                 loginNavGraph(
+                    modifier = modifier.padding(innerPadding),
                     navigateSignup = navigator::navigateSignup,
                     navigateHome = navigator::navigateHome,
                 )
 
                 signupNavGraph(
+                    modifier = modifier.padding(innerPadding),
                     navigateLogin = navigator::navigateLogin
                 )
 
                 MypageNavGraph(
+                    modifier = modifier.padding(innerPadding),
                     navigateToLoginScreen = navigator::navigateLogin
                 )
 
-                homeNavGraph()
+                homeNavGraph(
+                    modifier = modifier.padding(innerPadding),
+                )
 
-                searchNavGraph()
+                searchNavGraph(
+                    modifier = modifier.padding(innerPadding),
+                )
             }
         },
         bottomBar = {