feat: 컬렉션 기능 추가

app/build.gradle.kts

@@ -93,6 +93,7 @@ dependencies {
     implementation(projects.feature.signin)
     implementation(projects.feature.library)
     implementation(projects.feature.feed)
+    implementation(projects.feature.collection)
 
     // AndroidX 및 Jetpack 기본 라이브러리
     implementation(libs.androidx.core.ktx)

app/src/main/AndroidManifest.xml

@@ -76,6 +76,10 @@
             android:name=".ui.main.MainActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.collection.CollectionActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.notification.NotificationActivity"
             android:exported="false"

app/src/main/java/com/into/websoso/ui/collection/CollectionActivity.kt

@@ -0,0 +1,27 @@
+package com.into.websoso.ui.collection
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import com.into.websoso.core.designsystem.theme.WebsosoTheme
+import com.into.websoso.feature.collection.CollectionNavHost
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class CollectionActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            WebsosoTheme {
+                CollectionNavHost(onNavigateBack = ::finish)
+            }
+        }
+    }
+
+    companion object {
+        fun getIntent(context: Context): Intent = Intent(context, CollectionActivity::class.java)
+    }
+}

app/src/main/java/com/into/websoso/ui/main/myPage/MyPageFragment.kt

@@ -7,6 +7,7 @@ import android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
 import android.text.style.ForegroundColorSpan
 import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
@@ -28,11 +29,14 @@ import com.into.websoso.core.common.util.SingleEventHandler
 import com.into.websoso.core.common.util.getS3ImageUrl
 import com.into.websoso.core.common.util.setListViewHeightBasedOnChildren
 import com.into.websoso.core.common.util.tracker.Tracker
+import com.into.websoso.core.designsystem.theme.WebsosoTheme
 import com.into.websoso.core.resource.R.drawable.img_loading_thumbnail
 import com.into.websoso.core.resource.R.string.my_library_attractive_point_fixed_text
 import com.into.websoso.data.model.GenrePreferenceEntity
 import com.into.websoso.data.model.NovelPreferenceEntity
 import com.into.websoso.databinding.FragmentMyPageBinding
+import com.into.websoso.feature.collection.component.CollectionEntry
+import com.into.websoso.ui.collection.CollectionActivity
 import com.into.websoso.ui.main.MainViewModel
 import com.into.websoso.ui.main.myPage.MyLibraryViewModel
 import com.into.websoso.ui.main.myPage.adapter.RestGenrePreferenceAdapter
@@ -77,6 +81,7 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(fragment_my_page) {
         setupObserver()
         onProfileEditClick()
         onStorageButtonClick()
+        setupCollectionEntry()
         tracker.trackEvent("mypage")
     }
 
@@ -92,6 +97,23 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(fragment_my_page) {
         binding.lifecycleOwner = viewLifecycleOwner
     }
 
+    private fun setupCollectionEntry() {
+        binding.cvMyPageCollectionEntry.apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                WebsosoTheme {
+                    CollectionEntry(onClick = ::navigateToCollection)
+                }
+            }
+        }
+    }
+
+    private fun navigateToCollection() {
+        singleEventHandler.throttleFirst {
+            startActivity(CollectionActivity.getIntent(requireContext()))
+        }
+    }
+
     private fun setupRestGenrePreferenceAdapter() {
         binding.lvMyLibraryRestGenre.adapter = restGenrePreferenceAdapter
     }

app/src/main/res/layout/fragment_my_page.xml

@@ -279,11 +279,28 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/cl_my_page_user_profile" />
 
+                    <androidx.compose.ui.platform.ComposeView
+                        android:id="@+id/cv_my_page_collection_entry"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/view_my_page_profile_divider" />
+
+                    <View
+                        android:id="@+id/view_my_page_collection_divider"
+                        android:layout_width="0dp"
+                        android:layout_height="3dp"
+                        android:background="@color/gray_50_F4F5F8"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/cv_my_page_collection_entry" />
+
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/cl_my_library_genre_preference"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        app:layout_constraintTop_toBottomOf="@id/view_my_page_profile_divider"
+                        app:layout_constraintTop_toBottomOf="@id/view_my_page_collection_divider"
                         tools:layout_editor_absoluteX="0dp">
 
                         <TextView
