feat : 컬렉션 작품 검색 및 선택 상태 통합

core/resource/src/main/res/drawable/ic_collection_novel_add.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M6,3L6,9M3,6L9,6"
+        android:strokeColor="#FFFFFF"
+        android:strokeLineCap="round"
+        android:strokeWidth="1" />
+</vector>

core/resource/src/main/res/drawable/ic_collection_novel_delete.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3,3L9,9M9,3L3,9"
+        android:strokeColor="#FF675D"
+        android:strokeLineCap="round"
+        android:strokeWidth="1" />
+</vector>

core/resource/src/main/res/values/strings.xml

@@ -459,6 +459,12 @@
     <string name="collection_create_description_hint">컬렉션에 관련한 설명을 간단하게 작성해주세요</string>
     <string name="collection_create_novel_list">작품 리스트</string>
     <string name="collection_create_add_novel">작품 추가</string>
+    <string name="collection_create_add">추가</string>
+    <string name="collection_create_delete">삭제</string>
+    <string name="collection_create_added_novels">추가한 작품</string>
+    <string name="collection_create_added_novel_count">%1$d개</string>
+    <string name="collection_create_add_from_library">서재에서 추가</string>
+    <string name="collection_create_search_hint">작품 제목, 작가를 검색하세요</string>
     <string name="collection_create_count">(%1$d/%2$d)</string>
     <string name="collection_read_status_watching">보는 중</string>
     <string name="collection_read_status_watched">봤어요</string>

data/novel/build.gradle.kts

@@ -15,6 +15,4 @@ dependencies {
     implementation(libs.paging.runtime)
     implementation(libs.retrofit)
     implementation(libs.serialization.json)
-
-    testImplementation(libs.junit)
 }

data/novel/src/main/java/com/into/websoso/data/novel/NovelSearchRepository.kt

@@ -0,0 +1,33 @@
+package com.into.websoso.data.novel
+
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
+import com.into.websoso.data.novel.model.NovelSearchEntity
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class NovelSearchRepository
+    @Inject
+    internal constructor(
+        private val api: NovelSearchApi,
+    ) {
+        fun searchNovels(query: String): Flow<PagingData<NovelSearchEntity>> =
+            Pager(
+                config = PagingConfig(
+                    pageSize = PAGE_SIZE,
+                    initialLoadSize = PAGE_SIZE,
+                    enablePlaceholders = false,
+                ),
+                pagingSourceFactory = {
+                    NovelSearchPagingSource(
+                        query = query,
+                        api = api,
+                    )
+                },
+            ).flow
+
+        private companion object {
+            const val PAGE_SIZE = 20
+        }
+    }

feature/collection/build.gradle.kts

