From d9e39f88a81fc98f5533c43e655e4200bacca8bb Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Wed, 4 Dec 2024 11:45:27 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9E=AC=EC=83=9D=EB=AA=A9=EB=A1=9D=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20-=20=EC=BD=98=ED=85=90=EC=B8=A0=20?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AudioContentPlaylistListAdapter.kt        |   2 +-
 .../AudioContentPlaylistDetailActivity.kt     |  35 ++++
 .../AudioContentPlaylistDetailAdapter.kt      |  10 +-
 ...activity_audio_content_playlist_detail.xml | 188 ++++++++++--------
 4 files changed, 146 insertions(+), 89 deletions(-)

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/AudioContentPlaylistListAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/AudioContentPlaylistListAdapter.kt
index e9da0fd..08cbdd5 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/AudioContentPlaylistListAdapter.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/AudioContentPlaylistListAdapter.kt
@@ -15,7 +15,7 @@ class AudioContentPlaylistListAdapter(
     private val onClickItem: (Long) -> Unit
 ) : RecyclerView.Adapter<AudioContentPlaylistListAdapter.ViewHolder>() {
 
-    val items = mutableListOf<GetPlaylistsItem>()
+    private val items = mutableListOf<GetPlaylistsItem>()
 
     inner class ViewHolder(
         private val binding: ItemPlaylistListBinding
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailActivity.kt
index b6356d7..57835da 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailActivity.kt
@@ -1,16 +1,19 @@
 package kr.co.vividnext.sodalive.audio_content.playlist.detail
 
 import android.annotation.SuppressLint
+import android.graphics.Rect
 import android.os.Bundle
 import android.view.View
 import android.widget.ImageView
 import android.widget.Toast
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import kr.co.vividnext.sodalive.base.BaseActivity
 import kr.co.vividnext.sodalive.common.Constants
 import kr.co.vividnext.sodalive.common.LoadingDialog
 import kr.co.vividnext.sodalive.databinding.ActivityAudioContentPlaylistDetailBinding
+import kr.co.vividnext.sodalive.extensions.dpToPx
 import org.koin.android.ext.android.inject
 
 class AudioContentPlaylistDetailActivity : BaseActivity<ActivityAudioContentPlaylistDetailBinding>(
@@ -48,10 +51,41 @@ class AudioContentPlaylistDetailActivity : BaseActivity<ActivityAudioContentPlay
             LinearLayoutManager.VERTICAL,
             false
         )
+        recyclerView.addItemDecoration(object : RecyclerView.ItemDecoration() {
+            override fun getItemOffsets(
+                outRect: Rect,
+                view: View,
+                parent: RecyclerView,
+                state: RecyclerView.State
+            ) {
+                super.getItemOffsets(outRect, view, parent, state)
+
+                outRect.left = 0
+                outRect.right = 0
+
+                when (parent.getChildAdapterPosition(view)) {
+                    0 -> {
+                        outRect.top = 0
+                        outRect.bottom = 6.7f.dpToPx().toInt()
+                    }
+
+                    adapter.itemCount - 1 -> {
+                        outRect.top = 6.7f.dpToPx().toInt()
+                        outRect.bottom = 0
+                    }
+
+                    else -> {
+                        outRect.top = 6.7f.dpToPx().toInt()
+                        outRect.bottom = 6.7f.dpToPx().toInt()
+                    }
+                }
+            }
+        })
         recyclerView.adapter = adapter
 
         binding.llPlay.setOnClickListener { }
         binding.llShuffle.setOnClickListener { }
+        binding.toolbar.tvBack.setOnClickListener { finish() }
     }
 
     @SuppressLint("SetTextI18n")
@@ -73,6 +107,7 @@ class AudioContentPlaylistDetailActivity : BaseActivity<ActivityAudioContentPlay
             binding.tvTitle.text = it.title
             binding.tvContentCount.text = " ${it.contentCount}개"
             binding.tvCreateDate.text = "만든 날짜 ${it.createdDate} "
+            adapter.updateItems(it.contentList)
             updateCoverImageLayout(imageUrlList = it.playlistCoverImageList)
         }
     }
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailAdapter.kt
index 923f9fe..7bcc506 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailAdapter.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailAdapter.kt
@@ -1,5 +1,6 @@
 package kr.co.vividnext.sodalive.audio_content.playlist.detail
 
+import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
@@ -12,7 +13,7 @@ import kr.co.vividnext.sodalive.extensions.dpToPx
 class AudioContentPlaylistDetailAdapter :
     RecyclerView.Adapter<AudioContentPlaylistDetailAdapter.ViewHolder>() {
 
-    val items = mutableListOf<AudioContentPlaylistContent>()
+    private val items = mutableListOf<AudioContentPlaylistContent>()
 
     inner class ViewHolder(
         private val binding: ItemPlaylistContentBinding
@@ -43,4 +44,11 @@ class AudioContentPlaylistDetailAdapter :
     }
 
     override fun getItemCount() = items.count()
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun updateItems(items: List<AudioContentPlaylistContent>) {
+        this.items.clear()
+        this.items.addAll(items)
+        notifyDataSetChanged()
+    }
 }
