Merge branch 'develop' into feat-product-detail-view

# Conflicts:
#	app/src/main/java/org/sopt/kream/data/service/ProductService.kt

app/build.gradle.kts

@@ -76,10 +76,15 @@ dependencies {
 
     // Coil
     implementation(libs.coil)
+    implementation(libs.coil.compose)
 
     // Network
     implementation(platform(libs.okhttp.bom))
     implementation(libs.bundles.okhttp)
     implementation(libs.bundles.retrofit)
     implementation(libs.kotlin.serialization.json)
+
+    // Pager
+    implementation(libs.accompanist.pager.v02413rc)
+    implementation(libs.accompanist.pager.indicators.v02413rc)
 }

app/src/main/java/org/sopt/kream/data/model/request/RequestDeleteScrapDto.kt

@@ -0,0 +1,10 @@
+package org.sopt.kream.data.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RequestDeleteScrapDto(
+    @SerialName("memberId")
+    val memberId: String,
+)

app/src/main/java/org/sopt/kream/data/model/response/ResponseDeleteScrapDto.kt

@@ -0,0 +1,20 @@
+package org.sopt.kream.data.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseDeleteScrapDto(
+    @SerialName("productId")
+    val productId: List<DeleteScrapResponseDto>,
+) {
+    @Serializable
+    data class DeleteScrapResponseDto(
+        @SerialName("status")
+        val status: Int,
+        @SerialName("message")
+        val message: String,
+        @SerialName("data")
+        val data: String,
+    )
+}

app/src/main/java/org/sopt/kream/data/model/response/ResponseReleaseProductDto.kt

@@ -0,0 +1,26 @@
+package org.sopt.kream.data.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseReleaseProductDto(
+    @SerialName("releaseProducts")
+    val releaseProducts: List<ReleaseProductResponseDto>,
+) {
+    @Serializable
+    data class ReleaseProductResponseDto(
+        @SerialName("thumbnailUrl")
+        val thumbnailUrl: String,
+        @SerialName("brandTitle")
+        val brandTitle: String,
+        @SerialName("engTitle")
+        val engTitle: String,
+        @SerialName("isScrap")
+        var isScrap: Boolean,
+        @SerialName("isUpdate")
+        val isUpdate: Boolean,
+        @SerialName("isNew")
+        val isNew: Boolean,
+    )
+}

app/src/main/java/org/sopt/kream/data/service/ProductService.kt

@@ -1,8 +1,10 @@
 package org.sopt.kream.data.service
 
 import org.sopt.kream.data.model.response.ResponseProductDetailDto
+import org.sopt.kream.data.model.response.ResponseReleaseProductDto
 import org.sopt.kream.data.model.response.ResponseSearchProductDto
 import org.sopt.kream.util.base.BaseResponse
+import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.Path
@@ -20,6 +22,16 @@ interface ProductService {
         @Path("productId") productId: Int,
     ): BaseResponse<ResponseProductDetailDto>
 
+    @GET("product/release")
+    suspend fun getReleaseProduct(
+        @Header("memberId") userid: Int,
+    ): BaseResponse<ResponseReleaseProductDto>
+
+    @DELETE("product/release")
+    suspend fun deleteScrap(
+        @Header("memberId") userid: Int,
+    ): BaseResponse<ResponseReleaseProductDto>
+
     companion object {
         const val MEMBER_ID = 1
     }

app/src/main/java/org/sopt/kream/presentation/ui/main/home/release/AdvertisementDataClass.kt

@@ -0,0 +1,15 @@
+package org.sopt.kream.presentation.ui.main.home.release
+
+import org.sopt.kream.R
+
+data class Advertisement(
+    val id: Int,
+    val imgResource: Int,
+)
+
+enum class AdvertisementType(val imgResource: Int) {
+    AD_01(R.drawable.img_view1_ad_01),
+    AD_02(R.drawable.img_view1_ad_02),
+    AD_03(R.drawable.img_view1_ad_03),
+    AD_04(R.drawable.img_view1_ad_04),
+}