From 2589ba107c84579f499e99dd0071c531f4aecd33 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 16:20:25 +0900
Subject: [PATCH 01/41] =?UTF-8?q?feat:=20=ED=99=95=EC=9D=B8,=20=ED=99=95?=
 =?UTF-8?q?=EC=9D=B8/=EC=B7=A8=EC=86=8C=20Custom=20Dialog=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/presentation/util/DialogUtil.kt   | 63 ++++++++++++++++
 .../drawable/shape_dialog_button_cancel.xml   |  5 ++
 .../drawable/shape_dialog_button_confirm.xml  |  5 ++
 .../main/res/drawable/shape_dialog_corner.xml | 10 +++
 app/src/main/res/layout/dialog_ok.xml         | 63 ++++++++++++++++
 app/src/main/res/layout/dialog_ok_cancel.xml  | 75 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  3 +
 7 files changed, 224 insertions(+)
 create mode 100644 app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
 create mode 100644 app/src/main/res/drawable/shape_dialog_button_cancel.xml
 create mode 100644 app/src/main/res/drawable/shape_dialog_button_confirm.xml
 create mode 100644 app/src/main/res/drawable/shape_dialog_corner.xml
 create mode 100644 app/src/main/res/layout/dialog_ok.xml
 create mode 100644 app/src/main/res/layout/dialog_ok_cancel.xml

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
new file mode 100644
index 000000000..77b01e095
--- /dev/null
+++ b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
@@ -0,0 +1,63 @@
+package com.eatssu.android.presentation.util
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.view.Window
+import android.widget.TextView
+import androidx.core.graphics.drawable.toDrawable
+import com.eatssu.android.R
+
+fun Context.openOkCancelDialog(
+    title: String,
+    description: String,
+    onConfirm: (dialog: Dialog) -> Unit = {},
+    onCancel: (dialog: Dialog) -> Unit = {}
+) {
+    val dialog = Dialog(this)
+
+    // Dialog Radius 적용
+    dialog.window?.setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
+    dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+    dialog.setContentView(R.layout.dialog_ok_cancel)
+
+    // UI 설정
+    dialog.findViewById<TextView>(R.id.dialog_title).text = title
+    dialog.findViewById<TextView>(R.id.dialog_description).text = description
+
+    dialog.findViewById<TextView>(R.id.dialog_confirm_btn).setOnClickListener {
+        // 확인 버튼 클릭 시 동작
+        onConfirm(dialog)
+    }
+
+    dialog.findViewById<TextView>(R.id.dialog_cancel_btn).setOnClickListener {
+        // 취소 버튼 클릭 시 동작
+        onCancel(dialog)
+    }
+
+    dialog.show()
+}
+
+fun Context.openOkDialog(
+    title: String,
+    description: String,
+    onConfirm: (dialog: Dialog) -> Unit = {}
+) {
+    val dialog = Dialog(this)
+
+    // Dialog Radius 적용
+    dialog.window?.setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
+    dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+    dialog.setContentView(R.layout.dialog_ok)
+
+    // UI 설정
+    dialog.findViewById<TextView>(R.id.dialog_title).text = title
+    dialog.findViewById<TextView>(R.id.dialog_description).text = description
+
+    dialog.findViewById<TextView>(R.id.dialog_confirm_btn).setOnClickListener {
+        // 확인 버튼 클릭 시 동작
+        onConfirm(dialog)
+    }
+
+    dialog.show()
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_dialog_button_cancel.xml b/app/src/main/res/drawable/shape_dialog_button_cancel.xml
new file mode 100644
index 000000000..0626ef352
--- /dev/null
+++ b/app/src/main/res/drawable/shape_dialog_button_cancel.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/gray200" />
+    <corners android:radius="12dp" />
+</shape>
diff --git a/app/src/main/res/drawable/shape_dialog_button_confirm.xml b/app/src/main/res/drawable/shape_dialog_button_confirm.xml
new file mode 100644
index 000000000..f2f8d60f1
--- /dev/null
+++ b/app/src/main/res/drawable/shape_dialog_button_confirm.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/primary" />
+    <corners android:radius="12dp" />
+</shape>
diff --git a/app/src/main/res/drawable/shape_dialog_corner.xml b/app/src/main/res/drawable/shape_dialog_corner.xml
new file mode 100644
index 000000000..ba6e549c6
--- /dev/null
+++ b/app/src/main/res/drawable/shape_dialog_corner.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <padding
+            android:left="18dp"
+            android:top="18dp"
+            android:right="18dp"
+            android:bottom="18dp" />
+    <corners android:radius="28dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ok.xml b/app/src/main/res/layout/dialog_ok.xml
new file mode 100644
index 000000000..0cfc922cf
--- /dev/null
+++ b/app/src/main/res/layout/dialog_ok.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="321dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@drawable/shape_dialog_corner"
+        android:orientation="vertical"
+        android:padding="18dp">
+
+    <!-- Title and Description Container -->
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:padding="6dp">
+
+        <!-- Title -->
+        <TextView
+                android:id="@+id/dialog_title"
+                style="@style/H2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:gravity="center"
+                android:text="제목을 입력해주세요" />
+
+        <!-- Description -->
+        <TextView
+                android:id="@+id/dialog_description"
+                style="@style/Subtitle2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:textColor="@color/gray600"
+                android:gravity="center"
+                android:text="본문을 입력해주세요" />
+
+    </LinearLayout>
+
+    <!-- Buttons Container -->
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="18dp"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+        <!-- Confirm Button -->
+        <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/dialog_confirm_btn"
+                style="@style/Body1"
+                android:text="@string/confirm"
+                android:layout_width="0dp"
+                android:layout_height="48dp"
+                android:layout_weight="1"
+                android:layout_marginStart="4dp"
+                android:background="@drawable/shape_dialog_button_confirm"
+                android:textColor="@color/white" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ok_cancel.xml b/app/src/main/res/layout/dialog_ok_cancel.xml
new file mode 100644
index 000000000..8891aba92
--- /dev/null
+++ b/app/src/main/res/layout/dialog_ok_cancel.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="321dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@drawable/shape_dialog_corner"
+        android:orientation="vertical"
+        android:padding="18dp">
+
+    <!-- Title and Description Container -->
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:padding="6dp">
+
+        <!-- Title -->
+        <TextView
+                android:id="@+id/dialog_title"
+                style="@style/H2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:gravity="center"
+                android:text="제목을 입력해주세요" />
+
+        <!-- Description -->
+        <TextView
+                android:id="@+id/dialog_description"
+                style="@style/Subtitle2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:textColor="@color/gray600"
+                android:gravity="center"
+                android:text="본문을 입력해주세요" />
+
+    </LinearLayout>
+
+    <!-- Buttons Container -->
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="18dp"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+        <!-- Cancel Button -->
+        <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/dialog_cancel_btn"
+                style="@style/Body1"
+                android:text="@string/cancel"
+                android:layout_width="0dp"
+                android:layout_height="48dp"
+                android:layout_weight="1"
+                android:layout_marginEnd="4dp"
+                android:background="@drawable/shape_dialog_button_cancel"
+                android:textColor="@color/black" />
+
+        <!-- Confirm Button -->
+        <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/dialog_confirm_btn"
+                style="@style/Body1"
+                android:text="@string/confirm"
+                android:layout_width="0dp"
+                android:layout_height="48dp"
+                android:layout_weight="1"
+                android:layout_marginStart="4dp"
+                android:background="@drawable/shape_dialog_button_confirm"
+                android:textColor="@color/white" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3493d7a0b..4dcd4bdc5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -189,4 +189,7 @@
 
     <string name="eatssu_instagram">eatssu.official</string>
     <string name="recruiting_url">https://eat-ssu.notion.site/1d2eeef75a1681ae800cf6ffa6faa37d?pvs=74</string>
+
+    <string name="cancel">취소</string>
+    <string name="confirm">확인</string>
 </resources>
\ No newline at end of file

From 3ac0fa5c6ef848435a36bf5ab71dd9d919f217e2 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 16:23:49 +0900
Subject: [PATCH 02/41] =?UTF-8?q?feat:=20cancellable=20=ED=8C=8C=EB=9D=BC?=
 =?UTF-8?q?=EB=AF=B8=ED=84=B0=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/eatssu/android/presentation/util/DialogUtil.kt    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
index 77b01e095..1ec03bd29 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
@@ -12,7 +12,8 @@ fun Context.openOkCancelDialog(
     title: String,
     description: String,
     onConfirm: (dialog: Dialog) -> Unit = {},
-    onCancel: (dialog: Dialog) -> Unit = {}
+    onCancel: (dialog: Dialog) -> Unit = {},
+    cancellable: Boolean = true,
 ) {
     val dialog = Dialog(this)
 
@@ -35,13 +36,15 @@ fun Context.openOkCancelDialog(
         onCancel(dialog)
     }
 
+    dialog.setCancelable(cancellable)
     dialog.show()
 }
 
 fun Context.openOkDialog(
     title: String,
     description: String,
-    onConfirm: (dialog: Dialog) -> Unit = {}
+    onConfirm: (dialog: Dialog) -> Unit = {},
+    cancellable: Boolean = true,
 ) {
     val dialog = Dialog(this)
 
@@ -59,5 +62,6 @@ fun Context.openOkDialog(
         onConfirm(dialog)
     }
 
+    dialog.setCancelable(cancellable)
     dialog.show()
 }
\ No newline at end of file

From dcaa26972fea3c6386a2ae93ceced390b5df0042 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 16:36:05 +0900
Subject: [PATCH 03/41] =?UTF-8?q?refactor:=20Dialog=20=EC=98=B5=EC=85=98?=
 =?UTF-8?q?=20DSL=20=EA=B5=AC=EC=A1=B0=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/presentation/util/DialogUtil.kt   | 106 +++++++++++-------
 1 file changed, 63 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
index 1ec03bd29..30b373d0d 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
@@ -4,64 +4,84 @@ import android.app.Dialog
 import android.content.Context
 import android.graphics.Color
 import android.view.Window
+import android.widget.Button
 import android.widget.TextView
 import androidx.core.graphics.drawable.toDrawable
 import com.eatssu.android.R
 
-fun Context.openOkCancelDialog(
-    title: String,
-    description: String,
-    onConfirm: (dialog: Dialog) -> Unit = {},
-    onCancel: (dialog: Dialog) -> Unit = {},
-    cancellable: Boolean = true,
+class DialogBuilder(
+    private val context: Context,
+
+    // Dialog에 표시할 제목
+    private val title: String,
+
+    // Dialog에 표시할 설명
+    private val description: String
 ) {
-    val dialog = Dialog(this)
+    // 확인 버튼을 눌렀을 때 동작
+    private var onConfirm: (dialog: Dialog) -> Unit = { it.dismiss() }
+
+    // 취소 버튼을 눌렀을 때 동작
+    private var onCancel: (dialog: Dialog) -> Unit = { it.dismiss() }
 
-    // Dialog Radius 적용
-    dialog.window?.setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
-    dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
-    dialog.setContentView(R.layout.dialog_ok_cancel)
+    // Dialog 바깥을 누르면 닫히는지 여부
+    var cancellable: Boolean = true
 
-    // UI 설정
-    dialog.findViewById<TextView>(R.id.dialog_title).text = title
-    dialog.findViewById<TextView>(R.id.dialog_description).text = description
+    // 확인 버튼 텍스트
+    var confirmText: String = "확인"
 
-    dialog.findViewById<TextView>(R.id.dialog_confirm_btn).setOnClickListener {
-        // 확인 버튼 클릭 시 동작
-        onConfirm(dialog)
+    // 취소 버튼 텍스트
+    var cancelText: String = "취소"
+
+    // 취소 버튼 표시 여부
+    var showCancelButton: Boolean = true
+
+    fun onConfirm(action: (dialog: Dialog) -> Unit) = apply {
+        this.onConfirm = action
     }
 
-    dialog.findViewById<TextView>(R.id.dialog_cancel_btn).setOnClickListener {
-        // 취소 버튼 클릭 시 동작
-        onCancel(dialog)
+    fun onCancel(action: (dialog: Dialog) -> Unit) = apply {
+        this.onCancel = action
     }
 
-    dialog.setCancelable(cancellable)
-    dialog.show()
-}
+    fun show() {
+        val dialog = Dialog(context)
 
-fun Context.openOkDialog(
-    title: String,
-    description: String,
-    onConfirm: (dialog: Dialog) -> Unit = {},
-    cancellable: Boolean = true,
-) {
-    val dialog = Dialog(this)
+        // Dialog Radius 적용
+        dialog.window?.setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dialog.setContentView(R.layout.dialog_ok_cancel)
+
+        // UI 설정
+        dialog.findViewById<TextView>(R.id.dialog_title).text = title
+        dialog.findViewById<TextView>(R.id.dialog_description).text = description
 
-    // Dialog Radius 적용
-    dialog.window?.setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
-    dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
-    dialog.setContentView(R.layout.dialog_ok)
+        val confirmButton = dialog.findViewById<Button>(R.id.dialog_confirm_btn)
+        val cancelButton = dialog.findViewById<Button>(R.id.dialog_cancel_btn)
 
-    // UI 설정
-    dialog.findViewById<TextView>(R.id.dialog_title).text = title
-    dialog.findViewById<TextView>(R.id.dialog_description).text = description
+        confirmButton.text = confirmText
+        confirmButton.setOnClickListener {
+            onConfirm(dialog)
+        }
 
-    dialog.findViewById<TextView>(R.id.dialog_confirm_btn).setOnClickListener {
-        // 확인 버튼 클릭 시 동작
-        onConfirm(dialog)
+        if (showCancelButton) {
+            cancelButton.text = cancelText
+            cancelButton.setOnClickListener {
+                onCancel(dialog)
+            }
+        } else {
+            cancelButton.visibility = android.view.View.GONE
+        }
+
+        dialog.setCancelable(cancellable)
+        dialog.show()
     }
+}
 
-    dialog.setCancelable(cancellable)
-    dialog.show()
-}
\ No newline at end of file
+fun Context.showDialog(
+    title: String,
+    description: String,
+    builder: DialogBuilder.() -> Unit = {}
+) {
+    DialogBuilder(this, title, description).apply(builder).show()
+}

From 127de155867eeb66aa87b48fffa715993b77ce15 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 16:36:17 +0900
Subject: [PATCH 04/41] =?UTF-8?q?refactor:=20=EA=B0=95=EC=A0=9C=20?=
 =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20Custom=20Dialog=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/ForceUpdateActivity.kt             | 55 +++++++++----------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/common/ForceUpdateActivity.kt b/app/src/main/java/com/eatssu/android/presentation/common/ForceUpdateActivity.kt
index 4e241bbaa..09ec36167 100644
--- a/app/src/main/java/com/eatssu/android/presentation/common/ForceUpdateActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/common/ForceUpdateActivity.kt
@@ -1,11 +1,11 @@
 package com.eatssu.android.presentation.common
 
 
-import android.app.AlertDialog
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.net.toUri
+import com.eatssu.android.presentation.util.showDialog
 
 
 class ForceUpdateDialogActivity : AppCompatActivity() {
@@ -16,36 +16,33 @@ class ForceUpdateDialogActivity : AppCompatActivity() {
     }
 
     private fun showForceUpdateDialog() {
-        val builder = AlertDialog.Builder(this)
-        builder.setTitle("강제 업데이트")
-        builder.setMessage("새 버전의 앱을 설치해야 합니다.")
-
-        builder.setPositiveButton("업데이트") { dialog, which ->
-            // Google Play Store의 앱 페이지로 이동하여 업데이트를 다운로드합니다.
-            val appPackageName = packageName
-            try {
-                startActivity(
-                    Intent(
-                        Intent.ACTION_VIEW,
-                        Uri.parse("market://details?id=$appPackageName")
+        showDialog("강제 업데이트", "새 버전의 앱을 설치해야 합니다.") {
+            confirmText = "업데이트"
+            cancellable = false
+            showCancelButton = false
+
+            onConfirm {
+                // Google Play Store의 앱 페이지로 이동하여 업데이트를 다운로드합니다.
+                val appPackageName = packageName
+                try {
+                    startActivity(
+                        Intent(
+                            Intent.ACTION_VIEW,
+                            "market://details?id=$appPackageName".toUri()
+                        )
                     )
-                )
-            } catch (e: android.content.ActivityNotFoundException) {
-                startActivity(
-                    Intent(
-                        Intent.ACTION_VIEW,
-                        Uri.parse("https://play.google.com/store/apps/details?id=$appPackageName")
+                } catch (e: android.content.ActivityNotFoundException) {
+                    startActivity(
+                        Intent(
+                            Intent.ACTION_VIEW,
+                            "https://play.google.com/store/apps/details?id=$appPackageName".toUri()
+                        )
                     )
-                )
-            }
+                }
 
-            // 다이얼로그를 종료합니다.
-            finish()
+                // 다이얼로그를 종료합니다.
+                finish()
+            }
         }
-
-        builder.setCancelable(false) // 사용자가 다이얼로그를 취소할 수 없도록 설정
-
-        val dialog = builder.create()
-        dialog.show()
     }
 }
\ No newline at end of file

From a089334dd19a666b3587e9c3f455e1c89d524f5f Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 16:46:25 +0900
Subject: [PATCH 05/41] =?UTF-8?q?feat:=20Destructive=20Dialog=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/presentation/util/DialogUtil.kt     |  5 ++++-
 .../shape_dialog_button_destructive.xml         |  5 +++++
 ...{dialog_ok_cancel.xml => dialog_default.xml} |  0
 .../{dialog_ok.xml => dialog_destructive.xml}   | 17 +++++++++++++++--
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/shape_dialog_button_destructive.xml
 rename app/src/main/res/layout/{dialog_ok_cancel.xml => dialog_default.xml} (100%)
 rename app/src/main/res/layout/{dialog_ok.xml => dialog_destructive.xml} (81%)

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
index 30b373d0d..07d9e5604 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
@@ -36,6 +36,9 @@ class DialogBuilder(
     // 취소 버튼 표시 여부
     var showCancelButton: Boolean = true
 
+    // confirm, cancel 버튼 순서 변경 여부
+    var swapConfirmCancel: Boolean = false
+
     fun onConfirm(action: (dialog: Dialog) -> Unit) = apply {
         this.onConfirm = action
     }
@@ -50,7 +53,7 @@ class DialogBuilder(
         // Dialog Radius 적용
         dialog.window?.setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
-        dialog.setContentView(R.layout.dialog_ok_cancel)
+        dialog.setContentView(if (swapConfirmCancel) R.layout.dialog_destructive else R.layout.dialog_default)
 
         // UI 설정
         dialog.findViewById<TextView>(R.id.dialog_title).text = title
diff --git a/app/src/main/res/drawable/shape_dialog_button_destructive.xml b/app/src/main/res/drawable/shape_dialog_button_destructive.xml
new file mode 100644
index 000000000..69ad5c668
--- /dev/null
+++ b/app/src/main/res/drawable/shape_dialog_button_destructive.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/error" />
+    <corners android:radius="12dp" />
+</shape>
diff --git a/app/src/main/res/layout/dialog_ok_cancel.xml b/app/src/main/res/layout/dialog_default.xml
similarity index 100%
rename from app/src/main/res/layout/dialog_ok_cancel.xml
rename to app/src/main/res/layout/dialog_default.xml
diff --git a/app/src/main/res/layout/dialog_ok.xml b/app/src/main/res/layout/dialog_destructive.xml
similarity index 81%
rename from app/src/main/res/layout/dialog_ok.xml
rename to app/src/main/res/layout/dialog_destructive.xml
index 0cfc922cf..4b427eeac 100644
--- a/app/src/main/res/layout/dialog_ok.xml
+++ b/app/src/main/res/layout/dialog_destructive.xml
@@ -55,9 +55,22 @@
                 android:layout_width="0dp"
                 android:layout_height="48dp"
                 android:layout_weight="1"
-                android:layout_marginStart="4dp"
-                android:background="@drawable/shape_dialog_button_confirm"
+                android:layout_marginEnd="4dp"
+                android:background="@drawable/shape_dialog_button_destructive"
                 android:textColor="@color/white" />
+
+        <!-- Cancel Button -->
+        <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/dialog_cancel_btn"
+                style="@style/Body1"
+                android:text="@string/cancel"
+                android:layout_width="0dp"
+                android:layout_height="48dp"
+                android:layout_weight="1"
+                android:layout_marginStart="4dp"
+                android:background="@drawable/shape_dialog_button_cancel"
+                android:textColor="@color/black" />
+
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file

From 1ffacc0463f62d22dfc707cd691edc89a6d1204b Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 16:51:38 +0900
Subject: [PATCH 06/41] =?UTF-8?q?refactor:=20Destructive=20Flag=EB=A1=9C?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/eatssu/android/presentation/util/DialogUtil.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
index 07d9e5604..678d924f9 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
@@ -36,8 +36,8 @@ class DialogBuilder(
     // 취소 버튼 표시 여부
     var showCancelButton: Boolean = true
 
-    // confirm, cancel 버튼 순서 변경 여부
-    var swapConfirmCancel: Boolean = false
+    // Destructive한 동작인지 여부 - 확인/취소 버튼 위치 변경, 확인 색 Error 색 변경
+    var isDestructive: Boolean = false
 
     fun onConfirm(action: (dialog: Dialog) -> Unit) = apply {
         this.onConfirm = action
@@ -53,7 +53,7 @@ class DialogBuilder(
         // Dialog Radius 적용
         dialog.window?.setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
-        dialog.setContentView(if (swapConfirmCancel) R.layout.dialog_destructive else R.layout.dialog_default)
+        dialog.setContentView(if (isDestructive) R.layout.dialog_destructive else R.layout.dialog_default)
 
         // UI 설정
         dialog.findViewById<TextView>(R.id.dialog_title).text = title

From ac58048aa3988c370ab38d7d9ffb05c71968e4e3 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 16:51:46 +0900
Subject: [PATCH 07/41] =?UTF-8?q?refactor:=20=EB=A1=9C=EA=B7=B8=EC=95=84?=
 =?UTF-8?q?=EC=9B=83=20Custom=20Dialog=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/mypage/MyPageFragment.kt       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
index e9dec35e6..341df6a1b 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
@@ -27,6 +27,7 @@ import com.eatssu.android.presentation.login.LoginActivity
 import com.eatssu.android.presentation.mypage.myreview.MyReviewListActivity
 import com.eatssu.android.presentation.mypage.terms.WebViewActivity
 import com.eatssu.android.presentation.mypage.userinfo.UserInfoActivity
+import com.eatssu.android.presentation.util.showDialog
 import com.eatssu.android.presentation.util.showToast
 import com.eatssu.common.enums.ScreenId
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
@@ -207,15 +208,15 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(ScreenId.MYPAGE_MAIN)
     }
 
     private fun showLogoutDialog() {
-        AlertDialog.Builder(requireContext())
-            .setTitle("로그아웃")
-            .setMessage("로그아웃 하시겠습니까?")
-            .setPositiveButton("로그아웃") { _, _ ->
-                mainViewModel.logOut() // 로그아웃은 메인 액티비티에서 처리하도록 수정
-                startActivity(Intent(requireContext(), LoginActivity::class.java))
+        requireContext().run {
+            showDialog("로그아웃", "로그아웃 하시겠습니까?") {
+                isDestructive = true
+                onConfirm {
+                    mainViewModel.logOut() // 로그아웃은 메인 액티비티에서 처리하도록 수정
+                    startActivity(Intent(requireContext(), LoginActivity::class.java))
+                }
             }
-            .setNegativeButton("취소", null)
-            .show()
+        }
     }
 
     private fun moveToOss() {

From 6e3a35f3882ff375f07111fa178902bfba2bece7 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 16:57:55 +0900
Subject: [PATCH 08/41] =?UTF-8?q?refactor:=20=EB=82=B4=20=EB=A6=AC?=
 =?UTF-8?q?=EB=B7=B0=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C=20Custom=20Dialog=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/MyReviewBottomSheetFragment.kt     | 37 ++++++++++---------
 .../android/presentation/util/DialogUtil.kt   | 14 +++++++
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/common/MyReviewBottomSheetFragment.kt b/app/src/main/java/com/eatssu/android/presentation/common/MyReviewBottomSheetFragment.kt
index 2d4220c59..8ea41449e 100644
--- a/app/src/main/java/com/eatssu/android/presentation/common/MyReviewBottomSheetFragment.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/common/MyReviewBottomSheetFragment.kt
@@ -5,15 +5,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
-import com.eatssu.android.App
 import com.eatssu.android.R
 import com.eatssu.android.databinding.FragmentBottomsheetMyReviewBinding
-import com.eatssu.android.presentation.mypage.myreview.MyReviewViewModel
 import com.eatssu.android.presentation.cafeteria.review.modify.ModifyReviewActivity
-import com.eatssu.android.presentation.util.showToast
+import com.eatssu.android.presentation.mypage.myreview.MyReviewViewModel
+import com.eatssu.android.presentation.util.showDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
@@ -80,24 +78,27 @@ class MyReviewBottomSheetFragment : BottomSheetDialogFragment() {
         }
 
         binding.llDelete.setOnClickListener {
-            AlertDialog.Builder(requireContext()).apply {
-                setTitle(R.string.delete)
-                setMessage(R.string.delete_description)
-                setNegativeButton("취소") { _, _ ->
-                    activity?.showToast(App.appContext.getString(R.string.delete_undo))
-                }
-                setPositiveButton("삭제") { _, _ ->
-                    viewModel.deleteReview(reviewId)
-                    lifecycleScope.launch {
-                        viewModel.uiState.collectLatest {
-                            if (it.isDeleted) {
-                                onReviewDeletedListener?.onReviewDeleted() // 콜백 호출
-                                dismiss()
+            requireContext().run {
+                showDialog(
+                    R.string.delete,
+                    R.string.delete_description
+                ) {
+                    isDestructive = true
+                    confirmText = "삭제"
+
+                    onConfirm {
+                        viewModel.deleteReview(reviewId)
+                        lifecycleScope.launch {
+                            viewModel.uiState.collectLatest {
+                                if (it.isDeleted) {
+                                    onReviewDeletedListener?.onReviewDeleted() // 콜백 호출
+                                    dismiss()
+                                }
                             }
                         }
                     }
                 }
-            }.create().show()
+            }
         }
 
     }
diff --git a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
index 678d924f9..200b3a087 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
@@ -6,6 +6,7 @@ import android.graphics.Color
 import android.view.Window
 import android.widget.Button
 import android.widget.TextView
+import androidx.annotation.StringRes
 import androidx.core.graphics.drawable.toDrawable
 import com.eatssu.android.R
 
@@ -88,3 +89,16 @@ fun Context.showDialog(
 ) {
     DialogBuilder(this, title, description).apply(builder).show()
 }
+
+
+fun Context.showDialog(
+    @StringRes titleId: Int,
+    @StringRes descriptionId: Int,
+    builder: DialogBuilder.() -> Unit = {}
+) {
+    DialogBuilder(
+        this,
+        getString(titleId),
+        getString(descriptionId)
+    ).apply(builder).show()
+}
\ No newline at end of file

From e5c58b7a27037921fd2c101f93d003c7498e0edd Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 17:05:29 +0900
Subject: [PATCH 09/41] =?UTF-8?q?feat:=20Dialog=20=EA=B0=9D=EC=B2=B4?=
 =?UTF-8?q?=EB=A5=BC=20=EB=B0=98=ED=99=98=ED=95=98=EA=B3=A0=20=EC=B4=88?=
 =?UTF-8?q?=EA=B8=B0=EC=97=90=20=EC=97=B4=EB=A6=AC=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EC=9D=84=20=EC=88=98=20=EC=9E=88=EB=8A=94=20=EC=98=B5=EC=85=98?=
 =?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

---
 .../android/presentation/util/DialogUtil.kt   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
index 200b3a087..c70894b3f 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
@@ -40,6 +40,9 @@ class DialogBuilder(
     // Destructive한 동작인지 여부 - 확인/취소 버튼 위치 변경, 확인 색 Error 색 변경
     var isDestructive: Boolean = false
 
+    // Dialog를 생성 후 바로 열 것인지 여부
+    var showWhenStart: Boolean = true
+
     fun onConfirm(action: (dialog: Dialog) -> Unit) = apply {
         this.onConfirm = action
     }
@@ -48,7 +51,7 @@ class DialogBuilder(
         this.onCancel = action
     }
 
-    fun show() {
+    fun show(): Dialog {
         val dialog = Dialog(context)
 
         // Dialog Radius 적용
@@ -78,7 +81,11 @@ class DialogBuilder(
         }
 
         dialog.setCancelable(cancellable)
-        dialog.show()
+
+        if (showWhenStart)
+            dialog.show()
+
+        return dialog
     }
 }
 
@@ -86,8 +93,8 @@ fun Context.showDialog(
     title: String,
     description: String,
     builder: DialogBuilder.() -> Unit = {}
-) {
-    DialogBuilder(this, title, description).apply(builder).show()
+): Dialog {
+    return DialogBuilder(this, title, description).apply(builder).show()
 }
 
 
@@ -95,8 +102,8 @@ fun Context.showDialog(
     @StringRes titleId: Int,
     @StringRes descriptionId: Int,
     builder: DialogBuilder.() -> Unit = {}
-) {
-    DialogBuilder(
+): Dialog {
+    return DialogBuilder(
         this,
         getString(titleId),
         getString(descriptionId)

From 9f0ea55402bc1839b4ceaef98a22689fe733b362 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 17:05:39 +0900
Subject: [PATCH 10/41] =?UTF-8?q?refactor:=20=EB=84=A4=ED=8A=B8=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=20=EC=97=B0=EA=B2=B0=20=EC=95=88=EB=90=98=EC=97=88?=
 =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20Custom=20Dialog=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/common/NetworkConnection.kt  | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/common/NetworkConnection.kt b/app/src/main/java/com/eatssu/android/presentation/common/NetworkConnection.kt
index 522ba1f2c..50d60b8a1 100644
--- a/app/src/main/java/com/eatssu/android/presentation/common/NetworkConnection.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/common/NetworkConnection.kt
@@ -1,11 +1,14 @@
 package com.eatssu.android.presentation.common
 
-import android.app.AlertDialog
+import android.app.Dialog
 import android.content.Context
+import android.content.Intent
 import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
+import android.provider.Settings
+import com.eatssu.android.presentation.util.showDialog
 
 // 네트워크 연결 확인을 위해 네트워크 변경 시 알람에 사용하는 클래스 NetworkCallback 을 커스터마이징
 class NetworkConnection(private val context: Context) :
@@ -19,11 +22,20 @@ class NetworkConnection(private val context: Context) :
         .build()
 
     // 네트워크 연결 안 되어있을 때 보여줄 다이얼로그
-    private val dialog: AlertDialog by lazy {
-        AlertDialog.Builder(context)
-            .setTitle("네트워크 연결 안 됨")
-            .setMessage("와이파이 또는 모바일 데이터를 확인해주세요")
-            .create()
+    private val dialog: Dialog by lazy {
+        context.showDialog("네트워크 연결 안 됨", "Wi-Fi, 모바일 데이터를 확인해주세요") {
+            cancellable = false
+            showCancelButton = false
+            showWhenStart = false
+
+            onConfirm {
+                context.startActivity(
+                    Intent(Settings.ACTION_WIRELESS_SETTINGS)
+                        .apply {
+                            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        })
+            }
+        }
     }
 
     // NetworkCallback 등록

From b4ba1e204c79dd711892f0f1232df4ea734f2d60 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 18:34:02 +0900
Subject: [PATCH 11/41] =?UTF-8?q?feat:=20Custom=20Toast=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20resource=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/ic_toast_error.png  | Bin 0 -> 1072 bytes
 app/src/main/res/drawable/ic_toast_info.png   | Bin 0 -> 995 bytes
 .../main/res/drawable/ic_toast_success.png    | Bin 0 -> 1187 bytes
 .../main/res/drawable/ic_toast_warning.png    | Bin 0 -> 681 bytes
 .../main/res/drawable/shape_toast_error.xml   |  17 ++++++++++++
 .../main/res/drawable/shape_toast_info.xml    |  17 ++++++++++++
 .../main/res/drawable/shape_toast_success.xml |  17 ++++++++++++
 .../main/res/drawable/shape_toast_warning.xml |  17 ++++++++++++
 app/src/main/res/layout/toast_layout.xml      |  25 ++++++++++++++++++
 9 files changed, 93 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_toast_error.png
 create mode 100644 app/src/main/res/drawable/ic_toast_info.png
 create mode 100644 app/src/main/res/drawable/ic_toast_success.png
 create mode 100644 app/src/main/res/drawable/ic_toast_warning.png
 create mode 100644 app/src/main/res/drawable/shape_toast_error.xml
 create mode 100644 app/src/main/res/drawable/shape_toast_info.xml
 create mode 100644 app/src/main/res/drawable/shape_toast_success.xml
 create mode 100644 app/src/main/res/drawable/shape_toast_warning.xml
 create mode 100644 app/src/main/res/layout/toast_layout.xml

diff --git a/app/src/main/res/drawable/ic_toast_error.png b/app/src/main/res/drawable/ic_toast_error.png
new file mode 100644
index 0000000000000000000000000000000000000000..214265789138695d32914b689f738de6fe8af40c
GIT binary patch
literal 1072
zcmV-01kd}4P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1I0;1K~#7F?U^xC
z6G0Tm-yVSmj7Ol*E@vDn9pV^f=m@nlI(FD;fzSmSED5a*Ne5#gR@yo81qdB8z!*m>
zMog%%06YUWk=*lb5|Saeo4dW7Av5GR0~~vMd;hol?(MsG0A0FVZy5MQE;byuz>3n4
z6AUp*BkR<xS5KStlSg2A0Q{nXmN9mYGT;L(8IX&IbvP>|5MU1KV%^@E8<f#{dY6o?
zpLy_zCj+X&7puZs1{quPYKXD{2V<c`2_XrpGw!S;Zvk7nyM4T-c9{aXSZLX=S(kxK
zOGUPi=H2#pWdL^>JUjhJ!^fdLWZ8Le(#Ymbr;Zx90RI#=+9;kA#Q>i$XB-XSZUYEW
zXge6+9~)kF>ebYRzK;z(*AU;r6++M4d}QY&B|9%QAUA$1jHTiRjSz;b#iZxKkUbAl
z7qUu!7dt>aN4I*<7G)=eD^Q;O^I{G<2wH_f(JBa6pgj97(Qe#?!Rc3^PcM{@{qA4W
z6etMypMa>5DTK`6)GX*P7s|)|@kekt`xva#-@?9J@a>gP&^L0w)@HtW4Q?P;Nzk99
zZOq07o>i*(KGu%<M(&Zob>Ym4#49EOdRbfJxQz{z630P-!iQBT?tQEMFET<TzPR_5
zu3Z5YD(U)V1kV5)1(iX`UAWuGjF5>xoP8p7H5nq;wyoihSm-nTQQmngLf6aU>q5Cv
z=!^KO+WejE6XVi-1>M5n0oh9UCZ2=#6kcS2=R99z#04#jmuPd9jjDr!Hs4;qFCj9(
zF$b3pCJdDonuS;eT<pZ?%>Y@naSE|Y&_isyZ({?!U}r&*W}&iKh*bvhz;<tY18#x>
zPI2C8pHP9yFj>1^yCkI*;JJ`fsFWEIoSFd@ctOnG)<CslrtlopBTlnWDGsp;k%|0Y
zRLu)WB&BI+S1C2mg)Vdy-mf-|^A|=0pUu>-bqU=fBWbsji|RTCv|rFcuz+P4TV}qo
zUAU1MS<^&>G;|1z!J0@sN4gVhB`XOnY-+y2V}FmeBs(oNfUg4im-NDR!Khv;n|)5x
zT*#n$%vHJ)B1;<%#a?%{(b&)iwzss%m1QaSf8f;3T{e1NdP={QQw;C04C}WhUG)S7
z_8*2)6cG~eAK`8j**$h$!dH49i0q!sF~(kqvO*s)%XLr%@f_tB8vanR9$H=o@4zSc
ztg`{jXja6P(b`A8ah(dlT9OVYJk(M7jHk5$D`jL%&-;zvpIPISj*n8>8-_}8p#GVa
qUX&O^3IuGEXS{xWX6@4Dy7Lbtc)xpCIgCdD0000<MNUMnLSTYaD&BGc

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_toast_info.png b/app/src/main/res/drawable/ic_toast_info.png
new file mode 100644
index 0000000000000000000000000000000000000000..07494f1cd9cb937a9e59f4aa86f11e063747a308
GIT binary patch
literal 995
zcmV<9104K`P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH19(Y9K~#7F?U_Mn
z6G0S)|JfF`#X{9f4;~^^uZ=ekw%s1Zlb{~Oda;#4+M|NlB6>9yX?wEuY6VYT&9=4o
zdKJM4f?g^)h*BXL-`kDE?9OI)cBV<de6S?Dne5J+_vX!;e}Nu7{%-^<;m%37T1B3|
zPSQ>D5*S8sFcl$CmJ((9eD65$yl29L1&j=E=jCwiHwx6Tc{DnkmNGrv>#JeOTN7nu
zB$EMt#}Dv;MtL4K5ZK6Sh_(R}cO;MaBJ@W*3HHd+&WhO3`ID9b6SMM(wNa0OI#k?V
z6$={eli`r59^f^9MH`@rzULgllvfm$q_z%HKohluHg%q%5Y5*IERjS5{IHRJdTci?
zKRc;W%Mco$kvFNuIy%e3&Z;QJ{TOS2J0o*7ff7yH96C#-?<mg1&4<_!sycq2&mkk%
zrhu0Zf#>&tv!`K#zvjgKsPq7jepTQTGIHqxaQ8;z{Kqfg`hEKRiOi4}PN=+~^Z<`O
z49K5rK0iJHjGTlKlnIsVkJ11k%~IyxhvxHd`@qL9FoH5+L3KS6LiMV$1Vg4TQx+Qw
z!sh8Ka|0MMV(Q&ma~0bkZd9w;S+LgM1cyy%h356h`}bPJ0LnaLFkomfi1{#I_hC*D
z+D&Uh!~lw^oJ4l!t_E2s%&o^3!bn61H!_JS&T=>eh6Z4RND1$xX`}<keSw_3`4)#k
zq;LJO45v&!O!IzPR31pI!8=IuN-VnA0KwbN5Yb6YyCHNblwdxGuSG*hVhdf0aH4~&
zN~2xt0jd(b@U@5m^;)AF=RrAK2QkVtN;Stac_LFu%^MglCBo&zquZ2TzXvOFCPZ}f
z8D%+5l1A(vG>K8#eT|$V0|uL~^ZBU3&Wx2i)pex@c;|C*MlO>l3eaS;WUXvyK+>bP
zs+Jw&H}!#-#oJ2T5~42UKH3Mw>87!pdiFvMYPYo&(OUFvDQxYM9z&CP86AS3oh0_A
z(niN;Wm~01hV{|y6>&bPT`FyqB#kSgy(Nan;%=ITTJkz&rec=NqyvWyEm)}~{8S$J
zi+^K@X;oEd0ZtkVI-O^<3}ANF#D*h%_r8E7c+^?{+-)J^#$oo7FOVP?=_ZpIbkquW
zy#E-AX<lT+VeK_5%@3DepSskkF`6g2x;W5y&B`5yp9r?N;#C!9J$m%e=MU~L9+0kO
RQKJ9=002ovPDHLkV1g4R#G(KI

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_toast_success.png b/app/src/main/res/drawable/ic_toast_success.png
new file mode 100644
index 0000000000000000000000000000000000000000..341b06358adf58736f0b0ec3af04a2dd54608722
GIT binary patch
literal 1187
zcmV;U1YG-xP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1UN}VK~#7F?U_$#
z6jvO_zrWGCd$2LvgHRe}O{>sSaa#(mAT_NCl;#qfL&08J?5*J1OG`>hwopjgOHH7(
zhZb_F;GwiV2rX1xA>e`{5f6%rj-m)&690g^qVxRyX8$<5GqZVbb~YO@A4qoQ&3n7Q
z-|v0joA-VXSY?&x8$wLHHklo8ER`W;?NLf)K&lstdMm%87U5VnS+M!pISVLU87meL
z18q5w&JXljiBgUYJXAMUADe%?@B;AN#j&D|h(vP0H9T3KfMUaAfQ^`q>c|=x(m%B`
zM{6Jd4TS;3N9GAI^3q`6-G$>f=S><KInY0~>nAom&oN6Penf&Jsi9YT7yiHXpKc>9
z35jIZBualN#2WQ*6wN!267Sjh!s1d@Eofk^E1y_4;{{R~37AgRB_-s_25JP$Pg+M#
zEgg7uGW#iiOrdK~Hnn$?4D4cPjj#vl$!wbSbwV!DO^6nqQesQkcnBQ>7GVP2HeOJQ
z-#HH_!X5|qKsEZ;u!3;P$y87;1ol8R`W@qqja%{K@HmFH?a^+-OP0X5ez1g8=cdfQ
z4KL%D(H}6neHg!fG=-kzi+T--azVvD2V_-=4r>44?gOq9HF^^3^&0Y6sM^+m&jF`{
zFRan+AG(pRF*ElYZr;7E-QH1@X)g0QKtwyx0VL`NcYj{L7sIFLeuoK){K54(pgJU<
z@x8eQ>3nkJ3z$MszTgH7VkeE5`RtvK8)h6+>C_?rrpfPs;m&I3=C?6Ec&H(|UMkW#
zP`{5NooBWwpKWW=24dWi{Xe_cqi+slKg;66ol6aM{@~}esq$XwekAF%!rue30oUYS
z`F{PnC%N8r=Jk!+>SZ!$y*(q5k0hPCZKU%iCVdA=5AfBo@9XzoC&ciaM>@qDXEA%`
zDB8oZn@fBWBG9~oN<))B&mVI?WoaPPobdLJMEz@zqft@Hy53yopGL_!2}8t*=AQ6M
zXQo~0RN-mVx8e6WU^!%z6{ykdgtxrbOYI^Fv4FBh+>DvQK=#t?ghYKN>Xhln4$9^Q
zPos*a`G2G(wKyUAAKLmZW=|iDMLGfnM88_@r<yWczzSj=uq7yS7q}m&?0no_SP@9-
zF)ZyEx+iwZiG0+t5Hq&qO~W3Brd1XTb}9A#<}$ng0lElB|I5oQQt>VGLXwY34Q@*D
zWfon5rmv0_Tjr&-a-*E!THe&6!1>Xu-<*1DscKre(I@5PK3+&gdcj432n9**YSo1S
z{gb;6b7*qtC?cCv+6N~_=L0+@{^dgmSy0L5+Vn`NH8SHVYm8-+H)&>kLL(<A8wUIS
z;mZ_N9Eky%=FHo^Yv0ZlU`Tt1e4K*hFUa$sY<SZqZ7UIX4L_`NkP-Sdhza+Ym1iol
z)DB*^r`_a$_n4J8N<@nH8aOE{-nfogS6StG=P7n{f!<ZZGfn^i002ovPDHLkV1m58
BE`0z1

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_toast_warning.png b/app/src/main/res/drawable/ic_toast_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2d29c63380c41446831dbbdf084aa04516c5c6b
GIT binary patch
literal 681
zcmV;a0#^NrP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0zOGZK~#7F?U~C>
z!$1&*f7=pgmtbyOkdh9d14;-L@HiqKM&b-5qy$QU4x)q$x1@xeQDQS2oPd+{de%E@
zMZ(`{6_4WmXS_3>G0@TRzX{-p$t}+E07F{NvmEFBC%nT0UIdI%#NiSnS|-I$^DM$)
zKgArvgz!MPzy*FcuZY78m+*ji1jzddd4H<8q@vKLD9j*;cm$#)9x5)yhHH%xjex=X
z8^Q>u$En<b7L5RTcvxqX3r9grz~l~t95|`7Q#K!Iy&V@Z0kko;XER2mxQGZ)-bXoY
z){%_wWYVhhAubN?8|(xqM2eep1fqPWXmJrKZcY&}rOl)3DGuUfwf>sV@cDeGGjlF(
zP7yE_ruF8x*IUGq<AH80fV|(M%rk%^u4%Qg0D5#@A%shDYb2mS+BBk~Q2eJgjRe>f
zEt~&TeFQAA7BIeDZ9aiKNt3i{B|xQ3O1uO3f@+Fw6s!akX)}R8ta}Ew0Ofs&v{?t;
z<8pL^9@m~Nz(+S#d9MgBTw9iaNlGJ<7QDa4rns>LP@!RaM2c*|yJxL{rbSD=!0Fa(
z0`xdNgYj)tGoWgl+MdA}0nLD_ZEAal$_Q{qBqo^s00(2wP#FQ&w8`uTI2enYRzO=t
zi;LPzRa(^why=zS&RJ-Ss-9uz3={(@vAK;Ty0PR=1bn>fOQ9Qxl>|t4S{_Ko_elT#
zP!h1u-rw*uhuTnngaZ4Pu62TPRW1pjk8xLIFvGqQtUee%qNAguV{iBdz~{+ZV8gU(
P00000NkvXXu0mjf40R$p

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/shape_toast_error.xml b/app/src/main/res/drawable/shape_toast_error.xml
new file mode 100644
index 000000000..9b1145ecf
--- /dev/null
+++ b/app/src/main/res/drawable/shape_toast_error.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+            android:width="1dp"
+            android:color="#FCDFD9" />
+
+    <solid android:color="#FDEFEC" />
+
+    <padding
+            android:left="16dp"
+            android:top="16dp"
+            android:right="16dp"
+            android:bottom="16dp" />
+
+    <corners android:radius="12dp" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_toast_info.xml b/app/src/main/res/drawable/shape_toast_info.xml
new file mode 100644
index 000000000..527822924
--- /dev/null
+++ b/app/src/main/res/drawable/shape_toast_info.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+            android:width="1dp"
+            android:color="#D3EBFD" />
+
+    <solid android:color="#E7F4FE" />
+
+    <padding
+            android:left="16dp"
+            android:top="16dp"
+            android:right="16dp"
+            android:bottom="16dp" />
+
+    <corners android:radius="12dp" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_toast_success.xml b/app/src/main/res/drawable/shape_toast_success.xml
new file mode 100644
index 000000000..fad9fe3f4
--- /dev/null
+++ b/app/src/main/res/drawable/shape_toast_success.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+            android:width="1dp"
+            android:color="#D8EEDD" />
+
+    <solid android:color="#EAF6EC" />
+
+    <padding
+            android:left="16dp"
+            android:top="16dp"
+            android:right="16dp"
+            android:bottom="16dp" />
+
+    <corners android:radius="12dp" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_toast_warning.xml b/app/src/main/res/drawable/shape_toast_warning.xml
new file mode 100644
index 000000000..cec95cfc3
--- /dev/null
+++ b/app/src/main/res/drawable/shape_toast_warning.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+            android:width="1dp"
+            android:color="#FFE0A3" />
+
+    <solid android:color="#FFF3DB" />
+
+    <padding
+            android:left="16dp"
+            android:top="16dp"
+            android:right="16dp"
+            android:bottom="16dp" />
+
+    <corners android:radius="12dp" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/toast_layout.xml b/app/src/main/res/layout/toast_layout.xml
new file mode 100644
index 000000000..7d3f4dd84
--- /dev/null
+++ b/app/src/main/res/layout/toast_layout.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/toast_layout"
+        android:orientation="horizontal"
+        android:background="@drawable/shape_toast_info"
+        android:layout_width="342dp"
+        android:layout_height="60dp">
+
+    <ImageView
+            android:id="@+id/ic_toast"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@drawable/ic_toast_info"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginEnd="8dp" />
+
+    <TextView
+            android:id="@+id/toast_text"
+            style="@style/Body1"
+            android:textColor="@color/gray600"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="테스트" />
+
+</LinearLayout>
\ No newline at end of file

From 623ebc269a167bcb6b3b26f1353ef97c67f72733 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 18:34:20 +0900
Subject: [PATCH 12/41] =?UTF-8?q?feat:=20ToastUtil=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../util/{TimeUtil.kt.kt => TimeUtil.kt}      |  0
 .../android/presentation/util/ToastUtil.kt    | 77 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 rename app/src/main/java/com/eatssu/android/presentation/util/{TimeUtil.kt.kt => TimeUtil.kt} (100%)
 create mode 100644 app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/TimeUtil.kt.kt b/app/src/main/java/com/eatssu/android/presentation/util/TimeUtil.kt
similarity index 100%
rename from app/src/main/java/com/eatssu/android/presentation/util/TimeUtil.kt.kt
rename to app/src/main/java/com/eatssu/android/presentation/util/TimeUtil.kt
diff --git a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
new file mode 100644
index 000000000..ebcd8e503
--- /dev/null
+++ b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
@@ -0,0 +1,77 @@
+package com.eatssu.android.presentation.util
+
+import android.content.Context
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import android.widget.Toast
+import androidx.annotation.DrawableRes
+import com.eatssu.android.R
+
+enum class ToastType(@DrawableRes val iconId: Int, @DrawableRes val shapeId: Int) {
+    INFO(R.drawable.ic_toast_info, R.drawable.shape_toast_info),
+    SUCCESS(R.drawable.ic_toast_success, R.drawable.shape_toast_success),
+    WARNING(R.drawable.ic_toast_warning, R.drawable.shape_toast_warning),
+    ERROR(R.drawable.ic_toast_error, R.drawable.shape_toast_error)
+}
+
+enum class ToastLocation(val gravity: Int, val xOffset: Int, val yOffset: Int) {
+    BOTTOM_NAVIGATION(Gravity.BOTTOM, 0, 200),
+}
+
+fun Context.showToast(
+    message: String,
+    type: ToastType,
+    location: ToastLocation,
+    root: ViewGroup? = null,
+) {
+    val toast = Toast(this)
+    toast.setGravity(location.gravity, location.xOffset, location.yOffset)
+    toast.duration = Toast.LENGTH_SHORT
+
+    val inflater = LayoutInflater.from(this)
+    val layout = inflater.inflate(R.layout.toast_layout, root)
+
+    layout.findViewById<ImageView>(R.id.ic_toast).setImageResource(type.iconId)
+    layout.findViewById<LinearLayout>(R.id.toast_layout).setBackgroundResource(type.shapeId)
+    layout.findViewById<TextView>(R.id.toast_text).text = message
+
+    toast.view = layout
+    toast.show()
+}
+
+fun Context.showInfoToast(
+    message: String,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    showToast(message, ToastType.INFO, location, root)
+}
+
+fun Context.showSuccessToast(
+    message: String,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    showToast(message, ToastType.SUCCESS, location, root)
+}
+
+fun Context.showWarningToast(
+    message: String,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    showToast(message, ToastType.WARNING, location, root)
+}
+
+fun Context.showErrorToast(
+    message: String,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    showToast(message, ToastType.ERROR, location, root)
+}
+

From 4ffd26280a8e2e2aa74eb6b1612d7f761c5b9c00 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 18:54:36 +0900
Subject: [PATCH 13/41] =?UTF-8?q?feat:=20StringRes=EB=A1=9C=20=ED=86=A0?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B3=B4=EB=82=BC=20=EC=88=98=20=EC=9E=88?=
 =?UTF-8?q?=EA=B2=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/presentation/util/ToastUtil.kt    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
index ebcd8e503..581ac0f39 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
@@ -9,6 +9,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
 import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 import com.eatssu.android.R
 
 enum class ToastType(@DrawableRes val iconId: Int, @DrawableRes val shapeId: Int) {
@@ -51,6 +52,14 @@ fun Context.showInfoToast(
     showToast(message, ToastType.INFO, location, root)
 }
 
+fun Context.showInfoToast(
+    @StringRes messageId: Int,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    showToast(getString(messageId), ToastType.INFO, location, root)
+}
+
 fun Context.showSuccessToast(
     message: String,
     location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
@@ -59,6 +68,14 @@ fun Context.showSuccessToast(
     showToast(message, ToastType.SUCCESS, location, root)
 }
 
+fun Context.showSuccessToast(
+    @StringRes messageId: Int,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    showToast(getString(messageId), ToastType.SUCCESS, location, root)
+}
+
 fun Context.showWarningToast(
     message: String,
     location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
@@ -67,6 +84,14 @@ fun Context.showWarningToast(
     showToast(message, ToastType.WARNING, location, root)
 }
 
+fun Context.showWarningToast(
+    @StringRes messageId: Int,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    showToast(getString(messageId), ToastType.WARNING, location, root)
+}
+
 fun Context.showErrorToast(
     message: String,
     location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
@@ -75,3 +100,10 @@ fun Context.showErrorToast(
     showToast(message, ToastType.ERROR, location, root)
 }
 
+fun Context.showErrorToast(
+    @StringRes messageId: Int,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    showToast(getString(messageId), ToastType.ERROR, location, root)
+}
\ No newline at end of file

From 3cfe7bce5b8d060e74dd0a7bbc2926178841c775 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 18:54:44 +0900
Subject: [PATCH 14/41] =?UTF-8?q?feat:=20=ED=86=A0=ED=81=B0=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20Custom=20Toast=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/presentation/base/BaseActivity.kt  | 18 +++++++++---------
 app/src/main/res/values/strings.xml            |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/base/BaseActivity.kt b/app/src/main/java/com/eatssu/android/presentation/base/BaseActivity.kt
index 3f1760db6..de88f7d21 100644
--- a/app/src/main/java/com/eatssu/android/presentation/base/BaseActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/base/BaseActivity.kt
@@ -9,7 +9,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.TextView
-import android.widget.Toast
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
@@ -25,6 +24,7 @@ import com.eatssu.android.presentation.common.NetworkConnection
 import com.eatssu.android.presentation.common.VersionViewModel
 import com.eatssu.android.presentation.common.VersionViewModelFactory
 import com.eatssu.android.presentation.login.LoginActivity
+import com.eatssu.android.presentation.util.showInfoToast
 import com.eatssu.common.EventLogger
 import com.eatssu.common.enums.ScreenId
 import com.google.android.material.card.MaterialCardView
@@ -60,7 +60,7 @@ abstract class BaseActivity<B : ViewBinding>(
 
         toolbar = findViewById(R.id.toolbar)
         toolbarTitle = findViewById(R.id.toolbar_title)
-        backBtn =findViewById(R.id.mcv_setting)
+        backBtn = findViewById(R.id.mcv_setting)
 
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayShowTitleEnabled(false) // 툴바 기본 제목 비활성화
@@ -72,9 +72,12 @@ abstract class BaseActivity<B : ViewBinding>(
         networkCheck.register() // 네트워크 객체 등록
 
         firebaseRemoteConfigRepository = FirebaseRemoteConfigRepository()
-        versionViewModel = ViewModelProvider(this, VersionViewModelFactory(firebaseRemoteConfigRepository))[VersionViewModel::class.java]
+        versionViewModel = ViewModelProvider(
+            this,
+            VersionViewModelFactory(firebaseRemoteConfigRepository)
+        )[VersionViewModel::class.java]
 
-        if(versionViewModel.checkForceUpdate()){
+        if (versionViewModel.checkForceUpdate()) {
             showForceUpdateDialog()
         }
 
@@ -119,17 +122,14 @@ abstract class BaseActivity<B : ViewBinding>(
     private fun observeTokenExpiration() {
         lifecycleScope.launch {
             TokenEventBus.tokenExpired.collect {
-                Toast.makeText(this@BaseActivity,
-                    getString(R.string.token_expired), Toast.LENGTH_SHORT).show()
+                showInfoToast(R.string.token_expired)
                 navigateToLogin()
             }
         }
 
         lifecycleScope.launch {
             TokenEventBus.tokenServerError.collect {
-                Toast.makeText(this@BaseActivity,
-                    getString(R.string.token_server_error), Toast.LENGTH_SHORT)
-                    .show()
+                showInfoToast(R.string.token_server_error)
                 navigateToLogin()
             }
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4dcd4bdc5..dc342f488 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,7 +174,7 @@
     <string name="mypage">마이</string>
     <string name="mypage_full">마이페이지</string>
 
-    <string name="login_failed">로그인이 실패했습니다.\n</string>
+    <string name="login_failed">로그인이 실패했습니다.</string>
     <string name="token_expired">세션이 만료되었습니다. 다시 로그인 해주세요.</string>
     <string name="token_server_error">시스템 오류로 다시 로그인해주세요.</string>
 

From 0a5519f410364ceb940e339bdd143b897bc23977 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 19:08:14 +0900
Subject: [PATCH 15/41] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/eatssu/android/presentation/UiEvent.kt | 9 ++++++++-
 .../eatssu/android/presentation/login/LoginActivity.kt   | 3 ++-
 .../eatssu/android/presentation/login/LoginViewModel.kt  | 8 +++++++-
 app/src/main/res/values/strings.xml                      | 4 ++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/UiEvent.kt b/app/src/main/java/com/eatssu/android/presentation/UiEvent.kt
index 050b16ee6..895015f08 100644
--- a/app/src/main/java/com/eatssu/android/presentation/UiEvent.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/UiEvent.kt
@@ -1,10 +1,17 @@
 package com.eatssu.android.presentation
 
+import com.eatssu.android.presentation.util.ToastLocation
+import com.eatssu.android.presentation.util.ToastType
+
 
 /**
  * 각 Screen에 공통적인 이벤트 타입입니다.
  * 이벤트 타입을 추가하고 싶다면 UiEvent를 상속받아 사용하세요.
  */
 interface UiEvent {
-    data class ShowToast(val message: String) : UiEvent
+    data class ShowToast(
+        val message: String,
+        val type: ToastType,
+        val location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION
+    ) : UiEvent
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt b/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt
index 3abc4e64b..380a563ea 100644
--- a/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt
@@ -12,6 +12,7 @@ import com.eatssu.android.presentation.MainActivity
 import com.eatssu.android.presentation.UiEvent
 import com.eatssu.android.presentation.UiState
 import com.eatssu.android.presentation.base.BaseActivity
+import com.eatssu.android.presentation.util.showErrorToast
 import com.eatssu.android.presentation.util.showToast
 import com.eatssu.android.presentation.util.startActivity
 import com.eatssu.common.enums.ScreenId
@@ -85,7 +86,7 @@ class LoginActivity :
 
             else -> {
                 Timber.e(error, "Login failed")
-                showToast(getString(R.string.login_failed))
+                showErrorToast(R.string.login_failed)
             }
         }
     }
diff --git a/app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt
index d0753c817..90508c9ea 100644
--- a/app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt
@@ -12,6 +12,7 @@ import com.eatssu.android.domain.usecase.auth.SetRefreshTokenUseCase
 import com.eatssu.android.domain.usecase.user.SetUserEmailUseCase
 import com.eatssu.android.presentation.UiEvent
 import com.eatssu.android.presentation.UiState
+import com.eatssu.android.presentation.util.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
@@ -58,7 +59,12 @@ class LoginViewModel @Inject constructor(
 
             }.onFailure {
                 _uiState.value = UiState.Error
-                _uiEvent.emit(UiEvent.ShowToast(context.getString(R.string.login_failed)))
+                _uiEvent.emit(
+                    UiEvent.ShowToast(
+                        context.getString(R.string.login_failed),
+                        ToastType.ERROR
+                    )
+                )
             }
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dc342f488..c10d01c78 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,8 +174,8 @@
     <string name="mypage">마이</string>
     <string name="mypage_full">마이페이지</string>
 
-    <string name="login_failed">로그인이 실패했습니다.</string>
-    <string name="token_expired">세션이 만료되었습니다. 다시 로그인 해주세요.</string>
+    <string name="login_failed">로그인에 실패했어요.</string>
+    <string name="token_expired">세션이 만료되어 다시 로그인해주세요.</string>
     <string name="token_server_error">시스템 오류로 다시 로그인해주세요.</string>
 
     <string name="my_info">내 정보</string>

From 800f0fa0423a3850391c646f8e454fe035f200a8 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 19:16:16 +0900
Subject: [PATCH 16/41] =?UTF-8?q?feat:=20=EB=A9=94=EC=9D=B8=20=ED=86=A0?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/presentation/MainViewModel.kt     | 38 ++++++++-----------
 app/src/main/res/values/strings.xml           |  5 +--
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt
index fd73c8981..3e7ab5a4a 100644
--- a/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt
@@ -11,6 +11,7 @@ import com.eatssu.android.domain.usecase.auth.LogoutUseCase
 import com.eatssu.android.domain.usecase.user.GetUserCollegeDepartmentUseCase
 import com.eatssu.android.domain.usecase.user.GetUserNickNameUseCase
 import com.eatssu.android.domain.usecase.user.SetUserCollegeDepartmentUseCase
+import com.eatssu.android.presentation.util.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
@@ -61,28 +62,12 @@ class MainViewModel @Inject constructor(
             runCatching {
                 withContext(Dispatchers.IO) { getUserNickNameUseCase() }
             }.onSuccess { nickname ->
-                // 1) 닉네임 없음/기본 프리셋
-                if (nickname.isNullOrBlank() || nickname.startsWith("user-")) {
-                    _uiState.value = UiState.Success(MainState.NicknameNull)
-                    _uiEvent.emit(UiEvent.ShowToast(context.getString(R.string.set_nickname)))
-                    return@launch // ← 아래 분기 실행 막기
-                }
-
-                // 2) 정상 닉네임
                 _uiState.value = UiState.Success(MainState.NicknameExists(nickname))
-                _uiEvent.emit(
-                    UiEvent.ShowToast(
-                        String.format(
-                            context.getString(R.string.hello_user),
-                            nickname
-                        )
-                    )
-                )
             }.onFailure { e ->
                 _uiState.value = UiState.Error
                 _uiEvent.emit(
                     UiEvent.ShowToast(
-                            context.getString(R.string.not_found)
+                        context.getString(R.string.not_found), ToastType.ERROR
                     )
                 )
                 Timber.e(e)
@@ -94,7 +79,12 @@ class MainViewModel @Inject constructor(
         viewModelScope.launch {
             logoutUseCase()
             _uiState.value = UiState.Success(MainState.LoggedOut)
-            _uiEvent.emit(UiEvent.ShowToast("로그아웃 되었습니다."))
+            _uiEvent.emit(
+                UiEvent.ShowToast(
+                    context.getString(R.string.logout_success),
+                    ToastType.SUCCESS
+                )
+            )
         }
     }
 
@@ -122,14 +112,17 @@ class MainViewModel @Inject constructor(
                 _uiState.value = UiState.Success(
                     MainState.DepartmentState(
                         departmentName = department.departmentName,
-                        showUserDepartmentBottomSheet =
-                            (college.collegeId == -1 || department.departmentId == -1)
+                        showUserDepartmentBottomSheet = (college.collegeId == -1 || department.departmentId == -1)
                     )
                 )
             }.onFailure { e ->
                 Timber.e("getUserDepartment failed: ${e.message}")
                 _uiState.value = UiState.Error
-                _uiEvent.emit(UiEvent.ShowToast("정보를 불러올 수 없습니다."))
+                _uiEvent.emit(
+                    UiEvent.ShowToast(
+                        context.getString(R.string.not_found), ToastType.ERROR
+                    )
+                )
             }
         }
     }
@@ -141,7 +134,6 @@ sealed class MainState {
     data class NicknameExists(val nickname: String) : MainState()
     object LoggedOut : MainState()
     data class DepartmentState(
-        val departmentName: String = "",
-        val showUserDepartmentBottomSheet: Boolean = false
+        val departmentName: String = "", val showUserDepartmentBottomSheet: Boolean = false
     ) : MainState()
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c10d01c78..5564df69a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -94,8 +94,7 @@
     <string name="login_done">환영합니다!</string>
     <string name="login_for_service">서비스 이용을 위해 로그인 해주세요</string>
 
-    <string name="not_found">정보를 불러올 수 없습니다.</string>
-    <string name="hello_user">"%1$s님 반갑습니다!</string>
+    <string name="not_found">정보를 불러올 수 없어요.</string>
 
     <string name="nickname">닉네임</string>
     <string name="set_nickname">닉네임을 설정해주세요</string>
@@ -148,7 +147,7 @@
     <string name="inquiry_send_done">문의 전송이 완료되었습니다. 답변은 영업일 기준 2~3일 소요됩니다.</string>
     <string name="inquiry_send_not">문의 전송이 실패하였습니다. 다시 시도 해주세요.</string>
 
-    <string name="logout_description">로그아웃 되었습니다.</string>
+    <string name="logout_success">로그아웃했어요.</string>
     <string name="policy">개인정보 처리방침</string>
     <string name="terms">서비스 이용약관</string>
     <string name="contact">문의하기</string>

From 89c5f435588d1cab06cbf8698b6ba43d912a286b Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 19:34:09 +0900
Subject: [PATCH 17/41] =?UTF-8?q?chore:=20ContextUtil=20=EC=82=AD=EC=A0=9C?=
 =?UTF-8?q?,=20Fragment=EC=97=90=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20=ED=99=95?=
 =?UTF-8?q?=EC=9E=A5=20=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/presentation/util/ContextUtil.kt  | 19 -----
 .../android/presentation/util/ToastUtil.kt    | 74 +++++++++++++++++++
 2 files changed, 74 insertions(+), 19 deletions(-)
 delete mode 100644 app/src/main/java/com/eatssu/android/presentation/util/ContextUtil.kt

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/ContextUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/ContextUtil.kt
deleted file mode 100644
index 492a0fb37..000000000
--- a/app/src/main/java/com/eatssu/android/presentation/util/ContextUtil.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.eatssu.android.presentation.util
-
-import android.content.Context
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-
-// Activity
-fun Context.showToast(msg: String) {
-    if (msg.isNotEmpty()) {
-        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
-    }
-}
-
-// Fragment
-fun Fragment.showToast(msg: String) {
-    if (msg.isNotEmpty()) {
-        Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
index 581ac0f39..7a56cdbc7 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
@@ -10,6 +10,7 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
+import androidx.fragment.app.Fragment
 import com.eatssu.android.R
 
 enum class ToastType(@DrawableRes val iconId: Int, @DrawableRes val shapeId: Int) {
@@ -44,6 +45,15 @@ fun Context.showToast(
     toast.show()
 }
 
+fun Fragment.showToast(
+    message: String,
+    type: ToastType,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    requireContext().showToast(message, type, location, root)
+}
+
 fun Context.showInfoToast(
     message: String,
     location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
@@ -60,6 +70,22 @@ fun Context.showInfoToast(
     showToast(getString(messageId), ToastType.INFO, location, root)
 }
 
+fun Fragment.showInfoToast(
+    message: String,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    requireContext().showInfoToast(message, location, root)
+}
+
+fun Fragment.showInfoToast(
+    @StringRes messageId: Int,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    requireContext().showInfoToast(messageId, location, root)
+}
+
 fun Context.showSuccessToast(
     message: String,
     location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
@@ -76,6 +102,22 @@ fun Context.showSuccessToast(
     showToast(getString(messageId), ToastType.SUCCESS, location, root)
 }
 
+fun Fragment.showSuccessToast(
+    message: String,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    requireContext().showSuccessToast(message, location, root)
+}
+
+fun Fragment.showSuccessToast(
+    @StringRes messageId: Int,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    requireContext().showSuccessToast(messageId, location, root)
+}
+
 fun Context.showWarningToast(
     message: String,
     location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
@@ -92,6 +134,22 @@ fun Context.showWarningToast(
     showToast(getString(messageId), ToastType.WARNING, location, root)
 }
 
+fun Fragment.showWarningToast(
+    message: String,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    requireContext().showWarningToast(message, location, root)
+}
+
+fun Fragment.showWarningToast(
+    @StringRes messageId: Int,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    requireContext().showWarningToast(messageId, location, root)
+}
+
 fun Context.showErrorToast(
     message: String,
     location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
@@ -106,4 +164,20 @@ fun Context.showErrorToast(
     root: ViewGroup? = null,
 ) {
     showToast(getString(messageId), ToastType.ERROR, location, root)
+}
+
+fun Fragment.showErrorToast(
+    message: String,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    requireContext().showErrorToast(message, location, root)
+}
+
+fun Fragment.showErrorToast(
+    @StringRes messageId: Int,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
+    root: ViewGroup? = null,
+) {
+    requireContext().showErrorToast(messageId, location, root)
 }
\ No newline at end of file

From 19d383a6a1d1f660bbf857b0dab7d7c16c716269 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 19:34:17 +0900
Subject: [PATCH 18/41] =?UTF-8?q?feat:=20=EB=A7=88=EC=9D=B4=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/mypage/MyPageFragment.kt     | 12 ++++++-----
 .../presentation/mypage/MyPageViewModel.kt    | 21 ++++++++++++++++---
 app/src/main/res/values/strings.xml           |  7 +++++++
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
index 341df6a1b..487cb1464 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
@@ -28,6 +28,8 @@ import com.eatssu.android.presentation.mypage.myreview.MyReviewListActivity
 import com.eatssu.android.presentation.mypage.terms.WebViewActivity
 import com.eatssu.android.presentation.mypage.userinfo.UserInfoActivity
 import com.eatssu.android.presentation.util.showDialog
+import com.eatssu.android.presentation.util.showErrorToast
+import com.eatssu.android.presentation.util.showInfoToast
 import com.eatssu.android.presentation.util.showToast
 import com.eatssu.common.enums.ScreenId
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
@@ -72,7 +74,7 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(ScreenId.MYPAGE_MAIN)
                             }
 
                             is UiState.Error -> {
-                                showToast(getString(R.string.not_found))
+                                showErrorToast(R.string.not_found)
                             }
                         }
                     }
@@ -80,7 +82,7 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(ScreenId.MYPAGE_MAIN)
                 launch {
                     myPageViewModel.uiEvent.collectLatest { event ->
                         when (event) {
-                            is UiEvent.ShowToast -> showToast(event.message)
+                            is UiEvent.ShowToast -> showToast(event.message, event.type)
                             else -> Unit
                         }
                     }
@@ -116,7 +118,7 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(ScreenId.MYPAGE_MAIN)
         if (isChecked) {
             if (checkNotificationPermission(requireContext())) {
                 myPageViewModel.setNotificationOn()
-                showToast("EAT-SSU 알림 수신을 동의하였습니다.\n$formattedDate")
+                showInfoToast(getString(R.string.notification_enable, formattedDate))
             } else {
                 showNotificationPermissionDialog()
                 // 권한 미허용이면 스위치 원복
@@ -128,7 +130,7 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(ScreenId.MYPAGE_MAIN)
             }
         } else {
             myPageViewModel.setNotificationOff()
-            showToast("EAT-SSU 알림 수신을 거부하였습니다.\n$formattedDate")
+            showInfoToast(getString(R.string.notification_disable, formattedDate))
         }
     }
 
@@ -223,7 +225,7 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(ScreenId.MYPAGE_MAIN)
         try {
             startActivity(Intent(requireContext(), OssLicensesMenuActivity::class.java))
         } catch (e: Exception) {
-            showToast("오픈소스 라이브러리를 불러올 수 없습니다.")
+            showErrorToast(getString(R.string.oss_load_fail))
             Timber.e("Error opening OSS Licenses: ${e.message}")
         }
     }
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt
index a2264abfb..1458ddbd2 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt
@@ -1,15 +1,19 @@
 package com.eatssu.android.presentation.mypage
 
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.eatssu.android.BuildConfig
+import com.eatssu.android.R
 import com.eatssu.android.data.repository.PreferencesRepository
 import com.eatssu.android.domain.usecase.alarm.AlarmUseCase
 import com.eatssu.android.domain.usecase.alarm.SetDailyNotificationStatusUseCase
 import com.eatssu.android.domain.usecase.user.GetUserNickNameUseCase
 import com.eatssu.android.presentation.UiEvent
 import com.eatssu.android.presentation.UiState
+import com.eatssu.android.presentation.util.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -27,6 +31,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class MyPageViewModel @Inject constructor(
+    @ApplicationContext private val context: Context,
     private val getUserNickNameUseCase: GetUserNickNameUseCase,
     private val setNotificationStatusUseCase: SetDailyNotificationStatusUseCase,
     private val alarmUseCase: AlarmUseCase,
@@ -68,16 +73,26 @@ class MyPageViewModel @Inject constructor(
             runCatching {
                 withContext(Dispatchers.IO) { getUserNickNameUseCase() }
             }.onSuccess { nickname ->
-                if (nickname.isNullOrBlank() || nickname.startsWith("user-")) {
+                if (nickname.isBlank()) {
                     _state.update { it.copy(nickname = null) }
-                    _uiEvent.emit(UiEvent.ShowToast("닉네임을 설정해주세요."))
+                    _uiEvent.emit(
+                        UiEvent.ShowToast(
+                            context.getString(R.string.require_nickname),
+                            ToastType.INFO
+                        )
+                    )
                 } else {
                     _state.update { it.copy(nickname = nickname) }
                 }
             }.onFailure { e ->
                 // 에러 화면을 꼭 별도로 보여주고 싶다면 uiState를 에러로 전환하는 방식 선택
                 // 여기서는 '상태 유지 + 토스트'만 처리
-                _uiEvent.emit(UiEvent.ShowToast("정보를 불러올 수 없습니다."))
+                _uiEvent.emit(
+                    UiEvent.ShowToast(
+                        context.getString(R.string.not_found),
+                        ToastType.ERROR
+                    )
+                )
                 Timber.e(e)
             }
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5564df69a..1571669a4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -191,4 +191,11 @@
 
     <string name="cancel">취소</string>
     <string name="confirm">확인</string>
+
+    <string name="require_nickname">닉네임을 설정해주세요.</string>
+
+    <string name="notification_enable">EAT-SSU 수신 동의 (%1$s)</string>
+    <string name="notification_disable">EAT-SSU 수신 거절 (%1$s)</string>
+
+    <string name="oss_load_fail">오픈소스 라이브러리를 불러올 수 없어요.</string>
 </resources>
\ No newline at end of file

From bd145e3e382f25ce176466d2d8c206e4952d20aa Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 19:49:30 +0900
Subject: [PATCH 19/41] =?UTF-8?q?feat:=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20string=20=EC=9D=B4=EB=A6=84=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD,=20=ED=86=A0=ED=81=B0=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/presentation/MainViewModel.kt     |  2 +-
 .../android/presentation/base/BaseActivity.kt |  4 +-
 .../presentation/intro/IntroActivity.kt       |  2 +-
 .../presentation/intro/IntroViewModel.kt      | 53 +++++++++++--------
 .../presentation/login/LoginActivity.kt       |  2 +-
 .../presentation/login/LoginViewModel.kt      |  2 +-
 .../presentation/mypage/MyPageFragment.kt     |  6 +--
 .../presentation/mypage/MyPageViewModel.kt    |  2 +-
 .../android/presentation/util/ToastUtil.kt    |  2 +-
 app/src/main/res/values/strings.xml           | 19 ++++---
 10 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt
index 3e7ab5a4a..c1e0152d8 100644
--- a/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt
@@ -81,7 +81,7 @@ class MainViewModel @Inject constructor(
             _uiState.value = UiState.Success(MainState.LoggedOut)
             _uiEvent.emit(
                 UiEvent.ShowToast(
-                    context.getString(R.string.logout_success),
+                    context.getString(R.string.toast_logout_success),
                     ToastType.SUCCESS
                 )
             )
diff --git a/app/src/main/java/com/eatssu/android/presentation/base/BaseActivity.kt b/app/src/main/java/com/eatssu/android/presentation/base/BaseActivity.kt
index de88f7d21..fa4efff5d 100644
--- a/app/src/main/java/com/eatssu/android/presentation/base/BaseActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/base/BaseActivity.kt
@@ -122,14 +122,14 @@ abstract class BaseActivity<B : ViewBinding>(
     private fun observeTokenExpiration() {
         lifecycleScope.launch {
             TokenEventBus.tokenExpired.collect {
-                showInfoToast(R.string.token_expired)
+                showInfoToast(R.string.toast_token_expired)
                 navigateToLogin()
             }
         }
 
         lifecycleScope.launch {
             TokenEventBus.tokenServerError.collect {
-                showInfoToast(R.string.token_server_error)
+                showInfoToast(R.string.toast_token_server_error)
                 navigateToLogin()
             }
         }
diff --git a/app/src/main/java/com/eatssu/android/presentation/intro/IntroActivity.kt b/app/src/main/java/com/eatssu/android/presentation/intro/IntroActivity.kt
index e4d40fc4f..78a5df8b0 100644
--- a/app/src/main/java/com/eatssu/android/presentation/intro/IntroActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/intro/IntroActivity.kt
@@ -54,7 +54,7 @@ class IntroActivity : AppCompatActivity() {
                 when (event) {
                     is UiEvent.ShowToast -> {
                         // 에러 메시지 표시
-                        showToast(event.message)
+                        showToast(event.message, event.type)
                     }
                 }
             }
diff --git a/app/src/main/java/com/eatssu/android/presentation/intro/IntroViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/intro/IntroViewModel.kt
index f23d63b2b..8c1724125 100644
--- a/app/src/main/java/com/eatssu/android/presentation/intro/IntroViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/intro/IntroViewModel.kt
@@ -1,12 +1,19 @@
 package com.eatssu.android.presentation.intro
 
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.eatssu.android.R
+import com.eatssu.android.R.string.toast_token_invalid
 import com.eatssu.android.domain.usecase.auth.GetAccessTokenUseCase
 import com.eatssu.android.domain.usecase.auth.GetIsAccessTokenValidUseCase
 import com.eatssu.android.presentation.UiEvent
+import com.eatssu.android.presentation.UiEvent.ShowToast
 import com.eatssu.android.presentation.UiState
+import com.eatssu.android.presentation.UiState.Success
+import com.eatssu.android.presentation.util.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
@@ -17,6 +24,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class IntroViewModel @Inject constructor(
+    @ApplicationContext private val context: Context,
     private val getAccessTokenUseCase: GetAccessTokenUseCase,
     private val getIsAccessTokenValidUseCase: GetIsAccessTokenValidUseCase
 ) : ViewModel() {
@@ -33,36 +41,39 @@ class IntroViewModel @Inject constructor(
 
     private fun autoLogin() {
         viewModelScope.launch {
-            val userAccessToken = getAccessTokenUseCase()
-
             _uiState.value = UiState.Loading
-            try {
-                // 토큰 존재 여부 확인
-                if (userAccessToken.isEmpty()) {
-                    _uiState.value = UiState.Error
-                    _uiEvent.emit(UiEvent.ShowToast("로그인이 필요합니다"))
-                    return@launch
-                } else {
-                    checkValid(userAccessToken)
-                }
 
-            } catch (e: Exception) {
+            // 토큰 존재 여부 확인
+            val accessToken = getAccessTokenUseCase()
+            if (accessToken.isEmpty()) {
                 _uiState.value = UiState.Error
-                _uiEvent.emit(UiEvent.ShowToast("오류가 발생했습니다: ${e.message}"))
+                _uiEvent.emit(
+                    UiEvent.ShowToast(
+                        context.getString(R.string.toast_token_invalid),
+                        ToastType.INFO
+                    )
+                )
+                return@launch
             }
-        }
-    }
 
-    private fun checkValid(userAccessToken: String) {
-        viewModelScope.launch {
-            if (getIsAccessTokenValidUseCase(userAccessToken)) { //토큰이 있고 유효함
-                _uiState.value = UiState.Success(IntroState.ValidToken)
-            } else { //토큰이 있어도 유효하지 않음
+            // 엑세스 토큰 유효 여부 확인
+            if (!getIsAccessTokenValidUseCase(accessToken)) {
+                // 토큰이 있어도 유효하지 않음
                 _uiState.value = UiState.Error
-                _uiEvent.emit(UiEvent.ShowToast("로그인이 필요합니다"))
+                _uiEvent.emit(
+                    ShowToast(
+                        context.getString(toast_token_invalid),
+                        ToastType.INFO
+                    )
+                )
+                return@launch
             }
+
+            //토큰이 있고 유효함
+            _uiState.value = Success(IntroState.ValidToken)
         }
     }
+
 }
 
 sealed class IntroState {
diff --git a/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt b/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt
index 380a563ea..b977fb68d 100644
--- a/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt
@@ -86,7 +86,7 @@ class LoginActivity :
 
             else -> {
                 Timber.e(error, "Login failed")
-                showErrorToast(R.string.login_failed)
+                showErrorToast(R.string.toast_login_failed)
             }
         }
     }
diff --git a/app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt
index 90508c9ea..f214014cd 100644
--- a/app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt
@@ -61,7 +61,7 @@ class LoginViewModel @Inject constructor(
                 _uiState.value = UiState.Error
                 _uiEvent.emit(
                     UiEvent.ShowToast(
-                        context.getString(R.string.login_failed),
+                        context.getString(R.string.toast_login_failed),
                         ToastType.ERROR
                     )
                 )
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
index 487cb1464..40ba9b5a6 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
@@ -118,7 +118,7 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(ScreenId.MYPAGE_MAIN)
         if (isChecked) {
             if (checkNotificationPermission(requireContext())) {
                 myPageViewModel.setNotificationOn()
-                showInfoToast(getString(R.string.notification_enable, formattedDate))
+                showInfoToast(getString(R.string.toast_notification_enable, formattedDate))
             } else {
                 showNotificationPermissionDialog()
                 // 권한 미허용이면 스위치 원복
@@ -130,7 +130,7 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(ScreenId.MYPAGE_MAIN)
             }
         } else {
             myPageViewModel.setNotificationOff()
-            showInfoToast(getString(R.string.notification_disable, formattedDate))
+            showInfoToast(getString(R.string.toast_notification_disable, formattedDate))
         }
     }
 
@@ -225,7 +225,7 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(ScreenId.MYPAGE_MAIN)
         try {
             startActivity(Intent(requireContext(), OssLicensesMenuActivity::class.java))
         } catch (e: Exception) {
-            showErrorToast(getString(R.string.oss_load_fail))
+            showErrorToast(getString(R.string.toast_oss_load_fail))
             Timber.e("Error opening OSS Licenses: ${e.message}")
         }
     }
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt
index 1458ddbd2..c5a67195f 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt
@@ -77,7 +77,7 @@ class MyPageViewModel @Inject constructor(
                     _state.update { it.copy(nickname = null) }
                     _uiEvent.emit(
                         UiEvent.ShowToast(
-                            context.getString(R.string.require_nickname),
+                            context.getString(R.string.toast_require_nickname),
                             ToastType.INFO
                         )
                     )
diff --git a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
index 7a56cdbc7..fea591c07 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
@@ -27,7 +27,7 @@ enum class ToastLocation(val gravity: Int, val xOffset: Int, val yOffset: Int) {
 fun Context.showToast(
     message: String,
     type: ToastType,
-    location: ToastLocation,
+    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
     val toast = Toast(this)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1571669a4..21211de20 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -147,7 +147,6 @@
     <string name="inquiry_send_done">문의 전송이 완료되었습니다. 답변은 영업일 기준 2~3일 소요됩니다.</string>
     <string name="inquiry_send_not">문의 전송이 실패하였습니다. 다시 시도 해주세요.</string>
 
-    <string name="logout_success">로그아웃했어요.</string>
     <string name="policy">개인정보 처리방침</string>
     <string name="terms">서비스 이용약관</string>
     <string name="contact">문의하기</string>
@@ -173,10 +172,6 @@
     <string name="mypage">마이</string>
     <string name="mypage_full">마이페이지</string>
 
-    <string name="login_failed">로그인에 실패했어요.</string>
-    <string name="token_expired">세션이 만료되어 다시 로그인해주세요.</string>
-    <string name="token_server_error">시스템 오류로 다시 로그인해주세요.</string>
-
     <string name="my_info">내 정보</string>
     <string name="save">저장하기</string>
     <string name="inpur_department">학과 입력하기</string>
@@ -192,10 +187,14 @@
     <string name="cancel">취소</string>
     <string name="confirm">확인</string>
 
-    <string name="require_nickname">닉네임을 설정해주세요.</string>
-
-    <string name="notification_enable">EAT-SSU 수신 동의 (%1$s)</string>
-    <string name="notification_disable">EAT-SSU 수신 거절 (%1$s)</string>
+    <string name="toast_login_failed">로그인에 실패했어요.</string>
+    <string name="toast_token_invalid">다시 로그인해주세요.</string>
+    <string name="toast_token_expired">세션이 만료되어 다시 로그인해주세요.</string>
+    <string name="toast_token_server_error">시스템 오류로 다시 로그인해주세요.</string>
+    <string name="toast_logout_success">로그아웃했어요.</string>
 
-    <string name="oss_load_fail">오픈소스 라이브러리를 불러올 수 없어요.</string>
+    <string name="toast_require_nickname">닉네임을 설정해주세요.</string>
+    <string name="toast_notification_enable">EAT-SSU 수신 동의 (%1$s)</string>
+    <string name="toast_notification_disable">EAT-SSU 수신 거절 (%1$s)</string>
+    <string name="toast_oss_load_fail">오픈소스 라이브러리를 불러올 수 없어요.</string>
 </resources>
\ No newline at end of file

From e8c3c627c5a0ee4f4ae1e0a6c3a67c36f54c9b52 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 19:54:50 +0900
Subject: [PATCH 20/41] =?UTF-8?q?feat:=20=EC=A0=9C=ED=9C=B4=EC=A7=80?=
 =?UTF-8?q?=EB=8F=84=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/presentation/map/MapViewModel.kt  | 21 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  3 +++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/map/MapViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/map/MapViewModel.kt
index 0bb797c4c..c02ff0a30 100644
--- a/app/src/main/java/com/eatssu/android/presentation/map/MapViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/map/MapViewModel.kt
@@ -1,22 +1,24 @@
 package com.eatssu.android.presentation.map
 
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.eatssu.android.R
 import com.eatssu.android.domain.model.Partnership
 import com.eatssu.android.domain.model.PartnershipRestaurant
 import com.eatssu.android.domain.repository.PartnershipRepository
 import com.eatssu.android.domain.usecase.user.GetPartnershipDetailUseCase
-import com.eatssu.android.domain.usecase.user.GetUserCollegeDepartmentUseCase
 import com.eatssu.android.presentation.UiEvent
 import com.eatssu.android.presentation.UiState
 import com.eatssu.android.presentation.map.model.RestaurantInfo
+import com.eatssu.android.presentation.util.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@@ -34,6 +36,7 @@ data class MapState(
 
 @HiltViewModel
 class MapViewModel @Inject constructor(
+    @ApplicationContext private val context: Context,
     private val partnershipRepository: PartnershipRepository,
     private val getPartnershipDetailUseCase: GetPartnershipDetailUseCase,
 ) : ViewModel() {
@@ -60,7 +63,12 @@ class MapViewModel @Inject constructor(
                 .onFailure {
                     Timber.e(it, "제휴 정보 로딩 실패")
                     _uiState.value = UiState.Error
-                    _uiEvent.emit(UiEvent.ShowToast("제휴 정보를 불러오지 못했습니다."))
+                    _uiEvent.emit(
+                        UiEvent.ShowToast(
+                            context.getString(R.string.toast_map_partnership_load_fail),
+                            ToastType.ERROR
+                        )
+                    )
                 }
         }
     }
@@ -78,7 +86,12 @@ class MapViewModel @Inject constructor(
                 .onFailure {
                     Timber.e(it, "사용자 단과대 제휴 정보 로딩 실패")
                     _uiState.value = UiState.Error
-                    _uiEvent.emit(UiEvent.ShowToast("내 단과대 제휴 정보를 불러오지 못했습니다."))
+                    _uiEvent.emit(
+                        UiEvent.ShowToast(
+                            context.getString(R.string.toast_map_departure_load_fail),
+                            ToastType.ERROR
+                        )
+                    )
                 }
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 21211de20..a8a7078fa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -197,4 +197,7 @@
     <string name="toast_notification_enable">EAT-SSU 수신 동의 (%1$s)</string>
     <string name="toast_notification_disable">EAT-SSU 수신 거절 (%1$s)</string>
     <string name="toast_oss_load_fail">오픈소스 라이브러리를 불러올 수 없어요.</string>
+
+    <string name="toast_map_partnership_load_fail">제휴 정보를 불러오지 못했어요.</string>
+    <string name="toast_map_departure_load_fail">내 제휴 정보를 불러오지 못했어요.</string>
 </resources>
\ No newline at end of file

From 53e9335458c0be1fcae28c9421f967190e40e495 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 20:02:20 +0900
Subject: [PATCH 21/41] =?UTF-8?q?chore:=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=A7=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/intro/IntroViewModel.kt      | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/intro/IntroViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/intro/IntroViewModel.kt
index 8c1724125..50272202f 100644
--- a/app/src/main/java/com/eatssu/android/presentation/intro/IntroViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/intro/IntroViewModel.kt
@@ -4,13 +4,10 @@ import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.eatssu.android.R
-import com.eatssu.android.R.string.toast_token_invalid
 import com.eatssu.android.domain.usecase.auth.GetAccessTokenUseCase
 import com.eatssu.android.domain.usecase.auth.GetIsAccessTokenValidUseCase
 import com.eatssu.android.presentation.UiEvent
-import com.eatssu.android.presentation.UiEvent.ShowToast
 import com.eatssu.android.presentation.UiState
-import com.eatssu.android.presentation.UiState.Success
 import com.eatssu.android.presentation.util.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -41,39 +38,45 @@ class IntroViewModel @Inject constructor(
 
     private fun autoLogin() {
         viewModelScope.launch {
+            val userAccessToken = getAccessTokenUseCase()
+
             _uiState.value = UiState.Loading
+            try {
+                // 토큰 존재 여부 확인
+                if (userAccessToken.isEmpty()) {
+                    _uiState.value = UiState.Error
+                    _uiEvent.emit(
+                        UiEvent.ShowToast(
+                            context.getString(R.string.toast_token_invalid),
+                            ToastType.INFO
+                        )
+                    )
+                    return@launch
+                }
 
-            // 토큰 존재 여부 확인
-            val accessToken = getAccessTokenUseCase()
-            if (accessToken.isEmpty()) {
+                checkValid(userAccessToken)
+            } catch (e: Exception) {
                 _uiState.value = UiState.Error
-                _uiEvent.emit(
-                    UiEvent.ShowToast(
-                        context.getString(R.string.toast_token_invalid),
-                        ToastType.INFO
-                    )
-                )
-                return@launch
+                _uiEvent.emit(UiEvent.ShowToast("오류가 발생했습니다: ${e.message}", ToastType.ERROR))
             }
+        }
+    }
 
-            // 엑세스 토큰 유효 여부 확인
-            if (!getIsAccessTokenValidUseCase(accessToken)) {
-                // 토큰이 있어도 유효하지 않음
+    private fun checkValid(userAccessToken: String) {
+        viewModelScope.launch {
+            if (getIsAccessTokenValidUseCase(userAccessToken)) { //토큰이 있고 유효함
+                _uiState.value = UiState.Success(IntroState.ValidToken)
+            } else { //토큰이 있어도 유효하지 않음
                 _uiState.value = UiState.Error
                 _uiEvent.emit(
-                    ShowToast(
-                        context.getString(toast_token_invalid),
+                    UiEvent.ShowToast(
+                        context.getString(R.string.toast_token_invalid),
                         ToastType.INFO
                     )
                 )
-                return@launch
             }
-
-            //토큰이 있고 유효함
-            _uiState.value = Success(IntroState.ValidToken)
         }
     }
-
 }
 
 sealed class IntroState {

From 93619ef407c336305772ef856796c57412b43313 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Thu, 16 Oct 2025 20:13:56 +0900
Subject: [PATCH 22/41] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=ED=83=88?=
 =?UTF-8?q?=ED=87=B4=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/login/LoginActivity.kt       |  2 +-
 .../presentation/mypage/SignOutViewModel.kt   | 21 ++++++++++++++++---
 app/src/main/res/values/strings.xml           |  3 +++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt b/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt
index b977fb68d..ab164a966 100644
--- a/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt
@@ -115,7 +115,7 @@ class LoginActivity :
             repeatOnLifecycle(Lifecycle.State.STARTED) {
                 loginViewModel.uiEvent.collect { event ->
                     when (event) {
-                        is UiEvent.ShowToast -> showToast(event.message)
+                        is UiEvent.ShowToast -> showToast(event.message, event.type)
                     }
                 }
             }
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt
index e4ab459e3..4d029e7e4 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt
@@ -1,12 +1,16 @@
 package com.eatssu.android.presentation.mypage
 
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.eatssu.android.R
 import com.eatssu.android.domain.usecase.auth.LogoutUseCase
 import com.eatssu.android.domain.usecase.auth.SignOutUseCase
 import com.eatssu.android.presentation.UiEvent
 import com.eatssu.android.presentation.UiState
+import com.eatssu.android.presentation.util.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
@@ -17,6 +21,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class SignOutViewModel @Inject constructor(
+    @ApplicationContext private val context: Context,
     private val logoutUseCase: LogoutUseCase,
     private val signOutUseCase: SignOutUseCase,
 ) : ViewModel() {
@@ -34,15 +39,25 @@ class SignOutViewModel @Inject constructor(
                 val isSignOut = signOutUseCase()
                 if (isSignOut) {
                     _uiState.value = UiState.Success(SignOutState(isSignOuted = true))
-                    _uiEvent.emit(UiEvent.ShowToast("탈퇴가 완료되었습니다."))
+                    _uiEvent.emit(
+                        UiEvent.ShowToast(
+                            context.getString(R.string.toast_sign_out_success),
+                            ToastType.SUCCESS
+                        )
+                    )
                     logoutUseCase() // 자동 로그인 정보 삭제
                 } else {
                     _uiState.value = UiState.Error
-                    _uiEvent.emit(UiEvent.ShowToast("탈퇴에 실패했습니다."))
+                    _uiEvent.emit(
+                        UiEvent.ShowToast(
+                            context.getString(R.string.toast_sign_out_success),
+                            ToastType.ERROR
+                        )
+                    )
                 }
             } catch (e: Exception) {
                 _uiState.value = UiState.Error
-                _uiEvent.emit(UiEvent.ShowToast("오류가 발생했습니다. $e"))
+                _uiEvent.emit(UiEvent.ShowToast("오류가 발생했습니다. $e", ToastType.ERROR))
             }
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a8a7078fa..edc1141e0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -200,4 +200,7 @@
 
     <string name="toast_map_partnership_load_fail">제휴 정보를 불러오지 못했어요.</string>
     <string name="toast_map_departure_load_fail">내 제휴 정보를 불러오지 못했어요.</string>
+
+    <string name="toast_sign_out_success">회원탈퇴되었어요.</string>
+    <string name="toast_sign_out_fail">회원탈퇴에 실패했어요.</string>
 </resources>
\ No newline at end of file

From f08a0362cbd8ffc612d995f7a90aa6880b586807 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Mon, 24 Nov 2025 16:39:05 +0900
Subject: [PATCH 23/41] =?UTF-8?q?fix:=20=ED=99=98=EC=98=81=20=EB=A9=94?=
 =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/presentation/MainViewModel.kt     | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt
index 224620875..0617deb42 100644
--- a/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt
@@ -74,15 +74,6 @@ class MainViewModel @Inject constructor(
 
             // 2) 정상 닉네임
             _uiState.value = UiState.Success(MainState.NicknameExists(nickname))
-            _uiEvent.emit(
-                UiEvent.ShowToast(
-                    String.format(
-                        context.getString(R.string.hello_user),
-                        nickname
-                    ),
-                     ToastType.ERROR
-                )
-            )
         }
     }
 
@@ -92,8 +83,7 @@ class MainViewModel @Inject constructor(
             _uiState.value = UiState.Success(MainState.LoggedOut)
             _uiEvent.emit(
                 UiEvent.ShowToast(
-                    context.getString(R.string.toast_logout_success),
-                    ToastType.SUCCESS
+                    context.getString(R.string.toast_logout_success), ToastType.SUCCESS
                 )
             )
         }
@@ -115,7 +105,12 @@ class MainViewModel @Inject constructor(
         viewModelScope.launch {
             val (college, department) = userRepository.getUserCollegeDepartment() ?: run {
                 _uiState.value = UiState.Error
-                _uiEvent.emit(UiEvent.ShowToast(context.getString(R.string.not_found), ToastType.ERROR))
+                _uiEvent.emit(
+                    UiEvent.ShowToast(
+                        context.getString(R.string.not_found),
+                        ToastType.ERROR
+                    )
+                )
                 return@launch
             }
 

From 688e65ee9f3ce9713f33453b5f2abfee2d92e6e8 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Mon, 24 Nov 2025 16:39:55 +0900
Subject: [PATCH 24/41] =?UTF-8?q?refactor:=20=EA=B8=B0=EC=A1=B4=20Toast=20?=
 =?UTF-8?q?=ED=98=B8=EC=B6=9C=20=EC=BD=94=EB=93=9C=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/eatssu/android/presentation/MainActivity.kt  | 4 ++--
 .../cafeteria/review/write/ReviewWriteRateActivity.kt     | 2 +-
 .../cafeteria/review/write/ReviewWriteViewModel.kt        | 7 ++++---
 .../eatssu/android/presentation/intro/IntroActivity.kt    | 2 +-
 .../eatssu/android/presentation/login/LoginActivity.kt    | 2 +-
 .../eatssu/android/presentation/mypage/MyPageFragment.kt  | 3 +--
 .../eatssu/android/presentation/mypage/SignOutActivity.kt | 4 +---
 .../android/presentation/mypage/SignOutViewModel.kt       | 8 ++++++--
 .../presentation/mypage/userinfo/UserInfoActivity.kt      | 2 +-
 .../presentation/mypage/userinfo/UserInfoViewModel.kt     | 5 +++--
 .../com/eatssu/android/presentation/util/ToastUtil.kt     | 7 +++++++
 11 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/MainActivity.kt b/app/src/main/java/com/eatssu/android/presentation/MainActivity.kt
index d5fab44bf..8feeb254a 100644
--- a/app/src/main/java/com/eatssu/android/presentation/MainActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/MainActivity.kt
@@ -169,8 +169,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(
     private fun collectUiEvents() {
         lifecycleScope.launch {
             mainViewModel.uiEvent.collectLatest { event ->
-                if (event is UiEvent.ShowToast) {
-                    showToast(event.message)
+                when (event) {
+                    is UiEvent.ShowToast -> showToast(event)
                 }
             }
         }
diff --git a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/ReviewWriteRateActivity.kt b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/ReviewWriteRateActivity.kt
index 53dc53a0b..f260c4f62 100644
--- a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/ReviewWriteRateActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/ReviewWriteRateActivity.kt
@@ -122,7 +122,7 @@ class ReviewWriteRateActivity :
             repeatOnLifecycle(Lifecycle.State.STARTED) {
                 viewModel.uiEvent.collect { event ->
                     when (event) {
-                        is UiEvent.ShowToast -> showToast(event.message)
+                        is UiEvent.ShowToast -> showToast(event)
                     }
                 }
             }
diff --git a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/ReviewWriteViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/ReviewWriteViewModel.kt
index 9b888a6cd..4a6d8a494 100644
--- a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/ReviewWriteViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/ReviewWriteViewModel.kt
@@ -7,6 +7,7 @@ import com.eatssu.android.domain.usecase.review.GetImageUrlUseCase
 import com.eatssu.android.domain.usecase.review.WriteReviewUseCase
 import com.eatssu.android.presentation.UiEvent
 import com.eatssu.android.presentation.UiState
+import com.eatssu.android.presentation.util.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -36,12 +37,12 @@ class UploadReviewViewModel @Inject constructor(
 
             if (!success) {
                 _uiState.value = UiState.Error
-                _uiEvent.emit(UiEvent.ShowToast("리뷰 작성에 실패하였습니다."))
+                _uiEvent.emit(UiEvent.ShowToast("리뷰 작성에 실패하였습니다.", ToastType.ERROR))
                 return@launch
             }
 
             _uiState.value = UiState.Success(Unit)
-            _uiEvent.emit(UiEvent.ShowToast("리뷰가 작성되었습니다."))
+            _uiEvent.emit(UiEvent.ShowToast("리뷰가 작성되었습니다.", ToastType.INFO))
         }
     }
 
@@ -51,7 +52,7 @@ class UploadReviewViewModel @Inject constructor(
 
         if (url == null) {
             _uiState.value = UiState.Error
-            _uiEvent.emit(UiEvent.ShowToast("이미지 업로드에 실패하였습니다."))
+            _uiEvent.emit(UiEvent.ShowToast("이미지 업로드에 실패하였습니다.", ToastType.ERROR))
             return null
         }
 
diff --git a/app/src/main/java/com/eatssu/android/presentation/intro/IntroActivity.kt b/app/src/main/java/com/eatssu/android/presentation/intro/IntroActivity.kt
index 0f82fe70e..b8dd04b5f 100644
--- a/app/src/main/java/com/eatssu/android/presentation/intro/IntroActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/intro/IntroActivity.kt
@@ -64,7 +64,7 @@ class IntroActivity : AppCompatActivity() {
                 when (event) {
                     is UiEvent.ShowToast -> {
                         // 에러 메시지 표시
-                        showToast(event.message, event.type)
+                        showToast(event)
                     }
                 }
             }
diff --git a/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt b/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt
index 5f5c17139..177cd79d7 100644
--- a/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt
@@ -116,7 +116,7 @@ class LoginActivity :
             repeatOnLifecycle(Lifecycle.State.STARTED) {
                 loginViewModel.uiEvent.collect { event ->
                     when (event) {
-                        is UiEvent.ShowToast -> showToast(event.message, event.type)
+                        is UiEvent.ShowToast -> showToast(event)
                     }
                 }
             }
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
index 55b276c17..5c864c703 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
@@ -82,8 +82,7 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(ScreenId.MYPAGE_MAIN)
                 launch {
                     myPageViewModel.uiEvent.collectLatest { event ->
                         when (event) {
-                            is UiEvent.ShowToast -> showToast(event.message, event.type)
-                            else -> Unit
+                            is UiEvent.ShowToast -> showToast(event)
                         }
                     }
                 }
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutActivity.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutActivity.kt
index 987327616..bb6722409 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutActivity.kt
@@ -72,9 +72,7 @@ class SignOutActivity :
         lifecycleScope.launch {
             signOutViewModel.uiEvent.collectLatest { event ->
                 when (event) {
-                    is UiEvent.ShowToast -> {
-                        showToast(event.message)
-                    }
+                    is UiEvent.ShowToast -> showToast(event)
                 }
             }
         }
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt
index f5c977d78..3d48c54b7 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt
@@ -44,8 +44,12 @@ class SignOutViewModel @Inject constructor(
             }
 
             _uiState.value = UiState.Success(SignOutState(isSignOuted = true))
-            _uiEvent.emit(UiEvent.ShowToast(context.getString(R.string.toast_sign_out_success),
-                            ToastType.SUCCESS))
+            _uiEvent.emit(
+                UiEvent.ShowToast(
+                    context.getString(R.string.toast_sign_out_success),
+                    ToastType.SUCCESS
+                )
+            )
             logoutUseCase() // 자동 로그인 정보 삭제
         }
     }
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoActivity.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoActivity.kt
index 2e616daf1..2a43d7494 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoActivity.kt
@@ -92,7 +92,7 @@ class UserInfoActivity :
         lifecycleScope.launch {
             viewModel.uiEvent.collectLatest { event ->
                 when (event) {
-                    is UiEvent.ShowToast -> showToast(event.message)
+                    is UiEvent.ShowToast -> showToast(event)
                 }
             }
         }
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoViewModel.kt
index d00bf6f04..2ee6c9d7d 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoViewModel.kt
@@ -13,6 +13,7 @@ import com.eatssu.android.domain.usecase.user.SetUserNicknameUseCase
 import com.eatssu.android.domain.usecase.user.ValidateNicknameLocalUseCase
 import com.eatssu.android.presentation.UiEvent
 import com.eatssu.android.presentation.UiState
+import com.eatssu.android.presentation.util.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -206,7 +207,7 @@ class UserInfoViewModel @Inject constructor(
                 val result = setUserNicknameUseCase(data.nickname)
                 result.onFailure { error ->
                     val errorMessage = error.message ?: "닉네임 변경에 실패했어요."
-                    _uiEvent.emit(UiEvent.ShowToast(errorMessage))
+                    _uiEvent.emit(UiEvent.ShowToast(errorMessage, ToastType.ERROR))
                     _uiState.value = UiState.Error
                     return@launch
                 }
@@ -236,7 +237,7 @@ class UserInfoViewModel @Inject constructor(
                 else -> "변경사항이 없습니다."
             }
 
-            _uiEvent.emit(UiEvent.ShowToast(message))
+            _uiEvent.emit(UiEvent.ShowToast(message, ToastType.INFO))
             _uiState.update {
                 UiState.Success(
                     data.copy(
diff --git a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
index fea591c07..af7cf8c0c 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
@@ -12,6 +12,7 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
 import com.eatssu.android.R
+import com.eatssu.android.presentation.UiEvent
 
 enum class ToastType(@DrawableRes val iconId: Int, @DrawableRes val shapeId: Int) {
     INFO(R.drawable.ic_toast_info, R.drawable.shape_toast_info),
@@ -24,6 +25,9 @@ enum class ToastLocation(val gravity: Int, val xOffset: Int, val yOffset: Int) {
     BOTTOM_NAVIGATION(Gravity.BOTTOM, 0, 200),
 }
 
+fun Context.showToast(event: UiEvent.ShowToast) =
+    showToast(event.message, event.type, event.location)
+
 fun Context.showToast(
     message: String,
     type: ToastType,
@@ -45,6 +49,9 @@ fun Context.showToast(
     toast.show()
 }
 
+fun Fragment.showToast(event: UiEvent.ShowToast) =
+    showToast(event.message, event.type, event.location)
+
 fun Fragment.showToast(
     message: String,
     type: ToastType,

From 1a8e91fe5b1c66454230a7989c800dae7af6b3d8 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Fri, 12 Dec 2025 23:32:09 +0900
Subject: [PATCH 25/41] =?UTF-8?q?fix:=20ToastType=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/util/ToastExtensions.kt      | 28 +++++++
 .../android/presentation/util/ToastUtil.kt    | 77 ++++++-------------
 .../main/java/com/eatssu/common/UiEvent.kt    |  7 +-
 .../java/com/eatssu/common/enums/ToastType.kt | 12 +++
 4 files changed, 66 insertions(+), 58 deletions(-)
 create mode 100644 app/src/main/java/com/eatssu/android/presentation/util/ToastExtensions.kt
 create mode 100644 core/common/src/main/java/com/eatssu/common/enums/ToastType.kt

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/ToastExtensions.kt b/app/src/main/java/com/eatssu/android/presentation/util/ToastExtensions.kt
new file mode 100644
index 000000000..a812af8d6
--- /dev/null
+++ b/app/src/main/java/com/eatssu/android/presentation/util/ToastExtensions.kt
@@ -0,0 +1,28 @@
+package com.eatssu.android.presentation.util
+
+import androidx.annotation.DrawableRes
+import com.eatssu.android.R
+import com.eatssu.common.enums.ToastType
+
+/**
+ * common 모듈의 ToastType은 순수한 enum이므로 Android 리소스에 접근 불가
+ * 따라서 ToastExtensions.kt에서 리소스 매핑 제공
+ */
+
+@get:DrawableRes
+val ToastType.iconId: Int
+    get() = when (this) {
+        ToastType.INFO -> R.drawable.ic_toast_info
+        ToastType.SUCCESS -> R.drawable.ic_toast_success
+        ToastType.WARNING -> R.drawable.ic_toast_warning
+        ToastType.ERROR -> R.drawable.ic_toast_error
+    }
+
+@get:DrawableRes
+val ToastType.shapeId: Int
+    get() = when (this) {
+        ToastType.INFO -> R.drawable.shape_toast_info
+        ToastType.SUCCESS -> R.drawable.shape_toast_success
+        ToastType.WARNING -> R.drawable.shape_toast_warning
+        ToastType.ERROR -> R.drawable.shape_toast_error
+    }
diff --git a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
index af7cf8c0c..59acc7d4e 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
@@ -8,34 +8,19 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
-import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
 import com.eatssu.android.R
-import com.eatssu.android.presentation.UiEvent
-
-enum class ToastType(@DrawableRes val iconId: Int, @DrawableRes val shapeId: Int) {
-    INFO(R.drawable.ic_toast_info, R.drawable.shape_toast_info),
-    SUCCESS(R.drawable.ic_toast_success, R.drawable.shape_toast_success),
-    WARNING(R.drawable.ic_toast_warning, R.drawable.shape_toast_warning),
-    ERROR(R.drawable.ic_toast_error, R.drawable.shape_toast_error)
-}
-
-enum class ToastLocation(val gravity: Int, val xOffset: Int, val yOffset: Int) {
-    BOTTOM_NAVIGATION(Gravity.BOTTOM, 0, 200),
-}
-
-fun Context.showToast(event: UiEvent.ShowToast) =
-    showToast(event.message, event.type, event.location)
+import com.eatssu.common.UiEvent
+import com.eatssu.common.enums.ToastType
 
 fun Context.showToast(
     message: String,
     type: ToastType,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
     val toast = Toast(this)
-    toast.setGravity(location.gravity, location.xOffset, location.yOffset)
+    toast.setGravity(Gravity.BOTTOM, 0, 200)
     toast.duration = Toast.LENGTH_SHORT
 
     val inflater = LayoutInflater.from(this)
@@ -49,142 +34,128 @@ fun Context.showToast(
     toast.show()
 }
 
+fun Context.showToast(event: UiEvent.ShowToast) =
+    showToast(event.message, event.type)
+
 fun Fragment.showToast(event: UiEvent.ShowToast) =
-    showToast(event.message, event.type, event.location)
+    showToast(event.message, event.type)
 
 fun Fragment.showToast(
     message: String,
     type: ToastType,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    requireContext().showToast(message, type, location, root)
+    requireContext().showToast(message, type, root)
 }
 
 fun Context.showInfoToast(
     message: String,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    showToast(message, ToastType.INFO, location, root)
+    showToast(message, ToastType.INFO, root)
 }
 
 fun Context.showInfoToast(
     @StringRes messageId: Int,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    showToast(getString(messageId), ToastType.INFO, location, root)
+    showToast(getString(messageId), ToastType.INFO, root)
 }
 
 fun Fragment.showInfoToast(
     message: String,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    requireContext().showInfoToast(message, location, root)
+    requireContext().showInfoToast(message, root)
 }
 
 fun Fragment.showInfoToast(
     @StringRes messageId: Int,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    requireContext().showInfoToast(messageId, location, root)
+    requireContext().showInfoToast(messageId, root)
 }
 
 fun Context.showSuccessToast(
     message: String,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    showToast(message, ToastType.SUCCESS, location, root)
+    showToast(message, ToastType.SUCCESS, root)
 }
 
 fun Context.showSuccessToast(
     @StringRes messageId: Int,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    showToast(getString(messageId), ToastType.SUCCESS, location, root)
+    showToast(getString(messageId), ToastType.SUCCESS, root)
 }
 
 fun Fragment.showSuccessToast(
     message: String,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    requireContext().showSuccessToast(message, location, root)
+    requireContext().showSuccessToast(message, root)
 }
 
 fun Fragment.showSuccessToast(
     @StringRes messageId: Int,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    requireContext().showSuccessToast(messageId, location, root)
+    requireContext().showSuccessToast(messageId, root)
 }
 
 fun Context.showWarningToast(
     message: String,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    showToast(message, ToastType.WARNING, location, root)
+    showToast(message, ToastType.WARNING, root)
 }
 
 fun Context.showWarningToast(
     @StringRes messageId: Int,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    showToast(getString(messageId), ToastType.WARNING, location, root)
+    showToast(getString(messageId), ToastType.WARNING, root)
 }
 
 fun Fragment.showWarningToast(
     message: String,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    requireContext().showWarningToast(message, location, root)
+    requireContext().showWarningToast(message, root)
 }
 
 fun Fragment.showWarningToast(
     @StringRes messageId: Int,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    requireContext().showWarningToast(messageId, location, root)
+    requireContext().showWarningToast(messageId, root)
 }
 
 fun Context.showErrorToast(
     message: String,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    showToast(message, ToastType.ERROR, location, root)
+    showToast(message, ToastType.ERROR, root)
 }
 
 fun Context.showErrorToast(
     @StringRes messageId: Int,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    showToast(getString(messageId), ToastType.ERROR, location, root)
+    showToast(getString(messageId), ToastType.ERROR, root)
 }
 
 fun Fragment.showErrorToast(
     message: String,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    requireContext().showErrorToast(message, location, root)
+    requireContext().showErrorToast(message, root)
 }
 
 fun Fragment.showErrorToast(
     @StringRes messageId: Int,
-    location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION,
     root: ViewGroup? = null,
 ) {
-    requireContext().showErrorToast(messageId, location, root)
+    requireContext().showErrorToast(messageId, root)
 }
\ No newline at end of file
diff --git a/core/common/src/main/java/com/eatssu/common/UiEvent.kt b/core/common/src/main/java/com/eatssu/common/UiEvent.kt
index c44116e72..f421957c0 100644
--- a/core/common/src/main/java/com/eatssu/common/UiEvent.kt
+++ b/core/common/src/main/java/com/eatssu/common/UiEvent.kt
@@ -1,8 +1,6 @@
 package com.eatssu.common
 
-import com.eatssu.android.presentation.util.ToastLocation
-import com.eatssu.android.presentation.util.ToastType
-
+import com.eatssu.common.enums.ToastType
 
 /**
  * 각 Screen에 공통적인 이벤트 타입입니다.
@@ -11,8 +9,7 @@ import com.eatssu.android.presentation.util.ToastType
 interface UiEvent {
     data class ShowToast(
         val message: String,
-        val type: ToastType,
-        val location: ToastLocation = ToastLocation.BOTTOM_NAVIGATION
+        val type: ToastType
     ) : UiEvent
     object NavigateBack : UiEvent
 }
\ No newline at end of file
diff --git a/core/common/src/main/java/com/eatssu/common/enums/ToastType.kt b/core/common/src/main/java/com/eatssu/common/enums/ToastType.kt
new file mode 100644
index 000000000..7e0ddb0a3
--- /dev/null
+++ b/core/common/src/main/java/com/eatssu/common/enums/ToastType.kt
@@ -0,0 +1,12 @@
+package com.eatssu.common.enums
+
+/**
+ * Toast 타입을 정의하는 Enum 클래스
+ * common 모듈은 Android 리소스에 접근할 수 없으므로 순수한 타입 정보만 정의
+ */
+enum class ToastType {
+    INFO,
+    SUCCESS,
+    WARNING,
+    ERROR
+}
\ No newline at end of file

From 8c19d55ba4c3d421d9db36a3b6fa18e10511b912 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Fri, 12 Dec 2025 23:40:55 +0900
Subject: [PATCH 26/41] =?UTF-8?q?fix:=20=EB=AA=A8=EB=93=A0=20Toast=20?=
 =?UTF-8?q?=ED=98=B8=EC=B6=9C=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/eatssu/android/presentation/MainActivity.kt |  5 +++--
 .../eatssu/android/presentation/MainViewModel.kt    |  2 +-
 .../cafeteria/review/list/ReviewListScreen.kt       |  2 +-
 .../cafeteria/review/list/ReviewListViewModel.kt    |  7 ++++---
 .../cafeteria/review/modify/ModifyReviewScreen.kt   |  2 +-
 .../cafeteria/review/modify/ModifyViewModel.kt      |  5 +++--
 .../cafeteria/review/report/ReportActivity.kt       |  6 +++++-
 .../cafeteria/review/write/WriteReviewScreen.kt     |  2 +-
 .../cafeteria/review/write/WriteReviewViewModel.kt  | 13 +++++++------
 .../android/presentation/intro/IntroViewModel.kt    |  8 +++-----
 .../android/presentation/login/LoginViewModel.kt    |  2 +-
 .../android/presentation/mypage/MyPageViewModel.kt  |  8 ++------
 .../android/presentation/mypage/SignOutViewModel.kt |  2 +-
 .../mypage/myreview/MyReviewListScreen.kt           |  2 +-
 .../mypage/myreview/MyReviewViewModel.kt            |  5 +++--
 .../mypage/userinfo/UserInfoActivity.kt             |  3 ++-
 .../mypage/userinfo/UserInfoViewModel.kt            |  2 +-
 gradlew                                             |  0
 18 files changed, 40 insertions(+), 36 deletions(-)
 mode change 100644 => 100755 gradlew

diff --git a/app/src/main/java/com/eatssu/android/presentation/MainActivity.kt b/app/src/main/java/com/eatssu/android/presentation/MainActivity.kt
index 701458663..a007b5a29 100644
--- a/app/src/main/java/com/eatssu/android/presentation/MainActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/MainActivity.kt
@@ -20,6 +20,7 @@ import com.eatssu.android.presentation.base.BaseActivity
 import com.eatssu.android.presentation.login.LoginActivity
 import com.eatssu.android.presentation.mypage.MyPageViewModel
 import com.eatssu.android.presentation.mypage.userinfo.UserInfoActivity
+import com.eatssu.android.presentation.util.showInfoToast
 import com.eatssu.android.presentation.util.showToast
 import com.eatssu.android.presentation.util.startActivity
 import com.eatssu.common.UiEvent
@@ -114,11 +115,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(
         if (requestCode == 1000) {
             if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 // 권한이 승인됨
-                showToast("EAT-SSU 알림 수신을 동의하였습니다.")
+                showInfoToast("EAT-SSU 알림 수신을 동의하였습니다.")
                 myPageViewModel.setNotificationOn() //바로 알림 받도록 설정
             } else {
                 // 권한이 거부됨
-                showToast("EAT-SSU 알림 수신을 거부하였습니다.\n$dateFormat")
+                showInfoToast("EAT-SSU 알림 수신을 거부하였습니다.\n$dateFormat")
                 myPageViewModel.setNotificationOff() //바로 알림 받도록 설정
             }
         }
diff --git a/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt
index aab231719..6a22eab00 100644
--- a/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt
@@ -13,7 +13,7 @@ import com.eatssu.android.domain.usecase.user.GetUserNickNameUseCase
 import com.eatssu.android.domain.usecase.user.SetUserCollegeDepartmentUseCase
 import com.eatssu.common.UiEvent
 import com.eatssu.common.UiState
-import com.eatssu.android.presentation.util.ToastType
+import com.eatssu.common.enums.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableSharedFlow
diff --git a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/list/ReviewListScreen.kt b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/list/ReviewListScreen.kt
index ed7224819..03ec6ed26 100644
--- a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/list/ReviewListScreen.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/list/ReviewListScreen.kt
@@ -80,7 +80,7 @@ fun ReviewListScreen(
 
     when (uiEvent) {
         is UiEvent.ShowToast -> {
-            context.showToast((uiEvent as UiEvent.ShowToast).message)
+            context.showToast(uiEvent as UiEvent.ShowToast)
         }
     }
 
diff --git a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/list/ReviewListViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/list/ReviewListViewModel.kt
index a222b1adc..7ae6c17b7 100644
--- a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/list/ReviewListViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/list/ReviewListViewModel.kt
@@ -10,6 +10,7 @@ import com.eatssu.android.domain.usecase.review.GetReviewListUseCase
 import com.eatssu.common.UiEvent
 import com.eatssu.common.UiState
 import com.eatssu.common.enums.MenuType
+import com.eatssu.common.enums.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -53,7 +54,7 @@ class ReviewListViewModel @Inject constructor(
             _uiState.value = UiState.Success(ReviewListState(reviewInfo, reviewList))
         } catch (e: Exception) {
             _uiState.value = UiState.Error
-            _uiEvent.emit(UiEvent.ShowToast("리뷰를 불러오지 못했습니다."))
+            _uiEvent.emit(UiEvent.ShowToast("리뷰를 불러오지 못했습니다.", ToastType.ERROR))
         }
     }
 
@@ -63,12 +64,12 @@ class ReviewListViewModel @Inject constructor(
             val success = deleteReviewUseCase(reviewId)
 
             if (!success) {
-                _uiEvent.emit(UiEvent.ShowToast("리뷰 삭제에 실패했습니다."))
+                _uiEvent.emit(UiEvent.ShowToast("리뷰 삭제에 실패했습니다.", ToastType.ERROR))
                 return@launch
             }
 
             // 삭제 성공 시
-            _uiEvent.emit(UiEvent.ShowToast("리뷰를 삭제했습니다."))
+            _uiEvent.emit(UiEvent.ShowToast("리뷰를 삭제했습니다.", ToastType.INFO))
             val type = lastMenuType
             val id = lastItemId
             if (type != null && id != null) {
diff --git a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/modify/ModifyReviewScreen.kt b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/modify/ModifyReviewScreen.kt
index 637fb8b98..0818002a0 100644
--- a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/modify/ModifyReviewScreen.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/modify/ModifyReviewScreen.kt
@@ -65,7 +65,7 @@ fun ModifyReviewScreen(
             when (event) {
                 is UiEvent.NavigateBack -> onBack()
                 is UiEvent.ShowToast -> {
-                    context.showToast(event.message)
+                    context.showToast(event)
                 }
             }
         }
diff --git a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/modify/ModifyViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/modify/ModifyViewModel.kt
index f408f122c..fcb7a2722 100644
--- a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/modify/ModifyViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/modify/ModifyViewModel.kt
@@ -6,6 +6,7 @@ import com.eatssu.android.domain.model.Review
 import com.eatssu.android.domain.usecase.review.ModifyReviewUseCase
 import com.eatssu.common.UiEvent
 import com.eatssu.common.UiState
+import com.eatssu.common.enums.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -65,11 +66,11 @@ class ModifyViewModel @Inject constructor(
             )
             if (!success) {
                 _uiState.value = UiState.Success(editing)
-                _uiEvent.emit(UiEvent.ShowToast("리뷰 수정이 실패했습니다."))
+                _uiEvent.emit(UiEvent.ShowToast("리뷰 수정이 실패했습니다.", ToastType.ERROR))
             }
 
             _uiEvent.emit(UiEvent.NavigateBack)
-            _uiEvent.emit(UiEvent.ShowToast("리뷰를 수정했습니다."))
+            _uiEvent.emit(UiEvent.ShowToast("리뷰를 수정했습니다.", ToastType.SUCCESS))
         }
     }
 }
diff --git a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/report/ReportActivity.kt b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/report/ReportActivity.kt
index dec710a88..ab5d3874a 100644
--- a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/report/ReportActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/report/ReportActivity.kt
@@ -10,6 +10,7 @@ import com.eatssu.android.presentation.base.BaseActivity
 import com.eatssu.android.presentation.util.showToast
 import com.eatssu.common.enums.ReportType
 import com.eatssu.common.enums.ScreenId
+import com.eatssu.common.enums.ToastType
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
@@ -68,7 +69,10 @@ class ReportActivity : BaseActivity<ActivityReportBinding>(
 
             lifecycleScope.launch {
                 reportViewModel.uiState.collectLatest {
-                    showToast(it.toastMessage)
+                    showToast(
+                        it.toastMessage,
+                        if (it.isDone) ToastType.SUCCESS else ToastType.ERROR
+                    )
                     if (it.isDone) {
                         finish()
                     }
diff --git a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/WriteReviewScreen.kt b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/WriteReviewScreen.kt
index 5a718f610..554983cc8 100644
--- a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/WriteReviewScreen.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/WriteReviewScreen.kt
@@ -81,7 +81,7 @@ fun WriteReviewScreen(
             when (event) {
                 is UiEvent.NavigateBack -> onBack()
                 is UiEvent.ShowToast -> {
-                    context.showToast(event.message)
+                    context.showToast(event)
                 }
             }
         }
diff --git a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/WriteReviewViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/WriteReviewViewModel.kt
index 10b524226..ef99e2278 100644
--- a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/WriteReviewViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/write/WriteReviewViewModel.kt
@@ -11,6 +11,7 @@ import com.eatssu.android.domain.usecase.review.WriteReviewUseCase
 import com.eatssu.common.UiEvent
 import com.eatssu.common.UiState
 import com.eatssu.common.enums.MenuType
+import com.eatssu.common.enums.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import id.zelory.compressor.Compressor
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -111,24 +112,24 @@ class WriteReviewViewModel @Inject constructor(
                         val compressedFile = compressImage(context, originalFile)
                         if (compressedFile != null && compressedFile.exists()) {
                             imageUrl = getImageUrlUseCase(compressedFile)
-                            _uiEvent.emit(UiEvent.ShowToast("이미지가 업로드되었습니다."))
+                            _uiEvent.emit(UiEvent.ShowToast("이미지가 업로드되었습니다.", ToastType.SUCCESS))
 
                             // 원본 파일 삭제 (압축된 파일만 유지)
                             originalFile.delete()
                         } else {
                             _uiState.value = UiState.Success(editing) // 되돌림
-                            _uiEvent.emit(UiEvent.ShowToast("이미지 압축에 실패하였습니다."))
+                            _uiEvent.emit(UiEvent.ShowToast("이미지 압축에 실패하였습니다.", ToastType.ERROR))
                             return@launch
                         }
                     } else {
                         _uiState.value = UiState.Success(editing) // 되돌림
-                        _uiEvent.emit(UiEvent.ShowToast("이미지 파일을 찾을 수 없습니다."))
+                        _uiEvent.emit(UiEvent.ShowToast("이미지 파일을 찾을 수 없습니다.", ToastType.ERROR))
                         return@launch
                     }
                 } catch (e: Exception) {
                     Timber.e(e, "이미지 업로드 실패")
                     _uiState.value = UiState.Success(editing) // 되돌림
-                    _uiEvent.emit(UiEvent.ShowToast("이미지 업로드에 실패하였습니다."))
+                    _uiEvent.emit(UiEvent.ShowToast("이미지 업로드에 실패하였습니다.", ToastType.ERROR))
                     return@launch
                 }
             }
@@ -145,11 +146,11 @@ class WriteReviewViewModel @Inject constructor(
 
             if (!success) {
                 _uiState.value = UiState.Success(editing) // 되돌림
-                _uiEvent.emit(UiEvent.ShowToast("리뷰 작성에 실패하였습니다."))
+                _uiEvent.emit(UiEvent.ShowToast("리뷰 작성에 실패하였습니다.", ToastType.ERROR))
                 return@launch
             }
 
-            _uiEvent.emit(UiEvent.ShowToast("리뷰가 작성되었습니다."))
+            _uiEvent.emit(UiEvent.ShowToast("리뷰가 작성되었습니다.", ToastType.SUCCESS))
             _uiEvent.emit(UiEvent.NavigateBack)
         }
     }
diff --git a/app/src/main/java/com/eatssu/android/presentation/intro/IntroViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/intro/IntroViewModel.kt
index c7ed432be..dc0304fce 100644
--- a/app/src/main/java/com/eatssu/android/presentation/intro/IntroViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/intro/IntroViewModel.kt
@@ -9,11 +9,9 @@ import com.eatssu.android.domain.repository.FirebaseRemoteConfigRepository
 import com.eatssu.android.domain.usecase.auth.GetAccessTokenUseCase
 import com.eatssu.android.domain.usecase.auth.GetIsAccessTokenValidUseCase
 import com.eatssu.android.domain.usecase.health.HealthCheckUseCase
-import com.eatssu.android.presentation.UiEvent
-import com.eatssu.android.presentation.UiState
-import com.eatssu.android.presentation.util.ToastType
 import com.eatssu.common.UiEvent
 import com.eatssu.common.UiState
+import com.eatssu.common.enums.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -61,7 +59,7 @@ class IntroViewModel @Inject constructor(
             } catch (e: Exception) {
                 Timber.e(e, "앱 초기화 중 오류 발생")
                 _uiState.value = UiState.Error
-                _uiEvent.emit(UiEvent.ShowToast("앱 초기화 중 오류가 발생했습니다", ToastType.Error))
+                _uiEvent.emit(UiEvent.ShowToast("앱 초기화 중 오류가 발생했습니다", ToastType.ERROR))
             }
         }
     }
@@ -85,7 +83,7 @@ class IntroViewModel @Inject constructor(
             when (result) {
                 is VersionCheckResult.ForceUpdateRequired -> {
                     Timber.d("강제 업데이트 필요: 최신 버전 ${result.minimumVersionCode}")
-                    _uiEvent.emit(UiEvent.ShowToast("앱을 업데이트해주세요"))
+                    _uiEvent.emit(UiEvent.ShowToast("앱을 업데이트해주세요", ToastType.INFO))
                 }
 
                 VersionCheckResult.UpdateNotRequired -> {
diff --git a/app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt
index de20f4ac3..662be5580 100644
--- a/app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt
@@ -12,7 +12,7 @@ import com.eatssu.android.domain.usecase.auth.SetRefreshTokenUseCase
 import com.eatssu.android.domain.usecase.user.SetUserEmailUseCase
 import com.eatssu.common.UiEvent
 import com.eatssu.common.UiState
-import com.eatssu.android.presentation.util.ToastType
+import com.eatssu.common.enums.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt
index 4e997e244..223ec23d7 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt
@@ -1,20 +1,17 @@
 package com.eatssu.android.presentation.mypage
 
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.eatssu.android.BuildConfig
 import com.eatssu.android.R
-import com.eatssu.android.data.MySharedPreferences
-import com.eatssu.android.data.repository.PreferencesRepository
 import com.eatssu.android.data.local.SettingDataStore
 import com.eatssu.android.domain.usecase.alarm.AlarmUseCase
 import com.eatssu.android.domain.usecase.alarm.SetDailyNotificationStatusUseCase
 import com.eatssu.android.domain.usecase.user.GetUserNickNameUseCase
-import com.eatssu.android.presentation.UiEvent
-import com.eatssu.android.presentation.UiState
-import com.eatssu.android.presentation.util.ToastType
 import com.eatssu.common.UiEvent
 import com.eatssu.common.UiState
+import com.eatssu.common.enums.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -36,7 +33,6 @@ class MyPageViewModel @Inject constructor(
     private val getUserNickNameUseCase: GetUserNickNameUseCase,
     private val setNotificationStatusUseCase: SetDailyNotificationStatusUseCase,
     private val alarmUseCase: AlarmUseCase,
-    private val preferencesRepository: PreferencesRepository,
     private val settingDataStore: SettingDataStore,
 ) : ViewModel() {
 
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt
index 47f430cca..a7fe9faa6 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt
@@ -6,9 +6,9 @@ import androidx.lifecycle.viewModelScope
 import com.eatssu.android.R
 import com.eatssu.android.domain.usecase.auth.LogoutUseCase
 import com.eatssu.android.domain.usecase.auth.SignOutUseCase
-import com.eatssu.android.presentation.util.ToastType
 import com.eatssu.common.UiEvent
 import com.eatssu.common.UiState
+import com.eatssu.common.enums.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableSharedFlow
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListScreen.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListScreen.kt
index 458100308..3fbb9d2ff 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListScreen.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListScreen.kt
@@ -63,7 +63,7 @@ fun MyReviewListScreen(
 
     when (uiEvent) {
         is UiEvent.ShowToast -> {
-            context.showToast((uiEvent as UiEvent.ShowToast).message)
+            context.showToast(uiEvent as UiEvent.ShowToast)
         }
     }
 
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewViewModel.kt
index d020619c2..53cfe2a60 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewViewModel.kt
@@ -8,6 +8,7 @@ import com.eatssu.android.domain.usecase.review.GetMyReviewsUseCase
 import com.eatssu.android.domain.usecase.user.GetUserNickNameUseCase
 import com.eatssu.common.UiEvent
 import com.eatssu.common.UiState
+import com.eatssu.common.enums.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -64,10 +65,10 @@ class MyReviewViewModel @Inject constructor(
         viewModelScope.launch {
             val success = deleteReviewUseCase(reviewId)
             if (!success) {
-                _uiEvent.emit(UiEvent.ShowToast("리뷰 삭제에 실패했습니다."))
+                _uiEvent.emit(UiEvent.ShowToast("리뷰 삭제에 실패했습니다.", ToastType.ERROR))
                 return@launch
             }
-            _uiEvent.emit(UiEvent.ShowToast("리뷰를 삭제했습니다."))
+            _uiEvent.emit(UiEvent.ShowToast("리뷰를 삭제했습니다.", ToastType.SUCCESS))
             // 삭제 성공 시 내 리뷰 목록 재조회
             getMyReviewList()
         }
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoActivity.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoActivity.kt
index b551d06f1..e6a672a41 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoActivity.kt
@@ -19,6 +19,7 @@ import com.eatssu.android.presentation.util.showToast
 import com.eatssu.common.UiEvent
 import com.eatssu.common.UiState
 import com.eatssu.common.enums.ScreenId
+import com.eatssu.common.enums.ToastType
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
@@ -177,7 +178,7 @@ class UserInfoActivity :
 
         // 단과대를 먼저 선택하도록 유도
         if (data.selectedCollege.collegeId == -1) {
-            showToast("단과대를 먼저 선택해 주세요.")
+            showToast("단과대를 먼저 선택해 주세요.", ToastType.ERROR)
             return
         }
 
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoViewModel.kt
index 5a8616447..482979fa5 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/userinfo/UserInfoViewModel.kt
@@ -13,7 +13,7 @@ import com.eatssu.android.domain.usecase.user.ValidateNicknameLocalUseCase
 import com.eatssu.android.domain.usecase.user.ValidateNicknameServerUseCase
 import com.eatssu.common.UiEvent
 import com.eatssu.common.UiState
-import com.eatssu.android.presentation.util.ToastType
+import com.eatssu.common.enums.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755

From b2b895a7323effe0c5439dda890cdf362d2a9b77 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Fri, 12 Dec 2025 23:51:03 +0900
Subject: [PATCH 27/41] =?UTF-8?q?feat:=20onDismiss=20handler=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/eatssu/android/presentation/util/DialogUtil.kt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
index c70894b3f..e2388acd9 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
@@ -25,6 +25,9 @@ class DialogBuilder(
     // 취소 버튼을 눌렀을 때 동작
     private var onCancel: (dialog: Dialog) -> Unit = { it.dismiss() }
 
+    // Dialog가 닫힐 때 동작
+    private var onDismiss: () -> Unit = {}
+
     // Dialog 바깥을 누르면 닫히는지 여부
     var cancellable: Boolean = true
 
@@ -51,6 +54,10 @@ class DialogBuilder(
         this.onCancel = action
     }
 
+    fun onDismiss(action: () -> Unit) = apply {
+        this.onDismiss = action
+    }
+
     fun show(): Dialog {
         val dialog = Dialog(context)
 
@@ -81,6 +88,9 @@ class DialogBuilder(
         }
 
         dialog.setCancelable(cancellable)
+        dialog.setOnDismissListener {
+            onDismiss()
+        }
 
         if (showWhenStart)
             dialog.show()

From ef3e155f57995ef18fa75a1e669dfab72796a479 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Fri, 12 Dec 2025 23:51:16 +0900
Subject: [PATCH 28/41] =?UTF-8?q?refactor:=20=EA=B8=B0=EC=A1=B4=20AlertDia?=
 =?UTF-8?q?log=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/AndroidMessageDialogActivity.kt    | 33 ++++++++-----------
 .../presentation/mypage/MyPageFragment.kt     | 22 ++++++++-----
 .../android/presentation/util/ActivityUtil.kt | 29 +++++++---------
 3 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/common/AndroidMessageDialogActivity.kt b/app/src/main/java/com/eatssu/android/presentation/common/AndroidMessageDialogActivity.kt
index b76ceb6d9..d4276c7ce 100644
--- a/app/src/main/java/com/eatssu/android/presentation/common/AndroidMessageDialogActivity.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/common/AndroidMessageDialogActivity.kt
@@ -1,11 +1,9 @@
 package com.eatssu.android.presentation.common
 
-
-import android.app.AlertDialog
 import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
-
+import com.eatssu.android.presentation.util.showDialog
 
 class AndroidMessageDialogActivity : AppCompatActivity() {
 
@@ -15,23 +13,20 @@ class AndroidMessageDialogActivity : AppCompatActivity() {
     }
 
     private fun showDialog() {
-        val builder = AlertDialog.Builder(this)
-
-        builder.setTitle("공지")
         val message = intent.getStringExtra("message")
-        Log.d("message",message.toString())
-        builder.setMessage(intent.getStringExtra("message"))
-
-        builder.setPositiveButton("확인") { dialog, which ->
-            // Google Play Store의 앱 페이지로 이동하여 업데이트를 다운로드합니다.
-
-            // 다이얼로그를 종료합니다.
-            finish()
+        Log.d("message", message.toString())
+
+        showDialog(
+            title = "공지",
+            description = message ?: ""
+        ) {
+            confirmText = "확인"
+            showCancelButton = false
+            cancellable = false
+            onConfirm { dialog ->
+                dialog.dismiss()
+                finish()
+            }
         }
-
-        builder.setCancelable(false) // 사용자가 다이얼로그를 취소할 수 없도록 설정
-
-        val dialog = builder.create()
-        dialog.show()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
index 7d7b0e153..120f3ac70 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageFragment.kt
@@ -9,7 +9,6 @@ import android.os.Bundle
 import android.provider.Settings
 import android.view.LayoutInflater
 import android.view.View
-import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import androidx.fragment.app.activityViewModels
@@ -190,14 +189,19 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(ScreenId.MYPAGE_MAIN)
     }
 
     private fun showNotificationPermissionDialog() {
-        AlertDialog.Builder(requireContext())
-            .setTitle("알림 권한 필요")
-            .setMessage("알림을 받으려면 알림 권한을 활성화해야 합니다. 설정 화면으로 이동하시겠습니까?")
-            .setPositiveButton("설정으로 이동") { _, _ ->
-                openAppNotificationSettings(requireContext())
+        requireContext().run {
+            showDialog(
+                title = "알림 권한 필요",
+                description = "알림을 받으려면 알림 권한을 활성화해야 합니다. 설정 화면으로 이동하시겠습니까?"
+            ) {
+                confirmText = "설정으로 이동"
+                cancelText = "취소"
+                onConfirm { dialog ->
+                    openAppNotificationSettings(this@run)
+                    dialog.dismiss()
+                }
             }
-            .setNegativeButton("취소", null)
-            .show()
+        }
     }
 
     private fun checkNotificationPermission(context: Context): Boolean {
@@ -215,7 +219,7 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(ScreenId.MYPAGE_MAIN)
                 isDestructive = true
                 onConfirm {
                     mainViewModel.logOut() // 로그아웃은 메인 액티비티에서 처리하도록 수정
-                    startActivity(Intent(requireContext(), LoginActivity::class.java))
+                    startActivity(Intent(this@run, LoginActivity::class.java))
                 }
             }
         }
diff --git a/app/src/main/java/com/eatssu/android/presentation/util/ActivityUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/ActivityUtil.kt
index af9dee9fe..ec2953bf6 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/ActivityUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/ActivityUtil.kt
@@ -1,13 +1,13 @@
 package com.eatssu.android.presentation.util
 
 import android.app.Activity
-import android.app.AlertDialog
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.eatssu.android.R
 import com.eatssu.android.presentation.base.NetworkErrorEventBus
 import kotlinx.coroutines.launch
+import java.util.concurrent.atomic.AtomicBoolean
 
 inline fun <reified T : Activity> AppCompatActivity.startActivity(block: Intent.() -> Unit = {}) {
     startActivity(Intent(this, T::class.java).apply(block))
@@ -21,31 +21,24 @@ fun AppCompatActivity.observeNetworkError(
     errorTitle: String? = null,
     errorMessage: String? = null
 ) {
-    var networkErrorDialog: AlertDialog? = null
+    val isShowingDialog = AtomicBoolean(false)
 
     lifecycleScope.launch {
         NetworkErrorEventBus.networkError.collect {
-            if (networkErrorDialog?.isShowing == true) {
-                return@collect
-            }
+            // atomic하게 false→true로 변경, 이미 true면 false 반환
+            if (!isShowingDialog.compareAndSet(false, true)) return@collect
 
             val title = errorTitle ?: getString(R.string.server_error_title)
             val message = errorMessage ?: getString(R.string.server_error_message)
 
-            networkErrorDialog = AlertDialog.Builder(this@observeNetworkError)
-                .setTitle(title)
-                .setMessage(message)
-                .setPositiveButton(getString(R.string.confirm)) { dialog, _ ->
-                    dialog.dismiss()
-                }
-                .setCancelable(true)
-                .create()
-                .also { dialog ->
-                    dialog.setOnDismissListener {
-                        networkErrorDialog = null
-                    }
-                    dialog.show()
+            showDialog(title, message) {
+                confirmText = getString(R.string.confirm)
+                showCancelButton = false
+                onConfirm { it.dismiss() }
+                onDismiss {
+                    isShowingDialog.set(false)
                 }
+            }
         }
     }
 }
\ No newline at end of file

From 2d9ea2ea56e98b448e2dd9ec35c3eebe3158c086 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Fri, 12 Dec 2025 23:57:28 +0900
Subject: [PATCH 29/41] =?UTF-8?q?fix:=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=A4=84=EB=B0=94=EA=BF=88=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/toast_layout.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/toast_layout.xml b/app/src/main/res/layout/toast_layout.xml
index 7d3f4dd84..718a35a8e 100644
--- a/app/src/main/res/layout/toast_layout.xml
+++ b/app/src/main/res/layout/toast_layout.xml
@@ -4,22 +4,28 @@
         android:orientation="horizontal"
         android:background="@drawable/shape_toast_info"
         android:layout_width="342dp"
-        android:layout_height="60dp">
+        android:layout_height="wrap_content"
+        android:minHeight="60dp"
+        android:padding="16dp"
+        android:gravity="center_vertical">
 
     <ImageView
             android:id="@+id/ic_toast"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:src="@drawable/ic_toast_info"
-            android:layout_gravity="center_horizontal"
+            android:layout_gravity="center_vertical"
             android:layout_marginEnd="8dp" />
 
     <TextView
             android:id="@+id/toast_text"
             style="@style/Body1"
             android:textColor="@color/gray600"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:maxLines="2"
+            android:ellipsize="end"
             android:text="테스트" />
 
 </LinearLayout>
\ No newline at end of file

From 7d71f390e615c15183a4dd178f19b10d1732b6d7 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Sun, 14 Dec 2025 15:22:47 +0900
Subject: [PATCH 30/41] =?UTF-8?q?chore:=20dismiss=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/eatssu/android/presentation/common/NetworkConnection.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/eatssu/android/presentation/common/NetworkConnection.kt b/app/src/main/java/com/eatssu/android/presentation/common/NetworkConnection.kt
index 50d60b8a1..3098d7280 100644
--- a/app/src/main/java/com/eatssu/android/presentation/common/NetworkConnection.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/common/NetworkConnection.kt
@@ -34,6 +34,7 @@ class NetworkConnection(private val context: Context) :
                         .apply {
                             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                         })
+                dialog.dismiss()
             }
         }
     }

From 9c5fff6713eddb2ad3e3b39eecdba80d99617e67 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Sun, 14 Dec 2025 15:23:29 +0900
Subject: [PATCH 31/41] =?UTF-8?q?refactor:=20DialogBuilder=EC=9D=98=20?=
 =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EB=B2=84=ED=8A=BC=20=ED=85=8D=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EA=B0=92=EC=9D=B4=20Context=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=A4=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/eatssu/android/presentation/util/DialogUtil.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
index e2388acd9..9b9cf72e7 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/DialogUtil.kt
@@ -32,10 +32,10 @@ class DialogBuilder(
     var cancellable: Boolean = true
 
     // 확인 버튼 텍스트
-    var confirmText: String = "확인"
+    var confirmText: String = context.getString(R.string.confirm)
 
     // 취소 버튼 텍스트
-    var cancelText: String = "취소"
+    var cancelText: String = context.getString(R.string.cancel)
 
     // 취소 버튼 표시 여부
     var showCancelButton: Boolean = true

From a0ba7033df9b6da1a977e4508613c212aaf86b8d Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Sun, 14 Dec 2025 15:24:03 +0900
Subject: [PATCH 32/41] =?UTF-8?q?chore:=20=EB=A6=AC=EB=B7=B0=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C=20=EC=99=84=EB=A3=8C=20toast=EB=A5=BC=20Succes?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/cafeteria/review/list/ReviewListViewModel.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/list/ReviewListViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/list/ReviewListViewModel.kt
index 7ae6c17b7..3a880c762 100644
--- a/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/list/ReviewListViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/cafeteria/review/list/ReviewListViewModel.kt
@@ -69,7 +69,7 @@ class ReviewListViewModel @Inject constructor(
             }
 
             // 삭제 성공 시
-            _uiEvent.emit(UiEvent.ShowToast("리뷰를 삭제했습니다.", ToastType.INFO))
+            _uiEvent.emit(UiEvent.ShowToast("리뷰를 삭제했습니다.", ToastType.SUCCESS))
             val type = lastMenuType
             val id = lastItemId
             if (type != null && id != null) {

From 54132e6cb300176fdc3afbf3e07f948ced295dcc Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Sun, 14 Dec 2025 15:24:22 +0900
Subject: [PATCH 33/41] =?UTF-8?q?chore:=20unused=20import=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/eatssu/android/presentation/mypage/MyPageViewModel.kt    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt
index 223ec23d7..50e1c6cf0 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt
@@ -13,7 +13,6 @@ import com.eatssu.common.UiEvent
 import com.eatssu.common.UiState
 import com.eatssu.common.enums.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow

From ce369a1312f736b63253ee387bbd868ab98180ff Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Mon, 22 Dec 2025 23:52:55 +0900
Subject: [PATCH 34/41] =?UTF-8?q?fix:=20Toast=EA=B0=80=20=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=20=EA=B0=80=EB=A1=9C=20=EA=B8=B8=EC=9D=B4=20=EC=B1=84?=
 =?UTF-8?q?=EC=9A=B0=EA=B2=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/presentation/util/ToastUtil.kt    | 190 +++++++-----------
 app/src/main/res/layout/toast_layout.xml      |   2 +-
 2 files changed, 76 insertions(+), 116 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
index 59acc7d4e..2097ebb48 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
@@ -1,161 +1,121 @@
 package com.eatssu.android.presentation.util
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
-import android.widget.Toast
 import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import com.eatssu.android.R
+import com.eatssu.android.presentation.map.findActivityOrNull
 import com.eatssu.common.UiEvent
 import com.eatssu.common.enums.ToastType
+import com.google.android.material.snackbar.Snackbar
+import timber.log.Timber
 
+@SuppressLint("RestrictedApi")
 fun Context.showToast(
     message: String,
     type: ToastType,
-    root: ViewGroup? = null,
 ) {
-    val toast = Toast(this)
-    toast.setGravity(Gravity.BOTTOM, 0, 200)
-    toast.duration = Toast.LENGTH_SHORT
+    val viewGroup =
+        findActivityOrNull()?.window?.decorView?.findViewById<ViewGroup>(android.R.id.content)
 
+    if (viewGroup == null) {
+        Timber.w("ViewGroup is null - cannot show toast. Context type: ${this::class.simpleName}, Activity: ${findActivityOrNull()?.javaClass?.simpleName}")
+        return
+    }
+
+    val snackbar = Snackbar.make(viewGroup, "", 5000)
     val inflater = LayoutInflater.from(this)
-    val layout = inflater.inflate(R.layout.toast_layout, root)
+    val snackbarBinding = inflater.inflate(R.layout.toast_layout, viewGroup, false)
+
+    snackbarBinding.findViewById<ImageView>(R.id.ic_toast).setImageResource(type.iconId)
+    snackbarBinding.findViewById<LinearLayout>(R.id.toast_layout)
+        .setBackgroundResource(type.shapeId)
+    snackbarBinding.findViewById<TextView>(R.id.toast_text).text = message
+
+    val snackbarLayout = snackbar.view as Snackbar.SnackbarLayout
+    with(snackbarLayout) {
+        removeAllViews()
+        setPadding(0, 0, 0, 0)
+        setBackgroundColor(ContextCompat.getColor(context, android.R.color.transparent))
+
+        // Snackbar를 화면 가로로 꽉 채우고 정해진 위치에 띄워지게 설정
+        layoutParams = (layoutParams as FrameLayout.LayoutParams).apply {
+            width = FrameLayout.LayoutParams.MATCH_PARENT
+            gravity = Gravity.CENTER_HORIZONTAL or Gravity.BOTTOM
 
-    layout.findViewById<ImageView>(R.id.ic_toast).setImageResource(type.iconId)
-    layout.findViewById<LinearLayout>(R.id.toast_layout).setBackgroundResource(type.shapeId)
-    layout.findViewById<TextView>(R.id.toast_text).text = message
+            val horizontalMargin = (16 * resources.displayMetrics.density).toInt()
+            val bottomMargin = (84 * resources.displayMetrics.density).toInt()
+            setMargins(horizontalMargin, 0, horizontalMargin, bottomMargin)
+        }
 
-    toast.view = layout
-    toast.show()
+        addView(snackbarBinding.rootView)
+    }
+
+    snackbar.show()
 }
 
 fun Context.showToast(event: UiEvent.ShowToast) =
     showToast(event.message, event.type)
 
 fun Fragment.showToast(event: UiEvent.ShowToast) =
-    showToast(event.message, event.type)
+    requireContext().showToast(event.message, event.type)
 
-fun Fragment.showToast(
-    message: String,
-    type: ToastType,
-    root: ViewGroup? = null,
-) {
-    requireContext().showToast(message, type, root)
-}
+fun Fragment.showToast(message: String, type: ToastType) =
+    requireContext().showToast(message, type)
 
-fun Context.showInfoToast(
-    message: String,
-    root: ViewGroup? = null,
-) {
-    showToast(message, ToastType.INFO, root)
-}
+fun Context.showInfoToast(message: String) =
+    showToast(message, ToastType.INFO)
 
-fun Context.showInfoToast(
-    @StringRes messageId: Int,
-    root: ViewGroup? = null,
-) {
-    showToast(getString(messageId), ToastType.INFO, root)
-}
+fun Context.showInfoToast(@StringRes messageId: Int) =
+    showToast(getString(messageId), ToastType.INFO)
 
-fun Fragment.showInfoToast(
-    message: String,
-    root: ViewGroup? = null,
-) {
-    requireContext().showInfoToast(message, root)
-}
+fun Fragment.showInfoToast(message: String) =
+    requireContext().showInfoToast(message)
 
-fun Fragment.showInfoToast(
-    @StringRes messageId: Int,
-    root: ViewGroup? = null,
-) {
-    requireContext().showInfoToast(messageId, root)
-}
+fun Fragment.showInfoToast(@StringRes messageId: Int) =
+    requireContext().showInfoToast(messageId)
 
-fun Context.showSuccessToast(
-    message: String,
-    root: ViewGroup? = null,
-) {
-    showToast(message, ToastType.SUCCESS, root)
-}
+fun Context.showSuccessToast(message: String) =
+    showToast(message, ToastType.SUCCESS)
 
-fun Context.showSuccessToast(
-    @StringRes messageId: Int,
-    root: ViewGroup? = null,
-) {
-    showToast(getString(messageId), ToastType.SUCCESS, root)
-}
+fun Context.showSuccessToast(@StringRes messageId: Int) =
+    showToast(getString(messageId), ToastType.SUCCESS)
 
-fun Fragment.showSuccessToast(
-    message: String,
-    root: ViewGroup? = null,
-) {
-    requireContext().showSuccessToast(message, root)
-}
+fun Fragment.showSuccessToast(message: String) =
+    requireContext().showSuccessToast(message)
 
-fun Fragment.showSuccessToast(
-    @StringRes messageId: Int,
-    root: ViewGroup? = null,
-) {
-    requireContext().showSuccessToast(messageId, root)
-}
+fun Fragment.showSuccessToast(@StringRes messageId: Int) =
+    requireContext().showSuccessToast(messageId)
 
-fun Context.showWarningToast(
-    message: String,
-    root: ViewGroup? = null,
-) {
-    showToast(message, ToastType.WARNING, root)
-}
+fun Context.showWarningToast(message: String) =
+    showToast(message, ToastType.WARNING)
 
-fun Context.showWarningToast(
-    @StringRes messageId: Int,
-    root: ViewGroup? = null,
-) {
-    showToast(getString(messageId), ToastType.WARNING, root)
-}
+fun Context.showWarningToast(@StringRes messageId: Int) =
+    showToast(getString(messageId), ToastType.WARNING)
 
-fun Fragment.showWarningToast(
-    message: String,
-    root: ViewGroup? = null,
-) {
-    requireContext().showWarningToast(message, root)
-}
+fun Fragment.showWarningToast(message: String) =
+    requireContext().showWarningToast(message)
 
-fun Fragment.showWarningToast(
-    @StringRes messageId: Int,
-    root: ViewGroup? = null,
-) {
-    requireContext().showWarningToast(messageId, root)
-}
+fun Fragment.showWarningToast(@StringRes messageId: Int) =
+    requireContext().showWarningToast(messageId)
 
-fun Context.showErrorToast(
-    message: String,
-    root: ViewGroup? = null,
-) {
-    showToast(message, ToastType.ERROR, root)
-}
+fun Context.showErrorToast(message: String) =
+    showToast(message, ToastType.ERROR)
 
-fun Context.showErrorToast(
-    @StringRes messageId: Int,
-    root: ViewGroup? = null,
-) {
-    showToast(getString(messageId), ToastType.ERROR, root)
-}
+fun Context.showErrorToast(@StringRes messageId: Int) =
+    showToast(getString(messageId), ToastType.ERROR)
 
-fun Fragment.showErrorToast(
-    message: String,
-    root: ViewGroup? = null,
-) {
-    requireContext().showErrorToast(message, root)
-}
+fun Fragment.showErrorToast(message: String) =
+    requireContext().showErrorToast(message)
 
-fun Fragment.showErrorToast(
-    @StringRes messageId: Int,
-    root: ViewGroup? = null,
-) {
-    requireContext().showErrorToast(messageId, root)
-}
\ No newline at end of file
+fun Fragment.showErrorToast(@StringRes messageId: Int) =
+    requireContext().showErrorToast(messageId)
\ No newline at end of file
diff --git a/app/src/main/res/layout/toast_layout.xml b/app/src/main/res/layout/toast_layout.xml
index 718a35a8e..4ba9fa068 100644
--- a/app/src/main/res/layout/toast_layout.xml
+++ b/app/src/main/res/layout/toast_layout.xml
@@ -3,7 +3,7 @@
         android:id="@+id/toast_layout"
         android:orientation="horizontal"
         android:background="@drawable/shape_toast_info"
-        android:layout_width="342dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="60dp"
         android:padding="16dp"

From 8b8767afafd31e77ac56ca3a542896d32f92702b Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Tue, 23 Dec 2025 09:38:19 +0900
Subject: [PATCH 35/41] =?UTF-8?q?refactor:=20=EC=A4=91=EB=B3=B5=EB=90=9C?=
 =?UTF-8?q?=20confirm=20=EC=84=A4=EC=A0=95=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/eatssu/android/presentation/util/ActivityUtil.kt    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/ActivityUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/ActivityUtil.kt
index ec2953bf6..915f01523 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/ActivityUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/ActivityUtil.kt
@@ -32,7 +32,6 @@ fun AppCompatActivity.observeNetworkError(
             val message = errorMessage ?: getString(R.string.server_error_message)
 
             showDialog(title, message) {
-                confirmText = getString(R.string.confirm)
                 showCancelButton = false
                 onConfirm { it.dismiss() }
                 onDismiss {

From ca02ee58cb663cd35cf50df38bcad53f71d3281f Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Tue, 23 Dec 2025 09:39:31 +0900
Subject: [PATCH 36/41] =?UTF-8?q?refactor:=20=ED=95=98=EB=93=9C=EC=BD=94?=
 =?UTF-8?q?=EB=94=A9=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EB=A9=94=EC=8B=9C?=
 =?UTF-8?q?=EC=A7=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eatssu/android/presentation/mypage/SignOutViewModel.kt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt
index a7fe9faa6..74e4edb45 100644
--- a/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt
@@ -39,7 +39,12 @@ class SignOutViewModel @Inject constructor(
             val success = signOutUseCase()
             if (!success) {
                 _uiState.value = UiState.Error
-                _uiEvent.emit(UiEvent.ShowToast("탈퇴에 실패했습니다.", ToastType.ERROR))
+                _uiEvent.emit(
+                    UiEvent.ShowToast(
+                        context.getString(R.string.toast_sign_out_fail),
+                        ToastType.ERROR
+                    )
+                )
                 return@launch
             }
 

From 18da734337b9e3670d527087d6708357083a95e8 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Tue, 23 Dec 2025 09:40:47 +0900
Subject: [PATCH 37/41] =?UTF-8?q?refactor:=20=EC=A0=9C=EB=AF=B8=EB=8B=88?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/eatssu/android/presentation/common/NetworkConnection.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/common/NetworkConnection.kt b/app/src/main/java/com/eatssu/android/presentation/common/NetworkConnection.kt
index 3098d7280..af30eeae7 100644
--- a/app/src/main/java/com/eatssu/android/presentation/common/NetworkConnection.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/common/NetworkConnection.kt
@@ -34,7 +34,7 @@ class NetworkConnection(private val context: Context) :
                         .apply {
                             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                         })
-                dialog.dismiss()
+                it.dismiss()
             }
         }
     }

From cd8031a5b15148072f6e216cde82509837e66a95 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Tue, 23 Dec 2025 09:45:18 +0900
Subject: [PATCH 38/41] =?UTF-8?q?refactor:=20xml=20id=20=EC=BB=A8=EB=B2=A4?=
 =?UTF-8?q?=EC=85=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/eatssu/android/presentation/util/ToastUtil.kt    | 4 ++--
 app/src/main/res/layout/toast_layout.xml                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
index 2097ebb48..1a6c0fe33 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
@@ -36,10 +36,10 @@ fun Context.showToast(
     val inflater = LayoutInflater.from(this)
     val snackbarBinding = inflater.inflate(R.layout.toast_layout, viewGroup, false)
 
-    snackbarBinding.findViewById<ImageView>(R.id.ic_toast).setImageResource(type.iconId)
+    snackbarBinding.findViewById<ImageView>(R.id.iv_toast).setImageResource(type.iconId)
     snackbarBinding.findViewById<LinearLayout>(R.id.toast_layout)
         .setBackgroundResource(type.shapeId)
-    snackbarBinding.findViewById<TextView>(R.id.toast_text).text = message
+    snackbarBinding.findViewById<TextView>(R.id.tv_toast_text).text = message
 
     val snackbarLayout = snackbar.view as Snackbar.SnackbarLayout
     with(snackbarLayout) {
diff --git a/app/src/main/res/layout/toast_layout.xml b/app/src/main/res/layout/toast_layout.xml
index 4ba9fa068..6446e7e5f 100644
--- a/app/src/main/res/layout/toast_layout.xml
+++ b/app/src/main/res/layout/toast_layout.xml
@@ -10,7 +10,7 @@
         android:gravity="center_vertical">
 
     <ImageView
-            android:id="@+id/ic_toast"
+            android:id="@+id/iv_toast"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:src="@drawable/ic_toast_info"
@@ -18,7 +18,7 @@
             android:layout_marginEnd="8dp" />
 
     <TextView
-            android:id="@+id/toast_text"
+            android:id="@+id/tv_toast_text"
             style="@style/Body1"
             android:textColor="@color/gray600"
             android:layout_width="0dp"

From 39c5dc6a3fdce82b997e51cb6312161a1c2cd5fb Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Tue, 23 Dec 2025 09:48:24 +0900
Subject: [PATCH 39/41] =?UTF-8?q?refactor:=20Layout=20Binding=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/presentation/util/ToastUtil.kt    | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
index 1a6c0fe33..e0886b4b7 100644
--- a/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/util/ToastUtil.kt
@@ -6,13 +6,10 @@ import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
-import com.eatssu.android.R
+import com.eatssu.android.databinding.ToastLayoutBinding
 import com.eatssu.android.presentation.map.findActivityOrNull
 import com.eatssu.common.UiEvent
 import com.eatssu.common.enums.ToastType
@@ -32,15 +29,13 @@ fun Context.showToast(
         return
     }
 
-    val snackbar = Snackbar.make(viewGroup, "", 5000)
-    val inflater = LayoutInflater.from(this)
-    val snackbarBinding = inflater.inflate(R.layout.toast_layout, viewGroup, false)
-
-    snackbarBinding.findViewById<ImageView>(R.id.iv_toast).setImageResource(type.iconId)
-    snackbarBinding.findViewById<LinearLayout>(R.id.toast_layout)
-        .setBackgroundResource(type.shapeId)
-    snackbarBinding.findViewById<TextView>(R.id.tv_toast_text).text = message
+    val binding = ToastLayoutBinding.inflate(LayoutInflater.from(this), viewGroup, false).apply {
+        ivToast.setImageResource(type.iconId)
+        toastLayout.setBackgroundResource(type.shapeId)
+        tvToastText.text = message
+    }
 
+    val snackbar = Snackbar.make(viewGroup, "", 5000)
     val snackbarLayout = snackbar.view as Snackbar.SnackbarLayout
     with(snackbarLayout) {
         removeAllViews()
@@ -57,7 +52,7 @@ fun Context.showToast(
             setMargins(horizontalMargin, 0, horizontalMargin, bottomMargin)
         }
 
-        addView(snackbarBinding.rootView)
+        addView(binding.root)
     }
 
     snackbar.show()

From 3a1a60acf259036b053c5a0c6ba92445d4f038f1 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Tue, 23 Dec 2025 09:52:00 +0900
Subject: [PATCH 40/41] =?UTF-8?q?refactor:=20core=20=EB=AA=A8=EB=93=88?=
 =?UTF-8?q?=EB=A1=9C=20Toast=20=EA=B4=80=EB=A0=A8=20=EB=A6=AC=EC=86=8C?=
 =?UTF-8?q?=EC=8A=A4=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/util/ToastExtensions.kt      |  28 ------------------
 .../java/com/eatssu/common/enums/ToastType.kt |  17 +++++++----
 .../src/main/res/drawable/ic_toast_error.png  | Bin
 .../src/main/res/drawable/ic_toast_info.png   | Bin
 .../main/res/drawable/ic_toast_success.png    | Bin
 .../main/res/drawable/ic_toast_warning.png    | Bin
 .../main/res/drawable/shape_toast_error.xml   |   0
 .../main/res/drawable/shape_toast_info.xml    |   0
 .../main/res/drawable/shape_toast_success.xml |   0
 .../main/res/drawable/shape_toast_warning.xml |   0
 10 files changed, 11 insertions(+), 34 deletions(-)
 delete mode 100644 app/src/main/java/com/eatssu/android/presentation/util/ToastExtensions.kt
 rename {app => core/common}/src/main/res/drawable/ic_toast_error.png (100%)
 rename {app => core/common}/src/main/res/drawable/ic_toast_info.png (100%)
 rename {app => core/common}/src/main/res/drawable/ic_toast_success.png (100%)
 rename {app => core/common}/src/main/res/drawable/ic_toast_warning.png (100%)
 rename {app => core/common}/src/main/res/drawable/shape_toast_error.xml (100%)
 rename {app => core/common}/src/main/res/drawable/shape_toast_info.xml (100%)
 rename {app => core/common}/src/main/res/drawable/shape_toast_success.xml (100%)
 rename {app => core/common}/src/main/res/drawable/shape_toast_warning.xml (100%)

diff --git a/app/src/main/java/com/eatssu/android/presentation/util/ToastExtensions.kt b/app/src/main/java/com/eatssu/android/presentation/util/ToastExtensions.kt
deleted file mode 100644
index a812af8d6..000000000
--- a/app/src/main/java/com/eatssu/android/presentation/util/ToastExtensions.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.eatssu.android.presentation.util
-
-import androidx.annotation.DrawableRes
-import com.eatssu.android.R
-import com.eatssu.common.enums.ToastType
-
-/**
- * common 모듈의 ToastType은 순수한 enum이므로 Android 리소스에 접근 불가
- * 따라서 ToastExtensions.kt에서 리소스 매핑 제공
- */
-
-@get:DrawableRes
-val ToastType.iconId: Int
-    get() = when (this) {
-        ToastType.INFO -> R.drawable.ic_toast_info
-        ToastType.SUCCESS -> R.drawable.ic_toast_success
-        ToastType.WARNING -> R.drawable.ic_toast_warning
-        ToastType.ERROR -> R.drawable.ic_toast_error
-    }
-
-@get:DrawableRes
-val ToastType.shapeId: Int
-    get() = when (this) {
-        ToastType.INFO -> R.drawable.shape_toast_info
-        ToastType.SUCCESS -> R.drawable.shape_toast_success
-        ToastType.WARNING -> R.drawable.shape_toast_warning
-        ToastType.ERROR -> R.drawable.shape_toast_error
-    }
diff --git a/core/common/src/main/java/com/eatssu/common/enums/ToastType.kt b/core/common/src/main/java/com/eatssu/common/enums/ToastType.kt
index 7e0ddb0a3..00f434a60 100644
--- a/core/common/src/main/java/com/eatssu/common/enums/ToastType.kt
+++ b/core/common/src/main/java/com/eatssu/common/enums/ToastType.kt
@@ -1,12 +1,17 @@
 package com.eatssu.common.enums
 
+import androidx.annotation.DrawableRes
+import com.eatssu.common.R
+
 /**
  * Toast 타입을 정의하는 Enum 클래스
- * common 모듈은 Android 리소스에 접근할 수 없으므로 순수한 타입 정보만 정의
  */
-enum class ToastType {
-    INFO,
-    SUCCESS,
-    WARNING,
-    ERROR
+enum class ToastType(
+    @field:DrawableRes val iconId: Int,
+    @field:DrawableRes val shapeId: Int
+) {
+    INFO(R.drawable.ic_toast_info, R.drawable.shape_toast_info),
+    SUCCESS(R.drawable.ic_toast_success, R.drawable.shape_toast_success),
+    WARNING(R.drawable.ic_toast_warning, R.drawable.shape_toast_warning),
+    ERROR(R.drawable.ic_toast_error, R.drawable.shape_toast_error)
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_toast_error.png b/core/common/src/main/res/drawable/ic_toast_error.png
similarity index 100%
rename from app/src/main/res/drawable/ic_toast_error.png
rename to core/common/src/main/res/drawable/ic_toast_error.png
diff --git a/app/src/main/res/drawable/ic_toast_info.png b/core/common/src/main/res/drawable/ic_toast_info.png
similarity index 100%
rename from app/src/main/res/drawable/ic_toast_info.png
rename to core/common/src/main/res/drawable/ic_toast_info.png
diff --git a/app/src/main/res/drawable/ic_toast_success.png b/core/common/src/main/res/drawable/ic_toast_success.png
similarity index 100%
rename from app/src/main/res/drawable/ic_toast_success.png
rename to core/common/src/main/res/drawable/ic_toast_success.png
diff --git a/app/src/main/res/drawable/ic_toast_warning.png b/core/common/src/main/res/drawable/ic_toast_warning.png
similarity index 100%
rename from app/src/main/res/drawable/ic_toast_warning.png
rename to core/common/src/main/res/drawable/ic_toast_warning.png
diff --git a/app/src/main/res/drawable/shape_toast_error.xml b/core/common/src/main/res/drawable/shape_toast_error.xml
similarity index 100%
rename from app/src/main/res/drawable/shape_toast_error.xml
rename to core/common/src/main/res/drawable/shape_toast_error.xml
diff --git a/app/src/main/res/drawable/shape_toast_info.xml b/core/common/src/main/res/drawable/shape_toast_info.xml
similarity index 100%
rename from app/src/main/res/drawable/shape_toast_info.xml
rename to core/common/src/main/res/drawable/shape_toast_info.xml
diff --git a/app/src/main/res/drawable/shape_toast_success.xml b/core/common/src/main/res/drawable/shape_toast_success.xml
similarity index 100%
rename from app/src/main/res/drawable/shape_toast_success.xml
rename to core/common/src/main/res/drawable/shape_toast_success.xml
diff --git a/app/src/main/res/drawable/shape_toast_warning.xml b/core/common/src/main/res/drawable/shape_toast_warning.xml
similarity index 100%
rename from app/src/main/res/drawable/shape_toast_warning.xml
rename to core/common/src/main/res/drawable/shape_toast_warning.xml

From 8d2c5a0ab05bf334e08d215750b4a278ad80e806 Mon Sep 17 00:00:00 2001
From: PeraSite <pretocki3@gmail.com>
Date: Tue, 23 Dec 2025 10:00:48 +0900
Subject: [PATCH 41/41] =?UTF-8?q?refactor:=20=ED=86=A0=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EB=B2=A1=ED=84=B0=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=ED=99=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/drawable/ic_toast_error.png     | Bin 1072 -> 0 bytes
 .../src/main/res/drawable/ic_toast_error.xml     |  12 ++++++++++++
 .../src/main/res/drawable/ic_toast_info.png      | Bin 995 -> 0 bytes
 .../src/main/res/drawable/ic_toast_info.xml      |  15 +++++++++++++++
 .../src/main/res/drawable/ic_toast_success.png   | Bin 1187 -> 0 bytes
 .../src/main/res/drawable/ic_toast_success.xml   |  13 +++++++++++++
 .../src/main/res/drawable/ic_toast_warning.png   | Bin 681 -> 0 bytes
 .../src/main/res/drawable/ic_toast_warning.xml   |  12 ++++++++++++
 8 files changed, 52 insertions(+)
 delete mode 100644 core/common/src/main/res/drawable/ic_toast_error.png
 create mode 100644 core/common/src/main/res/drawable/ic_toast_error.xml
 delete mode 100644 core/common/src/main/res/drawable/ic_toast_info.png
 create mode 100644 core/common/src/main/res/drawable/ic_toast_info.xml
 delete mode 100644 core/common/src/main/res/drawable/ic_toast_success.png
 create mode 100644 core/common/src/main/res/drawable/ic_toast_success.xml
 delete mode 100644 core/common/src/main/res/drawable/ic_toast_warning.png
 create mode 100644 core/common/src/main/res/drawable/ic_toast_warning.xml

diff --git a/core/common/src/main/res/drawable/ic_toast_error.png b/core/common/src/main/res/drawable/ic_toast_error.png
deleted file mode 100644
index 214265789138695d32914b689f738de6fe8af40c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1072
zcmV-01kd}4P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1I0;1K~#7F?U^xC
z6G0Tm-yVSmj7Ol*E@vDn9pV^f=m@nlI(FD;fzSmSED5a*Ne5#gR@yo81qdB8z!*m>
zMog%%06YUWk=*lb5|Saeo4dW7Av5GR0~~vMd;hol?(MsG0A0FVZy5MQE;byuz>3n4
z6AUp*BkR<xS5KStlSg2A0Q{nXmN9mYGT;L(8IX&IbvP>|5MU1KV%^@E8<f#{dY6o?
zpLy_zCj+X&7puZs1{quPYKXD{2V<c`2_XrpGw!S;Zvk7nyM4T-c9{aXSZLX=S(kxK
zOGUPi=H2#pWdL^>JUjhJ!^fdLWZ8Le(#Ymbr;Zx90RI#=+9;kA#Q>i$XB-XSZUYEW
zXge6+9~)kF>ebYRzK;z(*AU;r6++M4d}QY&B|9%QAUA$1jHTiRjSz;b#iZxKkUbAl
z7qUu!7dt>aN4I*<7G)=eD^Q;O^I{G<2wH_f(JBa6pgj97(Qe#?!Rc3^PcM{@{qA4W
z6etMypMa>5DTK`6)GX*P7s|)|@kekt`xva#-@?9J@a>gP&^L0w)@HtW4Q?P;Nzk99
zZOq07o>i*(KGu%<M(&Zob>Ym4#49EOdRbfJxQz{z630P-!iQBT?tQEMFET<TzPR_5
zu3Z5YD(U)V1kV5)1(iX`UAWuGjF5>xoP8p7H5nq;wyoihSm-nTQQmngLf6aU>q5Cv
z=!^KO+WejE6XVi-1>M5n0oh9UCZ2=#6kcS2=R99z#04#jmuPd9jjDr!Hs4;qFCj9(
zF$b3pCJdDonuS;eT<pZ?%>Y@naSE|Y&_isyZ({?!U}r&*W}&iKh*bvhz;<tY18#x>
zPI2C8pHP9yFj>1^yCkI*;JJ`fsFWEIoSFd@ctOnG)<CslrtlopBTlnWDGsp;k%|0Y
zRLu)WB&BI+S1C2mg)Vdy-mf-|^A|=0pUu>-bqU=fBWbsji|RTCv|rFcuz+P4TV}qo
zUAU1MS<^&>G;|1z!J0@sN4gVhB`XOnY-+y2V}FmeBs(oNfUg4im-NDR!Khv;n|)5x
zT*#n$%vHJ)B1;<%#a?%{(b&)iwzss%m1QaSf8f;3T{e1NdP={QQw;C04C}WhUG)S7
z_8*2)6cG~eAK`8j**$h$!dH49i0q!sF~(kqvO*s)%XLr%@f_tB8vanR9$H=o@4zSc
ztg`{jXja6P(b`A8ah(dlT9OVYJk(M7jHk5$D`jL%&-;zvpIPISj*n8>8-_}8p#GVa
qUX&O^3IuGEXS{xWX6@4Dy7Lbtc)xpCIgCdD0000<MNUMnLSTYaD&BGc

diff --git a/core/common/src/main/res/drawable/ic_toast_error.xml b/core/common/src/main/res/drawable/ic_toast_error.xml
new file mode 100644
index 000000000..1ecd0dfa2
--- /dev/null
+++ b/core/common/src/main/res/drawable/ic_toast_error.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#DE3412"
+        android:pathData="M2,12C2,17.5228 6.4771,22 12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12Z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M14.4355,8.4346C14.748,8.1224 15.2541,8.1222 15.5664,8.4346C15.8788,8.7469 15.8786,9.253 15.5664,9.5654L13.1309,12.001L15.5645,14.4346C15.8769,14.747 15.8769,15.253 15.5645,15.5654C15.252,15.8778 14.746,15.8778 14.4336,15.5654L12,13.1318L9.5664,15.5654C9.254,15.8778 8.748,15.8778 8.4355,15.5654C8.1231,15.253 8.1231,14.747 8.4355,14.4346L10.8691,12.001L8.4336,9.5654C8.1214,9.253 8.1212,8.7469 8.4336,8.4346C8.746,8.1222 9.252,8.1224 9.5645,8.4346L12,10.8701L14.4355,8.4346Z"/>
+</vector>
diff --git a/core/common/src/main/res/drawable/ic_toast_info.png b/core/common/src/main/res/drawable/ic_toast_info.png
deleted file mode 100644
index 07494f1cd9cb937a9e59f4aa86f11e063747a308..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 995
zcmV<9104K`P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH19(Y9K~#7F?U_Mn
z6G0S)|JfF`#X{9f4;~^^uZ=ekw%s1Zlb{~Oda;#4+M|NlB6>9yX?wEuY6VYT&9=4o
zdKJM4f?g^)h*BXL-`kDE?9OI)cBV<de6S?Dne5J+_vX!;e}Nu7{%-^<;m%37T1B3|
zPSQ>D5*S8sFcl$CmJ((9eD65$yl29L1&j=E=jCwiHwx6Tc{DnkmNGrv>#JeOTN7nu
zB$EMt#}Dv;MtL4K5ZK6Sh_(R}cO;MaBJ@W*3HHd+&WhO3`ID9b6SMM(wNa0OI#k?V
z6$={eli`r59^f^9MH`@rzULgllvfm$q_z%HKohluHg%q%5Y5*IERjS5{IHRJdTci?
zKRc;W%Mco$kvFNuIy%e3&Z;QJ{TOS2J0o*7ff7yH96C#-?<mg1&4<_!sycq2&mkk%
zrhu0Zf#>&tv!`K#zvjgKsPq7jepTQTGIHqxaQ8;z{Kqfg`hEKRiOi4}PN=+~^Z<`O
z49K5rK0iJHjGTlKlnIsVkJ11k%~IyxhvxHd`@qL9FoH5+L3KS6LiMV$1Vg4TQx+Qw
z!sh8Ka|0MMV(Q&ma~0bkZd9w;S+LgM1cyy%h356h`}bPJ0LnaLFkomfi1{#I_hC*D
z+D&Uh!~lw^oJ4l!t_E2s%&o^3!bn61H!_JS&T=>eh6Z4RND1$xX`}<keSw_3`4)#k
zq;LJO45v&!O!IzPR31pI!8=IuN-VnA0KwbN5Yb6YyCHNblwdxGuSG*hVhdf0aH4~&
zN~2xt0jd(b@U@5m^;)AF=RrAK2QkVtN;Stac_LFu%^MglCBo&zquZ2TzXvOFCPZ}f
z8D%+5l1A(vG>K8#eT|$V0|uL~^ZBU3&Wx2i)pex@c;|C*MlO>l3eaS;WUXvyK+>bP
zs+Jw&H}!#-#oJ2T5~42UKH3Mw>87!pdiFvMYPYo&(OUFvDQxYM9z&CP86AS3oh0_A
z(niN;Wm~01hV{|y6>&bPT`FyqB#kSgy(Nan;%=ITTJkz&rec=NqyvWyEm)}~{8S$J
zi+^K@X;oEd0ZtkVI-O^<3}ANF#D*h%_r8E7c+^?{+-)J^#$oo7FOVP?=_ZpIbkquW
zy#E-AX<lT+VeK_5%@3DepSskkF`6g2x;W5y&B`5yp9r?N;#C!9J$m%e=MU~L9+0kO
RQKJ9=002ovPDHLkV1g4R#G(KI

diff --git a/core/common/src/main/res/drawable/ic_toast_info.xml b/core/common/src/main/res/drawable/ic_toast_info.xml
new file mode 100644
index 000000000..fd4e0d6e2
--- /dev/null
+++ b/core/common/src/main/res/drawable/ic_toast_info.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#3D69FF"
+        android:pathData="M2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12Z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11.8992,9.441C12.562,9.441 13.0992,8.9038 13.0992,8.241C13.0992,7.5783 12.562,7.041 11.8992,7.041C11.2365,7.041 10.6992,7.5783 10.6992,8.241C10.6992,8.9038 11.2365,9.441 11.8992,9.441Z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M10.3992,10.4312C10.2888,10.4312 10.1992,10.5207 10.1992,10.6312V11.4312C10.1992,11.5416 10.2888,11.6312 10.3992,11.6312H11.1008C11.2112,11.6312 11.3008,11.7207 11.3008,11.8312V15.5938H10.2C10.0895,15.5938 10,15.6833 10,15.7937V16.5938C10,16.7042 10.0895,16.7937 10.2,16.7937H13.8C13.9105,16.7937 14,16.7042 14,16.5938V15.7937C14,15.6833 13.9105,15.5938 13.8,15.5938H13.1008V10.6312C13.1008,10.5207 13.0112,10.4312 12.9008,10.4312H10.3992Z"/>
+</vector>
diff --git a/core/common/src/main/res/drawable/ic_toast_success.png b/core/common/src/main/res/drawable/ic_toast_success.png
deleted file mode 100644
index 341b06358adf58736f0b0ec3af04a2dd54608722..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1187
zcmV;U1YG-xP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1UN}VK~#7F?U_$#
z6jvO_zrWGCd$2LvgHRe}O{>sSaa#(mAT_NCl;#qfL&08J?5*J1OG`>hwopjgOHH7(
zhZb_F;GwiV2rX1xA>e`{5f6%rj-m)&690g^qVxRyX8$<5GqZVbb~YO@A4qoQ&3n7Q
z-|v0joA-VXSY?&x8$wLHHklo8ER`W;?NLf)K&lstdMm%87U5VnS+M!pISVLU87meL
z18q5w&JXljiBgUYJXAMUADe%?@B;AN#j&D|h(vP0H9T3KfMUaAfQ^`q>c|=x(m%B`
zM{6Jd4TS;3N9GAI^3q`6-G$>f=S><KInY0~>nAom&oN6Penf&Jsi9YT7yiHXpKc>9
z35jIZBualN#2WQ*6wN!267Sjh!s1d@Eofk^E1y_4;{{R~37AgRB_-s_25JP$Pg+M#
zEgg7uGW#iiOrdK~Hnn$?4D4cPjj#vl$!wbSbwV!DO^6nqQesQkcnBQ>7GVP2HeOJQ
z-#HH_!X5|qKsEZ;u!3;P$y87;1ol8R`W@qqja%{K@HmFH?a^+-OP0X5ez1g8=cdfQ
z4KL%D(H}6neHg!fG=-kzi+T--azVvD2V_-=4r>44?gOq9HF^^3^&0Y6sM^+m&jF`{
zFRan+AG(pRF*ElYZr;7E-QH1@X)g0QKtwyx0VL`NcYj{L7sIFLeuoK){K54(pgJU<
z@x8eQ>3nkJ3z$MszTgH7VkeE5`RtvK8)h6+>C_?rrpfPs;m&I3=C?6Ec&H(|UMkW#
zP`{5NooBWwpKWW=24dWi{Xe_cqi+slKg;66ol6aM{@~}esq$XwekAF%!rue30oUYS
z`F{PnC%N8r=Jk!+>SZ!$y*(q5k0hPCZKU%iCVdA=5AfBo@9XzoC&ciaM>@qDXEA%`
zDB8oZn@fBWBG9~oN<))B&mVI?WoaPPobdLJMEz@zqft@Hy53yopGL_!2}8t*=AQ6M
zXQo~0RN-mVx8e6WU^!%z6{ykdgtxrbOYI^Fv4FBh+>DvQK=#t?ghYKN>Xhln4$9^Q
zPos*a`G2G(wKyUAAKLmZW=|iDMLGfnM88_@r<yWczzSj=uq7yS7q}m&?0no_SP@9-
zF)ZyEx+iwZiG0+t5Hq&qO~W3Brd1XTb}9A#<}$ng0lElB|I5oQQt>VGLXwY34Q@*D
zWfon5rmv0_Tjr&-a-*E!THe&6!1>Xu-<*1DscKre(I@5PK3+&gdcj432n9**YSo1S
z{gb;6b7*qtC?cCv+6N~_=L0+@{^dgmSy0L5+Vn`NH8SHVYm8-+H)&>kLL(<A8wUIS
z;mZ_N9Eky%=FHo^Yv0ZlU`Tt1e4K*hFUa$sY<SZqZ7UIX4L_`NkP-Sdhza+Ym1iol
z)DB*^r`_a$_n4J8N<@nH8aOE{-nfogS6StG=P7n{f!<ZZGfn^i002ovPDHLkV1m58
BE`0z1

diff --git a/core/common/src/main/res/drawable/ic_toast_success.xml b/core/common/src/main/res/drawable/ic_toast_success.xml
new file mode 100644
index 000000000..0ed57ce78
--- /dev/null
+++ b/core/common/src/main/res/drawable/ic_toast_success.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#228738"
+        android:pathData="M2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12Z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M15.7533,8.3395C16.1181,8.5888 16.2117,9.0866 15.9625,9.4514L11.8625,15.4514C11.7282,15.6479 11.5133,15.7744 11.2763,15.7966C11.0394,15.8187 10.8048,15.7341 10.6364,15.5659L8.1349,13.0659C7.8224,12.7536 7.8222,12.247 8.1345,11.9345C8.4469,11.622 8.9534,11.6218 9.2659,11.9342L11.0854,13.7526L14.6414,8.5487C14.8907,8.1839 15.3885,8.0902 15.7533,8.3395Z"/>
+</vector>
diff --git a/core/common/src/main/res/drawable/ic_toast_warning.png b/core/common/src/main/res/drawable/ic_toast_warning.png
deleted file mode 100644
index d2d29c63380c41446831dbbdf084aa04516c5c6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 681
zcmV;a0#^NrP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0zOGZK~#7F?U~C>
z!$1&*f7=pgmtbyOkdh9d14;-L@HiqKM&b-5qy$QU4x)q$x1@xeQDQS2oPd+{de%E@
zMZ(`{6_4WmXS_3>G0@TRzX{-p$t}+E07F{NvmEFBC%nT0UIdI%#NiSnS|-I$^DM$)
zKgArvgz!MPzy*FcuZY78m+*ji1jzddd4H<8q@vKLD9j*;cm$#)9x5)yhHH%xjex=X
z8^Q>u$En<b7L5RTcvxqX3r9grz~l~t95|`7Q#K!Iy&V@Z0kko;XER2mxQGZ)-bXoY
z){%_wWYVhhAubN?8|(xqM2eep1fqPWXmJrKZcY&}rOl)3DGuUfwf>sV@cDeGGjlF(
zP7yE_ruF8x*IUGq<AH80fV|(M%rk%^u4%Qg0D5#@A%shDYb2mS+BBk~Q2eJgjRe>f
zEt~&TeFQAA7BIeDZ9aiKNt3i{B|xQ3O1uO3f@+Fw6s!akX)}R8ta}Ew0Ofs&v{?t;
z<8pL^9@m~Nz(+S#d9MgBTw9iaNlGJ<7QDa4rns>LP@!RaM2c*|yJxL{rbSD=!0Fa(
z0`xdNgYj)tGoWgl+MdA}0nLD_ZEAal$_Q{qBqo^s00(2wP#FQ&w8`uTI2enYRzO=t
zi;LPzRa(^why=zS&RJ-Ss-9uz3={(@vAK;Ty0PR=1bn>fOQ9Qxl>|t4S{_Ko_elT#
zP!h1u-rw*uhuTnngaZ4Pu62TPRW1pjk8xLIFvGqQtUee%qNAguV{iBdz~{+ZV8gU(
P00000NkvXXu0mjf40R$p

diff --git a/core/common/src/main/res/drawable/ic_toast_warning.xml b/core/common/src/main/res/drawable/ic_toast_warning.xml
new file mode 100644
index 000000000..d291deb44
--- /dev/null
+++ b/core/common/src/main/res/drawable/ic_toast_warning.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#D17D00"
+        android:pathData="M11.1704,2.4935C11.5391,1.8355 12.4609,1.8355 12.8296,2.4935L22.3702,19.5195C22.7389,20.1775 22.278,21 21.5406,21H2.4594C1.722,21 1.261,20.1775 1.6298,19.5195L11.1704,2.4935Z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12.5,16C12.7761,16 13,16.2239 13,16.5V17.5C13,17.7761 12.7761,18 12.5,18H11.5C11.2239,18 11,17.7761 11,17.5V16.5C11,16.2239 11.2239,16 11.5,16H12.5ZM12.5,8C12.7761,8 13,8.2239 13,8.5V14.5C13,14.7761 12.7761,15 12.5,15H11.5C11.2239,15 11,14.7761 11,14.5V8.5C11,8.2239 11.2239,8 11.5,8H12.5Z"/>
+</vector>