diff --git a/app/src/main/res/layout/activity_audio_content_playlist_detail.xml b/app/src/main/res/layout/activity_audio_content_playlist_detail.xml
index d6b56e4..8962995 100644
--- a/app/src/main/res/layout/activity_audio_content_playlist_detail.xml
+++ b/app/src/main/res/layout/activity_audio_content_playlist_detail.xml
@@ -14,98 +14,111 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginHorizontal="13.3dp">
+        android:layout_marginHorizontal="13.3dp"
+        android:layout_marginTop="21.3dp">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_cover"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cv_cover"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:cardBackgroundColor="@color/color_bbbbbb"
+            app:cardCornerRadius="4dp"
+            app:cardElevation="0dp"
+            app:cardPreventCornerOverlap="false"
+            app:cardUseCompatPadding="false"
+            app:contentPadding="0dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <ImageView
-                android:id="@+id/iv_cover_1"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:contentDescription="@null"
-                android:scaleType="centerCrop"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_cover"
+                android:layout_width="80dp"
+                android:layout_height="80dp">
 
-            <ImageView
-                android:id="@+id/iv_cover_2"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:contentDescription="@null"
-                android:scaleType="centerCrop"
-                android:visibility="gone"
-                app:layout_constraintBottom_toTopOf="@id/guideline_horizontal"
-                app:layout_constraintEnd_toStartOf="@id/guideline_vertical"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                <ImageView
+                    android:id="@+id/iv_cover_1"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:contentDescription="@null"
+                    android:scaleType="centerCrop"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
-                android:id="@+id/iv_cover_3"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:contentDescription="@null"
-                android:scaleType="centerCrop"
-                android:visibility="gone"
-                app:layout_constraintBottom_toTopOf="@id/guideline_horizontal"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/guideline_vertical"
-                app:layout_constraintTop_toTopOf="parent" />
+                <ImageView
+                    android:id="@+id/iv_cover_2"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:contentDescription="@null"
+                    android:scaleType="centerCrop"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toTopOf="@id/guideline_horizontal"
+                    app:layout_constraintEnd_toStartOf="@id/guideline_vertical"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
-                android:id="@+id/iv_cover_4"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:contentDescription="@null"
-                android:scaleType="centerCrop"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/guideline_horizontal" />
+                <ImageView
+                    android:id="@+id/iv_cover_3"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:contentDescription="@null"
+                    android:scaleType="centerCrop"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toTopOf="@id/guideline_horizontal"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/guideline_vertical"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
-                android:id="@+id/iv_cover_5"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:contentDescription="@null"
-                android:scaleType="centerCrop"
-                android:visibility="gone"
-                app:layout_constraintEnd_toStartOf="@id/guideline_vertical"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/guideline_horizontal" />
+                <ImageView
+                    android:id="@+id/iv_cover_4"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:contentDescription="@null"
+                    android:scaleType="centerCrop"
+                    android:visibility="gone"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/guideline_horizontal" />
 
-            <ImageView
-                android:id="@+id/iv_cover_6"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:contentDescription="@null"
-                android:scaleType="centerCrop"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/guideline_vertical"
-                app:layout_constraintTop_toBottomOf="@id/guideline_horizontal" />
+                <ImageView
+                    android:id="@+id/iv_cover_5"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:contentDescription="@null"
+                    android:scaleType="centerCrop"
+                    android:visibility="gone"
+                    app:layout_constraintEnd_toStartOf="@id/guideline_vertical"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/guideline_horizontal" />
 
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent="0.5" />
+                <ImageView
+                    android:id="@+id/iv_cover_6"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:contentDescription="@null"
+                    android:scaleType="centerCrop"
+                    android:visibility="gone"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/guideline_vertical"
+                    app:layout_constraintTop_toBottomOf="@id/guideline_horizontal" />
 
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline_horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_percent="0.5" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline_vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent="0.5" />
+
+                <androidx.constraintlayout.widget.Guideline
+                    android:id="@+id/guideline_horizontal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    app:layout_constraintGuide_percent="0.5" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.cardview.widget.CardView>
 
         <TextView
             android:id="@+id/tv_title"
@@ -118,8 +131,8 @@
             android:textColor="@color/color_d2d2d2"
             android:textSize="18.3sp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/cl_cover"
-            app:layout_constraintTop_toTopOf="@+id/cl_cover"
+            app:layout_constraintStart_toEndOf="@+id/cv_cover"
+            app:layout_constraintTop_toTopOf="@+id/cv_cover"
             tools:text="재생목록 제목" />
 
         <TextView
@@ -132,7 +145,7 @@
             android:maxLength="100"
             android:textColor="@color/color_909090"
             android:textSize="12sp"
-            app:layout_constraintBottom_toBottomOf="@+id/cl_cover"
+            app:layout_constraintBottom_toBottomOf="@+id/cv_cover"
             app:layout_constraintEnd_toEndOf="@+id/tv_title"
             app:layout_constraintStart_toStartOf="@+id/tv_title"
             app:layout_constraintTop_toBottomOf="@+id/tv_title"
@@ -142,12 +155,13 @@
             android:id="@+id/tv_create_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="13.3dp"
             android:fontFamily="@font/gmarket_sans_medium"
             android:gravity="center_vertical"
             android:textColor="@color/color_909090"
             android:textSize="13.3sp"
-            app:layout_constraintStart_toStartOf="@+id/cl_cover"
-            app:layout_constraintTop_toBottomOf="@+id/cl_cover"
+            app:layout_constraintStart_toStartOf="@+id/cv_cover"
+            app:layout_constraintTop_toBottomOf="@+id/cv_cover"
             tools:text="만든 날짜 2024.11.28 " />
 
         <TextView
@@ -159,8 +173,8 @@
             android:textColor="@color/color_eeeeee"
             android:textSize="13.3sp"
             app:layout_constraintBottom_toBottomOf="@+id/tv_create_date"
-            app:layout_constraintStart_toEndOf="@+id/tv_create_date"
             app:layout_constraintTop_toTopOf="@+id/tv_create_date"
+            app:layout_constraintEnd_toEndOf="parent"
             tools:text=" 5개" />
 
         <LinearLayout