Skip to content

[Navigation] Introduce navigation-compose-material and support for bottom sheet navigation destinations #173

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

Closed
jossiwolf wants to merge 50 commits into from
Closed

[Navigation] Introduce navigation-compose-material and support for bottom sheet navigation destinations #173

Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
3806657
Introduce navigation-compose-material and support for bottom sheet na…
jossiwolf Mar 15, 2021
e575917
Document BottomSheetNavigator's behavior with nested flows more closely
jossiwolf May 4, 2021
919f2cd
Clean up tests
jossiwolf May 4, 2021
00b1234
Enable strict API mode
jossiwolf May 4, 2021
b0b5e6c
Use NAVIGATION's version for navigation-compose-material
jossiwolf May 4, 2021
665feef
Rename "Compose Material Navigation" -> "Navigation Compose Material"
jossiwolf May 4, 2021
ad67867
Update BottomSheetNavigator's Navigator.Name to "BottomSheetNavigator…
jossiwolf May 4, 2021
6ca9ba4
Remove unneeded dependency
jossiwolf May 4, 2021
9308d85
Lint & Formatting
jossiwolf May 4, 2021
74c6662
Apply Kotlin plugin through AndroidXUiPlugin#applyAndConfigureKotlinP…
jossiwolf May 4, 2021
6bbf7d4
Add testOnSheetDismissedCalled_programmaticDismiss to test programmat…
jossiwolf May 6, 2021
1a94248
Remove ActiveNavBackStackEntry.kt
jossiwolf May 6, 2021
a432a99
Manually apply Kotlin Plugin for now
jossiwolf May 6, 2021
3923a87
Use runBlockingTest for SheetContentHostTest test methods
jossiwolf May 7, 2021
e56c40b
Use new LocalOwnersProvider API and lift SaveableStateHolder out of i…
jossiwolf May 7, 2021
738ee79
Use public APIs for routes
jossiwolf May 7, 2021
17ed7c8
Remove unneeded import
jossiwolf May 7, 2021
869ad5a
Add NavGraphBuilderTest.kt to test the NavGraphBuilder#bottomSheet ex…
jossiwolf May 7, 2021
38ede9d
Register navigator with navController as side effect
jossiwolf May 8, 2021
0851e06
Remove old BackStackEntryIdViewModel API entry; we already have the c…
jossiwolf May 11, 2021
35a46ad
Add test case for dismiss callback when ModalBottomSheetLayout starts…
jossiwolf May 11, 2021
e8c1dde
Add temporary workaround to pop back stack on sheet dismiss
jossiwolf May 12, 2021
3a8d677
Experiment with custom-restoring state
jossiwolf May 21, 2021
15f28f4
Use AndroidXComposePlugin instead of AndroidXUiPlugin
jossiwolf Jul 16, 2021
c94e5fb
Switch to NavigatorState#pop over popBackStack
jossiwolf Jul 16, 2021
eef6cc3
Revert "Experiment with custom-restoring state"
jossiwolf Jul 16, 2021
4ae2f14
Access NavigatorState's back stack directly
jossiwolf Jul 16, 2021
cf63f07
Use transition APIs
jossiwolf Jul 21, 2021
84616c2
Move sheet dismissal listener logic to SheetContentHost.kt
jossiwolf Jul 22, 2021
37b4c9a
Remove BottomSheetNavigator's onBottomSheet param
jossiwolf Jul 22, 2021
8b631ed
Revert "Move sheet dismissal listener logic to SheetContentHost.kt"
jossiwolf Jul 22, 2021
d4e0f94
Retrieve argument with getString instead of casting
jossiwolf Jul 22, 2021
805db36
Make SheetContentHost's onSheetShown param non-optional
jossiwolf Jul 23, 2021
732b43f
Add onSheetShown test
jossiwolf Jul 23, 2021
9506246
Add state restoration test
jossiwolf Jul 24, 2021
b533643
`@Ignore` testSheetShownAfterNavControllerRestoresState
jossiwolf Jul 24, 2021
55fef09
Use rememberNavController over manually creating NavHostController be…
jossiwolf Jul 24, 2021
df14817
Use popWithTransition
jossiwolf Jul 28, 2021
9bba09d
Make sheetState an impl detail of BottomSheetNavigator.kt and expose …
jossiwolf Jul 28, 2021
9e98f25
Use markTransitionComplete API
jossiwolf Jul 29, 2021
80f1029
Pin Compose 1.0.1 for navigation-compose-material
jossiwolf Jul 30, 2021
c09724b
Use internalShow instead of show, the show call is cancelled
jossiwolf Jul 30, 2021
4e8677b
Pop only dismissed sheet's entry
jossiwolf Jul 30, 2021
cb6739f
Mark all entries' transitions as complete
jossiwolf Jul 30, 2021
88a78c5
Attach NavigatorState before first composition
jossiwolf Jul 30, 2021
c66eb71
Lint :)
jossiwolf Jul 31, 2021
82f8ba8
Add `testNavigateCompletesEntriesTransitions` Test
jossiwolf Jul 31, 2021
0e0046c
Make BottomSheetNavigator's fields public
jossiwolf Jul 31, 2021
adcf347
Add BottomSheetNavigator to NavController in composition
jossiwolf Aug 1, 2021
f3423e1
Remove `testNavigationNestedInGraph` test
jossiwolf Aug 1, 2021
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
Prev Previous commit
Next Next commit
Pop only dismissed sheet's entry 
Change-Id: I6017c5bfbbd438f92fc9ad36a3c09de1f5768ad5
  • Loading branch information
@jossiwolf
jossiwolf committed Aug 1, 2021
commit 4e8677b9bba34c776935ea64ef352ff0ed947b7c
4 changes: 1 addition & 3 deletions ...mpose-material/src/main/java/androidx/navigation/compose/material/BottomSheetNavigator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,7 @@ public class BottomSheetNavigator(
if (state.transitionsInProgress.value.contains(backStackEntry)) {
state.markTransitionComplete(backStackEntry)
} else {
// When the sheet has been dismissed by the user we always want to pop
// the whole back stack of this navigator's state
state.pop(popUpTo = state.backStack.value.first(), saveState = false)
state.pop(popUpTo = backStackEntry, saveState = false)
}
}
)
Expand Down