[BOOK-188] feat: 도서 상세 화면 클릭 이벤트 연동

easyhooon · easyhooon · commit 1cbdcc5028fe · 2025-08-01T01:42:46.000+09:00
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailPresenter.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailPresenter.kt
@@ -5,11 +5,13 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import com.ninecraft.booket.core.common.constants.BookStatus
 import com.ninecraft.booket.core.common.utils.handleException
 import com.ninecraft.booket.core.data.api.repository.BookRepository
 import com.ninecraft.booket.feature.screens.BookDetailScreen
 import com.ninecraft.booket.feature.screens.LoginScreen
 import com.ninecraft.booket.feature.screens.RecordDetailScreen
+import com.ninecraft.booket.feature.screens.RecordScreen
 import com.orhanobut.logger.Logger
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.retained.rememberRetained
@@ -31,6 +33,10 @@ class BookDetailPresenter @AssistedInject constructor(
     override fun present(): BookDetailUiState {
         val scope = rememberCoroutineScope()
 
+        var isBookUpdateBottomSheetVisible by rememberRetained { mutableStateOf(false) }
+        var isRecordSortBottomSheetVisible by rememberRetained { mutableStateOf(false) }
+        var currentBookStatus by rememberRetained { mutableStateOf(BookStatus.READING) }
+        var currentRecordSort by rememberRetained { mutableStateOf(RecordSort.PAGE_ASCENDING) }
         var sideEffect by rememberRetained { mutableStateOf<BookDetailSideEffect?>(null) }
 
         fun upsertBook(bookIsbn: String, bookStatus: String) {
@@ -62,20 +68,41 @@ class BookDetailPresenter @AssistedInject constructor(
                     sideEffect = null
                 }
 
-                is BookDetailUiEvent.OnBackClicked -> {
+                is BookDetailUiEvent.OnBackClick -> {
                     navigator.pop()
                 }
 
-                is BookDetailUiEvent.OnBeforeReadingClick -> {
-                    upsertBook(screen.isbn, "BEFORE_READING")
+                is BookDetailUiEvent.OnBookStatusButtonClick -> {
+                    isBookUpdateBottomSheetVisible = true
                 }
 
-                is BookDetailUiEvent.OnReadingClick -> {
-                    upsertBook(screen.isbn, "READING")
+                is BookDetailUiEvent.OnRegisterRecordButtonClick -> {
+                    navigator.goTo(RecordScreen(""))
                 }
 
-                is BookDetailUiEvent.OnCompletedClick -> {
-                    upsertBook(screen.isbn, "COMPLETED")
+                is BookDetailUiEvent.OnRecordSortButtonClick -> {
+                    isRecordSortBottomSheetVisible = true
+                }
+
+                is BookDetailUiEvent.OnBookUpdateBottomSheetDismiss -> {
+                    isBookUpdateBottomSheetVisible = false
+                }
+
+                is BookDetailUiEvent.OnBookStatusItemSelected -> {
+                    currentBookStatus = event.bookStatus
+                }
+
+                is BookDetailUiEvent.OnBookStatusUpdateButtonClick -> {
+                    upsertBook(screen.isbn, currentBookStatus.value)
+                }
+
+                is BookDetailUiEvent.OnRecordSortBottomSheetDismiss -> {
+                    isRecordSortBottomSheetVisible = false
+                }
+
+                is BookDetailUiEvent.OnRecordSortItemSelected -> {
+                    currentRecordSort = event.sortType
+                    isRecordSortBottomSheetVisible = false
                 }
 
                 is BookDetailUiEvent.OnRecordItemClick -> {
@@ -85,6 +112,10 @@ class BookDetailPresenter @AssistedInject constructor(
         }
 
         return BookDetailUiState(
+            isBookUpdateBottomSheetVisible = isBookUpdateBottomSheetVisible,
+            isRecordSortBottomSheetVisible = isRecordSortBottomSheetVisible,
+            currentBookStatus = currentBookStatus,
+            currentRecordSort = currentRecordSort,
             sideEffect = sideEffect,
             eventSink = ::handleEvent,
         )
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailUi.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailUi.kt
@@ -12,10 +12,13 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.material3.VerticalDivider
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -24,6 +27,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import com.ninecraft.booket.core.common.constants.BookStatus
 import com.ninecraft.booket.core.designsystem.ComponentPreview
 import com.ninecraft.booket.core.designsystem.component.NetworkImage
 import com.ninecraft.booket.core.designsystem.component.ReedDivider
@@ -33,19 +37,28 @@ import com.ninecraft.booket.core.designsystem.component.button.largeButtonStyle
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
 import com.ninecraft.booket.core.ui.component.ReedBackTopAppBar
 import com.ninecraft.booket.core.ui.component.ReedFullScreen
+import com.ninecraft.booket.feature.detail.book.component.BookUpdateBottomSheet
 import com.ninecraft.booket.feature.detail.book.component.CollectedSeed
+import com.ninecraft.booket.feature.detail.book.component.RecordSortBottomSheet
 import com.ninecraft.booket.feature.detail.book.component.RecordsCollection
 import com.ninecraft.booket.feature.screens.BookDetailScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import dagger.hilt.android.components.ActivityRetainedComponent
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.launch
 import com.ninecraft.booket.core.designsystem.R as designR
 
+@OptIn(ExperimentalMaterial3Api::class)
 @CircuitInject(BookDetailScreen::class, ActivityRetainedComponent::class)
 @Composable
 internal fun BookDetailUi(
     state: BookDetailUiState,
     modifier: Modifier = Modifier,
 ) {
+    val bookUpdateBottomSheetState = rememberModalBottomSheetState()
+    val recordSortBottomSheetState = rememberModalBottomSheetState()
+    val coroutineScope = rememberCoroutineScope()
+
     HandleBookDetailSideEffects(
         state = state,
         eventSink = state.eventSink,
@@ -55,11 +68,54 @@ internal fun BookDetailUi(
         ReedBackTopAppBar(
             title = "",
             onBackClick = {
-                state.eventSink(BookDetailUiEvent.OnBackClicked)
+                state.eventSink(BookDetailUiEvent.OnBackClick)
             },
         )
         BookDetailContent(state = state)
     }
+
+    if (state.isBookUpdateBottomSheetVisible) {
+        BookUpdateBottomSheet(
+            onDismissRequest = {
+                state.eventSink(BookDetailUiEvent.OnBookUpdateBottomSheetDismiss)
+            },
+            sheetState = bookUpdateBottomSheetState,
+            onCloseButtonClick = {
+                coroutineScope.launch {
+                    bookUpdateBottomSheetState.hide()
+                    state.eventSink(BookDetailUiEvent.OnBookUpdateBottomSheetDismiss)
+                }
+            },
+            bookStatuses = BookStatus.entries.toTypedArray().toImmutableList(),
+            currentBookStatus = state.currentBookStatus,
+            onItemSelected = {
+                state.eventSink(BookDetailUiEvent.OnBookStatusItemSelected(it))
+            },
+            onBookUpdateButtonClick = {
+                state.eventSink(BookDetailUiEvent.OnBookStatusUpdateButtonClick)
+            },
+        )
+    }
+
+    if (state.isRecordSortBottomSheetVisible) {
+        RecordSortBottomSheet(
+            onDismissRequest = {
+                state.eventSink(BookDetailUiEvent.OnRecordSortBottomSheetDismiss)
+            },
+            sheetState = recordSortBottomSheetState,
+            onCloseButtonClick = {
+                coroutineScope.launch {
+                    recordSortBottomSheetState.hide()
+                    state.eventSink(BookDetailUiEvent.OnRecordSortBottomSheetDismiss)
+                }
+            },
+            recordSortItems = RecordSort.entries.toTypedArray().toImmutableList(),
+            currentRecordSort = state.currentRecordSort,
+            onItemSelected = {
+                state.eventSink(BookDetailUiEvent.OnRecordSortItemSelected(it))
+            },
+        )
+    }
 }
 
 @Composable
@@ -142,7 +198,9 @@ internal fun BookDetailContent(
                 .padding(horizontal = ReedTheme.spacing.spacing5),
         ) {
             ReedButton(
-                onClick = {},
+                onClick = {
+                    state.eventSink(BookDetailUiEvent.OnBookStatusButtonClick)
+                },
                 text = "읽는 중",
                 sizeStyle = largeButtonStyle,
                 colorStyle = ReedButtonColorStyle.SECONDARY,
@@ -157,7 +215,9 @@ internal fun BookDetailContent(
             )
             Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing2))
             ReedButton(
-                onClick = {},
+                onClick = {
+                    state.eventSink(BookDetailUiEvent.OnRegisterRecordButtonClick)
+                },
                 text = "독서 기록 추가",
                 sizeStyle = largeButtonStyle,
                 colorStyle = ReedButtonColorStyle.PRIMARY,
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailUiState.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/BookDetailUiState.kt
@@ -1,6 +1,7 @@
 package com.ninecraft.booket.feature.detail.book
 
 import com.ninecraft.booket.core.common.R
+import com.ninecraft.booket.core.common.constants.BookStatus
 import com.ninecraft.booket.core.model.Emotion
 import com.ninecraft.booket.core.model.EmotionModel
 import com.ninecraft.booket.core.model.RecordRegisterModel
@@ -11,6 +12,8 @@ import kotlinx.collections.immutable.persistentListOf
 import java.util.UUID
 
 data class BookDetailUiState(
+    val isBookUpdateBottomSheetVisible: Boolean = false,
+    val isRecordSortBottomSheetVisible: Boolean = false,
     val emotionList: ImmutableList<EmotionModel> = persistentListOf(
         EmotionModel(
             type = Emotion.WARM,
@@ -29,6 +32,7 @@ data class BookDetailUiState(
             count = 2,
         ),
     ),
+    val currentBookStatus: BookStatus = BookStatus.BEFORE_READING,
     val currentRecordSort: RecordSort = RecordSort.PAGE_ASCENDING,
     val recordCollections: ImmutableList<RecordRegisterModel> = persistentListOf(
         RecordRegisterModel(
@@ -69,10 +73,15 @@ sealed interface BookDetailSideEffect {
 
 sealed interface BookDetailUiEvent : CircuitUiEvent {
     data object InitSideEffect : BookDetailUiEvent
-    data object OnBackClicked : BookDetailUiEvent
-    data object OnBeforeReadingClick : BookDetailUiEvent
-    data object OnReadingClick : BookDetailUiEvent
-    data object OnCompletedClick : BookDetailUiEvent
+    data object OnBackClick : BookDetailUiEvent
+    data object OnBookStatusButtonClick : BookDetailUiEvent
+    data object OnRegisterRecordButtonClick : BookDetailUiEvent
+    data object OnRecordSortButtonClick : BookDetailUiEvent
+    data object OnBookUpdateBottomSheetDismiss : BookDetailUiEvent
+    data class OnBookStatusItemSelected(val bookStatus: BookStatus) : BookDetailUiEvent
+    data object OnBookStatusUpdateButtonClick : BookDetailUiEvent
+    data object OnRecordSortBottomSheetDismiss : BookDetailUiEvent
+    data class OnRecordSortItemSelected(val sortType: RecordSort) : BookDetailUiEvent
     data class OnRecordItemClick(val recordId: String) : BookDetailUiEvent
 }
 
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookUpdateBottomSheet.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/BookUpdateBottomSheet.kt
@@ -49,7 +49,7 @@ internal fun BookUpdateBottomSheet(
     bookStatuses: ImmutableList<BookStatus>,
     currentBookStatus: BookStatus?,
     onItemSelected: (BookStatus) -> Unit,
-    onBookRegisterButtonClick: () -> Unit,
+    onBookUpdateButtonClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     ReedBottomSheet(
@@ -107,7 +107,7 @@ internal fun BookUpdateBottomSheet(
             Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing4))
             ReedButton(
                 onClick = {
-                    onBookRegisterButtonClick()
+                    onBookUpdateButtonClick()
                 },
                 sizeStyle = largeButtonStyle,
                 colorStyle = ReedButtonColorStyle.PRIMARY,
@@ -168,7 +168,7 @@ private fun BookUpdateBottomSheetPreview() {
             bookStatuses = BookStatus.entries.toImmutableList(),
             currentBookStatus = null,
             onItemSelected = {},
-            onBookRegisterButtonClick = {},
+            onBookUpdateButtonClick = {},
         )
     }
 }
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordItem.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordItem.kt
@@ -69,7 +69,7 @@ internal fun RecordItem(
             Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing2))
             Column {
                 Text(
-                    text = "#감동 공감",
+                    text = "#감동·공감",
                     color = ReedTheme.colors.contentBrand,
                     style = ReedTheme.typography.label1SemiBold,
                 )
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordsCollection.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordsCollection.kt
@@ -1,5 +1,6 @@
 package com.ninecraft.booket.feature.detail.book.component
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
@@ -12,6 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.designsystem.ComponentPreview
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
+import com.ninecraft.booket.feature.detail.book.BookDetailUiEvent
 import com.ninecraft.booket.feature.detail.book.BookDetailUiState
 import kotlinx.collections.immutable.toImmutableList
 
@@ -24,8 +26,12 @@ internal fun RecordsCollection(
         modifier = modifier
             .fillMaxWidth()
             .padding(horizontal = ReedTheme.spacing.spacing5)
-            .height((192 * state.recordCollections.size).dp + 40.dp),
-        contentPadding = PaddingValues(vertical = ReedTheme.spacing.spacing6),
+            // contentPadding + Header + (RecordItem + padding) * size
+            .height(36.dp + 40.dp + (192 * state.recordCollections.size).dp),
+        contentPadding = PaddingValues(
+            top = ReedTheme.spacing.spacing6,
+            bottom = ReedTheme.spacing.spacing3,
+        ),
         verticalArrangement = Arrangement.spacedBy(ReedTheme.spacing.spacing3),
         userScrollEnabled = false,
     ) {
@@ -43,6 +49,9 @@ internal fun RecordsCollection(
                     emotionTags = emotionTags.toImmutableList(),
                     pageNumber = pageNumber,
                     createdAt = createdAt,
+                    modifier = Modifier.clickable {
+                        state.eventSink(BookDetailUiEvent.OnRecordItemClick(id))
+                    },
                 )
             }
         }
diff --git a/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordsCollectionHeader.kt b/feature/detail/src/main/kotlin/com/ninecraft/booket/feature/detail/book/component/RecordsCollectionHeader.kt
@@ -1,5 +1,6 @@
 package com.ninecraft.booket.feature.detail.book.component
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -13,10 +14,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
-import com.ninecraft.booket.core.designsystem.R as designR
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
 import com.ninecraft.booket.feature.detail.R
+import com.ninecraft.booket.feature.detail.book.BookDetailUiEvent
 import com.ninecraft.booket.feature.detail.book.BookDetailUiState
+import com.ninecraft.booket.core.designsystem.R as designR
 
 @Composable
 internal fun RecordsCollectionHeader(
@@ -41,7 +43,11 @@ internal fun RecordsCollectionHeader(
                 style = ReedTheme.typography.headline2SemiBold,
             )
         }
-        Row {
+        Row(
+            modifier = Modifier.clickable {
+                state.eventSink(BookDetailUiEvent.OnRecordSortButtonClick)
+            },
+        ) {
             Text(
                 text = stringResource(state.currentRecordSort.getDisplayNameRes()),
                 color = ReedTheme.colors.contentSecondary,

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ internal fun RecordItem(`
`69`	`69`	`Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing2))`
`70`	`70`	`Column {`
`71`	`71`	`Text(`
`72`		`- text = "#감동 공감",`
	`72`	`+ text = "#감동·공감",`
`73`	`73`	`color = ReedTheme.colors.contentBrand,`
`74`	`74`	`style = ReedTheme.typography.label1SemiBold,`
`75`	`75`	`)`