@@ -70,12 +70,9 @@ fun MainScreen(
7070 val context = LocalContext .current
7171 var backPressedState by remember { mutableStateOf(true ) }
7272 var backPressedTime = 0L
73-
7473 val snackBarHostState = remember { SnackbarHostState () }
7574 val coroutineScope = rememberCoroutineScope()
7675
77- val amplitudeTracker = LocalTracker .current
78-
7976 BackHandler (enabled = backPressedState) {
8077 if (System .currentTimeMillis() - backPressedTime <= 3000 ) {
8178 (context as Activity ).finish()
@@ -91,6 +88,12 @@ fun MainScreen(
9188 backPressedTime = System .currentTimeMillis()
9289 }
9390
91+ val amplitudeTracker = LocalTracker .current
92+ val splashNavOptions = NavOptions .Builder ().setPopUpTo(
93+ route = Splash (redirect),
94+ inclusive = true
95+ ).build()
96+
9497 Scaffold (
9598 snackbarHost = {
9699 SnackbarHost (
@@ -146,36 +149,16 @@ fun MainScreen(
146149 ) {
147150 splashNavGraph(
148151 navigateHome = {
149- navigator.navController.navigateHome(
150- navOptions = NavOptions .Builder ().setPopUpTo(
151- route = Splash (redirect),
152- inclusive = true
153- ).build()
154- )
152+ navigator.navController.navigateHome(navOptions = splashNavOptions)
155153 },
156154 navigateSignIn = {
157- navigator.navController.navigateSignIn(
158- navOptions = NavOptions .Builder ().setPopUpTo(
159- route = Splash (redirect),
160- inclusive = true
161- ).build()
162- )
155+ navigator.navController.navigateSignIn(navOptions = splashNavOptions)
163156 },
164157 navigateCalendar = {
165- navigator.navController.navigateCalendar(
166- navOptions = NavOptions .Builder ().setPopUpTo(
167- route = Splash (redirect),
168- inclusive = true
169- ).build()
170- )
158+ navigator.navController.navigateCalendar(navOptions = splashNavOptions)
171159 },
172160 navigateSearch = {
173- navigator.navController.navigateSearch(
174- navOptions = NavOptions .Builder ().setPopUpTo(
175- route = Splash (redirect),
176- inclusive = true
177- ).build()
178- )
161+ navigator.navController.navigateSearch(navOptions = splashNavOptions)
179162 }
180163 )
181164 homeNavGraph(
0 commit comments