fix(android): preserve More in back navigation - #1571
Merged
Conversation
ryanbr
marked this pull request as ready for review
August 24, 2026 05:51
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does
Preserves the Android More page in the navigation back stack when one of its 27 destination rows is opened.
More became a real
NavHostdestination in798567e1, but its rows continued usingnavigateTopLevel(). That helper pops to the graph start destination (Today) before navigating, so the stack becameToday → destinationand Android Back skipped More.The shared More callback now performs an ordinary push:
Bottom-tab selections keep their existing single-top state save/restore behavior. Contextual top-level links elsewhere are untouched because their section-switching semantics are independent of this report.
A focused source-contract regression test pins both sides of that boundary: every generated More row still uses the shared push callback, while bottom tabs continue through
navigateTopLevel().No BLE, protocol, persistence, analytics, localization, public API, or visual/layout changes.
Type of change
How it was tested
Added
MoreNavigationContractTest.moreRowsPushWhileBottomTabsRemainTopLevel, which checks that:nav.navigate(it);nav.navigateTopLevel(it);navigateTopLevel().Local source checks:
python3 Tools/doc_comment_lint.py— passpython3 Tools/i18n_audit.py --ci origin/main— passgit diff --check— passassembleFullDebug+testFullDebugUnitTest— passAndroid compile/unit-test commands were attempted but could not start because this workspace has no Java runtime or Android SDK:
The PR is therefore opened as a draft pending
./gradlew testFullDebugUnitTest,./gradlew compileFullDebugKotlin, and Android emulator/device verification.Manual acceptance matrix for that verification:
Checklist
swift testinPackages/<name>) — no Swift packages touchedandroid/(./gradlew testFullDebugUnitTest) — GitHub Android CIStrandDesigntokens — no visual/layout changesdocs/CONTRIBUTING.mdStrand.xcodeproj/) or any secrets/keystoresRelated issues
Closes #1570
Related: #397 proposes a larger replacement of the current More page.