From 6640130ef91efb034b588be21434f03d9cfe145d Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Fri, 30 Aug 2024 13:11:56 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=20-=20=EB=8C=93=EA=B8=80=EC=9D=B4=20=EC=97=86?=
 =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=EC=9C=A0=EB=A3=8C=20=EC=BD=98=ED=85=90?=
 =?UTF-8?q?=EC=B8=A0=EB=A5=BC=20=EA=B5=AC=EB=A7=A4=ED=95=9C=20=EC=82=AC?=
 =?UTF-8?q?=EB=9E=8C=EC=9D=B4=20=EB=B9=84=EB=B0=80=EB=8C=93=EA=B8=80?=
 =?UTF-8?q?=EC=9D=84=20=EB=93=B1=EB=A1=9D=ED=95=A0=20=EC=88=98=20=EC=9E=88?=
 =?UTF-8?q?=EB=8A=94=20=EA=B8=B0=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

---
 .idea/other.xml                               | 22 ++++++++
 .../comment/AudioContentCommentRepository.kt  |  4 +-
 .../RegisterAudioContentCommentRequest.kt     |  6 +--
 .../detail/AudioContentDetailActivity.kt      | 15 +++++-
 .../detail/AudioContentDetailViewModel.kt     |  3 +-
 .../layout/activity_audio_content_detail.xml  | 53 +++++++++++++------
 6 files changed, 81 insertions(+), 22 deletions(-)

diff --git a/.idea/other.xml b/.idea/other.xml
index 1b1a2c5..94c96f6 100644
--- a/.idea/other.xml
+++ b/.idea/other.xml
@@ -113,6 +113,17 @@
           <option name="screenX" value="1440" />
           <option name="screenY" value="3088" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e1q" />
+          <option name="id" value="e1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -124,6 +135,17 @@
           <option name="screenX" value="2208" />
           <option name="screenY" value="1840" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentRepository.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentRepository.kt
index e6ea569..ba71f67 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentRepository.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentRepository.kt
@@ -8,12 +8,14 @@ class AudioContentCommentRepository(private val api: AudioContentApi) {
         contentId: Long,
         comment: String,
         parentId: Long? = null,
+        isSecret: Boolean = false,
         token: String
     ) = api.registerComment(
         request = RegisterAudioContentCommentRequest(
             comment = comment,
             contentId = contentId,
-            parentId = parentId
+            parentId = parentId,
+            isSecret = isSecret
         ),
         authHeader = token
     )
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/RegisterAudioContentCommentRequest.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/RegisterAudioContentCommentRequest.kt
index 51e93e6..ebd7bc5 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/RegisterAudioContentCommentRequest.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/RegisterAudioContentCommentRequest.kt
@@ -1,12 +1,12 @@
 package kr.co.vividnext.sodalive.audio_content.comment
 
-import com.google.gson.annotations.SerializedName
-
 import androidx.annotation.Keep
+import com.google.gson.annotations.SerializedName
 
 @Keep
 data class RegisterAudioContentCommentRequest(
     @SerializedName("comment") val comment: String,
     @SerializedName("contentId") val contentId: Long,
-    @SerializedName("parentId") val parentId: Long?
+    @SerializedName("parentId") val parentId: Long?,
+    @SerializedName("isSecret") val isSecret: Boolean
 )
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 305e71b..e87fe82 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
@@ -469,6 +469,7 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
                 binding.tvCommentText.text = response.commentList[0].comment
                 binding.tvCommentText.visibility = View.VISIBLE
                 binding.rlInputComment.visibility = View.GONE
+                binding.tvSecret.visibility = View.GONE
 
                 binding.llComment.setOnClickListener { showCommentBottomSheetDialog() }
             } else {
@@ -482,8 +483,20 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
 
                 binding.ivCommentSend.setOnClickListener {
                     val comment = binding.etComment.text.toString()
+                    val isSecret = binding.tvSecret.isSelected
+                    viewModel.registerComment(audioContentId, comment, isSecret)
+
                     binding.etComment.setText("")
-                    viewModel.registerComment(audioContentId, comment)
+                    binding.tvSecret.isSelected = false
+                }
+
+                if (response.existOrdered) {
+                    binding.tvSecret.visibility = View.VISIBLE
+                    binding.tvSecret.setOnClickListener {
+                        binding.tvSecret.isSelected = !binding.tvSecret.isSelected
+                    }
+                } else {
+                    binding.tvSecret.visibility = View.GONE
                 }
 
                 binding.llComment.setOnClickListener {}
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailViewModel.kt
index 49ca169..dc8dc18 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailViewModel.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailViewModel.kt
@@ -254,7 +254,7 @@ class AudioContentDetailViewModel(
         )
     }
 
-    fun registerComment(audioContentId: Long, comment: String) {
+    fun registerComment(audioContentId: Long, comment: String, isSecret: Boolean) {
         if (!isLoading.value!!) {
             isLoading.value = true
         }
@@ -263,6 +263,7 @@ class AudioContentDetailViewModel(
             commentRepository.registerComment(
                 contentId = audioContentId,
                 comment = comment,
+                isSecret = isSecret,
                 token = "Bearer ${SharedPreferenceManager.token}"
             )
                 .subscribeOn(Schedulers.io())
diff --git a/app/src/main/res/layout/activity_audio_content_detail.xml b/app/src/main/res/layout/activity_audio_content_detail.xml
index 2852815..46ffd83 100644
--- a/app/src/main/res/layout/activity_audio_content_detail.xml
+++ b/app/src/main/res/layout/activity_audio_content_detail.xml
@@ -604,29 +604,50 @@
                     android:orientation="vertical"
                     android:padding="10.3dp">
 
-                    <LinearLayout
+                    <RelativeLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
+                        android:layout_height="wrap_content">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:fontFamily="@font/gmarket_sans_medium"
+                                android:text="댓글"
+                                android:textColor="@color/white"
+                                android:textSize="12sp" />
+
+                            <TextView
+                                android:id="@+id/tv_comment_count"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="5.3dp"
+                                android:fontFamily="@font/gmarket_sans_medium"
+                                android:textColor="@color/color_909090"
+                                android:textSize="12sp"
+                                tools:text="1,204" />
+                        </LinearLayout>
 
                         <TextView
+                            android:id="@+id/tv_secret"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:button="@null"
+                            android:drawablePadding="8dp"
                             android:fontFamily="@font/gmarket_sans_medium"
-                            android:text="댓글"
-                            android:textColor="@color/white"
-                            android:textSize="12sp" />
+                            android:gravity="center"
+                            android:text="비밀댓글"
+                            android:textColor="@color/color_eeeeee"
+                            android:textSize="12.5sp"
+                            android:visibility="gone"
+                            app:drawableStartCompat="@drawable/ic_select" />
 
-                        <TextView
-                            android:id="@+id/tv_comment_count"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="5.3dp"
-                            android:fontFamily="@font/gmarket_sans_medium"
-                            android:textColor="@color/color_909090"
-                            android:textSize="12sp"
-                            tools:text="1,204" />
-                    </LinearLayout>
+                    </RelativeLayout>
 
                     <LinearLayout
                         android:layout_width="match_parent"