Merge pull request #21 from Kaaveh/bugfix/baseviewmodel_instance

[bugfix] handle instance of baseViewModel
Kaaveh · Jan 24, 2023 · 673ab2a · 673ab2a
2 parents 2d10dc9 + 2aa77aa
commit 673ab2a
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/app/src/main/java/ir/kaaveh/composenews/ui/MainActivity.kt b/app/src/main/java/ir/kaaveh/composenews/ui/MainActivity.kt
@@ -9,6 +9,10 @@ import androidx.compose.material.Scaffold
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Favorite
 import androidx.compose.material.icons.filled.Home
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.navigation.compose.currentBackStackEntryAsState
@@ -26,9 +30,6 @@ import ir.kaaveh.navigation.Destinations
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
-    // TODO: handle viewModel more properly
-    private var baseViewModel: BaseViewModel = BaseViewModel()
-
     private val items = listOf(
         BottomNavItem(
             name = "News",
@@ -47,6 +48,10 @@ class MainActivity : ComponentActivity() {
         setContent {
             ComposeNewsTheme {
 
+                // TODO: handle viewModel more properly
+                var baseViewModel: BaseViewModel by remember {
+                    mutableStateOf(BaseViewModel())
+                }
                 val navController = rememberNavController()
                 val backStackEntry = navController.currentBackStackEntryAsState()
                 val currentScreenRoute = backStackEntry.value?.destination?.route