@@ -447,7 +464,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:visibility="gone"
-                        app:layout_constraintTop_toBottomOf="@id/view_my_page_profile_divider">
+                        app:layout_constraintTop_toBottomOf="@id/view_my_page_collection_divider">
 
                         <TextView
                             android:id="@+id/tv_my_library_preference_analysis_title"

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

@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="19.44"
+    android:viewportHeight="19.44">
+    <path
+        android:pathData="M9.707,0.36C14.838,0.36 19.08,4.593 19.08,9.716C19.08,14.847 14.847,19.08 9.716,19.08C4.593,19.08 0.36,14.847 0.36,9.716C0.36,4.594 4.584,0.36 9.707,0.36Z"
+        android:fillColor="#FFFFFF"
+        android:strokeColor="#EEEEF2"
+        android:strokeWidth="0.72" />
+    <path
+        android:pathData="M5.4,9.72L14.04,9.72"
+        android:fillColor="#00000000"
+        android:strokeColor="#6A5DFD"
+        android:strokeLineCap="round"
+        android:strokeWidth="2.254" />
+    <path
+        android:pathData="M9.72,5.4L9.72,14.04"
+        android:fillColor="#00000000"
+        android:strokeColor="#6A5DFD"
+        android:strokeLineCap="round"
+        android:strokeWidth="2.254" />
+</vector>

data/library/src/main/java/com/into/websoso/data/library/LibraryRepository.kt

@@ -10,6 +10,8 @@ interface LibraryRepository {
 
     fun getLibraryFlow(): Flow<PagingData<NovelEntity>>
 
+    fun getUnfilteredLibraryFlow(): Flow<PagingData<NovelEntity>>
+
     suspend fun getRegisteredKeywords(): List<LibraryKeywordEntity>
 
     companion object {

data/library/src/main/java/com/into/websoso/data/library/repository/MyLibraryRepository.kt

@@ -39,25 +39,10 @@ class MyLibraryRepository
         @OptIn(ExperimentalCoroutinesApi::class)
         override fun getLibraryFlow(): Flow<PagingData<NovelEntity>> =
             filterRepository.filterFlow
-                .flatMapLatest { currentFilter ->
-                    Pager(
-                        config = PagingConfig(
-                            pageSize = PAGE_SIZE,
-                            enablePlaceholders = false,
-                        ),
-                        pagingSourceFactory = {
-                            LibraryPagingSource(
-                                getNovels = { cursor ->
-                                    getUserNovels(cursor, currentFilter).also { result ->
-                                        _novelTotalCount.update {
-                                            result.getOrNull()?.userNovelCount ?: 0
-                                        }
-                                    }
-                                },
-                            )
-                        },
-                    ).flow
-                }
+                .flatMapLatest(::createLibraryFlow)
+
+        override fun getUnfilteredLibraryFlow(): Flow<PagingData<NovelEntity>> =
+            createLibraryFlow(LibraryFilter())
 
         override suspend fun getRegisteredKeywords(): List<LibraryKeywordEntity> {
             val userId = accountRepository.userIdFlow.first { it != 0L }
@@ -87,6 +72,25 @@ class MyLibraryRepository
             )
         }
 
+        private fun createLibraryFlow(libraryFilter: LibraryFilter): Flow<PagingData<NovelEntity>> =
+            Pager(
+                config = PagingConfig(
+                    pageSize = PAGE_SIZE,
+                    enablePlaceholders = false,
+                ),
+                pagingSourceFactory = {
+                    LibraryPagingSource(
+                        getNovels = { cursor ->
+                            getUserNovels(cursor, libraryFilter).also { result ->
+                                _novelTotalCount.update {
+                                    result.getOrNull()?.userNovelCount ?: 0
+                                }
+                            }
+                        },
+                    )
+                },
+            ).flow
+
         private fun LibraryFilter.toRatingRangeParams(): Pair<Float?, Float?> =
             when {
                 isRatingless -> null to null

data/library/src/main/java/com/into/websoso/data/library/repository/UserLibraryRepository.kt

@@ -43,25 +43,10 @@ internal class UserLibraryRepository
         @OptIn(ExperimentalCoroutinesApi::class)
         override fun getLibraryFlow(): Flow<PagingData<NovelEntity>> =
             filterRepository.filterFlow
-                .flatMapLatest { currentFilter ->
-                    Pager(
-                        config = PagingConfig(
-                            pageSize = PAGE_SIZE,
-                            enablePlaceholders = false,
-                        ),
-                        pagingSourceFactory = {
-                            LibraryPagingSource(
-                                getNovels = { cursor ->
-                                    getUserNovels(cursor, currentFilter).also { result ->
-                                        _novelTotalCount.update {
-                                            result.getOrNull()?.userNovelCount ?: 0
-                                        }
-                                    }
-                                },
-                            )
-                        },
-                    ).flow
-                }
+                .flatMapLatest(::createLibraryFlow)
+
+        override fun getUnfilteredLibraryFlow(): Flow<PagingData<NovelEntity>> =
+            createLibraryFlow(LibraryFilter())
 
         override suspend fun getRegisteredKeywords() = libraryRemoteDataSource.getUserNovelKeywords(userId = userId)
 
@@ -88,6 +73,25 @@ internal class UserLibraryRepository
             )
         }
 
