From 8c8b8c1747ca14cd28dc993f6a1a65b4d8ad99b6 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Fri, 13 Dec 2024 22:58:53 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EB=B3=84=20=EC=BD=98=ED=85=90?=
 =?UTF-8?q?=EC=B8=A0=20=EC=9E=AC=EC=83=9D=20<->=20=EC=9E=AC=EC=83=9D?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=9E=AC=EC=83=9D=20-=20=EA=B8=B0?=
 =?UTF-8?q?=EC=A1=B4=EC=97=90=20=EC=9E=AC=EC=83=9D=20=EC=A4=91=EC=9D=B8=20?=
 =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0(=EC=9E=AC=EC=83=9D=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D)=EB=A5=BC=20=EB=A9=88=EC=B6=94=EA=B3=A0=20=EC=8B=A0?=
 =?UTF-8?q?=EA=B7=9C=EB=A1=9C=20=EC=9E=AC=EC=83=9D=ED=95=9C=20=EC=BD=98?=
 =?UTF-8?q?=ED=85=90=EC=B8=A0(=EC=9E=AC=EC=83=9D=EB=AA=A9=EB=A1=9D)?=
 =?UTF-8?q?=EA=B0=80=20=EB=8B=A8=EB=8F=85=EC=9C=BC=EB=A1=9C=20=EC=9E=AC?=
 =?UTF-8?q?=EC=83=9D=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/AudioContentDetailActivity.kt       |  8 ++++++++
 .../AudioContentPlaylistDetailActivity.kt      | 13 +++++++++++++
 .../layout/fragment_audio_content_player.xml   | 18 ++++++------------
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt
index fa81bdb..6544d65 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt
@@ -21,6 +21,7 @@ import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
+import androidx.media3.common.util.UnstableApi
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import coil.load
@@ -36,6 +37,7 @@ import kr.co.vividnext.sodalive.audio_content.modify.AudioContentModifyActivity
 import kr.co.vividnext.sodalive.audio_content.order.AudioContentOrderConfirmDialog
 import kr.co.vividnext.sodalive.audio_content.order.AudioContentOrderFragment
 import kr.co.vividnext.sodalive.audio_content.order.OrderType
+import kr.co.vividnext.sodalive.audio_content.player.AudioContentPlayerService
 import kr.co.vividnext.sodalive.base.BaseActivity
 import kr.co.vividnext.sodalive.base.SodaDialog
 import kr.co.vividnext.sodalive.common.Constants
@@ -57,6 +59,7 @@ import kr.co.vividnext.sodalive.report.ReportType
 import org.koin.android.ext.android.inject
 import kotlin.math.ceil
 
+@UnstableApi
 class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBinding>(
     ActivityAudioContentDetailBinding::inflate
 ) {
@@ -662,6 +665,11 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
         ) {
             binding.ivPlayOrPause.visibility = View.VISIBLE
             binding.ivPlayOrPause.setOnClickListener {
+                startService(
+                    Intent(applicationContext, AudioContentPlayerService::class.java).apply {
+                        action = "STOP_SERVICE"
+                    }
+                )
                 startService(
                     Intent(this, AudioContentPlayService::class.java).apply {
                         putExtra(
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 899f2f9..23084d4 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
@@ -24,6 +24,7 @@ import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import coil.transform.RoundedCornersTransformation
 import kr.co.vividnext.sodalive.R
+import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService
 import kr.co.vividnext.sodalive.audio_content.player.AudioContentPlayerFragment
 import kr.co.vividnext.sodalive.audio_content.player.AudioContentPlayerService
 import kr.co.vividnext.sodalive.audio_content.playlist.modify.AudioContentPlaylistModifyActivity
@@ -244,9 +245,21 @@ class AudioContentPlaylistDetailActivity : BaseActivity<ActivityAudioContentPlay
         recyclerView.adapter = adapter
 
         binding.llPlay.setOnClickListener {
+            startService(
+                Intent(applicationContext, AudioContentPlayService::class.java).apply {
+                    action = AudioContentPlayService.MusicAction.STOP.name
+                }
+            )
+
             showPlayerFragment(contentList = ArrayList(contentList))
         }
         binding.llShuffle.setOnClickListener {
+            startService(
+                Intent(applicationContext, AudioContentPlayService::class.java).apply {
+                    action = AudioContentPlayService.MusicAction.STOP.name
+                }
+            )
+
             val shuffledList = ArrayList(contentList).apply { shuffle(Random) }
             showPlayerFragment(contentList = shuffledList)
         }
diff --git a/app/src/main/res/layout/fragment_audio_content_player.xml b/app/src/main/res/layout/fragment_audio_content_player.xml
index 63c1916..cd4c452 100644
--- a/app/src/main/res/layout/fragment_audio_content_player.xml
+++ b/app/src/main/res/layout/fragment_audio_content_player.xml
@@ -54,22 +54,16 @@
         app:layout_constraintTop_toTopOf="@+id/iv_creator_profile"
         tools:text="닉네임" />
 
-    <LinearLayout
+    <ImageView
+        android:id="@+id/iv_cover"
         android:layout_width="240dp"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
+        android:layout_height="240dp"
+        android:contentDescription="@null"
         app:layout_constraintBottom_toTopOf="@+id/sb_progress"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/iv_creator_profile">
-
-        <ImageView
-            android:id="@+id/iv_cover"
-            android:layout_width="240dp"
-            android:layout_height="240dp"
-            android:contentDescription="@null"
-            tools:src="@drawable/img_compleate_book" />
-    </LinearLayout>
+        app:layout_constraintTop_toBottomOf="@+id/iv_creator_profile"
+        tools:src="@drawable/img_compleate_book" />
 
     <SeekBar
         android:id="@+id/sb_progress"