From 6fbe7da71e26aa25b8afd7a1607acca34ccca0c1 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Wed, 4 Dec 2024 18:10:50 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9E=AC=EC=83=9D=20=EB=AA=A9=EB=A1=9D=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20-=20=EC=82=AD=EC=A0=9C=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AudioContentPlaylistListFragment.kt       |   6 +-
 .../AudioContentPlaylistRepository.kt         |   8 +++
 .../audio_content/playlist/PlaylistApi.kt     |   7 +++
 .../AudioContentPlaylistDetailActivity.kt     |  26 ++++++++-
 ...udioContentPlaylistDetailNotifyFragment.kt |  30 ++++++++++
 .../AudioContentPlaylistDetailViewModel.kt    |  34 +++++++++++
 .../res/drawable-xxhdpi/ic_edit_white.png     | Bin 0 -> 496 bytes
 .../ic_seemore_vertical_white.png             | Bin 0 -> 360 bytes
 ...activity_audio_content_playlist_detail.xml |  53 ++++++++++++++++--
 ...t_audio_content_playlist_detail_notify.xml |  20 +++++++
 10 files changed, 176 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailNotifyFragment.kt
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_edit_white.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_seemore_vertical_white.png
 create mode 100644 app/src/main/res/layout/fragment_audio_content_playlist_detail_notify.xml

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/AudioContentPlaylistListFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/AudioContentPlaylistListFragment.kt
index b31445c..e367b8c 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/AudioContentPlaylistListFragment.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/AudioContentPlaylistListFragment.kt
@@ -27,7 +27,7 @@ class AudioContentPlaylistListFragment : BaseFragment<FragmentAudioContentPlayli
     private lateinit var loadingDialog: LoadingDialog
     private lateinit var adapter: AudioContentPlaylistListAdapter
 
