Move to ViewModel

Author: levinli303

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto"
-    android:versionCode="665"
+    android:versionCode="666"
     android:versionName="1.9.5">
 
     <uses-feature android:name="android.hardware.type.pc" android:required="false" />

app/src/main/java/space/celestia/mobilecelestia/eventfinder/EventFinderContainerFragment.kt

@@ -30,9 +30,7 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.ComposeView
@@ -51,25 +49,22 @@ import space.celestia.celestia.EclipseFinder
 import space.celestia.mobilecelestia.R
 import space.celestia.mobilecelestia.compose.Mdc3Theme
 import space.celestia.mobilecelestia.eventfinder.viewmodel.EventFinderViewModel
+import space.celestia.mobilecelestia.eventfinder.viewmodel.Page
 import space.celestia.mobilecelestia.utils.CelestiaString
 import space.celestia.mobilecelestia.utils.julianDay
 import space.celestia.mobilecelestia.utils.showAlert
 import space.celestia.mobilecelestia.utils.showLoading
 
-private sealed class Page {
-    data object Home : Page()
-    class Results(val results: List<EclipseFinder.Eclipse>) : Page()
-}
-
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun EventFinder() {
-    val backStack = rememberSaveable { mutableStateListOf<Page>(Page.Home) }
     val scope = rememberCoroutineScope()
     val viewModel: EventFinderViewModel = hiltViewModel()
     val activity = LocalActivity.current
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
 
+    val backStack = viewModel.backStack
+
     Scaffold(
         topBar = {
             TopAppBar(title = {

app/src/main/java/space/celestia/mobilecelestia/eventfinder/viewmodel/EventFinderViewModel.kt

@@ -1,10 +1,19 @@
 package space.celestia.mobilecelestia.eventfinder.viewmodel
 
+import androidx.compose.runtime.mutableStateListOf
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import space.celestia.celestia.AppCore
+import space.celestia.celestia.EclipseFinder
 import space.celestia.mobilecelestia.common.CelestiaExecutor
 import javax.inject.Inject
 
+sealed class Page {
+    data object Home : Page()
+    class Results(val results: List<EclipseFinder.Eclipse>) : Page()
+}
+
 @HiltViewModel
-class EventFinderViewModel @Inject constructor(val appCore: AppCore, val executor: CelestiaExecutor) : ViewModel()
+class EventFinderViewModel @Inject constructor(val appCore: AppCore, val executor: CelestiaExecutor) : ViewModel() {
+    val backStack = mutableStateListOf<Page>(Page.Home)
+}