feat: 홈화면 UI 개편

app/src/main/java/com/flint/core/designsystem/component/bottomsheet/OttListBottomSheet.kt

@@ -1,13 +1,18 @@
 package com.flint.core.designsystem.component.bottomsheet
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SheetState
+import androidx.compose.material3.Text
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.flint.core.designsystem.component.listItem.OttShortCutListItem
@@ -20,7 +25,6 @@ import com.flint.domain.type.OttType
 fun OttListBottomSheet(
     ottList: OttListModel,
     onDismiss: () -> Unit,
-    onMoveClick: (String) -> Unit,
     modifier: Modifier = Modifier,
     sheetState: SheetState = rememberModalBottomSheetState(),
 ) {
@@ -29,17 +33,26 @@ fun OttListBottomSheet(
         onDismiss = onDismiss,
     ) {
         LazyColumn(
-            modifier = modifier.padding(top = 24.dp, bottom = 32.dp),
-            verticalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = modifier.padding(bottom = 30.dp),
         ) {
+            item {
+                Text(
+                    text = "이 작품을 볼 수 있는 OTT",
+                    style = FlintTheme.typography.head3Sb18,
+                    color = FlintTheme.colors.white,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                )
+
+                Spacer(Modifier.height(12.dp))
+            }
+
             items(ottList.otts.size) {
                 OttShortCutListItem(
                     ottModel = ottList.otts[it],
-                    onMoveClick = {
-                        onMoveClick(ottList.otts[it].contentUrl)
-                        onDismiss()
-                    },
                 )
+                Spacer(Modifier.height(8.dp))
             }
         }
     }
@@ -57,7 +70,6 @@ private fun PreviewOttListBottomSheet() {
         OttListBottomSheet(
             ottList = ottList,
             onDismiss = {},
-            onMoveClick = {},
             modifier = Modifier,
             sheetState = sheetState,
         )

app/src/main/java/com/flint/core/designsystem/component/listItem/OttShortCutListItem.kt

@@ -31,7 +31,6 @@ import com.flint.domain.type.OttType
 @Composable
 fun OttShortCutListItem(
     ottModel: OttModel,
-    onMoveClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Row(
@@ -57,23 +56,6 @@ fun OttShortCutListItem(
         )
 
         Spacer(Modifier.weight(1f))
-
-        Box(
-            modifier =
-                Modifier
-                    .clip(RoundedCornerShape(8.dp))
-                    .background(FlintTheme.colors.primary400)
-                    .clickable {
-                        onMoveClick()
-                    }.padding(vertical = 7.dp, horizontal = 12.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            Text(
-                text = "바로 보러가기",
-                style = FlintTypography.body2M14,
-                color = FlintTheme.colors.white,
-            )
-        }
     }
 }
 
@@ -88,8 +70,7 @@ private fun PreviewOttShortCutListItem() {
                     name = "Netflix",
                     logoUrl = "",
                     contentUrl = "",
-                ),
-                onMoveClick = {},
+                )
             )
         }
     }

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

@@ -72,8 +72,15 @@ data class Colors(
     val yellow: Color,
     val blue: Color,
     val kakao: Color,
+    val transparent: Color,
     val buttonStroke: Brush,
     val myGradient: Brush,
+    val blueGradient: Brush,
+    val primary400Gradient: Brush,
+    val grayGradient: Brush,
+    val gray800Gradient: Brush,
+    val userBadgeGradient: Brush,
+    val userBadgeStroke: Brush,
 )
 
 val FlintColors =
@@ -160,6 +167,7 @@ val FlintColors =
         yellow = Color(0xFFF9B902),
         blue = Color(0xFF38A5FF),
         kakao = Color(0xFFFEE500),
