Replace Nav2 with Nav3: Part 1 by Iannnr · Pull Request #594 · imashnake0/Animite

Iannnr · 2026-03-03T23:41:54Z

Read CONTRIBUTING.md.

Summary of changes:

Each screen is now internal & provided by hilt (can also be done with koin so still KMP compliant-ish for now)
NavigationBarPaths was naughty and had too many responsibilities
All navigation is now provided by the Navigator class, similar to the nav3 class, but it's just a wrapper around a statelist
Deep links currently broken because they have to be parsed manually in nav3
the nav stack is now flattened, so removed a lot of logic with destinations, nested graphs, etc

Tested changes:

Navigation bar reappears after a non-root screen is popped
Nested screens, like Media, Search result, Settings etc, can be navigated to
Shared Transition still applies to MediaPage
Forward & Backwards navigation is animated
Bottom sheets still show
Tested Profile logout & login so deep links are good enough

* Each screen is now internal & provided by hilt (can also be done with koin so still KMP compliant-ish for now) * NavigationBarPaths was naughty and had too many responsibilities * All navigation is now provided by the Navigator class, similar to the nav3 class, but it's just a wrapper around a statelist * Deep links currently broken because they have to be parsed manually in nav3 * the nav stack is now flattened, so removed a lot of logic with destinations, nested graphs, etc

# Conflicts: # anime/src/main/kotlin/com/imashnake/animite/anime/AnimeViewModel.kt # app/src/main/kotlin/com/imashnake/animite/features/MainActivity.kt # manga/src/main/kotlin/com/imashnake/animite/manga/MangaViewModel.kt # media/src/main/kotlin/com/imashnake/animite/media/MediaPage.kt # navigation/build.gradle.kts # navigation/src/main/kotlin/com/imashnake/animite/navigation/NavigationBar.kt # navigation/src/main/kotlin/com/imashnake/animite/navigation/NavigationBarPaths.kt # navigation/src/main/kotlin/com/imashnake/animite/navigation/NavigationRail.kt # settings/src/main/kotlin/com/imashnake/animite/settings/SettingsPage.kt

Iannnr · 2026-03-04T00:17:57Z

 }

+@Composable
+private fun getTopRightRadius(): Int {


definitely wasn't AI

…framework

Iannnr · 2026-03-04T01:50:44Z

-                        mediaType = mediaType.rawValue,
-                        title = title,
-                    )
+                val route = MediaPage(


decided that we should rename these to _Route classes, maybe another day

Iannnr · 2026-03-04T01:53:45Z

    sharedTransitionScope: SharedTransitionScope,
    animatedVisibilityScope: AnimatedVisibilityScope,
+    viewModel: MediaPageViewModel,
+    deviceScreenCornerRadius: Int = getTopRightRadius(),


don't think this needs to be passed as param anymore?

Iannnr · 2026-03-04T01:55:21Z

-                val selected = remember(destination, currentBackStackEntry) {
-                    currentBackStackEntry?.let { destination.matchesDestination(it) } == true
-                }
+                val isSelected = backStack.contains(destination.route)


Given these are root paths, and when we navigate to a root path we clear the stack, this is simple enough

github-advanced-security

detekt found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

Iannnr added 3 commits March 3, 2026 23:38

Fix Navigation Bar/Rail with avatar & rotating icons

e4f9f5f

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread app/src/main/kotlin/com/imashnake/animite/features/MainActivity.kt

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread app/build.gradle.kts Outdated

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread app/src/main/kotlin/com/imashnake/animite/ApplicationModule.kt Outdated

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread media/src/main/kotlin/com/imashnake/animite/media/navigation/di/NavigationModule.kt Outdated

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread navigation/src/main/kotlin/com/imashnake/animite/navigation/di/NavigationModule.kt Outdated

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread navigation/src/main/kotlin/com/imashnake/animite/navigation/AnimatedAnimeIcon.kt Outdated

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread navigation/build.gradle.kts Outdated

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread profile/build.gradle.kts Outdated

Fix some formatting

23331ae

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread social/build.gradle.kts Outdated

Iannnr and others added 4 commits March 4, 2026 00:27

Apply suggestions from code review

742b5db

Fix some formatting

5eba379

Merge remote-tracking branch 'origin/IR/nav3-framework' into IR/nav3-…

ebfa816

…framework

fix EOF

06c8f80

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread settings/build.gradle.kts Outdated

Apply suggestions from code review

fe1a1d6

Iannnr marked this pull request as ready for review March 4, 2026 01:46

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread app/src/main/kotlin/com/imashnake/animite/features/MainActivity.kt

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread app/src/main/kotlin/com/imashnake/animite/features/MainActivity.kt

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread media/src/main/kotlin/com/imashnake/animite/media/navigation/di/NavigationModule.kt

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread navigation/src/main/kotlin/com/imashnake/animite/navigation/AnimatedAnimeIcon.kt

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread navigation/src/main/kotlin/com/imashnake/animite/navigation/AnimatedProfileIcon.kt

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread navigation/build.gradle.kts

Iannnr commented Mar 4, 2026

View reviewed changes

Comment thread settings/src/main/kotlin/com/imashnake/animite/settings/SettingsPage.kt Outdated

Merge branch 'main' into IR/nav3-framework

efb7d19

Iannnr requested review from boswelja and imashnake0 and removed request for boswelja March 6, 2026 22:16

boswelja reviewed Mar 6, 2026

View reviewed changes

Iannnr and others added 2 commits March 6, 2026 22:26

delete partially used EntryInstaller

e17ebfc

Merge branch 'main' into IR/nav3-framework

1e1aa51

Iannnr requested a review from boswelja March 6, 2026 22:39

Iannnr and others added 3 commits March 7, 2026 00:38

fix back handler going back to anime route

224e4ff

allow navdisplay to share transition scope

539233f

Merge branch 'main' into IR/nav3-framework

7ca926c

boswelja marked this pull request as draft March 8, 2026 02:22

github-advanced-security AI found potential problems Mar 8, 2026

View reviewed changes

Conversation

Iannnr commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Iannnr Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Iannnr Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Iannnr Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Iannnr Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-advanced-security AI left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Iannnr commented Mar 3, 2026 •

edited

Loading