From a53b76415ba8e62dfe1207a6639f9b16ab88ee5a Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Wed, 27 Sep 2023 15:49:00 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=ED=81=90?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=EC=A0=84=EC=B2=B4=EB=B3=B4?=
 =?UTF-8?q?=EA=B8=B0=20-=20UI=20=ED=98=95=ED=83=9C=20=EA=B7=B8=EB=A6=AC?=
 =?UTF-8?q?=EB=93=9C=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../curation/AudioContentCurationActivity.kt  | 72 +++++++++++--------
 .../curation/GetCurationContentResponse.kt    |  4 +-
 2 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/curation/AudioContentCurationActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/curation/AudioContentCurationActivity.kt
index 48a4c4c..2edae01 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/curation/AudioContentCurationActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/curation/AudioContentCurationActivity.kt
@@ -8,16 +8,18 @@ import android.view.View
 import android.widget.TextView
 import android.widget.Toast
 import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import kr.co.vividnext.sodalive.R
-import kr.co.vividnext.sodalive.audio_content.AudioContentAdapter
 import kr.co.vividnext.sodalive.audio_content.AudioContentViewModel
+import kr.co.vividnext.sodalive.audio_content.all.AudioContentNewAllAdapter
 import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
 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.ActivityAudioContentCurationBinding
+import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
 import kr.co.vividnext.sodalive.extensions.dpToPx
 import org.koin.android.ext.android.inject
 
@@ -28,7 +30,7 @@ class AudioContentCurationActivity : BaseActivity<ActivityAudioContentCurationBi
     private val viewModel: AudioContentCurationViewModel by inject()
 
     private lateinit var loadingDialog: LoadingDialog
-    private lateinit var adapter: AudioContentAdapter
+    private lateinit var adapter: AudioContentNewAllAdapter
 
     private var curationId: Long = 0
     private lateinit var title: String
@@ -52,20 +54,26 @@ class AudioContentCurationActivity : BaseActivity<ActivityAudioContentCurationBi
         binding.toolbar.tvBack.text = title
         binding.toolbar.tvBack.setOnClickListener { finish() }
 
-        adapter = AudioContentAdapter {
-            startActivity(
-                Intent(applicationContext, AudioContentDetailActivity::class.java).apply {
-                    putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it)
-                }
-            )
-        }
-
-        binding.rvCuration.layoutManager = LinearLayoutManager(
-            applicationContext,
-            LinearLayoutManager.VERTICAL,
-            false
+        adapter = AudioContentNewAllAdapter(
+            itemWidth = (screenWidth - 40f.dpToPx().toInt()) / 2,
+            onClickItem = {
+                startActivity(
+                    Intent(this, AudioContentDetailActivity::class.java).apply {
+                        putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, it)
+                    }
+                )
+            },
+            onClickCreator = {
+                startActivity(
+                    Intent(this, UserProfileActivity::class.java).apply {
+                        putExtra(Constants.EXTRA_USER_ID, it)
+                    }
+                )
+            }
         )
 
+        binding.rvCuration.layoutManager = GridLayoutManager(this, 2)
+
         binding.rvCuration.addItemDecoration(object : RecyclerView.ItemDecoration() {
             override fun getItemOffsets(
                 outRect: Rect,
@@ -75,25 +83,31 @@ class AudioContentCurationActivity : BaseActivity<ActivityAudioContentCurationBi
             ) {
                 super.getItemOffsets(outRect, view, parent, state)
 
-                when (parent.getChildAdapterPosition(view)) {
-                    0 -> {
-                        outRect.top = 40f.dpToPx().toInt()
-                        outRect.bottom = 20f.dpToPx().toInt()
+                val position = parent.getChildAdapterPosition(view)
+                if (position % 2 == 0) {
+                    outRect.left = 13.3f.dpToPx().toInt()
+                    outRect.right = 6.7f.dpToPx().toInt()
+                } else {
+                    outRect.left = 6.7f.dpToPx().toInt()
+                    outRect.right = 13.3f.dpToPx().toInt()
+                }
+
+                when (position) {
+                    0, 1 -> {
+                        outRect.top = 13.3f.dpToPx().toInt()
+                        outRect.bottom = 6.7f.dpToPx().toInt()
                     }
 
-                    adapter.itemCount - 1 -> {
-                        outRect.top = 20f.dpToPx().toInt()
-                        outRect.bottom = 40f.dpToPx().toInt()
+                    adapter.itemCount - 1, adapter.itemCount - 2 -> {
+                        outRect.top = 6.7f.dpToPx().toInt()
+                        outRect.bottom = 13.3f.dpToPx().toInt()
                     }
 
                     else -> {
-                        outRect.top = 20f.dpToPx().toInt()
-                        outRect.bottom = 20f.dpToPx().toInt()
+                        outRect.top = 6.7f.dpToPx().toInt()
+                        outRect.bottom = 6.7f.dpToPx().toInt()
                     }
                 }
-
-                outRect.left = 13.3f.dpToPx().toInt()
-                outRect.right = 13.3f.dpToPx().toInt()
             }
         })
 
@@ -145,14 +159,12 @@ class AudioContentCurationActivity : BaseActivity<ActivityAudioContentCurationBi
 
         viewModel.contentListLiveData.observe(this) {
             if (viewModel.page - 1 == 1) {
-                adapter.items.clear()
+                adapter.clear()
                 binding.rvCuration.scrollToPosition(0)
             }
 
             binding.tvTotalCount.text = "${it.totalCount}"
-
-            adapter.items.addAll(it.items)
-            adapter.notifyDataSetChanged()
+            adapter.addItems(it.items)
         }
 
         viewModel.sort.observe(this) {
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/curation/GetCurationContentResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/curation/GetCurationContentResponse.kt
index 125fc5c..b0c4e05 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/curation/GetCurationContentResponse.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/curation/GetCurationContentResponse.kt
@@ -1,9 +1,9 @@
 package kr.co.vividnext.sodalive.audio_content.curation
 
 import com.google.gson.annotations.SerializedName
-import kr.co.vividnext.sodalive.explorer.profile.GetAudioContentListItem
+import kr.co.vividnext.sodalive.audio_content.main.GetAudioContentMainItem
 
 data class GetCurationContentResponse(
     @SerializedName("totalCount") val totalCount: Int,
-    @SerializedName("items") val items: List<GetAudioContentListItem>
+    @SerializedName("items") val items: List<GetAudioContentMainItem>
 )