From 8b241709e151184f104cb9ec4e721e516a9d8b7a Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Thu, 28 Aug 2025 01:53:45 +0900
Subject: [PATCH] =?UTF-8?q?fix(chat):=20=EB=8C=80=ED=99=94=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20-=20=EB=8C=80=ED=99=94=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=ED=99=94=20=EC=98=A4=EB=A5=B8=EC=AA=BD=EC=97=90=2030=EC=BA=94?=
 =?UTF-8?q?=20=EC=95=88=EB=82=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chat/talk/room/ChatRoomActivity.kt        |   2 +-
 .../talk/room/ChatRoomMoreDialogFragment.kt   |  17 +--
 .../layout/fragment_chat_room_more_dialog.xml | 103 +++++++++++-------
 3 files changed, 71 insertions(+), 51 deletions(-)

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<ActivityChatRoomBinding>(
             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<LinearLayout>(R.id.row_reset)?.setOnClickListener {
+        view.findViewById<RelativeLayout>(R.id.row_reset)?.setOnClickListener {
             (activity as? ChatRoomActivity)?.onResetChatRequested()
         }
 
-        // 신고하기 (임시 안내)
-        view.findViewById<LinearLayout>(R.id.row_report)?.setOnClickListener {
-            SodaDialog(
-                requireActivity(),
-                layoutInflater,
-                title = "신고하기",
-                desc = "신고하기 기능은 준비 중입니다.",
-                confirmButtonTitle = "확인",
-                confirmButtonClick = {},
-                cancelButtonTitle = ""
-            ).show(resources.displayMetrics.widthPixels)
+        view.findViewById<LinearLayout>(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 @@
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/sw_background"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    app:trackTint="@color/color_777777" />
             </LinearLayout>
 
             <View
@@ -108,55 +109,83 @@
                 android:background="#26FFFFFF" />
 
             <!-- 대화 초기화 -->
-            <LinearLayout
+            <RelativeLayout
                 android:id="@+id/row_reset"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
+                android:orientation="horizontal"
                 android:paddingHorizontal="24dp"
                 android:paddingVertical="12dp">
 
-                <TextView
+                <LinearLayout
+                    android:id="@+id/ll_desc"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/pretendard_bold"
-                    android:text="대화 초기화"
-                    android:textColor="#B0BEC5"
-                    android:textSize="18sp" />
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="10dp"
+                    android:layout_toStartOf="@+id/ll_btn_can"
+                    android:orientation="vertical">
 
-                <TextView
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="@font/pretendard_bold"
+                        android:text="대화 초기화"
+                        android:textColor="#B0BEC5"
+                        android:textSize="18sp" />
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/pretendard_regular"
+                            android:text="⚠️ "
+                            android:textColor="#B3FFFFFF"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/pretendard_regular"
+                            android:text="지금까지의 대화가 모두 초기화 되고, 이용자가 새로운 캐릭터가 되어 새롭게 대화를 시작합니다."
+                            android:textColor="#B3FFFFFF"
+                            android:textSize="14sp" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_btn_can"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="6dp"
-                    android:fontFamily="@font/pretendard_regular"
-                    android:text="지금까지의 대화가 모두 초기화 되고 새롭게 대화를 시작합니다."
-                    android:textColor="#B3FFFFFF"
-                    android:textSize="16sp" />
-            </LinearLayout>
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/bg_buy_button"
+                    android:gravity="center_vertical"
+                    android:paddingHorizontal="10dp"
+                    android:paddingVertical="3dp">
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="#26FFFFFF" />
-
-            <!-- 신고하기 -->
-            <LinearLayout
-                android:id="@+id/row_report"
-                android:layout_width="match_parent"
-                android:layout_height="56dp"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="@font/pretendard_bold"
-                    android:text="신고하기"
-                    android:textColor="#B0BEC5"
-                    android:textSize="18sp" />
-            </LinearLayout>
+                    <ImageView
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:layout_marginEnd="4dp"
+                        android:contentDescription="@null"
+                        android:src="@drawable/ic_can" />
 
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="@font/pretendard_bold"
+                        android:text="30"
+                        android:textColor="#263238"
+                        android:textSize="16sp" />
+                </LinearLayout>
+            </RelativeLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>