feat: shaping for api

triandamai · Jun 20, 2023 · 93ab71e · 93ab71e
1 parent 0e1c86b
commit 93ab71e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/ui/src/main/java/app/trian/mvi/ui/PageWrapper.kt b/ui/src/main/java/app/trian/mvi/ui/PageWrapper.kt
@@ -30,19 +30,20 @@ inline fun <reified ViewModel : MviViewModel<*, *>> NavGraphBuilder.pageWrapper(
         deepLinks = deepLinks
     ) {
         val viewModel: ViewModel = (if (parent.isNullOrEmpty()) {
-            hiltViewModel()
+            hiltViewModel<ViewModel>().apply {
+                setController(controller)
+            }
         } else {
             val parentEntry = remember(controller.navigator.currentBackStackEntry) {
                 controller
                     .navigator
                     .getBackStackEntry(parent)
             }
-            hiltViewModel(parentEntry)
-        })
-
-        LaunchedEffect(key1 = viewModel, block = {
-            viewModel.setController(controller)
+            hiltViewModel<ViewModel>(parentEntry).apply {
+                setController(controller)
+            }
         })
         content(viewModel)
     }
 }
+
diff --git a/ui/src/main/java/app/trian/mvi/ui/viewModel/MviViewModel.kt b/ui/src/main/java/app/trian/mvi/ui/viewModel/MviViewModel.kt
@@ -90,7 +90,12 @@ abstract class MviViewModel<State : Parcelable, Action>(
                 when (it) {
                     is ResultState.Error -> error(
                         it.message.ifEmpty {
-                            controller.getString(it.stringId)
+                            try {
+                                controller.getString(it.stringId)
+                            }catch (e:Exception){
+                                "Unknown error message"
+                            }
+
                         }
                     )
 
@@ -111,7 +116,11 @@ abstract class MviViewModel<State : Parcelable, Action>(
                 when (it) {
                     is ResultStateData.Error -> error(
                         it.message.ifEmpty {
-                            controller.getString(it.stringId)
+                            try {
+                                controller.getString(it.stringId)
+                            }catch (e:Exception){
+                                "Unknown error message"
+                            }
                         }
                     )