-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Migrate codebase to Navigation 3 #1902
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.
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
Open
dturner
wants to merge
7
commits into
android:main
Choose a base branch
from
claraf3:cleanup-new-code
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+2,514
−2,543
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
7cc2b1a
Split feature modules into api and impl modules
claraf3 a163dd7
Add NiaBackStack and BackStack providers
claraf3 b96b3e9
Refactor feature modules to navigation3
claraf3 04fa1ff
Refactor app to navigation3
claraf3 67d7978
Refactor Interests to ListDetailScene
claraf3 9985a02
Update feature ViewModels and tests
claraf3 289d1ac
Update readme and build dependency graph
claraf3 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
53 changes: 53 additions & 0 deletions
53
app/src/main/kotlin/com/google/samples/apps/nowinandroid/di/BackStackProvider.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * Copyright 2025 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.samples.apps.nowinandroid.di | ||
|
|
||
| import com.google.samples.apps.nowinandroid.core.navigation.NiaBackStack | ||
| import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey | ||
| import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination | ||
| import dagger.Module | ||
| import dagger.Provides | ||
| import dagger.hilt.InstallIn | ||
| import dagger.hilt.components.SingletonComponent | ||
| import kotlinx.serialization.modules.PolymorphicModuleBuilder | ||
| import kotlinx.serialization.modules.SerializersModule | ||
| import kotlinx.serialization.modules.polymorphic | ||
| import javax.inject.Singleton | ||
|
|
||
| @Module | ||
| @InstallIn(SingletonComponent::class) | ||
| object BackStackProvider { | ||
| @Provides | ||
| @Singleton | ||
| fun provideNiaBackStack(): NiaBackStack = | ||
| NiaBackStack(startKey = TopLevelDestination.FOR_YOU.key) | ||
|
|
||
| /** | ||
| * Registers feature modules' polymorphic serializers to support | ||
| * feature keys' save and restore by savedstate | ||
| * in [com.google.samples.apps.nowinandroid.core.navigation.NiaBackStackViewModel]. | ||
| */ | ||
| @Provides | ||
| @Singleton | ||
| fun provideSerializersModule( | ||
dturner marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| polymorphicModuleBuilders: Set<@JvmSuppressWildcards PolymorphicModuleBuilder<NiaNavKey>.() -> Unit>, | ||
| ): SerializersModule = SerializersModule { | ||
| polymorphic(NiaNavKey::class) { | ||
| polymorphicModuleBuilders.forEach { it() } | ||
| } | ||
| } | ||
| } | ||
54 changes: 54 additions & 0 deletions
54
app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavDisplay.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Copyright 2025 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.samples.apps.nowinandroid.navigation | ||
|
|
||
| import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi | ||
| import androidx.compose.material3.adaptive.navigation3.rememberListDetailSceneStrategy | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator | ||
| import androidx.navigation3.runtime.EntryProviderBuilder | ||
| import androidx.navigation3.runtime.entryProvider | ||
| import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator | ||
| import androidx.navigation3.ui.NavDisplay | ||
| import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator | ||
| import com.google.samples.apps.nowinandroid.core.navigation.NiaBackStack | ||
| import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey | ||
|
|
||
| @OptIn(ExperimentalMaterial3AdaptiveApi::class) | ||
| @Composable | ||
| fun NiaNavDisplay( | ||
| niaBackStack: NiaBackStack, | ||
| entryProviderBuilders: Set<EntryProviderBuilder<NiaNavKey>.() -> Unit>, | ||
| ) { | ||
| val listDetailStrategy = rememberListDetailSceneStrategy<NiaNavKey>() | ||
|
|
||
| NavDisplay( | ||
dturner marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| backStack = niaBackStack.backStack, | ||
| sceneStrategy = listDetailStrategy, | ||
| onBack = { count -> niaBackStack.popLast(count) }, | ||
| entryDecorators = listOf( | ||
| rememberSceneSetupNavEntryDecorator(), | ||
| rememberSavedStateNavEntryDecorator(), | ||
| rememberViewModelStoreNavEntryDecorator(), | ||
| ), | ||
| entryProvider = entryProvider { | ||
| entryProviderBuilders.forEach { builder -> | ||
| builder() | ||
| } | ||
| }, | ||
| ) | ||
| } | ||
72 changes: 0 additions & 72 deletions
72
app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.