Skip to content

Update navigation logic to properly pop up the onboarding route #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yusufnasserdev merged 2 commits into from
Jun 27, 2025
Merged

Update navigation logic to properly pop up the onboarding route #67

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75d65ee
update navigation logic to properly pop up the onboarding route
yusufnasserdev Jun 27, 2025
b16319d
replace material 3 TextButton with Tudee's TextButton
yusufnasserdev Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 6 additions & 17 deletions app/src/main/java/com/example/tudee/presentation/screen/onboarding/OnBoardingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.example.tudee.presentation.screen.onboarding

import android.content.res.Configuration
import android.util.Log
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
Expand All @@ -13,7 +12,6 @@ import androidx.compose.foundation.pager.PagerState
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.rememberCoroutineScope
Expand Down Expand Up @@ -49,13 +47,9 @@ fun OnBoardingScreen(

val isFirstEntry by viewModel.isFirstEntry.collectAsState()

LaunchedEffect(isFirstEntry) {
if (!isFirstEntry) {
navController.navigate(Destination.HomeScreen.route) {
popUpTo(navController.graph.startDestinationId) {
inclusive = true
}
}
if (!isFirstEntry) {
navController.navigate(Destination.HomeScreen.route) {
popUpTo(Destination.OnBoardingScreen.route) { inclusive = true }
}
}

Expand Down Expand Up @@ -95,9 +89,7 @@ fun OnBoardingScreen(
viewModel.loadInitialData()
viewModel.saveFirstEntry()
navController.navigate(Destination.HomeScreen.route) {
popUpTo(navController.graph.startDestinationId) {
inclusive = true
}
popUpTo(Destination.OnBoardingScreen.route) { inclusive = true }
}
}
)
Expand All @@ -123,10 +115,7 @@ private fun OnBoardingContent(
modifier = Modifier
.align(alignment = Alignment.TopStart)
.zIndex(10f),
onClick = {
Log.d("OnBoarding", "Skip button clicked")
navigateToHome()
},
onClick = navigateToHome,
) {
Text(
stringResource(R.string.skip_button),
Expand Down Expand Up @@ -158,7 +147,7 @@ private fun OnBoardingContent(
onClick = {
scope.launch {
if (pageState.currentPage != onBoardingPageUiModels.lastIndex) {
pageState.animateScrollToPage(pageState.currentPage + 1)
pageState.animateScrollToPage(pageState.currentPage + Pages.SecondPage.page)
} else {
navigateToHome()
}
Expand Down