-    private val createPlaylistResult = registerForActivityResult(
+    private val createOrUpdatePlaylistResult = registerForActivityResult(
         ActivityResultContracts.StartActivityForResult()
     ) { result ->
         if (result.resultCode == RESULT_OK) {
@@ -46,7 +46,7 @@ class AudioContentPlaylistListFragment : BaseFragment<FragmentAudioContentPlayli
     private fun setupView() {
         loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
         adapter = AudioContentPlaylistListAdapter { playlistId ->
-            startActivity(
+            createOrUpdatePlaylistResult.launch(
                 Intent(requireContext(), AudioContentPlaylistDetailActivity::class.java).apply {
                     putExtra(
                         Constants.EXTRA_AUDIO_CONTENT_PLAYLIST_ID,
@@ -98,7 +98,7 @@ class AudioContentPlaylistListFragment : BaseFragment<FragmentAudioContentPlayli
         recyclerView.adapter = adapter
 
         binding.tvCreatePlaylist.setOnClickListener {
-            createPlaylistResult.launch(
+            createOrUpdatePlaylistResult.launch(
                 Intent(
                     requireContext(),
                     AudioContentPlaylistCreateActivity::class.java
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/AudioContentPlaylistRepository.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/AudioContentPlaylistRepository.kt
index bae2eb8..62115c0 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/AudioContentPlaylistRepository.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/AudioContentPlaylistRepository.kt
@@ -17,4 +17,12 @@ class AudioContentPlaylistRepository(private val api: PlaylistApi) {
         request: CreatePlaylistRequest,
         token: String
     ) = api.createPlaylist(request, token)
+
+    fun deletePlaylist(
+        playlistId: Long,
+        token: String
+    ) = api.deletePlaylist(
+        id = playlistId,
+        authHeader = token
+    )
 }
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/PlaylistApi.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/PlaylistApi.kt
index f0e70b0..25f969c 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/PlaylistApi.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/PlaylistApi.kt
@@ -5,6 +5,7 @@ import kr.co.vividnext.sodalive.audio_content.playlist.create.CreatePlaylistRequ
 import kr.co.vividnext.sodalive.audio_content.playlist.detail.GetPlaylistDetailResponse
 import kr.co.vividnext.sodalive.common.ApiResponse
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.POST
@@ -27,4 +28,10 @@ interface PlaylistApi {
         @Body request: CreatePlaylistRequest,
         @Header("Authorization") authHeader: String
     ): Single<ApiResponse<Any>>
+
+    @DELETE("/audio-content/playlist/{id}")
+    fun deletePlaylist(
+        @Path("id") id: Long,
+        @Header("Authorization") authHeader: String
+    ): Single<ApiResponse<Any>>
 }
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 57835da..eaec1bc 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
@@ -10,6 +10,7 @@ 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.base.SodaDialog
 import kr.co.vividnext.sodalive.common.Constants
 import kr.co.vividnext.sodalive.common.LoadingDialog
 import kr.co.vividnext.sodalive.databinding.ActivityAudioContentPlaylistDetailBinding
@@ -85,7 +86,30 @@ class AudioContentPlaylistDetailActivity : BaseActivity<ActivityAudioContentPlay
 
         binding.llPlay.setOnClickListener { }
         binding.llShuffle.setOnClickListener { }
-        binding.toolbar.tvBack.setOnClickListener { finish() }
+        binding.tvBack.setOnClickListener { finish() }
+        binding.ivEdit.setOnClickListener { }
+        binding.ivMore.setOnClickListener {
+            val notifyFragment = AudioContentPlaylistDetailNotifyFragment {
+                SodaDialog(
+                    activity = this@AudioContentPlaylistDetailActivity,
+                    layoutInflater = layoutInflater,
+                    title = "재생 목록 삭제",
+                    desc = "'${binding.tvTitle.text}'을 삭제하시겠습니까?",
+                    confirmButtonTitle = "삭제",
+                    confirmButtonClick = {
+                        viewModel.deletePlaylist(playlistId = playlistId) {
+                            setResult(RESULT_OK)
+                            finish()
+                        }
+                    },
+                    cancelButtonTitle = "취소",
+                    cancelButtonClick = {}
+                ).show(screenWidth)
+            }
+
+            if (notifyFragment.isAdded) return@setOnClickListener
+            notifyFragment.show(supportFragmentManager, notifyFragment.tag)
+        }
     }
 
     @SuppressLint("SetTextI18n")
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailNotifyFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailNotifyFragment.kt
new file mode 100644
index 0000000..32d387e
--- /dev/null
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailNotifyFragment.kt
@@ -0,0 +1,30 @@
+package kr.co.vividnext.sodalive.audio_content.playlist.detail
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import kr.co.vividnext.sodalive.R
+
+class AudioContentPlaylistDetailNotifyFragment(
+    private val onClickDelete: () -> Unit
+) : BottomSheetDialogFragment() {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View = inflater.inflate(
+        R.layout.fragment_audio_content_playlist_detail_notify,
+        container,
+        false
+    )
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        view.findViewById<TextView>(R.id.tv_delete).setOnClickListener {
+            onClickDelete()
+            dialog?.dismiss()
+        }
+    }
+}
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailViewModel.kt
index 0134826..1f4c612 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailViewModel.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailViewModel.kt
@@ -56,4 +56,38 @@ class AudioContentPlaylistDetailViewModel(
                 )
         )
     }
+
+    fun deletePlaylist(playlistId: Long, onSuccess: () -> Unit) {
+        _isLoading.value = true
+        compositeDisposable.add(
+            repository.deletePlaylist(
+                playlistId = playlistId,
+                token = "Bearer ${SharedPreferenceManager.token}"
+            )
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                    {
+                        if (it.success) {
+                            _toastLiveData.value = "삭제되었습니다."
+                            onSuccess()
+                        } else {
+                            if (it.message != null) {
+                                _toastLiveData.postValue(it.message)
+                            } else {
+                                _toastLiveData.postValue(
+                                    "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요."
+                                )
+                            }
+                        }
+                        _isLoading.value = false
+                    },
+                    {
+                        _isLoading.value = false
+                        it.message?.let { message -> Logger.e(message) }
+                        _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
+                    }
+                )
+        )
+    }
 }
diff --git a/app/src/main/res/drawable-xxhdpi/ic_edit_white.png b/app/src/main/res/drawable-xxhdpi/ic_edit_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e0d7e711ade17f752d207b02ae9371f1ab31295
GIT binary patch
literal 496
zcmV<M0T2F(P)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0fk9KK~#7F?b_{W
zgg_9+@maY7vUm77Eu@4?2k9U+q=I-IBqgMSlyD`agcKl}2Gr~W5rTM!FS9!1%^&2B
zUHtF^5geAtvMkH8tZrpl9>euaw@`q-7DdtE!hhOw|FKJ;9jzE(P19t3d(OGcdw(M4
zRs&zdw#7iN0v>{G<3=wI9)oS;L@x@Sf^Dm+>M>2zGtDfag_?s!yWQ@d7+M587aQ(9
zg-7~>7>fQ#b6^jLLq<$R1xv%CXkdw06a_35i`c=Ev4|Bc9gEn&8nB23tObi^gEe8%
zEU-2#nhe&6MU%i<v1l|{GZu{kYsaF&;4NU$An;bOXb>2)Vw#vFEQ&hukcLIkz!I@2
z3Ro%@v4bUJ5i3|a7O{afV9`+U_qEM{ebIomEX%Si%d#xSE{=F`*t4$dBPlFNk}vQ5
zXWw2gc<#_nLVq7LZ{77?a2VQ^;pdKY_p{&ceRpxOb6QgB1><9$lot%|ed`xrT6vy7
mIp-coVc}(a<~XKkY3vv7A7snig*HV10000<MNUMnLSTZ*gwHzw

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_seemore_vertical_white.png b/app/src/main/res/drawable-xxhdpi/ic_seemore_vertical_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..69c0cd6b0d4165be2ce2b1fcd9590e61a44716e0
GIT binary patch
literal 360
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$;i8oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{$EcQ$B+ufw>J*<9x@PUedu|K!Ey<|*NL!A
zw>@uoHFy<pewnDTuu-FDy@rF{XO#>8J*VkZ>b-w7ah@bY&4fcO%QCa3r@s8N>-*-<
zle-pKTrI6N6O2sYzg>Cb@U7YHb`>w`g(tAcwLM&~bNcb>nU(YEXD#y-TVuk=|ND2|
zvQ?|jv8Xi0?oLe0XIgb&JFl^|Z~*JRycwQq3Y>4`FWr{6Sg#J$es2Hz^-Gp7{5-oz
z{PdHrCVh{Oo_~~n>ifR;(aa1C2gDa#?s8iGwZTuDV{Vv$)mqV$EHAbwUC6wc$;iM^
zqiD5Oqa=#|#g?WEnXC&hM@{qrDrA}~Hdl-xr<nc9tljrS!-{7B1A@WR)z4*}Q$iB}
Da>S6x

literal 0
HcmV?d00001

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 8962995..befecbe 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
@@ -7,9 +7,54 @@
     android:background="@color/black"
     android:orientation="vertical">
 
-    <include
-        android:id="@+id/toolbar"
-        layout="@layout/detail_toolbar" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="51.7dp"
+        android:background="@color/black"
+        android:paddingHorizontal="13.3dp">
+
+        <TextView
+            android:id="@+id/tv_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:drawablePadding="6.7dp"
+            android:ellipsize="end"
+            android:fontFamily="@font/gmarket_sans_bold"
+            android:gravity="center"
+            android:minHeight="48dp"
+            android:textColor="@color/color_eeeeee"
+            android:textSize="18.3sp"
+            app:drawableStartCompat="@drawable/ic_back"
+            tools:ignore="RelativeOverlap"
+            tools:text="보이스온" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/iv_edit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@null"
+                android:padding="8dp"
+                android:src="@drawable/ic_edit_white" />
+
+            <ImageView
+                android:id="@+id/iv_more"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5.3dp"
+                android:contentDescription="@null"
+                android:padding="8dp"
+                android:src="@drawable/ic_seemore_vertical_white" />
+        </LinearLayout>
+
+    </RelativeLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -173,8 +218,8 @@
             android:textColor="@color/color_eeeeee"
             android:textSize="13.3sp"
             app:layout_constraintBottom_toBottomOf="@+id/tv_create_date"
-            app:layout_constraintTop_toTopOf="@+id/tv_create_date"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tv_create_date"
             tools:text=" 5개" />
 
         <LinearLayout
diff --git a/app/src/main/res/layout/fragment_audio_content_playlist_detail_notify.xml b/app/src/main/res/layout/fragment_audio_content_playlist_detail_notify.xml
new file mode 100644
index 0000000..a71586b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_audio_content_playlist_detail_notify.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_top_round_corner_10_222222"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/tv_delete"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/gmarket_sans_medium"
+        android:text="삭제"
+        android:textColor="@color/color_eeeeee"
+        android:textSize="13.3sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>