+        transparent = Color.Transparent,
         buttonStroke =
             Brush.verticalGradient(
                 colors = listOf(Color(0xFFAEAEAE), Color(0xFF666666)),
@@ -168,6 +176,45 @@ val FlintColors =
             Brush.verticalGradient(
                 colors = listOf(Color(0xFF424BBD).copy(1f), Color(0xFF121212).copy(alpha = 0.04f)),
             ),
+        blueGradient =
+            Brush.verticalGradient(
+                colors = listOf(Color(0xFF062845).copy(alpha = 0f), Color(0xFF062845).copy(1f)),
+            ),
+        primary400Gradient =
+            Brush.verticalGradient(
+                colors = listOf(Color(0xFF1ABFF2).copy(0f), Color(0xFF1ABFF2).copy(0.35f)),
+            ),
+        grayGradient =
+            Brush.verticalGradient(
+                colors = listOf(Color(0xFF21242C).copy(alpha = 0f), Color(0xFF21242C).copy(alpha = 1f)),
+            ),
+        gray800Gradient =
+            Brush.verticalGradient(
+                colors = listOf(Color(0xFF21242C).copy(alpha = 0f), Color(0xFF21242C).copy(alpha = 0.35f)),
+            ),
+        userBadgeGradient = object : ShaderBrush() {
+            override fun createShader(size: Size): Shader {
+                return LinearGradientShader(
+                    from = Offset(size.width * 0.095f, size.height * 0.109f),
+                    to = Offset(size.width * 0.921f, size.height * 0.844f),
+                    colors = listOf(Color.White.copy(alpha = 0f), Color.White.copy(alpha = 0.1f)),
+                )
+            }
+        },
+        userBadgeStroke = object : ShaderBrush() {
+            override fun createShader(size: Size): Shader {
+                return LinearGradientShader(
+                    from = Offset(size.width * 0.429f, 0f),
+                    to = Offset(size.width * 0.738f, size.height),
+                    colors = listOf(
+                        Color.White.copy(alpha = 0.7f),
+                        Color.White.copy(alpha = 0f),
+                        Color.White.copy(alpha = 0.7f),
+                    ),
+                    colorStops = listOf(0f, 0.52f, 1f),
+                )
+            }
+        },
     )
 
 @Preview(device = Devices.DESKTOP)

app/src/main/java/com/flint/core/navigation/model/CollectionListRouteType.kt

@@ -5,5 +5,5 @@ enum class CollectionListRouteType(
 ) {
     CREATED(title = "전체 컬렉션"),
     SAVED(title = "저장 컬렉션"),
-    RECENT(title = "눈여겨보고 있는 컬렉션"),
+    FAMOUS(title = "인기 컬렉션")
 }

app/src/main/java/com/flint/data/api/HomeApi.kt

@@ -1,11 +1,15 @@
 package com.flint.data.api
 
 import com.flint.data.dto.base.BaseResponse
+import com.flint.data.dto.home.response.PopularCollectionResponseDto
 import com.flint.data.dto.home.response.RecommendCollectionResponseDto
 import retrofit2.http.GET
 
 interface HomeApi {
 
     @GET("/api/v1/home/recommended-collections")
-    suspend fun getRecommendedCollections() : BaseResponse<RecommendCollectionResponseDto>
+    suspend fun getRecommendedCollections(): BaseResponse<RecommendCollectionResponseDto>
+
+    @GET("/api/v1/home/popular-collections")
+    suspend fun getPopularCollections(): BaseResponse<PopularCollectionResponseDto>
 }

app/src/main/java/com/flint/data/api/UserApi.kt

@@ -36,7 +36,7 @@ interface UserApi {
     ): BaseResponse<BookmarkedCollectionListResponseDto>
 
     // 사용자별 북마크한 콘텐츠 목록 조회
-    @GET("/api/v1/contents/{userId}/bookmarked-contents")
+    @GET("/api/v1/users/{userId}/bookmarked-contents")
     suspend fun getBookmarkedContentListByUserId(
         @Path("userId") userId: String
     ): BaseResponse<BookmarkedContentListResponseDto>

app/src/main/java/com/flint/data/di/interceptor/TokenInterceptor.kt

@@ -23,8 +23,8 @@ class TokenInterceptor
 
             val requestBuilder = originalRequest.newBuilder()
 
-            val isSearchRequest = originalRequest.url.encodedPath.endsWith("/contents/search")
-            if (accessToken.isNotEmpty() && !isSearchRequest) {
+            val isPublicEndpoint = originalRequest.url.encodedPath == "/api/v1/search/contents"
+            if (accessToken.isNotEmpty() && !isPublicEndpoint) {
                 requestBuilder.header("Authorization", "Bearer $accessToken")
             }
 

app/src/main/java/com/flint/data/dto/content/response/BookmarkedContentListResponseDto.kt

@@ -5,6 +5,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class BookmarkedContentListResponseDto(
+    @SerialName("totalCount")
+    val totalCount: Int = 0,
     @SerialName("contents")
     val contents: List<BookmarkedContentResponseDto>
 )
@@ -19,6 +21,10 @@ data class BookmarkedContentResponseDto(
     val year: Int,
     @SerialName("imageUrl")
     val imageUrl: String,
+    @SerialName("bookmarkCount")
+    val bookmarkCount: Int = 0,
+    @SerialName("isBookmarked")
+    val isBookmarked: Boolean = false,
     @SerialName("getOttSimpleList")
     val getOttSimpleList: List<OttSimpleResponseDto>
 )
@@ -29,4 +35,4 @@ data class OttSimpleResponseDto(
     val ottName: String,
     @SerialName("logoUrl")
     val logoUrl: String
-)
+)

