From 49617272373fe31621aabb87011e98c43ca3aea6 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Fri, 30 Aug 2024 14:42:20 +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=EB=A6=AC=EC=8A=A4=ED=8A=B8=20-=20=EB=8C=93?=
 =?UTF-8?q?=EA=B8=80=EC=9D=B4=20=EC=97=86=EC=9D=84=20=EB=95=8C=20=EC=9C=A0?=
 =?UTF-8?q?=EB=A3=8C=20=EC=BD=98=ED=85=90=EC=B8=A0=EB=A5=BC=20=EA=B5=AC?=
 =?UTF-8?q?=EB=A7=A4=ED=95=9C=20=EC=82=AC=EB=9E=8C=EC=9D=B4=20=EB=B9=84?=
 =?UTF-8?q?=EB=B0=80=EB=8C=93=EA=B8=80=EC=9D=84=20=EB=93=B1=EB=A1=9D?=
 =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8A=94=20=EA=B8=B0=EB=8A=A5?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comment/AudioContentCommentFragment.kt    |  6 ++--
 .../AudioContentCommentListFragment.kt        | 23 +++++++++++++--
 .../AudioContentCommentListViewModel.kt       |  3 +-
 .../detail/AudioContentDetailActivity.kt      | 29 +++++++++++++++++--
 .../co/vividnext/sodalive/common/Constants.kt |  1 +
 .../fragment_audio_content_comment_list.xml   | 20 ++++++++++++-
 6 files changed, 73 insertions(+), 9 deletions(-)

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 693322b..5c8e454 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
@@ -14,7 +14,8 @@ import kr.co.vividnext.sodalive.databinding.DialogAudioContentCommentBinding
 
 class AudioContentCommentFragment(
     private val creatorId: Long,
-    private val audioContentId: Long
+    private val audioContentId: Long,
+    private val isShowSecret: Boolean
 ) : BottomSheetDialogFragment() {
 
     private lateinit var binding: DialogAudioContentCommentBinding
@@ -50,7 +51,8 @@ class AudioContentCommentFragment(
         val commentListFragmentTag = "COMMENT_LIST_FRAGMENT"
         val commentListFragment = AudioContentCommentListFragment.newInstance(
             creatorId = creatorId,
-            audioContentId = audioContentId
+            audioContentId = audioContentId,
+            isShowSecret = isShowSecret
         )
         val fragmentTransaction = childFragmentManager.beginTransaction()
         fragmentTransaction.add(R.id.fl_container, commentListFragment, commentListFragmentTag)
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 4667ae4..181d7b1 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
@@ -35,6 +35,7 @@ class AudioContentCommentListFragment : BaseFragment<FragmentAudioContentComment
 
     private var creatorId: Long = 0
     private var audioContentId: Long = 0
+    private var isShowSecret: Boolean = false
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -43,6 +44,7 @@ class AudioContentCommentListFragment : BaseFragment<FragmentAudioContentComment
     ): View? {
         creatorId = arguments?.getLong(Constants.EXTRA_AUDIO_CONTENT_CREATOR_ID) ?: 0
         audioContentId = arguments?.getLong(Constants.EXTRA_AUDIO_CONTENT_ID) ?: 0
+        isShowSecret = arguments?.getBoolean(Constants.EXTRA_IS_SHOW_SECRET) ?: false
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
@@ -73,8 +75,20 @@ class AudioContentCommentListFragment : BaseFragment<FragmentAudioContentComment
         binding.ivCommentSend.setOnClickListener {
             hideKeyboard()
             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 (isShowSecret) {
+            binding.tvSecret.visibility = View.VISIBLE
+            binding.tvSecret.setOnClickListener {
+                binding.tvSecret.isSelected = !binding.tvSecret.isSelected
+            }
+        } else {
+            binding.tvSecret.visibility = View.GONE
         }
 
         adapter = AudioContentCommentAdapter(
@@ -202,10 +216,15 @@ class AudioContentCommentListFragment : BaseFragment<FragmentAudioContentComment
     }
 
     companion object {
-        fun newInstance(creatorId: Long, audioContentId: Long): AudioContentCommentListFragment {
+        fun newInstance(
+            creatorId: Long,
+            audioContentId: Long,
+            isShowSecret: Boolean
+        ): AudioContentCommentListFragment {
             val args = Bundle()
             args.putLong(Constants.EXTRA_AUDIO_CONTENT_CREATOR_ID, creatorId)
             args.putLong(Constants.EXTRA_AUDIO_CONTENT_ID, audioContentId)
+            args.putBoolean(Constants.EXTRA_IS_SHOW_SECRET, isShowSecret)
 
             val fragment = AudioContentCommentListFragment()
             fragment.arguments = args
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentListViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentListViewModel.kt
index 40ec885..25eb72e 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentListViewModel.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/comment/AudioContentCommentListViewModel.kt
@@ -84,7 +84,7 @@ class AudioContentCommentListViewModel(
         }
     }
 
-    fun registerComment(contentId: Long, comment: String) {
+    fun registerComment(contentId: Long, comment: String, isSecret: Boolean) {
         if (!_isLoading.value!!) {
             _isLoading.value = true
         }
@@ -93,6 +93,7 @@ class AudioContentCommentListViewModel(
             repository.registerComment(
                 contentId = contentId,
                 comment = comment,
+                isSecret = isSecret,
                 token = "Bearer ${SharedPreferenceManager.token}"
             )
                 .subscribeOn(Schedulers.io())
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 e87fe82..b9d63b6 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
@@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.audio_content.detail
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.app.Service
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -9,8 +10,11 @@ import android.content.IntentFilter
 import android.graphics.Rect
 import android.os.Build
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.view.LayoutInflater
 import android.view.View
+import android.view.inputmethod.InputMethodManager
 import android.widget.RelativeLayout
 import android.widget.SeekBar
 import android.widget.Toast
@@ -65,6 +69,7 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
     private val audioContentReceiver = AudioContentReceiver()
 
     private var creatorId: Long = 0
+    private val handler = Handler(Looper.getMainLooper())
 
     private var refresh = false
     private var title = ""
@@ -72,6 +77,7 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
     private lateinit var activityResultLauncher: ActivityResultLauncher<Intent>
     private lateinit var audioContent: GetAudioContentDetailResponse
     private lateinit var orderType: OrderType
+    private lateinit var imm: InputMethodManager
 
     @SuppressLint("SetTextI18n")
     override fun onNewIntent(intent: Intent) {
@@ -92,6 +98,8 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
         audioContentId = intent.getLongExtra(Constants.EXTRA_AUDIO_CONTENT_ID, 0)
         super.onCreate(savedInstanceState)
 
+        imm = getSystemService(Service.INPUT_METHOD_SERVICE) as InputMethodManager
+
         if (audioContentId <= 0) {
             Toast.makeText(applicationContext, "잘못된 요청입니다.", Toast.LENGTH_LONG).show()
             finish()
@@ -471,7 +479,11 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
                 binding.rlInputComment.visibility = View.GONE
                 binding.tvSecret.visibility = View.GONE
 
-                binding.llComment.setOnClickListener { showCommentBottomSheetDialog() }
+                binding.llComment.setOnClickListener {
+                    showCommentBottomSheetDialog(
+                        isShowSecret = response.existOrdered
+                    )
+                }
             } else {
                 binding.tvCommentText.visibility = View.GONE
                 binding.rlInputComment.visibility = View.VISIBLE
@@ -482,6 +494,7 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
                 }
 
                 binding.ivCommentSend.setOnClickListener {
+                    hideKeyboard()
                     val comment = binding.etComment.text.toString()
                     val isSecret = binding.tvSecret.isSelected
                     viewModel.registerComment(audioContentId, comment, isSecret)
@@ -507,10 +520,11 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
         }
     }
 
-    private fun showCommentBottomSheetDialog() {
+    private fun showCommentBottomSheetDialog(isShowSecret: Boolean) {
         val dialog = AudioContentCommentFragment(
             creatorId = creatorId,
-            audioContentId = audioContentId
+            audioContentId = audioContentId,
+            isShowSecret = isShowSecret
         )
         dialog.show(
             supportFragmentManager,
@@ -932,6 +946,15 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
         }
     }
 
+    private fun hideKeyboard() {
+        handler.postDelayed({
+            imm.hideSoftInputFromWindow(
+                window.decorView.applicationWindowToken,
+                InputMethodManager.HIDE_NOT_ALWAYS
+            )
+        }, 100)
+    }
+
     inner class AudioContentReceiver : BroadcastReceiver() {
         @SuppressLint("SetTextI18n")
         override fun onReceive(context: Context?, intent: Intent?) {
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/common/Constants.kt b/app/src/main/java/kr/co/vividnext/sodalive/common/Constants.kt
index 49de510..334695f 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/common/Constants.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/common/Constants.kt
@@ -59,6 +59,7 @@ object Constants {
     const val EXTRA_AUDIO_CONTENT_NEXT_ACTION = "audio_content_next_action"
     const val EXTRA_AUDIO_CONTENT_ALERT_PREVIEW = "audio_content_alert_preview"
     const val EXTRA_AUDIO_CONTENT_COVER_IMAGE_URL = "audio_content_cover_image_url"
+    const val EXTRA_IS_SHOW_SECRET = "extra_is_show_secret"
 
     const val LIVE_SERVICE_NOTIFICATION_ID: Int = 2
     const val ACTION_AUDIO_CONTENT_RECEIVER = "soda_live_action_content_receiver"
diff --git a/app/src/main/res/layout/fragment_audio_content_comment_list.xml b/app/src/main/res/layout/fragment_audio_content_comment_list.xml
index ded8f9f..c17c39a 100644
--- a/app/src/main/res/layout/fragment_audio_content_comment_list.xml
+++ b/app/src/main/res/layout/fragment_audio_content_comment_list.xml
@@ -63,11 +63,29 @@
         android:layout_marginTop="12dp"
         android:background="@color/color_595959" />
 
+    <TextView
+        android:id="@+id/tv_secret"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/divider"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="13.3dp"
+        android:button="@null"
+        android:drawablePadding="8dp"
+        android:fontFamily="@font/gmarket_sans_medium"
+        android:gravity="center"
+        android:layout_marginHorizontal="13.3dp"
+        android:text="비밀댓글"
+        android:textColor="@color/color_eeeeee"
+        android:textSize="13.3sp"
+        android:visibility="visible"
+        app:drawableStartCompat="@drawable/ic_select" />
+
     <LinearLayout
         android:id="@+id/ll_comment_input"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/divider"
+        android:layout_below="@+id/tv_secret"
         android:background="@drawable/bg_top_round_corner_8_222222"
         android:elevation="13.3dp"
         android:gravity="center_vertical"