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" />