@@ -10,6 +10,7 @@ android {
 
 dependencies {
     implementation(projects.data.library)
+    implementation(projects.data.novel)
 
     implementation(libs.navigation.compose)
     implementation(libs.paging.compose)

feature/collection/src/main/java/com/into/websoso/feature/collection/CollectionLibraryNovelSelectionScreen.kt

@@ -1,34 +1,24 @@
 package com.into.websoso.feature.collection
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 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.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@@ -37,39 +27,36 @@ import androidx.paging.LoadState
 import androidx.paging.PagingData
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
-import com.into.websoso.core.designsystem.theme.Black
-import com.into.websoso.core.designsystem.theme.Gray300
-import com.into.websoso.core.designsystem.theme.Primary100
 import com.into.websoso.core.designsystem.theme.WebsosoTheme
 import com.into.websoso.core.designsystem.theme.White
-import com.into.websoso.core.resource.R.drawable.img_load_fail
-import com.into.websoso.core.resource.R.string.load_fail_description
-import com.into.websoso.core.resource.R.string.load_fail_reload
-import com.into.websoso.core.resource.R.string.load_fail_title
+import com.into.websoso.core.resource.R.string.collection_create_add
+import com.into.websoso.core.resource.R.string.library
 import com.into.websoso.feature.collection.component.CollectionAppBar
 import com.into.websoso.feature.collection.component.CollectionLibraryNovelItem
+import com.into.websoso.feature.collection.component.CollectionNetworkError
 import com.into.websoso.feature.collection.model.CollectionLibraryNovelUiModel
+import com.into.websoso.feature.collection.model.CollectionSelectedNovel
 import kotlinx.coroutines.flow.flowOf
 
 @Composable
 internal fun CollectionLibraryNovelSelectionRoute(
-    initialSelectedNovelIds: Set<Long>,
-    onAddClick: (Set<Long>) -> Unit,
+    initialSelectedNovels: List<CollectionSelectedNovel>,
+    onAddClick: (List<CollectionSelectedNovel>) -> Unit,
     onNavigateBack: () -> Unit,
     viewModel: CollectionLibraryNovelSelectionViewModel = hiltViewModel(),
 ) {
     val novels = viewModel.novels.collectAsLazyPagingItems()
-    val selectedNovelIds by viewModel.selectedNovelIds.collectAsStateWithLifecycle()
+    val selectedNovels by viewModel.selectedNovels.collectAsStateWithLifecycle()
 
-    LaunchedEffect(initialSelectedNovelIds) {
-        viewModel.setSelectedNovelIds(initialSelectedNovelIds)
+    LaunchedEffect(initialSelectedNovels) {
+        viewModel.setSelectedNovels(initialSelectedNovels)
     }
 
     CollectionLibraryNovelSelectionScreen(
         novels = novels,
-        selectedNovelIds = selectedNovelIds,
+        selectedNovelIds = selectedNovels.mapTo(mutableSetOf()) { it.novelId },
         onNovelSelectionChange = viewModel::toggleNovelSelection,
-        onAddClick = { onAddClick(selectedNovelIds) },
+        onAddClick = { onAddClick(selectedNovels) },
         onNavigateBack = onNavigateBack,
     )
 }
@@ -78,7 +65,7 @@ internal fun CollectionLibraryNovelSelectionRoute(
 internal fun CollectionLibraryNovelSelectionScreen(
     novels: LazyPagingItems<CollectionLibraryNovelUiModel>,
     selectedNovelIds: Set<Long>,
-    onNovelSelectionChange: (Long) -> Unit,
+    onNovelSelectionChange: (CollectionLibraryNovelUiModel) -> Unit,
     onAddClick: () -> Unit,
     onNavigateBack: () -> Unit,
     modifier: Modifier = Modifier,
@@ -90,8 +77,8 @@ internal fun CollectionLibraryNovelSelectionScreen(
             .statusBarsPadding(),
     ) {
         CollectionAppBar(
-            title = "서재",
-            actionLabel = "추가",
+            title = stringResource(library),
+            actionLabel = stringResource(collection_create_add),
             onNavigateBack = onNavigateBack,
             onActionClick = onAddClick,
             isActionEnabled = selectedNovelIds.isNotEmpty(),
@@ -108,44 +95,10 @@ internal fun CollectionLibraryNovelSelectionScreen(
 
                 (novels.itemCount == 0 && novels.loadState.refresh is LoadState.Error) ||
                     novels.loadState.append is LoadState.Error -> {
-                    Column(
+                    CollectionNetworkError(
+                        onRetryClick = novels::retry,
                         modifier = Modifier.align(Alignment.Center),
-                        horizontalAlignment = Alignment.CenterHorizontally,
-                    ) {
-                        Image(
-                            painter = painterResource(img_load_fail),
-                            contentDescription = null,
-                            modifier = Modifier.size(width = 166.dp, height = 160.dp),
-                        )
-                        Spacer(modifier = Modifier.height(40.dp))
-                        Text(
-                            text = stringResource(load_fail_title),
-                            color = Black,
-                            style = WebsosoTheme.typography.title1,
-                            textAlign = TextAlign.Center,
-                        )
-                        Spacer(modifier = Modifier.height(10.dp))
-                        Text(
-                            text = stringResource(load_fail_description),
-                            color = Gray300,
-                            style = WebsosoTheme.typography.body2,
-                            textAlign = TextAlign.Center,
-                        )
-                        Spacer(modifier = Modifier.height(40.dp))
-                        Button(
-                            onClick = novels::retry,
-                            shape = RoundedCornerShape(8.dp),
-                            colors = ButtonDefaults.buttonColors(containerColor = Primary100),
-                            contentPadding = PaddingValues(horizontal = 38.dp, vertical = 14.dp),
-                            elevation = null,
-                        ) {
-                            Text(
-                                text = stringResource(load_fail_reload),
-                                color = White,
-                                style = WebsosoTheme.typography.label1,
-                            )
-                        }
-                    }
+                    )
                 }
 
                 else -> {
@@ -165,7 +118,7 @@ internal fun CollectionLibraryNovelSelectionScreen(
                                 CollectionLibraryNovelItem(
                                     novel = novel,
                                     isSelected = novel.novelId in selectedNovelIds,
-                                    onSelectionChange = { onNovelSelectionChange(novel.novelId) },
+                                    onSelectionChange = { onNovelSelectionChange(novel) },
                                 )
                             }
                         }

feature/collection/src/main/java/com/into/websoso/feature/collection/CollectionLibraryNovelSelectionViewModel.kt

@@ -9,6 +9,7 @@ import com.into.websoso.data.library.LibraryRepository
 import com.into.websoso.data.library.model.NovelEntity
 import com.into.websoso.feature.collection.mapper.toUiModel
 import com.into.websoso.feature.collection.model.CollectionLibraryNovelUiModel
+import com.into.websoso.feature.collection.model.CollectionSelectedNovel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -24,26 +25,34 @@ internal class CollectionLibraryNovelSelectionViewModel
     constructor(
         libraryRepository: LibraryRepository,
     ) : ViewModel() {
-        private val _selectedNovelIds = MutableStateFlow<Set<Long>>(emptySet())
-        val selectedNovelIds: StateFlow<Set<Long>> = _selectedNovelIds.asStateFlow()
+        private val _selectedNovels = MutableStateFlow<List<CollectionSelectedNovel>>(emptyList())
+        val selectedNovels: StateFlow<List<CollectionSelectedNovel>> = _selectedNovels.asStateFlow()
 
         val novels: Flow<PagingData<CollectionLibraryNovelUiModel>> =
             libraryRepository
                 .getUnfilteredLibraryFlow()
                 .map { pagingData -> pagingData.map(NovelEntity::toUiModel) }
                 .cachedIn(viewModelScope)
 
-        fun toggleNovelSelection(novelId: Long) {
-            _selectedNovelIds.update { selectedNovelIds ->
-                if (novelId in selectedNovelIds) {
-                    selectedNovelIds - novelId
+        fun toggleNovelSelection(novel: CollectionLibraryNovelUiModel) {
+            _selectedNovels.update { selectedNovels ->
+                if (selectedNovels.any { it.novelId == novel.novelId }) {
+                    selectedNovels.filterNot { it.novelId == novel.novelId }
                 } else {
-                    selectedNovelIds + novelId
+                    selectedNovels + novel.toSelectedNovel()
                 }
             }
         }
 
-        fun setSelectedNovelIds(novelIds: Set<Long>) {
-            _selectedNovelIds.value = novelIds
+        fun setSelectedNovels(novels: List<CollectionSelectedNovel>) {
+            _selectedNovels.value = novels
         }
     }
+
+private fun CollectionLibraryNovelUiModel.toSelectedNovel(): CollectionSelectedNovel =
+    CollectionSelectedNovel(
+        novelId = novelId,
+        title = title,
+        author = "",
+        imageUrl = imageUrl,
+    )