[refactor] #7 home refactoring

NOW-SOPT-ANDROID · May 3, 2024 · b37109b · b37109b
1 parent 0402f18
commit b37109b
Show file tree

Hide file tree

Showing 7 changed files with 134 additions and 318 deletions.
diff --git a/feature/home/build.gradle.kts b/feature/home/build.gradle.kts
@@ -10,4 +10,6 @@ android {
 
 dependencies {
     implementation(projects.core.domain)
+    implementation(libs.androidx.paging)
+    implementation(libs.androidx.paging.compose)
 }
diff --git a/feature/home/src/main/java/org/sopt/home/AddFriendBottomSheet.kt b/feature/home/src/main/java/org/sopt/home/AddFriendBottomSheet.kt
diff --git a/feature/home/src/main/java/org/sopt/home/HomeContract.kt b/feature/home/src/main/java/org/sopt/home/HomeContract.kt
diff --git a/feature/home/src/main/java/org/sopt/home/HomeFriendContainer.kt b/feature/home/src/main/java/org/sopt/home/HomeFriendContainer.kt
@@ -16,7 +16,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp

diff --git a/feature/home/src/main/java/org/sopt/home/HomeScreen.kt b/feature/home/src/main/java/org/sopt/home/HomeScreen.kt
@@ -3,35 +3,17 @@ package org.sopt.home
 import androidx.compose.animation.core.LinearOutSlowInEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-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.lazy.LazyColumn
-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.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
+import androidx.paging.compose.LazyPagingItems
+import androidx.paging.compose.collectAsLazyPagingItems
+import org.sopt.model.ReqresUser
 
 
 @Composable
@@ -40,137 +22,60 @@ fun HomeRoute(
     viewModel: HomeViewModel = hiltViewModel(),
     label: String,
 ) {
-    val state by viewModel.collectAsState()
+    val postState = viewModel.userState.collectAsLazyPagingItems()
 
     HomeScreen(
         modifier = modifier,
-        state = state,
-        onQueryValueChange = viewModel::updateQuery,
-        onLongClickItem = viewModel::showDeleteDialog,
-        onClickFloatingButton = viewModel::showAddFriendBottomSheet,
-        onClickSave = viewModel::insertFriend,
-        onBottomSheetNameChange = viewModel::updateSavingName,
-        onBottomSheetHobbyChange = viewModel::updateSavingHobby,
-        onDismissRequest = viewModel::dismissAddFriendBottomSheet,
-        onClickDialogPositiveButton = viewModel::deleteFriend,
-        onClickDialogNegativeButton = viewModel::dismissDeleteDialog
+        postItem = postState,
     )
 }
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun HomeScreen(
     modifier: Modifier = Modifier,
-    state: HomeState = HomeState(),
-    onQueryValueChange: (String) -> Unit = {},
-    onLongClickItem: (Int) -> Unit = {},
-    onClickFloatingButton: () -> Unit = {},
-    onClickSave: () -> Unit = {},
-    onBottomSheetNameChange: (String) -> Unit = {},
-    onBottomSheetHobbyChange: (String) -> Unit = {},
-    onDismissRequest: () -> Unit = {},
-    onClickDialogPositiveButton: (Int) -> Unit = {},
-    onClickDialogNegativeButton: () -> Unit = {},
+    postItem: LazyPagingItems<ReqresUser>,
 ) {
     val listState = rememberLazyListState()
-    Box (
+    Box(
         modifier = modifier
     ) {
-        if (state.showDeleteDialog.first) {
-            SoptAlertDialog(
-                title = "삭제?",
-                positiveLabel = "삭제",
-                negativeLabel = "취소",
-                onClickPositive = { onClickDialogPositiveButton(state.showDeleteDialog.second) },
-                onClickNegative = onClickDialogNegativeButton,
-            )
-        }
-        Column(
+        LazyColumn(
             modifier = Modifier
-                .fillMaxSize()
-                .background(White),
+                .fillMaxSize(),
+            state = listState
         ) {
-            RegularTextField(
-                modifier = Modifier
-                    .padding(start = 20.dp, end = 20.dp, top = 10.dp)
-                    .height(40.dp),
-                value = state.query,
-                onValueChange = onQueryValueChange,
-                placeholder = "검색어를 입력해주세요"
-            )
-            LazyColumn(
-                modifier = Modifier
-                    .fillMaxSize(),
-                state = listState
-            ) {
-                items(
-                    items = state.friendList,
-                    key = { it.id!! }
-                ) { friend ->
-                    HomeFriendContainer(
+            items(postItem.itemCount)
+            { index ->
+                postItem[index]?.let { reqres ->
+                    ReqresContainer(
                         modifier = Modifier.animateItemPlacement(
                             animationSpec = tween(
                                 durationMillis = 500,
                                 easing = LinearOutSlowInEasing,
                             )
                         ),
-                        id = friend.id,
-                        title = friend.name,
-                        subTitle = friend.hobby,
+                        id = reqres.id,
+                        email = reqres.email,
+                        imageUri = reqres.avatar,
+                        firstName = reqres.firstName,
+                        lastName = reqres.lastName,
                         containerHeight = 80.dp,
-                        onLongClick = { onLongClickItem(friend.id!!) }
                     )
                 }
             }
-            Spacer(modifier = Modifier.height(56.dp))
-        }
-        FloatingActionButton(
-            modifier = Modifier
-                .align(Alignment.BottomEnd)
-                .padding(20.dp)
-                .padding(bottom = 76.dp),
-            onClick = onClickFloatingButton,
-        ) {
-            Icon(Icons.Filled.Add, "floatingBtn")
-        }
-        if (state.showBottomSheet) {
-            AddFriendBottomSheet(
-                onClickSave = onClickSave,
-                onDismissRequest = onDismissRequest,
-                onNameValueChange = onBottomSheetNameChange,
-                onHobbyValueChange = onBottomSheetHobbyChange,
-                state = state
-            )
         }
     }
-
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
-@Preview
+
+/*@Preview
 @Composable
 fun preview() {
     NOWSOPTAndroidTheme {
         HomeScreen(
             state = HomeState(
-                friendList = persistentListOf(
-                    Friend(1, "asd", "asd"),
-                    Friend(2, "asd", "asd"),
-                    Friend(3, "asd", "asd"),
-                    Friend(4, "asd", "asd"),
-                    Friend(5, "asd", "asd"),
-                    Friend(6, "asd", "asd"),
-                    Friend(7, "asd", "asd"),
-                    Friend(8, "asd", "asd"),
-                    Friend(9, "asd", "asd"),
-                    Friend(10, "asd", "asd"),
-                    Friend(11, "asd", "asd"),
-                    Friend(12, "asd", "asd"),
-                    Friend(13, "asd", "asd"),
-                    Friend(14, "asd", "asd"),
-                    Friend(15, "asd", "asd"),
-                )
             )
         )
     }
-}
+}*/