Skip to content

Implemented Onboarding Screen Full Display #3

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
wenja0618 merged 8 commits into from
Mar 30, 2026
Merged

Implemented Onboarding Screen Full Display #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
59156be
Onboarding screen without login interface
yoyo3245 Mar 21, 2026
bf5060e
Revert "Onboarding screen without login interface"
wenja0618 Mar 21, 2026
1d8ce2c
Reapply "Onboarding screen without login interface"
wenja0618 Mar 21, 2026
d4e8da2
finished onboarding screen ui
wenja0618 Mar 26, 2026
1d1978c
Addressed PR comments
wenja0618 Mar 29, 2026
3e1b376
Implemented navigation logic from login buttons to homescreen
wenja0618 Mar 29, 2026
75f56d7
Cleanup
wenja0618 Mar 29, 2026
7a24d51
Addressed onLoginClick mutable state comments
wenja0618 Mar 29, 2026
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
1 change: 0 additions & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ dependencies {
implementation(libs.androidx.compose.ui.graphics)
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.ui.graphics)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/cornellappdev/chimes/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import androidx.compose.ui.unit.sp
import com.cornellappdev.chimes.ui.components.HeaderButton
import com.cornellappdev.chimes.ui.navigation.MainNavigation
import com.cornellappdev.chimes.ui.screens.HomeScreen
import com.cornellappdev.chimes.ui.screens.Onboarding
import com.cornellappdev.chimes.ui.theme.ChimesandroidTheme

class MainActivity : ComponentActivity() {
Expand Down
16 changes: 13 additions & 3 deletions app/src/main/java/com/cornellappdev/chimes/ui/navigation/MainNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,31 @@ import androidx.compose.runtime.remember
import androidx.navigation3.runtime.entryProvider
import androidx.navigation3.ui.NavDisplay
import com.cornellappdev.chimes.ui.screens.HomeScreen
import com.cornellappdev.chimes.ui.screens.Onboarding

@RequiresApi(Build.VERSION_CODES.S)
@Composable
fun MainNavigation () {
val backStack = remember { mutableStateListOf<Any>(NavigationItem.Home) }
fun MainNavigation() {
val backStack = remember { mutableStateListOf<Any>(NavigationItem.Onboarding) }

NavDisplay(
backStack = backStack,
onBack = {
if (backStack.size > 1) backStack.removeLastOrNull()
},
entryProvider = entryProvider {
entry<NavigationItem.Onboarding> {
Onboarding(
onLoginClick = {
backStack.clear()
backStack.add(NavigationItem.Home)
}
)
}

entry<NavigationItem.Home> {
HomeScreen()
}
}
)
}
}
8 changes: 6 additions & 2 deletions app/src/main/java/com/cornellappdev/chimes/ui/navigation/NavigationItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ package com.cornellappdev.chimes.ui.navigation
sealed class NavigationItem(
val route: String,
) {
object Home : NavigationItem (
object Home : NavigationItem(
route = Routes.HOME.name,
)

object Onboarding : NavigationItem(
route = Routes.ONBOARDING.name,
)
}

/**
Expand All @@ -23,4 +27,4 @@ interface NavUnit {
enum class Routes(override var route: String) : NavUnit {
HOME("home"),
ONBOARDING("onboarding"),
}
}
Loading