chore: update BookDialog to use entity

Earth-Breakers · Apr 8, 2024 · d8cd28e · d8cd28e
1 parent 6509fdd
commit d8cd28e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/app/src/main/java/univ/earthbreaker/namu/feature/book/BookDialog.kt b/app/src/main/java/univ/earthbreaker/namu/feature/book/BookDialog.kt
@@ -20,17 +20,16 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import univ.earthbreaker.namu.R
 import univ.earthbreaker.namu.compose.CommonDialogWithXIcon
+import univ.earthbreaker.namu.domain.entity.book.BookInfo
 import univ.earthbreaker.namu.feature.book.component.CharacterTypeItem
 import univ.earthbreaker.namu.ui.theme.GTTheme
 
 @Composable
 fun BookDialog(
+    bookInfo: BookInfo,
     modifier: Modifier = Modifier,
-    characterCount: Int = 0,
     onDismissRequest: () -> Unit,
 ) {
-    val mockCharacterCategoryList = listOf("아름다움", "생명력", "정화력", "아름다움")
-
     CommonDialogWithXIcon(
         onDismissRequest = onDismissRequest,
     ) {
@@ -59,18 +58,18 @@ fun BookDialog(
                 )
                 Spacer(modifier = Modifier.width(6.dp))
                 Text(
-                    characterCount.toString(),
+                    text = bookInfo.totalAcquiredCount.toString(),
                     style = GTTheme.typography.detailSemiBold14,
                     color = GTTheme.colors.blue1,
                 )
             }
             Spacer(modifier = Modifier.height(25.dp))
             LazyColumn(modifier = Modifier.fillMaxHeight(0.7f)) {
-                items(mockCharacterCategoryList) {
+                items(bookInfo.categories) {
                     CharacterTypeItem(
-                        characterCategory = it,
-                        userCharacters = emptyList(),
-                        totalCharacterCount = 7,
+                        characterCategory = it.characterType.type,
+                        characters = it.characters,
+                        acquiredCount = it.acquiredCount,
                     )
                     Spacer(modifier = Modifier.height(27.dp))
                 }
@@ -82,5 +81,5 @@ fun BookDialog(
 @Preview
 @Composable
 fun BookContentPreview() {
-    BookDialog(onDismissRequest = {})
+    BookDialog(bookInfo = BookInfo(), onDismissRequest = {})
 }
diff --git a/app/src/main/java/univ/earthbreaker/namu/feature/home/HomeScreen.kt b/app/src/main/java/univ/earthbreaker/namu/feature/home/HomeScreen.kt
@@ -26,6 +26,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import univ.earthbreaker.namu.R
+import univ.earthbreaker.namu.domain.entity.book.BookInfo
 import univ.earthbreaker.namu.domain.entity.home.HomeInfo
 import univ.earthbreaker.namu.domain.entity.mission.MissionListInfo
 import univ.earthbreaker.namu.feature.book.BookDialog
@@ -65,7 +66,7 @@ fun HomeScreen(
             level = state.homeInfo.userLevel,
             userExp = state.homeInfo.userExp,
             energy = state.homeInfo.energy,
-            onBookClick = { actions.openDialog(HomeDialogState(doesBookDialogExist = true)) },
+            onBookClick = actions.getBookInfo,
             onMissionListClick = { actions.openDialog(HomeDialogState(doesMissionListDialogExist = true)) },
         )
         Image(
@@ -91,6 +92,7 @@ fun HomeScreen(
 
     if (state.homeDialogState.doesBookDialogExist) {
         BookDialog(
+            bookInfo = state.bookInfo,
             onDismissRequest = { actions.dismissDialog() },
         )
     }
@@ -265,6 +267,7 @@ private fun HomeScreenPreview() {
             isMissionCertificationSuccessful = false,
             selectedMission = MissionListInfo.Mission(0, "", false),
             missionListInfo = MissionListInfo(emptyList(), emptyList()),
+            bookInfo = BookInfo(),
         ),
         actions = HomeActions(
             onClickCameraIcon = {},
@@ -276,6 +279,7 @@ private fun HomeScreenPreview() {
             getHomeInfo = {},
             getMissionListInfo = {},
             setSelectedMission = {},
+            getBookInfo = {},
         ),
     )
 }

diff --git a/app/src/main/java/univ/earthbreaker/namu/feature/home/model/HomeUiState.kt b/app/src/main/java/univ/earthbreaker/namu/feature/home/model/HomeUiState.kt
@@ -1,6 +1,7 @@
 package univ.earthbreaker.namu.feature.home.model
 
 import android.net.Uri
+import univ.earthbreaker.namu.domain.entity.book.BookInfo
 import univ.earthbreaker.namu.domain.entity.home.HomeInfo
 import univ.earthbreaker.namu.domain.entity.mission.MissionListInfo
 
@@ -14,6 +15,7 @@ sealed interface HomeUiState {
         val missionImageUri: Uri?,
         val isMissionCertificationSuccessful: Boolean?,
         val selectedMission: MissionListInfo.Mission?,
+        val bookInfo: BookInfo,
         val homeDialogState: HomeDialogState = HomeDialogState(),
     ) : HomeUiState