app/src/main/java/com/flint/data/dto/home/response/PopularCollectionResponseDto.kt

@@ -0,0 +1,24 @@
+package com.flint.data.dto.home.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PopularCollectionResponseDto(
+    @SerialName("collections")
+    val collections: List<PopularCollectionItemResponseDto>
+)
+
+@Serializable
+data class PopularCollectionItemResponseDto(
+    @SerialName("id")
+    val id: String,
+    @SerialName("thumbnailUrl")
+    val thumbnailUrl: String?,
+    @SerialName("title")
+    val title: String,
+    @SerialName("nickname")
+    val nickname: String,
+    @SerialName("profileImageUrl")
+    val profileUrl: String?
+)

app/src/main/java/com/flint/domain/mapper/collection/CollectionMapper.kt

@@ -3,6 +3,8 @@ package com.flint.domain.mapper.collection
 import com.flint.data.dto.collection.response.CollectionsResponseDto
 import com.flint.data.dto.collection.response.RecentCollectionItemResponseDto
 import com.flint.data.dto.collection.response.RecentCollectionListResponseDto
+import com.flint.data.dto.home.response.PopularCollectionItemResponseDto
+import com.flint.data.dto.home.response.PopularCollectionResponseDto
 import com.flint.data.dto.home.response.RecommendCollectionItemResponseDto
 import com.flint.data.dto.home.response.RecommendCollectionResponseDto
 import com.flint.data.dto.user.response.BookmarkedCollectionItemResponseDto
@@ -22,6 +24,22 @@ fun CollectionsResponseDto.toModel(): CollectionsModel {
 }
 
 
+fun PopularCollectionResponseDto.toModel(): CollectionListModel {
+    return CollectionListModel(
+        collections = collections.map { it.toModel() }.toImmutableList()
+    )
+}
+
+private fun PopularCollectionItemResponseDto.toModel(): CollectionItemModel {
+    return CollectionItemModel(
+        id = id,
+        thumbnailUrl = thumbnailUrl,
+        title = title,
+        nickname = nickname,
+        profileUrl = profileUrl
+    )
+}
+
 fun RecommendCollectionResponseDto.toModel(): CollectionListModel {
     return CollectionListModel(
         collections = collections.map { it.toModel() }.toImmutableList()

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

@@ -21,6 +21,30 @@ data class CollectionListModel(
                     userId = "0",
                     nickname = "nickname",
                     profileUrl = null
+                ),
+                CollectionItemModel(
+                    id = "1",
+                    thumbnailUrl = "",
+                    title = "드라마 제목",
+                    description = "드라마 제목 드라마 제목 드라마 제목 드라마 제목 드라마 제목",
+                    imageList = emptyList(),
+                    bookmarkCount = 0,
+                    isBookmarked = false,
+                    userId = "0",
+                    nickname = "nickname",
+                    profileUrl = null
+                ),
+                CollectionItemModel(
+                    id = "2",
+                    thumbnailUrl = "",
+                    title = "드라마 제목",
+                    description = "드라마 제목 드라마 제목 드라마 제목 드라마 제목 드라마 제목",
+                    imageList = emptyList(),
+                    bookmarkCount = 0,
+                    isBookmarked = false,
+                    userId = "0",
+                    nickname = "nickname",
+                    profileUrl = null
                 )
             )
         )

app/src/main/java/com/flint/domain/repository/HomeRepository.kt

@@ -12,4 +12,7 @@ class HomeRepository @Inject constructor(
 ) {
     suspend fun getRecommendedCollectionList(): Result<CollectionListModel> =
         suspendRunCatching { apiService.getRecommendedCollections().data.toModel() }
+
+    suspend fun getPopularCollectionList(): Result<CollectionListModel> =
+        suspendRunCatching { apiService.getPopularCollections().data.toModel() }
 }