From ca6416c69719c5d01f0b4736713afda5702b861f Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Fri, 8 Mar 2024 04:55:49 +0900
Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EB=B3=80=EA=B2=BD=20=EB=8B=A4=EC=9D=B4=EC=96=BC?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20-=20=EA=B3=B5=EC=A7=80,=20=EB=A9=94?=
 =?UTF-8?q?=EB=89=B4=20=EC=9E=85=EB=A0=A5=20=EC=B0=BD=20=EC=8A=A4=ED=81=AC?=
 =?UTF-8?q?=EB=A1=A4=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../room/update/LiveRoomInfoEditDialog.kt     | 24 +++++++++++++++++--
 .../layout/dialog_live_room_info_update.xml   |  5 +++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/update/LiveRoomInfoEditDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/update/LiveRoomInfoEditDialog.kt
index a2e87bf..f8a482e 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/update/LiveRoomInfoEditDialog.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/update/LiveRoomInfoEditDialog.kt
@@ -1,9 +1,11 @@
 package kr.co.vividnext.sodalive.live.room.update
 
+import android.annotation.SuppressLint
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
 import android.widget.ImageView
@@ -22,6 +24,7 @@ import kr.co.vividnext.sodalive.extensions.dpToPx
 import kr.co.vividnext.sodalive.live.room.create.LiveRoomCreateViewModel
 import kr.co.vividnext.sodalive.live.room.menu.GetMenuPresetResponse
 
+@SuppressLint("ClickableViewAccessibility")
 class LiveRoomInfoEditDialog(
     private val activity: AppCompatActivity,
     layoutInflater: LayoutInflater,
@@ -56,6 +59,22 @@ class LiveRoomInfoEditDialog(
         dialogView.ivClose.setOnClickListener { alertDialog.dismiss() }
         dialogView.tvCancel.setOnClickListener { alertDialog.dismiss() }
 
+        dialogView.etNotice.setOnTouchListener { view, motionEvent ->
+            view.parent.parent.requestDisallowInterceptTouchEvent(true)
+            if ((motionEvent.action and MotionEvent.ACTION_MASK) == MotionEvent.ACTION_UP) {
+                view.parent.parent.requestDisallowInterceptTouchEvent(false)
+            }
+            false
+        }
+
+        dialogView.etMenu.setOnTouchListener { view, motionEvent ->
+            view.parent.parent.requestDisallowInterceptTouchEvent(true)
+            if ((motionEvent.action and MotionEvent.ACTION_MASK) == MotionEvent.ACTION_UP) {
+                view.parent.parent.requestDisallowInterceptTouchEvent(false)
+            }
+            false
+        }
+
         dialogView.ivSwitch.setOnClickListener {
             isActivateMenuLiveData.value = !isActivateMenuLiveData.value!!
             isActivateMenu = isActivateMenuLiveData.value!!
@@ -100,6 +119,7 @@ class LiveRoomInfoEditDialog(
                 )
             }
         }
+
         isActivateMenuLiveData.observe(activity) {
             if (it) {
                 dialogView.llEditMenu.visibility = View.VISIBLE
@@ -116,7 +136,7 @@ class LiveRoomInfoEditDialog(
         currentContent: String,
     ) {
         dialogView.etTitle.setText(currentTitle)
-        dialogView.etContent.setText(currentContent)
+        dialogView.etNotice.setText(currentContent)
     }
 
     fun setCoverImageUri(coverImageUri: Uri) {
@@ -161,7 +181,7 @@ class LiveRoomInfoEditDialog(
             alertDialog.dismiss()
 
             val newTitle = dialogView.etTitle.text.toString()
-            val newContent = dialogView.etContent.text.toString()
+            val newContent = dialogView.etNotice.text.toString()
             val menu = dialogView.etMenu.text.toString()
 
             confirmAction(
diff --git a/app/src/main/res/layout/dialog_live_room_info_update.xml b/app/src/main/res/layout/dialog_live_room_info_update.xml
index d0db38a..546bb25 100644
--- a/app/src/main/res/layout/dialog_live_room_info_update.xml
+++ b/app/src/main/res/layout/dialog_live_room_info_update.xml
@@ -117,7 +117,7 @@
                     android:textSize="16.7sp" />
 
                 <EditText
-                    android:id="@+id/et_content"
+                    android:id="@+id/et_notice"
                     android:layout_width="match_parent"
                     android:layout_height="200dp"
                     android:layout_marginTop="8dp"
@@ -127,7 +127,10 @@
                     android:hint="라이브 공지를 입력해 주세요"
                     android:importantForAutofill="no"
                     android:inputType="textMultiLine"
+                    android:overScrollMode="always"
                     android:padding="20dp"
+                    android:scrollbarStyle="insideInset"
+                    android:scrollbars="vertical"
                     android:textColor="@color/color_eeeeee"
                     android:textColorHint="@color/color_777777"
                     android:textCursorDrawable="@drawable/edit_text_cursor"