Zzx/feature/map nav3#578
Merged
Merged
Conversation
generalio
requested review from
282649458,
985892345,
HI-IR,
QTwawa,
Copilot,
sanhuzhen and
summerpalace2
There was a problem hiding this comment.
Pull request overview
This PR migrates the “map” feature to the new Navigation3-based NavEntry architecture, including bottom-sheet overlays and updated back-handling, and updates other modules’ entry points accordingly.
Changes:
- Replace legacy route-based Map entry usage with
MapNavArgumentnavigation and add the required module dependency. - Refactor Map’s Search / PlaceDetail bottom sheets into NavEntry-driven overlay content using
LocalBottomSheetScope. - Introduce a cross-subtree ViewModel/argument bridge (
MapVmHolder) and migrate back handling toandroidx.navigationevent.
Reviewed changes
Copilot reviewed 147 out of 187 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| cyxbs-pages/ufield/src/androidMain/kotlin/com/cyxbs/pages/ufield/ui/activity/DetailActivity.kt | Switches “open map” action to the new Map navigation entry point. |
| cyxbs-pages/ufield/build.gradle.kts | Adds dependency on cyxbsPages.map.api so ufield can reference MapNavArgument. |
| cyxbs-pages/map/src/commonMain/kotlin/com/cyxbs/pages/map/widget/SearchBottomSheet.kt | Extracts Search bottom-sheet inner content and switches draggable handling to LocalBottomSheetScope. |
| cyxbs-pages/map/src/commonMain/kotlin/com/cyxbs/pages/map/widget/PlaceDetailBottomSheet.kt | Extracts PlaceDetail bottom-sheet inner content and switches draggable handling to LocalBottomSheetScope. |
| cyxbs-pages/map/src/commonMain/kotlin/com/cyxbs/pages/map/viewmodel/MapComposeViewModel.kt | Minor formatting plus removal of the unused VR jump hook. |
| cyxbs-pages/map/src/commonMain/kotlin/com/cyxbs/pages/map/ui/SearchCompose.kt | Migrates from custom backHandler modifier to NavigationBackHandler. |
| cyxbs-pages/map/src/commonMain/kotlin/com/cyxbs/pages/map/ui/MapVmHolder.kt | Adds a holder to share Map VM / owner / arguments across NavEntry subtrees (for overlay sheets). |
| cyxbs-pages/map/src/commonMain/kotlin/com/cyxbs/pages/map/ui/MapNavEntry.kt | Publishes shared VM scope, migrates back handling, hosts overlay sheet entries, and switches VR jump to AppScheme. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
141
to
143
| layoutMap.setOnClickListener { | ||
| startActivity(DISCOVER_MAP) | ||
| MapNavArgument().navigate() | ||
| } |
985892345
approved these changes
Jun 7, 2026
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.
map的nav3迁移