refactor: consolidate duplicate navigation code between app and shared modules#14
Merged
Merged
Conversation
garfiec
force-pushed
the
refactor/consolidate-navigation
branch
2 times, most recently
from
b792793 to
fc82101
Compare
garfiec
force-pushed
the
refactor/consolidate-navigation
branch
from
fc82101 to
acd8366
Compare
7 tasks
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
1 participant
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.
Description:
Problem
The KMP migration duplicated the entire navigation layer into both app/ (Android) and shared/ (iOS/common) — 10 files with near-identical implementations maintained independently. The shared version had KMP-safe improvements (no runBlocking, defensive error handling, CMP resources) while the app version had Android-specific features (tablet layout, deep links, share intents). Changes to one required manual mirroring to
the other.
Solution
Consolidated into a single source of truth in the shared module. The app module now depends on :shared and retains only two thin Android-specific files:
MainNavDisplay extracted as a public composable in shared, reused by both the shared PhoneLayout and app's TabletLayout.
firstBlocking expect/actual added to core:common so the shared NavHostViewModel can synchronously read persisted sidebar state on Android (runBlocking) while returning a safe default on iOS.