+        private fun createLibraryFlow(libraryFilter: LibraryFilter): Flow<PagingData<NovelEntity>> =
+            Pager(
+                config = PagingConfig(
+                    pageSize = PAGE_SIZE,
+                    enablePlaceholders = false,
+                ),
+                pagingSourceFactory = {
+                    LibraryPagingSource(
+                        getNovels = { cursor ->
+                            getUserNovels(cursor, libraryFilter).also { result ->
+                                _novelTotalCount.update {
+                                    result.getOrNull()?.userNovelCount ?: 0
+                                }
+                            }
+                        },
+                    )
+                },
+            ).flow
+
         private fun LibraryFilter.toRatingRangeParams(): Pair<Float?, Float?> =
             when {
                 isRatingless -> null to null

feature/collection/build.gradle.kts

@@ -0,0 +1,16 @@
+import com.into.websoso.setNamespace
+
+plugins {
+    id("websoso.android.feature")
+}
+
+android {
+    setNamespace("feature.collection")
+}
+
+dependencies {
+    implementation(projects.data.library)
+
+    implementation(libs.navigation.compose)
+    implementation(libs.paging.compose)
+}

feature/collection/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+
+</manifest>

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

@@ -0,0 +1,86 @@
+package com.into.websoso.feature.collection
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.into.websoso.core.designsystem.theme.WebsosoTheme
+import com.into.websoso.core.designsystem.theme.White
+import com.into.websoso.feature.collection.component.CollectionAppBar
+import com.into.websoso.feature.collection.component.CollectionDescriptionInput
+import com.into.websoso.feature.collection.component.CollectionNameInput
+import com.into.websoso.feature.collection.component.CollectionNovelSection
+import com.into.websoso.feature.collection.component.CollectionPrivacySetting
+
+@Composable
+internal fun CollectionCreateScreen(
+    onNavigateBack: () -> Unit,
+    onNavigateToNovelSearch: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    var isPrivate by rememberSaveable { mutableStateOf(false) }
+    var collectionName by rememberSaveable { mutableStateOf("") }
+    var collectionDescription by rememberSaveable { mutableStateOf("") }
+
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .background(White)
+            .statusBarsPadding(),
+    ) {
+        CollectionAppBar(
+            actionLabel = "완료",
+            onNavigateBack = onNavigateBack,
+        )
+        CollectionPrivacySetting(
+            isPrivate = isPrivate,
+            onPrivateChange = { isPrivate = it },
+        )
+        CollectionNameInput(
+            value = collectionName,
+            onValueChange = { collectionName = it },
+            modifier = Modifier.padding(
+                start = 20.dp,
+                top = 20.dp,
+                end = 20.dp,
+            ),
+        )
+        CollectionDescriptionInput(
+            value = collectionDescription,
+            onValueChange = { collectionDescription = it },
+            modifier = Modifier.padding(
+                start = 20.dp,
+                top = 30.dp,
+                end = 20.dp,
+            ),
+        )
+        CollectionNovelSection(
+            onAddNovelClick = onNavigateToNovelSearch,
+            modifier = Modifier.padding(
+                start = 20.dp,
+                top = 30.dp,
+                end = 20.dp,
+            ),
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun CollectionCreateScreenPreview() {
+    WebsosoTheme {
+        CollectionCreateScreen(
+            onNavigateBack = {},
+            onNavigateToNovelSearch = {},
+        )
+    }
+}