diff --git a/app/src/main/java/kr/co/vividnext/sodalive/chat/talk/room/ChatRoomActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/chat/talk/room/ChatRoomActivity.kt index b9729be4..f1abdc45 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/chat/talk/room/ChatRoomActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/chat/talk/room/ChatRoomActivity.kt @@ -910,7 +910,7 @@ class ChatRoomActivity : BaseActivity( layoutInflater = this.layoutInflater, title = title, desc = desc, - confirmButtonTitle = "초기화", + confirmButtonTitle = "30캔으로 초기화", confirmButtonClick = { val loadingDialog = LoadingDialog(this, layoutInflater) loadingDialog.show( diff --git a/app/src/main/java/kr/co/vividnext/sodalive/chat/talk/room/ChatRoomMoreDialogFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/chat/talk/room/ChatRoomMoreDialogFragment.kt index 42ddef7c..bf64c773 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/chat/talk/room/ChatRoomMoreDialogFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/chat/talk/room/ChatRoomMoreDialogFragment.kt @@ -7,10 +7,10 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.LinearLayout +import android.widget.RelativeLayout import androidx.fragment.app.DialogFragment import com.google.android.material.switchmaterial.SwitchMaterial import kr.co.vividnext.sodalive.R -import kr.co.vividnext.sodalive.base.SodaDialog /** * 채팅방 우측 상단 더보기 버튼 클릭 시 표시되는 전체화면 다이얼로그. @@ -65,21 +65,12 @@ class ChatRoomMoreDialogFragment : DialogFragment() { } // 대화 초기화: Activity에 위임 - view.findViewById(R.id.row_reset)?.setOnClickListener { + view.findViewById(R.id.row_reset)?.setOnClickListener { (activity as? ChatRoomActivity)?.onResetChatRequested() } - // 신고하기 (임시 안내) - view.findViewById(R.id.row_report)?.setOnClickListener { - SodaDialog( - requireActivity(), - layoutInflater, - title = "신고하기", - desc = "신고하기 기능은 준비 중입니다.", - confirmButtonTitle = "확인", - confirmButtonClick = {}, - cancelButtonTitle = "" - ).show(resources.displayMetrics.widthPixels) + view.findViewById(R.id.ll_btn_can)?.setOnClickListener { + (activity as? ChatRoomActivity)?.onResetChatRequested() } } diff --git a/app/src/main/res/layout/fragment_chat_room_more_dialog.xml b/app/src/main/res/layout/fragment_chat_room_more_dialog.xml index 6f49fc92..90b07863 100644 --- a/app/src/main/res/layout/fragment_chat_room_more_dialog.xml +++ b/app/src/main/res/layout/fragment_chat_room_more_dialog.xml @@ -76,7 +76,8 @@ + android:layout_height="wrap_content" + app:trackTint="@color/color_777777" /> - - + android:layout_alignParentStart="true" + android:layout_centerVertical="true" + android:layout_marginEnd="10dp" + android:layout_toStartOf="@+id/ll_btn_can" + android:orientation="vertical"> - + + + + + + + + + + - + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:background="@drawable/bg_buy_button" + android:gravity="center_vertical" + android:paddingHorizontal="10dp" + android:paddingVertical="3dp"> - - - - - - - + + + +