[Setting] Error Message 처리 고도화

dnd-side-project · Feb 4, 2024 · 3dc58f9 · 3dc58f9
1 parent 89ed9c5
commit 3dc58f9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/...ac/dnd/bookkeeping/android/presentation/ui/main/home/event/common/group/AddGroupScreen.kt b/...ac/dnd/bookkeeping/android/presentation/ui/main/home/event/common/group/AddGroupScreen.kt
@@ -3,6 +3,7 @@ package ac.dnd.bookkeeping.android.presentation.ui.main.home.event.common.group
 import ac.dnd.bookkeeping.android.presentation.R
 import ac.dnd.bookkeeping.android.presentation.common.theme.Gray200
 import ac.dnd.bookkeeping.android.presentation.common.theme.Headline2
+import ac.dnd.bookkeeping.android.presentation.common.util.ErrorObserver
 import ac.dnd.bookkeeping.android.presentation.common.util.LaunchedEffectWithLifecycle
 import ac.dnd.bookkeeping.android.presentation.common.util.coroutine.event.EventFlow
 import ac.dnd.bookkeeping.android.presentation.common.util.coroutine.event.MutableEventFlow
@@ -58,6 +59,7 @@ fun AddGroupScreen(
             state = state
         )
     }
+    ErrorObserver(viewModel)
 
     AddGroupScreen(
         appState = appState,

diff --git a/...okkeeping/android/presentation/ui/main/home/event/common/relation/SearchRelationScreen.kt b/...okkeeping/android/presentation/ui/main/home/event/common/relation/SearchRelationScreen.kt
@@ -20,7 +20,6 @@ import ac.dnd.bookkeeping.android.presentation.common.util.coroutine.event.Mutab
 import ac.dnd.bookkeeping.android.presentation.common.util.coroutine.event.eventObserve
 import ac.dnd.bookkeeping.android.presentation.common.view.BottomSheetScreen
 import ac.dnd.bookkeeping.android.presentation.common.view.CustomTextField
-import ac.dnd.bookkeeping.android.presentation.common.view.DialogScreen
 import ac.dnd.bookkeeping.android.presentation.common.view.confirm.ConfirmButton
 import ac.dnd.bookkeeping.android.presentation.common.view.confirm.ConfirmButtonProperties
 import ac.dnd.bookkeeping.android.presentation.common.view.confirm.ConfirmButtonSize
@@ -57,7 +56,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -84,16 +82,6 @@ fun SearchRelationScreen(
     }
     ErrorObserver(viewModel)
 
-    var isDialogShowing by remember { mutableStateOf(false) }
-
-    DialogScreen(
-        isShowing = isDialogShowing,
-        title = stringResource(id = R.string.error_dialog_title),
-        onDismissRequest = {
-            isDialogShowing = false
-        }
-    )
-
     SearchRelationScreen(
         appState = appState,
         model = model,

diff --git a/...main/kotlin/ac/dnd/bookkeeping/android/presentation/ui/main/home/history/HistoryScreen.kt b/...main/kotlin/ac/dnd/bookkeeping/android/presentation/ui/main/home/history/HistoryScreen.kt
@@ -1,5 +1,6 @@
 package ac.dnd.bookkeeping.android.presentation.ui.main.home.history
 
+import ac.dnd.bookkeeping.android.presentation.common.util.ErrorObserver
 import ac.dnd.bookkeeping.android.presentation.ui.main.ApplicationState
 import ac.dnd.bookkeeping.android.presentation.ui.main.home.history.main.HistoryMainModel
 import ac.dnd.bookkeeping.android.presentation.ui.main.home.history.main.HistoryMainScreen
@@ -22,6 +23,7 @@ fun HistoryScreen(
             historyInfo = historyInfo
         )
     }
+    ErrorObserver(viewModel)
 
     HistoryMainScreen(
         appState = appState,

diff --git a/.../bookkeeping/android/presentation/ui/main/home/history/main/detail/HistoryDetailScreen.kt b/.../bookkeeping/android/presentation/ui/main/home/history/main/detail/HistoryDetailScreen.kt
@@ -20,6 +20,7 @@ import ac.dnd.bookkeeping.android.presentation.common.theme.Space20
 import ac.dnd.bookkeeping.android.presentation.common.theme.Space24
 import ac.dnd.bookkeeping.android.presentation.common.theme.Space4
 import ac.dnd.bookkeeping.android.presentation.common.theme.Space8
+import ac.dnd.bookkeeping.android.presentation.common.util.ErrorObserver
 import ac.dnd.bookkeeping.android.presentation.common.view.chip.ChipType
 import ac.dnd.bookkeeping.android.presentation.common.view.chip.GroupChipListComponent
 import ac.dnd.bookkeeping.android.presentation.common.view.textfield.TypingTextField
@@ -97,6 +98,7 @@ fun HistoryDetailScreen(
             historyGroups = groups,
         )
     }
+    ErrorObserver(viewModel)
 
     var searchText by remember { mutableStateOf("") }
     var selectedGroupId by remember {