From ef32eb70dd8acdda1adbd081f073d2d7d7bf105f Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Fri, 14 Feb 2025 18:30:26 +0900
Subject: [PATCH] =?UTF-8?q?=EC=83=88=EB=A1=9C=EC=9A=B4=20=EC=BD=98?=
 =?UTF-8?q?=ED=85=90=EC=B8=A0=20=EC=A0=84=EC=B2=B4=EB=B3=B4=EA=B8=B0=20-?=
 =?UTF-8?q?=20=EB=AC=B4=EB=A3=8C=20=ED=94=8C=EB=9E=98=EA=B7=B8=EB=A5=BC=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=ED=95=98=EC=97=AC=20=EB=AC=B4=EB=A3=8C?=
 =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=EB=A7=8C=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=EA=B0=80=20=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sodalive/audio_content/AudioContentApi.kt |  9 +++++
 .../audio_content/AudioContentRepository.kt   |  2 +
 .../all/AudioContentNewAllActivity.kt         | 12 ++++--
 .../all/AudioContentNewAllViewModel.kt        |  7 ++--
 .../curation/AudioContentCurationActivity.kt  |  3 ++
 .../free/AudioContentMainTabFreeFragment.kt   | 13 ++++++-
 .../free/AudioContentMainTabFreeRepository.kt | 12 ++++++
 .../free/AudioContentMainTabFreeViewModel.kt  | 38 +++++++++++++++++++
 8 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentApi.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentApi.kt
