[Feat] 새 Toast, Dialog 적용

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() //바로 알림 받도록 설정
             }
         }
@@ -171,8 +172,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)
                 }
             }
         }

app/src/main/java/com/eatssu/android/presentation/MainViewModel.kt

@@ -13,6 +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.common.enums.ToastType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -67,28 +68,24 @@ class MainViewModel @Inject constructor(
             // 1) 닉네임 없음
             if (nickname.isBlank()) {
                 _uiState.value = UiState.Success(MainState.NicknameNull)
-                _uiEvent.emit(UiEvent.ShowToast(context.getString(R.string.set_nickname)))
+                _uiEvent.emit(UiEvent.ShowToast(context.getString(R.string.set_nickname), ToastType.ERROR))
                 return@launch
             }
 
             // 2) 정상 닉네임
             _uiState.value = UiState.Success(MainState.NicknameExists(nickname))
-            _uiEvent.emit(
-                UiEvent.ShowToast(
-                    String.format(
-                        context.getString(R.string.hello_user),
-                        nickname
-                    )
-                )
-            )
         }
     }
 
     fun logOut() {
         viewModelScope.launch {
             logoutUseCase()
             _uiState.value = UiState.Success(MainState.LoggedOut)
-            _uiEvent.emit(UiEvent.ShowToast("로그아웃 되었습니다."))
+            _uiEvent.emit(
+                UiEvent.ShowToast(
+                    context.getString(R.string.toast_logout_success), ToastType.SUCCESS
+                )
+            )
         }
     }
 
@@ -121,7 +118,12 @@ class MainViewModel @Inject constructor(
         viewModelScope.launch {
             val (college, department) = userRepository.getUserCollegeDepartment() ?: run {
                 _uiState.value = UiState.Error
-                _uiEvent.emit(UiEvent.ShowToast("정보를 불러올 수 없습니다."))
+                _uiEvent.emit(
+                    UiEvent.ShowToast(
+                        context.getString(R.string.not_found),
+                        ToastType.ERROR
+                    )
+                )
                 return@launch
             }
 

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
@@ -21,6 +20,7 @@ import com.eatssu.android.R
 import com.eatssu.android.presentation.common.NetworkConnection
 import com.eatssu.android.presentation.login.LoginActivity
 import com.eatssu.android.presentation.util.observeNetworkError
+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
@@ -107,17 +107,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.toast_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.toast_token_server_error)
                 navigateToLogin()
             }
         }

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)
         }
     }
 

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.SUCCESS))
             val type = lastMenuType
             val id = lastItemId
             if (type != null && id != null) {

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)
                 }
             }
         }

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))
         }
     }
 }

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()
                     }

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)
                 }
             }
         }

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)
         }
     }

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()
     }
 }