Skip to content

refactor(app): 앱 루트를 Navigation 3로 전환 (#1702) #2295

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
1hyok merged 3 commits into from
Oct 14, 2026
Merged

refactor(app): 앱 루트를 Navigation 3로 전환 (#1702) #2295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
195aed3
refactor(app): move root navigation to Navigation 3 (#1702)
1hyok Oct 14, 2026
2197570
fix(nav3): preserve predictive back root transition
1hyok Oct 14, 2026
0b1e8bc
fix(navigation): initialize supplied start destination
1hyok Oct 14, 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
28 changes: 8 additions & 20 deletions app/src/androidTest/java/com/afternote/afternote_fe/AppAndReceiverCompletionAndroidTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,42 +500,30 @@ class ReceiverRuntimeCompletionAndroidTest {
actions = homeActions
}
AfternoteTheme {
NavHost(
navController = currentAppState.navController,
startDestination = Route.Home,
) {
composable<Route.Home> { Text("home route") }
composable<Route.Afternote> { Text("afternote route") }
composable<Route.MindRecord> { Text("mind record route") }
composable<Route.TimeLetter> { Text("time letter route") }
composable<Route.MemorySpace> { Text("memory space route") }
composable<Route.Setting> { Text("setting route") }
}
Text("home route")
}
}
composeRule.onNodeWithText("home route").assertIsDisplayed()

val homeActions = checkNotNull(actions)
composeRule.runOnIdle { homeActions.onNextStepClick() }
composeRule.onNodeWithText("afternote route").assertIsDisplayed()
assertEquals(Route.Afternote, composeRule.runOnIdle { checkNotNull(appState).backStack.last() })
// 카테고리 카드는 시안에 없어 사라졌지만(#700) 주간 이미지·카운트는 여전히
// Route.MindRecord 로 간다 — 살아 있는 진입점이라 가드를 그쪽으로 옮긴다 (리뷰 지적).
composeRule.runOnIdle { homeActions.onWeeklyImageClick() }
composeRule.onNodeWithText("mind record route").assertIsDisplayed()
composeRule.runOnIdle { checkNotNull(appState).navController.popBackStack() }
assertEquals(Route.MindRecord, composeRule.runOnIdle { checkNotNull(appState).backStack.last() })
composeRule.runOnIdle { homeActions.onWeeklyCountClick() }
composeRule.onNodeWithText("mind record route").assertIsDisplayed()
composeRule.runOnIdle { checkNotNull(appState).navController.popBackStack() }
assertEquals(Route.MindRecord, composeRule.runOnIdle { checkNotNull(appState).backStack.last() })

// 2026-08-09 확정된 타임레터 NEXT STEP 카드의 목적지 (#700).
composeRule.runOnIdle { homeActions.onTimeLetterNextStepClick() }
composeRule.onNodeWithText("time letter route").assertIsDisplayed()
assertEquals(Route.TimeLetter, composeRule.runOnIdle { checkNotNull(appState).backStack.last() })

composeRule.runOnIdle { checkNotNull(appState).navController.popBackStack() }
composeRule.runOnIdle { homeActions.onMemoriesSectionClick() }
composeRule.onNodeWithText("memory space route").assertIsDisplayed()
assertEquals(Route.MindRecord, composeRule.runOnIdle { checkNotNull(appState).backStack.last() })
assertEquals(Route.MemorySpace, composeRule.runOnIdle { checkNotNull(appState).pendingMindRecordDestination })
composeRule.runOnIdle { homeActions.onSettingClick() }
composeRule.onNodeWithText("setting route").assertIsDisplayed()
assertEquals(Route.Setting(), composeRule.runOnIdle { checkNotNull(appState).backStack.last() })
}

@Test
Expand Down
5 changes: 3 additions & 2 deletions app/src/androidTest/java/com/afternote/afternote_fe/MindRecordHomeRequestCountAndroidTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import androidx.navigation.compose.ComposeNavigator
import androidx.navigation.testing.TestNavHostController
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.afternote.afternote_fe.navigation.AppNavigation
import com.afternote.afternote_fe.navigation.AppState
import com.afternote.afternote_fe.navigation.rememberAfternoteAppState
import com.afternote.afternote_fe.test.FailureArtifactRule
import com.afternote.core.ui.Route
import com.afternote.core.ui.theme.AfternoteTheme
Expand Down Expand Up @@ -91,7 +91,8 @@ class MindRecordHomeRequestCountAndroidTest {
AfternoteTheme {
AppNavigation(
startDestination = Route.MindRecord,
appState = AppState(navController),
appState = rememberAfternoteAppState(Route.MindRecord),
mindRecordNavController = navController,
)
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/androidTest/java/com/afternote/afternote_fe/ReceiverSelectionResultAndroidTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.navigation.testing.TestNavHostController
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import com.afternote.afternote_fe.navigation.AppNavigation
import com.afternote.afternote_fe.navigation.AppState
import com.afternote.afternote_fe.navigation.rememberAfternoteAppState
import com.afternote.afternote_fe.test.FailureArtifactRule
import com.afternote.core.domain.repository.UserRepository
import com.afternote.core.domain.testing.FakeUserRepository
Expand Down Expand Up @@ -118,7 +118,7 @@ class ReceiverSelectionResultAndroidTest {
AfternoteTheme {
AppNavigation(
startDestination = Route.Afternote,
appState = AppState(navController),
appState = rememberAfternoteAppState(Route.Afternote),
)
}
}
Expand Down
Loading
Loading