[Feat] CollectionList 화면 유형 구분 및 컬렉션 조회 API 연동

app/src/main/java/com/flint/core/designsystem/theme/Color.kt

@@ -73,6 +73,7 @@ data class Colors(
     val blue: Color,
     val kakao: Color,
     val buttonStroke: Brush,
+    val myGradient: Brush,
 )
 
 val FlintColors =
@@ -163,6 +164,10 @@ val FlintColors =
             Brush.verticalGradient(
                 colors = listOf(Color(0xFFAEAEAE), Color(0xFF666666)),
             ),
+        myGradient =
+            Brush.verticalGradient(
+                colors = listOf(Color(0xFF424BBD).copy(1f), Color(0xFF121212).copy(alpha = 0.04f)),
+            ),
     )
 
 @Preview(device = Devices.DESKTOP)

app/src/main/java/com/flint/core/navigation/Route.kt

@@ -1,5 +1,6 @@
 package com.flint.core.navigation
 
+import com.flint.domain.type.CollectionListRouteType
 import kotlinx.serialization.Serializable
 
 interface Route {
@@ -24,7 +25,9 @@ interface Route {
     data object OnboardingDone : Route
 
     @Serializable
-    data object CollectionList : Route
+    data class CollectionList(
+        val routeType: CollectionListRouteType,
+    ) : Route
 
     @Serializable
     data class CollectionDetail(

app/src/main/java/com/flint/domain/model/collection/CollectionDetailModel.kt

@@ -36,84 +36,6 @@ data class CollectionDetailModelNew(
     )
 }
 
-data class CollectionDetailModel(
-    val collectionId: String,
-    val collectionTitle: String,
-    val collectionContent: String,
-    val collectionImageUrl1: String,
-    val collectionImageUrl2: String,
-    val createdAt: String,
-    val isBookmarked: Boolean,
-    val bookmarkCount: Int,
-    val author: AuthorModel,
-) {
-    companion object {
-        val Fake =
-            CollectionDetailModel(
-                collectionId = "id_0",
-                collectionTitle = "컬렉션 제목 1",
-                collectionContent = "컬렉션에 대한 설명이 들어갑니다. 최대 2줄까지 표시됩니다.",
-                collectionImageUrl1 = "",
-                collectionImageUrl2 = "",
-                createdAt = "2024-01-01",
-                isBookmarked = true,
-                bookmarkCount = 10,
-                author = AuthorModel.Companion.Fake,
-            )
-
-        val FakeList = persistentListOf(
-            Fake.copy(
-                collectionId = "1",
-                collectionTitle = "2024 인생 영화 모음",
-                collectionContent = "올해 본 영화 중 최고만 모았습니다",
-                isBookmarked = true,
-                bookmarkCount = 128,
-                author = AuthorModel.Fake.copy(nickname = "닉네임은여덟글자"),
-            ),
-            Fake.copy(
-                collectionId = "2",
-                collectionTitle = "혼자 보기 아까운 숨은 명작",
-                collectionContent = "알려지지 않은 갓작들",
-                isBookmarked = false,
-                bookmarkCount = 56,
-                author = AuthorModel.Fake.copy(nickname = "시네필"),
-            ),
-            Fake.copy(
-                collectionId = "3",
-                collectionTitle = "비 오는 날 보기 좋은 영화",
-                collectionContent = "감성 충전용 영화 컬렉션입니다. 우울할 때 보면 좋아요.",
-                isBookmarked = true,
-                bookmarkCount = 234,
-                author = AuthorModel.Fake.copy(nickname = "무비러버"),
-            ),
-            Fake.copy(
-                collectionId = "4",
-                collectionTitle = "넷플릭스 정주행 리스트",
-                collectionContent = "주말에 몰아보기 좋은 시리즈",
-                isBookmarked = false,
-                bookmarkCount = 89,
-                author = AuthorModel.Fake,
-            ),
-            Fake.copy(
-                collectionId = "5",
-                collectionTitle = "SF 덕후 추천작",
-                collectionContent = "우주와 미래를 다룬 SF 명작 모음",
-                isBookmarked = true,
-                bookmarkCount = 412,
-                author = AuthorModel.Fake.copy(nickname = "SF매니아"),
-            ),
-            Fake.copy(
-                collectionId = "6",
-                collectionTitle = "첫 데이트용 무난한 영화",
-                collectionContent = "어색한 분위기를 풀어줄 영화들",
-                isBookmarked = false,
-                bookmarkCount = 67,
-                author = AuthorModel.Fake.copy(nickname = "연애고수"),
-            ),
-        )
-    }
-}
-
 private fun CollectionDetailResponseDto.Author.toModel(): AuthorModelNew {
     return AuthorModelNew(
         id = id,

app/src/main/java/com/flint/domain/type/CollectionListRouteType.kt

@@ -0,0 +1,9 @@
+package com.flint.domain.type
+
+enum class CollectionListRouteType(
+    val title: String
+) {
+    CREATED(title = "전체 컬렉션"),
+    SAVED(title = "저장 컬렉션"),
+    RECENT(title = "눈여겨보고 있는 컬렉션"),
+}

app/src/main/java/com/flint/presentation/collectiondetail/CollectionDetailScreen.kt

@@ -74,13 +74,14 @@ import com.flint.presentation.collectiondetail.sideeffect.CollectionDetailSideEf
 import com.flint.presentation.collectiondetail.uistate.CollectionDetailUiState
 import com.flint.core.designsystem.component.toast.ShowSaveToast
 import com.flint.core.designsystem.component.toast.ShowToast
+import com.flint.domain.type.CollectionListRouteType
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
 @Composable
 fun CollectionDetailRoute(
     paddingValues: PaddingValues,
-    navigateToCollectionList: () -> Unit,
+    navigateToCollectionList: (CollectionListRouteType) -> Unit,
     navigateUp: () -> Unit,
     viewModel: CollectionDetailViewModel = hiltViewModel(),
 ) {
@@ -134,7 +135,7 @@ fun CollectionDetailRoute(
     if (showSaveToast) {
         ShowSaveToast(
             navigateToSavedCollection = {
-                navigateToCollectionList()
+                navigateToCollectionList(CollectionListRouteType.SAVED)
             },
             paddingValues = paddingValues,
             yOffset = 12.dp,

app/src/main/java/com/flint/presentation/collectiondetail/navigation/CollectionDetailNavigation.kt

@@ -6,6 +6,7 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
 import com.flint.core.navigation.Route
+import com.flint.domain.type.CollectionListRouteType
 import com.flint.presentation.collectiondetail.CollectionDetailRoute
 
 fun NavController.navigateToCollectionDetail(
@@ -17,7 +18,7 @@ fun NavController.navigateToCollectionDetail(
 
 fun NavGraphBuilder.collectionDetailNavGraph(
     paddingValues: PaddingValues,
-    navigateToCollectionList: () -> Unit,
+    navigateToCollectionList: (CollectionListRouteType) -> Unit,
     navigateUp: () -> Unit,
 ) {
     composable<Route.CollectionDetail> {

app/src/main/java/com/flint/presentation/collectionlist/CollectionListScreen.kt

@@ -15,37 +15,44 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.flint.core.common.extension.noRippleClickable
+import com.flint.core.common.util.UiState
+import com.flint.core.designsystem.component.indicator.FlintLoadingIndicator
 import com.flint.core.designsystem.component.topappbar.FlintBackTopAppbar
 import com.flint.core.designsystem.theme.FlintTheme
-import com.flint.domain.model.collection.CollectionDetailModel
+import com.flint.domain.model.collection.CollectionListModel
 import com.flint.presentation.collectionlist.component.CollectionFileItem
-import kotlinx.collections.immutable.ImmutableList
 
 @Composable
 fun CollectionListRoute(
     paddingValues: PaddingValues,
     navigateUp: () -> Unit,
     navigateToCollectionDetail: (collectionId: String) -> Unit,
+    viewModel: CollectionListViewModel = hiltViewModel()
 ) {
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+
     CollectionListScreen(
         modifier = Modifier.padding(paddingValues),
-        title = "전체 컬렉션", // TODO: 타이틀 변경 필요
+        title = viewModel.routeType.title,
         onBackClick = navigateUp,
         onCollectionItemClick = navigateToCollectionDetail,
-        collections = CollectionDetailModel.FakeList, // TODO: 변경 필요
+        collectionList = uiState.collectionList,
     )
 }
 
 @Composable
 private fun CollectionListScreen(
     onBackClick: () -> Unit,
     title: String,
-    collections: ImmutableList<CollectionDetailModel>,
+    collectionList: UiState<CollectionListModel>,
     onCollectionItemClick: (collectionId: String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -63,42 +70,64 @@ private fun CollectionListScreen(
 
         Spacer(Modifier.height(12.dp))
 
-        Text(
-            text = "총 ${collections.size}개",
-            color = FlintTheme.colors.gray100,
-            modifier =
-                Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 16.dp),
-        )
+        when (collectionList) {
+            is UiState.Loading -> {
+                FlintLoadingIndicator()
+            }
+
+            is UiState.Success -> {
+                with(collectionList.data) {
+                    Text(
+                        text = "총 ${collections.size}개",
+                        color = FlintTheme.colors.gray100,
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .padding(horizontal = 16.dp),
+                    )
 
-        Spacer(Modifier.height(24.dp))
+                    Spacer(Modifier.height(24.dp))
 
-        LazyVerticalGrid(
-            contentPadding = PaddingValues(10.dp),
-            columns = GridCells.Fixed(2),
-            horizontalArrangement = Arrangement.spacedBy(12.dp, Alignment.CenterHorizontally),
-            verticalArrangement = Arrangement.spacedBy(12.dp),
-            modifier =
-                Modifier
-                    .padding(horizontal = 10.dp),
-        ) {
-            items(
-                items = collections,
-                key = { it.collectionId },
-            ) { collection ->
-                Box(modifier = Modifier.fillMaxSize(1f).align(Alignment.CenterHorizontally)) {
-                    CollectionFileItem(
-                        collection = collection,
+                    LazyVerticalGrid(
+                        contentPadding = PaddingValues(10.dp),
+                        columns = GridCells.Fixed(2),
+                        horizontalArrangement =
+                            Arrangement.spacedBy(
+                                12.dp,
+                                Alignment.CenterHorizontally,
+                            ),
+                        verticalArrangement = Arrangement.spacedBy(12.dp),
                         modifier =
                             Modifier
-                                .align(Alignment.Center)
-                                .noRippleClickable(
-                                    onClick = { onCollectionItemClick(collection.collectionId) }
+                                .padding(horizontal = 10.dp),
+                    ) {
+                        items(
+                            items = collections,
+                            key = { it.id },
+                        ) { collection ->
+                            Box(
+                                modifier =
+                                    Modifier
+                                        .fillMaxSize(1f)
+                                        .align(Alignment.CenterHorizontally),
+                            ) {
+                                CollectionFileItem(
+                                    collection = collection,
+                                    modifier =
+                                        Modifier
+                                            .align(Alignment.Center)
+                                            .noRippleClickable(
+                                                onClick = { onCollectionItemClick(collection.id) },
+                                            ),
                                 )
-                    )
+                            }
+                        }
+                    }
                 }
+
             }
+
+            else -> {}
         }
     }
 }
@@ -110,7 +139,7 @@ private fun CollectionListScreenPreview() {
         CollectionListScreen(
             onBackClick = {},
             title = "전체 컬렉션",
-            collections = CollectionDetailModel.FakeList,
+            collectionList = UiState.Success(CollectionListModel.FakeList),
             onCollectionItemClick = {}
         )
     }

app/src/main/java/com/flint/presentation/collectionlist/CollectionListViewModel.kt

@@ -0,0 +1,50 @@
+package com.flint.presentation.collectionlist
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import androidx.navigation.toRoute
+import com.flint.core.common.util.UiState
+import com.flint.core.navigation.Route
+import com.flint.domain.repository.CollectionRepository
+import com.flint.domain.repository.UserRepository
+import com.flint.domain.type.CollectionListRouteType
+import com.flint.presentation.collectionlist.uistate.CollectionListUiState
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class CollectionListViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    val userRepository: UserRepository,
+    val collectionRepository: CollectionRepository,
+) : ViewModel() {
+
+    val routeType = savedStateHandle.toRoute<Route.CollectionList>().routeType
+
+    private val _uiState = MutableStateFlow<CollectionListUiState>(CollectionListUiState())
+    val uiState: MutableStateFlow<CollectionListUiState> = _uiState
+
+    init {
+        getCollectionList()
+    }
+
+    private fun getCollectionList() {
+        viewModelScope.launch {
+            _uiState.update { it.copy(collectionList = UiState.Loading) }
+
+            when (routeType) {
+                CollectionListRouteType.CREATED -> userRepository.getUserCreatedCollections(userId = null)
+                CollectionListRouteType.SAVED -> userRepository.getUserBookmarkedCollections(userId = null)
+                CollectionListRouteType.RECENT -> collectionRepository.getRecentCollectionList()
+            }.onSuccess { result ->
+                _uiState.update { it.copy(collectionList = UiState.Success(result)) }
+            }.onFailure {
+                _uiState.update { it.copy(collectionList = UiState.Failure) }
+            }
+        }
+    }
+}