From 55226721958df0697b52be5197a82950e8bf4b19 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Thu, 7 Sep 2023 13:06:35 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=8C=93?=
 =?UTF-8?q?=EA=B8=80=20=EC=88=98=EC=A0=95=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comment/AudioContentCommentAdapter.kt     | 28 ++++++++++---
 .../comment/AudioContentCommentFragment.kt    |  6 ++-
 .../AudioContentCommentListFragment.kt        | 15 ++++++-
 .../detail/AudioContentDetailActivity.kt      |  8 +++-
 .../res/layout/item_audio_content_comment.xml | 39 +++++++++++++++++++
 .../res/menu/content_comment_option_menu.xml  |  6 +++
 .../res/menu/content_comment_option_menu2.xml |  9 +++++
 7 files changed, 101 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/menu/content_comment_option_menu2.xml

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentAdapter.kt
index a0e1bd6..473ec4b 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentAdapter.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentAdapter.kt
@@ -17,6 +17,7 @@ import kr.co.vividnext.sodalive.extensions.moneyFormat
 
 class AudioContentCommentAdapter(
     private val creatorId: Long,
+    private val modifyComment: (Long, String) -> Unit,
     private val onClickDelete: (Long) -> Unit,
     private val onItemClick: (GetAudioContentCommentListItem) -> Unit
 ) : RecyclerView.Adapter<AudioContentCommentAdapter.ViewHolder>() {
@@ -92,6 +93,7 @@ class AudioContentCommentAdapter(
                 item.writerId == SharedPreferenceManager.userId ||
                 creatorId == SharedPreferenceManager.userId
             ) {
+                binding.etCommentModify.setText(item.comment)
                 binding.ivMenu.visibility = View.VISIBLE
                 binding.ivMenu.setOnClickListener {
                     showOptionMenu(
@@ -99,9 +101,19 @@ class AudioContentCommentAdapter(
                         binding.ivMenu,
                         commentId = item.id,
                         writerId = item.writerId,
-                        creatorId = creatorId
+                        creatorId = creatorId,
+                        onClickModify = {
+                            binding.rlCommentModify.visibility = View.VISIBLE
+                            binding.tvComment.visibility = View.GONE
+                        }
                     )
                 }
+
+                binding.tvModify.setOnClickListener {
+                    binding.rlCommentModify.visibility = View.GONE
+                    binding.tvComment.visibility = View.VISIBLE
+                    modifyComment(item.id, binding.etCommentModify.text.toString())
+                }
             } else {
                 binding.ivMenu.visibility = View.GONE
             }
@@ -131,20 +143,24 @@ class AudioContentCommentAdapter(
         v: View,
         commentId: Long,
         writerId: Long,
-        creatorId: Long
+        creatorId: Long,
+        onClickModify: () -> Unit
     ) {
         val popup = PopupMenu(context, v)
         val inflater = popup.menuInflater
 
-        if (
-            writerId == SharedPreferenceManager.userId ||
-            creatorId == SharedPreferenceManager.userId
-        ) {
+        if (writerId == SharedPreferenceManager.userId) {
             inflater.inflate(R.menu.content_comment_option_menu, popup.menu)
+        } else if (creatorId == SharedPreferenceManager.userId) {
+            inflater.inflate(R.menu.content_comment_option_menu2, popup.menu)
         }
 
         popup.setOnMenuItemClickListener {
             when (it.itemId) {
+                R.id.menu_review_modify -> {
+                    onClickModify()
+                }
+
                 R.id.menu_review_delete -> {
                     onClickDelete(commentId)
                 }
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentFragment.kt
index 6cae097..0b25906 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentFragment.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentFragment.kt
@@ -12,7 +12,10 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kr.co.vividnext.sodalive.R
 import kr.co.vividnext.sodalive.databinding.DialogAudioContentCommentBinding
 
-class AudioContentCommentFragment(private val audioContentId: Long) : BottomSheetDialogFragment() {
+class AudioContentCommentFragment(
+    private val creatorId: Long,
+    private val audioContentId: Long
+) : BottomSheetDialogFragment() {
 
     private lateinit var binding: DialogAudioContentCommentBinding
 
@@ -46,6 +49,7 @@ class AudioContentCommentFragment(private val audioContentId: Long) : BottomShee
 
         val commentListFragmentTag = "COMMENT_LIST_FRAGMENT"
         val commentListFragment = AudioContentCommentListFragment.newInstance(
+            creatorId = creatorId,
             audioContentId = audioContentId
         )
         val fragmentTransaction = childFragmentManager.beginTransaction()
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentListFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentListFragment.kt
index 05ce876..4667ae4 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentListFragment.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentListFragment.kt
@@ -33,6 +33,7 @@ class AudioContentCommentListFragment : BaseFragment<FragmentAudioContentComment
     private lateinit var loadingDialog: LoadingDialog
     private lateinit var adapter: AudioContentCommentAdapter
 
+    private var creatorId: Long = 0
     private var audioContentId: Long = 0
 
     override fun onCreateView(
@@ -40,6 +41,7 @@ class AudioContentCommentListFragment : BaseFragment<FragmentAudioContentComment
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
+        creatorId = arguments?.getLong(Constants.EXTRA_AUDIO_CONTENT_CREATOR_ID) ?: 0
         audioContentId = arguments?.getLong(Constants.EXTRA_AUDIO_CONTENT_ID) ?: 0
         return super.onCreateView(inflater, container, savedInstanceState)
     }
@@ -76,7 +78,15 @@ class AudioContentCommentListFragment : BaseFragment<FragmentAudioContentComment
         }
 
         adapter = AudioContentCommentAdapter(
-            creatorId = 0,
+            creatorId = creatorId,
+            modifyComment = { commentId, comment ->
+                hideKeyboard()
+                viewModel.modifyComment(
+                    commentId = commentId,
+                    audioContentId = audioContentId,
+                    comment = comment
+                )
+            },
             onClickDelete = {
                 SodaDialog(
                     activity = requireActivity(),
@@ -192,8 +202,9 @@ class AudioContentCommentListFragment : BaseFragment<FragmentAudioContentComment
     }
 
     companion object {
-        fun newInstance(audioContentId: Long): AudioContentCommentListFragment {
+        fun newInstance(creatorId: Long, audioContentId: Long): AudioContentCommentListFragment {
             val args = Bundle()
+            args.putLong(Constants.EXTRA_AUDIO_CONTENT_CREATOR_ID, creatorId)
             args.putLong(Constants.EXTRA_AUDIO_CONTENT_ID, audioContentId)
 
             val fragment = AudioContentCommentListFragment()
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 1919df4..bdfc722 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
@@ -56,6 +56,8 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
     private var isAlertPreview = false
     private val audioContentReceiver = AudioContentReceiver()
 
+    private var creatorId: Long = 0
+
     private var refresh = false
         set(value) {
             field = value
@@ -474,7 +476,10 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
     }
 
     private fun showCommentBottomSheetDialog() {
-        val dialog = AudioContentCommentFragment(audioContentId = audioContentId)
+        val dialog = AudioContentCommentFragment(
+            creatorId = creatorId,
+            audioContentId = audioContentId
+        )
         dialog.show(
             supportFragmentManager,
             dialog.tag
@@ -629,6 +634,7 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
     }
 
     private fun setupCreatorArea(creator: AudioContentCreator) {
+        this.creatorId = creator.creatorId
         binding.rlProfile.setOnClickListener {
             startActivity(
                 Intent(applicationContext, UserProfileActivity::class.java).apply {
diff --git a/app/src/main/res/layout/item_audio_content_comment.xml b/app/src/main/res/layout/item_audio_content_comment.xml
index b3aec0a..01d2181 100644
--- a/app/src/main/res/layout/item_audio_content_comment.xml
+++ b/app/src/main/res/layout/item_audio_content_comment.xml
@@ -32,6 +32,7 @@
         android:layout_height="wrap_content"
         android:contentDescription="@null"
         android:src="@drawable/ic_seemore_vertical"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/iv_comment_profile" />
 
@@ -96,6 +97,44 @@
             android:textColor="@color/color_777777"
             android:textSize="12sp"
             tools:text="내용내용내용내용내용내용내용내용내용내용내용내용내용 내용내용내용내용내용내용내용내용내용내용 내용내용내용내용" />
+
+        <RelativeLayout
+            android:id="@+id/rl_comment_modify"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:visibility="gone">
+
+            <EditText
+                android:id="@+id/et_comment_modify"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_marginEnd="13.3dp"
+                android:layout_toStartOf="@+id/tv_modify"
+                android:background="@drawable/bg_round_corner_10_339970ff_9970ff"
+                android:importantForAutofill="no"
+                android:inputType="text"
+                android:paddingHorizontal="13.3dp"
+                android:paddingVertical="13dp"
+                android:textColor="@color/color_eeeeee"
+                android:textColorHint="@color/color_eeeeee"
+                android:textCursorDrawable="@drawable/edit_text_cursor"
+                android:textSize="13.3sp"
+                android:theme="@style/EditTextStyle"
+                tools:ignore="LabelFor" />
+
+            <TextView
+                android:id="@+id/tv_modify"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:background="@drawable/bg_round_corner_6_7_9970ff"
+                android:fontFamily="@font/gmarket_sans_bold"
+                android:padding="13dp"
+                android:text="수정"
+                android:textColor="@color/white" />
+        </RelativeLayout>
     </LinearLayout>
 
     <TextView
diff --git a/app/src/main/res/menu/content_comment_option_menu.xml b/app/src/main/res/menu/content_comment_option_menu.xml
index 0bd7450..f4fa605 100644
--- a/app/src/main/res/menu/content_comment_option_menu.xml
+++ b/app/src/main/res/menu/content_comment_option_menu.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_review_modify"
+        android:title="수정"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/menu_review_delete"
         android:title="삭제"
diff --git a/app/src/main/res/menu/content_comment_option_menu2.xml b/app/src/main/res/menu/content_comment_option_menu2.xml
new file mode 100644
index 0000000..fbe8082
--- /dev/null
+++ b/app/src/main/res/menu/content_comment_option_menu2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_review_delete"
+        android:title="삭제"
+        app:showAsAction="ifRoom" />
+</menu>