From 4d9e68d60bf63c7446064b0a0a5335b29ca6a4d5 Mon Sep 17 00:00:00 2001 From: klaus Date: Tue, 10 Jun 2025 18:24:46 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=8B=9C=EB=A6=AC=EC=A6=88=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20-=20=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20-=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EA=B0=80=EB=8A=A5=20=EC=97=AC=EB=B6=80=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../series/content/SeriesContentAdapter.kt | 6 +++ .../detail/GetSeriesContentListResponse.kt | 3 +- .../main/res/layout/item_audio_content.xml | 2 +- .../main/res/layout/item_series_content.xml | 50 +++++++++++++------ app/src/main/res/values/colors.xml | 1 - 5 files changed, 44 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAdapter.kt index 9f55a2d3..e18e38e9 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAdapter.kt @@ -28,6 +28,12 @@ class SeriesContentAdapter( transformations(RoundedCornersTransformation(5.3f.dpToPx())) } + binding.tvPoint.visibility = if (item.isPointAvailable) { + View.VISIBLE + } else { + View.GONE + } + binding.tvTitle.text = item.title binding.tvDuration.text = item.duration diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/detail/GetSeriesContentListResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/detail/GetSeriesContentListResponse.kt index a1097371..6425d297 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/detail/GetSeriesContentListResponse.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/detail/GetSeriesContentListResponse.kt @@ -21,5 +21,6 @@ data class GetSeriesContentListItem( @SerializedName("duration") val duration: String, @SerializedName("price") val price: Int, @SerializedName("isRented") var isRented: Boolean, - @SerializedName("isOwned") var isOwned: Boolean + @SerializedName("isOwned") var isOwned: Boolean, + @SerializedName("isPointAvailable") var isPointAvailable: Boolean ) : Parcelable diff --git a/app/src/main/res/layout/item_audio_content.xml b/app/src/main/res/layout/item_audio_content.xml index 3bb755cc..25a2f0e3 100644 --- a/app/src/main/res/layout/item_audio_content.xml +++ b/app/src/main/res/layout/item_audio_content.xml @@ -79,7 +79,7 @@ android:gravity="center" android:padding="2.6dp" android:text="포인트" - android:textColor="@color/color_bf98ff" + android:textColor="@color/white" android:textSize="8sp" android:visibility="gone" tools:ignore="SmallSp" /> diff --git a/app/src/main/res/layout/item_series_content.xml b/app/src/main/res/layout/item_series_content.xml index db62f784..309e1ef7 100644 --- a/app/src/main/res/layout/item_series_content.xml +++ b/app/src/main/res/layout/item_series_content.xml @@ -23,18 +23,38 @@ android:orientation="vertical" tools:ignore="RelativeOverlap"> - + android:layout_height="wrap_content"> + + + + + @@ -73,11 +93,11 @@ android:background="@drawable/bg_round_corner_2_6_cf5c37" android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="5.3dp" - android:visibility="gone" android:paddingVertical="2.7dp" android:text="무료" android:textColor="@color/white" android:textSize="13.3sp" + android:visibility="gone" tools:ignore="RelativeOverlap" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 20e4a284..8ffaa80d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -130,5 +130,4 @@ #CC777777 #EC3AA6 #7849BC - #BF98FF