index 4373f32..6989bef 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentApi.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentApi.kt
@@ -161,6 +161,7 @@ interface AudioContentApi {
 
     @GET("/audio-content/main/new/all")
     fun getNewContentAllOfTheme(
+        @Query("isFree") isFree: Boolean,
         @Query("theme") theme: String,
         @Query("isAdultContentVisible") isAdultContentVisible: Boolean,
         @Query("contentType") contentType: ContentType,
@@ -333,4 +334,12 @@ interface AudioContentApi {
         @Query("size") size: Int,
         @Header("Authorization") authHeader: String
     ): Single<ApiResponse<List<GetAudioContentMainItem>>>
+
+    @GET("/v2/audio-content/main/free/new-content-by-theme")
+    fun getNewFreeContentOfTheme(
+        @Query("theme") theme: String,
+        @Query("page") page: Int,
+        @Query("size") size: Int,
+        @Header("Authorization") authHeader: String
+    ): Single<ApiResponse<List<GetAudioContentMainItem>>>
 }
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentRepository.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentRepository.kt
index e737127..fe645a7 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentRepository.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentRepository.kt
@@ -147,11 +147,13 @@ class AudioContentRepository(
     )
 
     fun getNewContentAllOfTheme(
+        isFree: Boolean,
         theme: String,
         page: Int,
         size: Int,
         token: String
     ) = api.getNewContentAllOfTheme(
+        isFree = isFree,
         theme = theme,
         isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible,
         contentType = ContentType.values()[SharedPreferenceManager.contentPreference],
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt
index a64d465..7e7f0d3 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt
@@ -5,6 +5,8 @@ import android.graphics.Rect
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
+import androidx.annotation.OptIn
+import androidx.media3.common.util.UnstableApi
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -19,6 +21,7 @@ import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
 import kr.co.vividnext.sodalive.extensions.dpToPx
 import org.koin.android.ext.android.inject
 
+@OptIn(UnstableApi::class)
 class AudioContentNewAllActivity : BaseActivity<ActivityAudioContentNewAllBinding>(
     ActivityAudioContentNewAllBinding::inflate
 ) {
@@ -29,12 +32,15 @@ class AudioContentNewAllActivity : BaseActivity<ActivityAudioContentNewAllBindin
     private lateinit var newContentThemeAdapter: AudioContentMainNewContentThemeAdapter
     private lateinit var newContentAdapter: AudioContentNewAllAdapter
 
+    private var isFree: Boolean = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        isFree = intent.getBooleanExtra(Constants.EXTRA_AUDIO_CONTENT_FREE, false)
 
         bindData()
         viewModel.getThemeList()
-        viewModel.getNewContentList()
+        viewModel.getNewContentList(isFree = isFree)
     }
 
     override fun setupView() {
@@ -49,7 +55,7 @@ class AudioContentNewAllActivity : BaseActivity<ActivityAudioContentNewAllBindin
     private fun setupNewContentTheme() {
         newContentThemeAdapter = AudioContentMainNewContentThemeAdapter {
             newContentAdapter.clear()
-            viewModel.selectTheme(it)
+            viewModel.selectTheme(it, isFree = isFree)
         }
 
         binding.rvNewContentTheme.layoutManager = LinearLayoutManager(
@@ -125,7 +131,7 @@ class AudioContentNewAllActivity : BaseActivity<ActivityAudioContentNewAllBindin
                 if (!recyclerView.canScrollVertically(1) &&
                     lastVisibleItemPosition == itemTotalCount
                 ) {
-                    viewModel.getNewContentList()
+                    viewModel.getNewContentList(isFree)
                 }
             }
         })
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllViewModel.kt
index f7ff068..16c70ac 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllViewModel.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllViewModel.kt
@@ -38,12 +38,13 @@ class AudioContentNewAllViewModel(
     private val size = 10
     private var selectedTheme = ""
 
-    fun getNewContentList() {
+    fun getNewContentList(isFree: Boolean = false) {
         if (!_isLoading.value!! && !isLast) {
             _isLoading.value = true
 
             compositeDisposable.add(
                 repository.getNewContentAllOfTheme(
+                    isFree = isFree,
                     theme = if (selectedTheme == "전체") {
                         ""
                     } else {
@@ -118,10 +119,10 @@ class AudioContentNewAllViewModel(
         )
     }
 
-    fun selectTheme(theme: String) {
+    fun selectTheme(theme: String, isFree: Boolean) {
         isLast = false
         page = 1
         selectedTheme = theme
-        getNewContentList()
+        getNewContentList(isFree)
     }
 }
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 733143d..b76502b 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
@@ -5,7 +5,9 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.TextView
 import android.widget.Toast
+import androidx.annotation.OptIn
 import androidx.core.content.ContextCompat
+import androidx.media3.common.util.UnstableApi
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -21,6 +23,7 @@ import kr.co.vividnext.sodalive.databinding.ActivityAudioContentCurationBinding
 import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
 import org.koin.android.ext.android.inject
 
+@OptIn(UnstableApi::class)
 class AudioContentCurationActivity : BaseActivity<ActivityAudioContentCurationBinding>(
     ActivityAudioContentCurationBinding::inflate
 ) {
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeFragment.kt
index 47b3929..e62dbd7 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeFragment.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeFragment.kt
@@ -290,7 +290,9 @@ class AudioContentMainTabFreeFragment : BaseFragment<FragmentAudioContentMainTab
     }
 
     private fun setupNewContentTheme() {
-        newContentThemeAdapter = AudioContentMainNewContentThemeAdapter {}
+        newContentThemeAdapter = AudioContentMainNewContentThemeAdapter {
+            viewModel.getNewFreeContentOfTheme(theme = it)
+        }
 
         binding.rvNewContentTheme.layoutManager = LinearLayoutManager(
             context,
@@ -336,7 +338,14 @@ class AudioContentMainTabFreeFragment : BaseFragment<FragmentAudioContentMainTab
 
     private fun setupNewContent() {
         binding.ivNewContentAll.setOnClickListener {
-            startActivity(Intent(requireContext(), AudioContentNewAllActivity::class.java))
+            startActivity(
+                Intent(
+                    requireContext(),
+                    AudioContentNewAllActivity::class.java
+                ).apply {
+                    putExtra(Constants.EXTRA_AUDIO_CONTENT_FREE, true)
+                }
+            )
         }
 
         newContentAdapter = AudioContentMainContentAdapter(
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeRepository.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeRepository.kt
index 8a6962f..c4d00ab 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeRepository.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeRepository.kt
@@ -9,4 +9,16 @@ class AudioContentMainTabFreeRepository(private val api: AudioContentApi) {
         size = size,
         authHeader = token
     )
+
+    fun getNewContentOfTheme(
+        theme: String,
+        page: Int = 1,
+        size: Int = 10,
+        token: String
+    ) = api.getNewFreeContentOfTheme(
+        theme = theme,
+        page = page - 1,
+        size = size,
+        authHeader = token
+    )
 }
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeViewModel.kt
index daea961..a7b0292 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeViewModel.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/v2/free/AudioContentMainTabFreeViewModel.kt
@@ -92,4 +92,42 @@ class AudioContentMainTabFreeViewModel(
                 )
         )
     }
+
+    fun getNewFreeContentOfTheme(theme: String) {
+        _isLoading.value = true
+        compositeDisposable.add(
+            repository.getNewContentOfTheme(
+                theme = if (theme == "전체") {
+                    ""
+                } else {
+                    theme
+                },
+                token = "Bearer ${SharedPreferenceManager.token}"
+            )
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                    {
+                        if (it.success && it.data != null) {
+                            _newContentListLiveData.value = it.data!!
+                        } else {
+                            if (it.message != null) {
+                                _toastLiveData.postValue(it.message)
+                            } else {
+                                _toastLiveData.postValue(
+                                    "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요."
+                                )
+                            }
+                        }
+
+                        _isLoading.value = false
+                    },
+                    {
+                        it.message?.let { message -> Logger.e(message) }
+                        _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
+                        _isLoading.value = false
+                    }
+                )
+        )
+    }
 }