Skip to content

Commit 161181f

Browse files
authored
Migrate project to Jetpack Navigation 3
Migrate project to Jetpack Navigation 3
2 parents d438a00 + b51d49c commit 161181f

174 files changed

Lines changed: 2391 additions & 1683 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/Build.yaml

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -77,27 +77,28 @@ jobs:
7777
disable_globbing: true
7878
commit_message: "🤖 Updates baselines for Dependency Guard"
7979

80-
- name: Update Graphs
81-
run: ./gradlew graphUpdate
82-
83-
- name: Check Graphs
84-
id: graphs_verify
85-
run: git add -- '**/README.md' && git diff --cached --quiet --exit-code -- '**/README.md'
86-
87-
- name: Prevent updating graphs if this is a fork
88-
id: checkfork_graphs
89-
continue-on-error: false
90-
if: steps.graphs_verify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository
91-
run: |
92-
echo "::error::Check Graphs failed, please update graphs with: ./gradlew graphUpdate" && exit 1
93-
94-
- name: Push new graphs if available
95-
if: steps.graphs_verify.outcome == 'failure' && github.event_name == 'pull_request'
96-
uses: stefanzweifel/git-auto-commit-action@v5
97-
with:
98-
file_pattern: '**/README.md'
99-
disable_globbing: true
100-
commit_message: "🤖 Updates graphs"
80+
# See https://github.com/android/nowinandroid/issues/2005
81+
# - name: Update Graphs
82+
# run: ./gradlew graphUpdate
83+
#
84+
# - name: Check Graphs
85+
# id: graphs_verify
86+
# run: git add -- "**/README.md" && git diff --cached --quiet --exit-code -- "**/README.md"
87+
#
88+
# - name: Prevent updating graphs if this is a fork
89+
# id: checkfork_graphs
90+
# continue-on-error: false
91+
# if: steps.graphs_verify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository
92+
# run: |
93+
# echo "::error::Check Graphs failed, please update graphs with: ./gradlew graphUpdate" && exit 1
94+
#
95+
# - name: Push new graphs if available
96+
# if: steps.graphs_verify.outcome == 'failure' && github.event_name == 'pull_request'
97+
# uses: stefanzweifel/git-auto-commit-action@v5
98+
# with:
99+
# file_pattern: '**/README.md'
100+
# disable_globbing: true
101+
# commit_message: "🤖 Updates graphs"
101102

102103
- name: Run all local screenshot tests (Roborazzi)
103104
id: screenshotsverify

app-nia-catalog/dependencies/releaseRuntimeClasspath.txt

Lines changed: 66 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -12,47 +12,49 @@ androidx.browser:browser:1.8.0
1212
androidx.collection:collection-jvm:1.5.0
1313
androidx.collection:collection-ktx:1.5.0
1414
androidx.collection:collection:1.5.0
15-
androidx.compose.animation:animation-android:1.10.0-alpha02
16-
androidx.compose.animation:animation-core-android:1.10.0-alpha02
17-
androidx.compose.animation:animation-core:1.10.0-alpha02
18-
androidx.compose.animation:animation:1.10.0-alpha02
19-
androidx.compose.foundation:foundation-android:1.10.0-alpha02
20-
androidx.compose.foundation:foundation-layout-android:1.10.0-alpha02
21-
androidx.compose.foundation:foundation-layout:1.10.0-alpha02
22-
androidx.compose.foundation:foundation:1.10.0-alpha02
23-
androidx.compose.material3.adaptive:adaptive-android:1.2.0-beta01
24-
androidx.compose.material3.adaptive:adaptive:1.2.0-beta01
25-
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.5.0-alpha03
26-
androidx.compose.material3:material3-adaptive-navigation-suite:1.5.0-alpha03
27-
androidx.compose.material3:material3-android:1.5.0-alpha03
28-
androidx.compose.material3:material3:1.5.0-alpha03
15+
androidx.compose.animation:animation-android:1.10.0-alpha04
16+
androidx.compose.animation:animation-core-android:1.10.0-alpha04
17+
androidx.compose.animation:animation-core:1.10.0-alpha04
18+
androidx.compose.animation:animation:1.10.0-alpha04
19+
androidx.compose.foundation:foundation-android:1.10.0-alpha04
20+
androidx.compose.foundation:foundation-layout-android:1.10.0-alpha04
21+
androidx.compose.foundation:foundation-layout:1.10.0-alpha04
22+
androidx.compose.foundation:foundation:1.10.0-alpha04
23+
androidx.compose.material3.adaptive:adaptive-android:1.2.0-beta03
24+
androidx.compose.material3.adaptive:adaptive:1.2.0-beta03
25+
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.5.0-alpha04
26+
androidx.compose.material3:material3-adaptive-navigation-suite:1.5.0-alpha04
27+
androidx.compose.material3:material3-android:1.5.0-alpha04
28+
androidx.compose.material3:material3:1.5.0-alpha04
2929
androidx.compose.material:material-icons-core-android:1.7.8
3030
androidx.compose.material:material-icons-core:1.7.8
3131
androidx.compose.material:material-icons-extended-android:1.7.8
3232
androidx.compose.material:material-icons-extended:1.7.8
33-
androidx.compose.material:material-ripple-android:1.10.0-alpha02
34-
androidx.compose.material:material-ripple:1.10.0-alpha02
35-
androidx.compose.runtime:runtime-android:1.10.0-alpha02
36-
androidx.compose.runtime:runtime-annotation-android:1.10.0-alpha02
37-
androidx.compose.runtime:runtime-annotation:1.10.0-alpha02
38-
androidx.compose.runtime:runtime-saveable-android:1.10.0-alpha02
39-
androidx.compose.runtime:runtime-saveable:1.10.0-alpha02
40-
androidx.compose.runtime:runtime:1.10.0-alpha02
41-
androidx.compose.ui:ui-android:1.10.0-alpha02
42-
androidx.compose.ui:ui-geometry-android:1.10.0-alpha02
43-
androidx.compose.ui:ui-geometry:1.10.0-alpha02
44-
androidx.compose.ui:ui-graphics-android:1.10.0-alpha02
45-
androidx.compose.ui:ui-graphics:1.10.0-alpha02
46-
androidx.compose.ui:ui-text-android:1.10.0-alpha02
47-
androidx.compose.ui:ui-text:1.10.0-alpha02
48-
androidx.compose.ui:ui-tooling-preview-android:1.10.0-alpha02
49-
androidx.compose.ui:ui-tooling-preview:1.10.0-alpha02
50-
androidx.compose.ui:ui-unit-android:1.10.0-alpha02
51-
androidx.compose.ui:ui-unit:1.10.0-alpha02
52-
androidx.compose.ui:ui-util-android:1.10.0-alpha02
53-
androidx.compose.ui:ui-util:1.10.0-alpha02
54-
androidx.compose.ui:ui:1.10.0-alpha02
55-
androidx.compose:compose-bom-alpha:2025.08.01
33+
androidx.compose.material:material-ripple-android:1.10.0-alpha04
34+
androidx.compose.material:material-ripple:1.10.0-alpha04
35+
androidx.compose.runtime:runtime-android:1.10.0-alpha04
36+
androidx.compose.runtime:runtime-annotation-android:1.10.0-alpha04
37+
androidx.compose.runtime:runtime-annotation:1.10.0-alpha04
38+
androidx.compose.runtime:runtime-retain-android:1.10.0-alpha04
39+
androidx.compose.runtime:runtime-retain:1.10.0-alpha04
40+
androidx.compose.runtime:runtime-saveable-android:1.10.0-alpha04
41+
androidx.compose.runtime:runtime-saveable:1.10.0-alpha04
42+
androidx.compose.runtime:runtime:1.10.0-alpha04
43+
androidx.compose.ui:ui-android:1.10.0-alpha04
44+
androidx.compose.ui:ui-geometry-android:1.10.0-alpha04
45+
androidx.compose.ui:ui-geometry:1.10.0-alpha04
46+
androidx.compose.ui:ui-graphics-android:1.10.0-alpha04
47+
androidx.compose.ui:ui-graphics:1.10.0-alpha04
48+
androidx.compose.ui:ui-text-android:1.10.0-alpha04
49+
androidx.compose.ui:ui-text:1.10.0-alpha04
50+
androidx.compose.ui:ui-tooling-preview-android:1.10.0-alpha04
51+
androidx.compose.ui:ui-tooling-preview:1.10.0-alpha04
52+
androidx.compose.ui:ui-unit-android:1.10.0-alpha04
53+
androidx.compose.ui:ui-unit:1.10.0-alpha04
54+
androidx.compose.ui:ui-util-android:1.10.0-alpha04
55+
androidx.compose.ui:ui-util:1.10.0-alpha04
56+
androidx.compose.ui:ui:1.10.0-alpha04
57+
androidx.compose:compose-bom-alpha:2025.09.01
5658
androidx.concurrent:concurrent-futures:1.1.0
5759
androidx.core:core-ktx:1.16.0
5860
androidx.core:core-viewtree:1.0.0
@@ -69,34 +71,34 @@ androidx.graphics:graphics-shapes-android:1.0.1
6971
androidx.graphics:graphics-shapes:1.0.1
7072
androidx.interpolator:interpolator:1.0.0
7173
androidx.legacy:legacy-support-core-utils:1.0.0
72-
androidx.lifecycle:lifecycle-common-java8:2.10.0-alpha03
73-
androidx.lifecycle:lifecycle-common-jvm:2.10.0-alpha03
74-
androidx.lifecycle:lifecycle-common:2.10.0-alpha03
75-
androidx.lifecycle:lifecycle-livedata-core-ktx:2.10.0-alpha03
76-
androidx.lifecycle:lifecycle-livedata-core:2.10.0-alpha03
77-
androidx.lifecycle:lifecycle-livedata:2.10.0-alpha03
78-
androidx.lifecycle:lifecycle-process:2.10.0-alpha03
79-
androidx.lifecycle:lifecycle-runtime-android:2.10.0-alpha03
80-
androidx.lifecycle:lifecycle-runtime-compose-android:2.10.0-alpha03
81-
androidx.lifecycle:lifecycle-runtime-compose:2.10.0-alpha03
82-
androidx.lifecycle:lifecycle-runtime-ktx-android:2.10.0-alpha03
83-
androidx.lifecycle:lifecycle-runtime-ktx:2.10.0-alpha03
84-
androidx.lifecycle:lifecycle-runtime:2.10.0-alpha03
85-
androidx.lifecycle:lifecycle-viewmodel-android:2.10.0-alpha03
86-
androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0-alpha03
87-
androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.10.0-alpha03
88-
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0-alpha03
89-
androidx.lifecycle:lifecycle-viewmodel:2.10.0-alpha03
74+
androidx.lifecycle:lifecycle-common-java8:2.9.4
75+
androidx.lifecycle:lifecycle-common-jvm:2.9.4
76+
androidx.lifecycle:lifecycle-common:2.9.4
77+
androidx.lifecycle:lifecycle-livedata-core-ktx:2.9.4
78+
androidx.lifecycle:lifecycle-livedata-core:2.9.4
79+
androidx.lifecycle:lifecycle-livedata:2.9.4
80+
androidx.lifecycle:lifecycle-process:2.9.4
81+
androidx.lifecycle:lifecycle-runtime-android:2.9.4
82+
androidx.lifecycle:lifecycle-runtime-compose-android:2.9.4
83+
androidx.lifecycle:lifecycle-runtime-compose:2.9.4
84+
androidx.lifecycle:lifecycle-runtime-ktx-android:2.9.4
85+
androidx.lifecycle:lifecycle-runtime-ktx:2.9.4
86+
androidx.lifecycle:lifecycle-runtime:2.9.4
87+
androidx.lifecycle:lifecycle-viewmodel-android:2.9.4
88+
androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4
89+
androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.9.4
90+
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4
91+
androidx.lifecycle:lifecycle-viewmodel:2.9.4
9092
androidx.loader:loader:1.0.0
9193
androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
9294
androidx.metrics:metrics-performance:1.0.0-beta01
9395
androidx.print:print:1.0.0
9496
androidx.profileinstaller:profileinstaller:1.4.0
95-
androidx.savedstate:savedstate-android:1.4.0-alpha03
96-
androidx.savedstate:savedstate-compose-android:1.4.0-alpha03
97-
androidx.savedstate:savedstate-compose:1.4.0-alpha03
98-
androidx.savedstate:savedstate-ktx:1.4.0-alpha03
99-
androidx.savedstate:savedstate:1.4.0-alpha03
97+
androidx.savedstate:savedstate-android:1.3.2
98+
androidx.savedstate:savedstate-compose-android:1.3.2
99+
androidx.savedstate:savedstate-compose:1.3.2
100+
androidx.savedstate:savedstate-ktx:1.3.2
101+
androidx.savedstate:savedstate:1.3.2
100102
androidx.startup:startup-runtime:1.1.1
101103
androidx.tracing:tracing-ktx:1.3.0-alpha02
102104
androidx.tracing:tracing:1.3.0-alpha02
@@ -128,10 +130,10 @@ org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
128130
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
129131
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
130132
org.jetbrains.kotlin:kotlin-stdlib:2.2.21
131-
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1
132-
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1
133-
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
134-
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
133+
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
134+
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0
135+
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0
136+
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0
135137
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
136138
org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
137139
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3

app/README.md

Lines changed: 85 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,42 @@ config:
1111
nodePlacementStrategy: SIMPLE
1212
---
1313
graph TB
14+
subgraph :feature
15+
direction TB
16+
subgraph :feature:settings
17+
direction TB
18+
:feature:settings:impl[impl]:::android-library
19+
end
20+
subgraph :feature:foryou
21+
direction TB
22+
:feature:foryou:api[api]:::android-library
23+
:feature:foryou:impl[impl]:::android-library
24+
end
25+
subgraph :feature:bookmarks
26+
direction TB
27+
:feature:bookmarks:api[api]:::android-library
28+
:feature:bookmarks:impl[impl]:::android-library
29+
end
30+
subgraph :feature:search
31+
direction TB
32+
:feature:search:api[api]:::android-library
33+
:feature:search:impl[impl]:::android-library
34+
end
35+
subgraph :feature:interests
36+
direction TB
37+
:feature:interests:api[api]:::android-library
38+
:feature:interests:impl[impl]:::android-library
39+
end
40+
subgraph :feature:topic
41+
direction TB
42+
:feature:topic:api[api]:::android-library
43+
:feature:topic:impl[impl]:::android-library
44+
end
45+
end
46+
subgraph :sync
47+
direction TB
48+
:sync:work[work]:::android-library
49+
end
1450
subgraph :core
1551
direction TB
1652
:core:analytics[analytics]:::android-library
@@ -22,23 +58,11 @@ graph TB
2258
:core:designsystem[designsystem]:::android-library
2359
:core:domain[domain]:::android-library
2460
:core:model[model]:::jvm-library
61+
:core:navigation[navigation]:::android-library
2562
:core:network[network]:::android-library
2663
:core:notifications[notifications]:::android-library
2764
:core:ui[ui]:::android-library
2865
end
29-
subgraph :feature
30-
direction TB
31-
:feature:bookmarks[bookmarks]:::android-feature
32-
:feature:foryou[foryou]:::android-feature
33-
:feature:interests[interests]:::android-feature
34-
:feature:search[search]:::android-feature
35-
:feature:settings[settings]:::android-feature
36-
:feature:topic[topic]:::android-feature
37-
end
38-
subgraph :sync
39-
direction TB
40-
:sync:work[work]:::android-library
41-
end
4266
:benchmarks[benchmarks]:::android-test
4367
:app[app]:::android-application
4468
@@ -49,12 +73,17 @@ graph TB
4973
:app -.-> :core:designsystem
5074
:app -.-> :core:model
5175
:app -.-> :core:ui
52-
:app -.-> :feature:bookmarks
53-
:app -.-> :feature:foryou
54-
:app -.-> :feature:interests
55-
:app -.-> :feature:search
56-
:app -.-> :feature:settings
57-
:app -.-> :feature:topic
76+
:app -.-> :feature:bookmarks:api
77+
:app -.-> :feature:bookmarks:impl
78+
:app -.-> :feature:foryou:api
79+
:app -.-> :feature:foryou:impl
80+
:app -.-> :feature:interests:api
81+
:app -.-> :feature:interests:impl
82+
:app -.-> :feature:search:api
83+
:app -.-> :feature:search:impl
84+
:app -.-> :feature:settings:impl
85+
:app -.-> :feature:topic:api
86+
:app -.-> :feature:topic:impl
5887
:app -.-> :sync:work
5988
:benchmarks -.->|testedApks| :app
6089
:core:data -.-> :core:analytics
@@ -76,28 +105,43 @@ graph TB
76105
:core:ui --> :core:analytics
77106
:core:ui --> :core:designsystem
78107
:core:ui --> :core:model
79-
:feature:bookmarks -.-> :core:data
80-
:feature:bookmarks -.-> :core:designsystem
81-
:feature:bookmarks -.-> :core:ui
82-
:feature:foryou -.-> :core:data
83-
:feature:foryou -.-> :core:designsystem
84-
:feature:foryou -.-> :core:domain
85-
:feature:foryou -.-> :core:notifications
86-
:feature:foryou -.-> :core:ui
87-
:feature:interests -.-> :core:data
88-
:feature:interests -.-> :core:designsystem
89-
:feature:interests -.-> :core:domain
90-
:feature:interests -.-> :core:ui
91-
:feature:search -.-> :core:data
92-
:feature:search -.-> :core:designsystem
93-
:feature:search -.-> :core:domain
94-
:feature:search -.-> :core:ui
95-
:feature:settings -.-> :core:data
96-
:feature:settings -.-> :core:designsystem
97-
:feature:settings -.-> :core:ui
98-
:feature:topic -.-> :core:data
99-
:feature:topic -.-> :core:designsystem
100-
:feature:topic -.-> :core:ui
108+
:feature:bookmarks:api --> :core:navigation
109+
:feature:bookmarks:impl -.-> :core:data
110+
:feature:bookmarks:impl -.-> :core:designsystem
111+
:feature:bookmarks:impl -.-> :core:ui
112+
:feature:bookmarks:impl -.-> :feature:bookmarks:api
113+
:feature:bookmarks:impl -.-> :feature:topic:api
114+
:feature:foryou:api --> :core:navigation
115+
:feature:foryou:impl -.-> :core:designsystem
116+
:feature:foryou:impl -.-> :core:domain
117+
:feature:foryou:impl -.-> :core:notifications
118+
:feature:foryou:impl -.-> :core:ui
119+
:feature:foryou:impl -.-> :feature:foryou:api
120+
:feature:foryou:impl -.-> :feature:topic:api
121+
:feature:interests:api --> :core:navigation
122+
:feature:interests:impl -.-> :core:designsystem
123+
:feature:interests:impl -.-> :core:domain
124+
:feature:interests:impl -.-> :core:ui
125+
:feature:interests:impl -.-> :feature:interests:api
126+
:feature:interests:impl -.-> :feature:topic:api
127+
:feature:search:api -.-> :core:domain
128+
:feature:search:api --> :core:navigation
129+
:feature:search:impl -.-> :core:designsystem
130+
:feature:search:impl -.-> :core:domain
131+
:feature:search:impl -.-> :core:ui
132+
:feature:search:impl -.-> :feature:interests:api
133+
:feature:search:impl -.-> :feature:search:api
134+
:feature:search:impl -.-> :feature:topic:api
135+
:feature:settings:impl -.-> :core:data
136+
:feature:settings:impl -.-> :core:designsystem
137+
:feature:settings:impl -.-> :core:ui
138+
:feature:topic:api -.-> :core:designsystem
139+
:feature:topic:api --> :core:navigation
140+
:feature:topic:api -.-> :core:ui
141+
:feature:topic:impl -.-> :core:data
142+
:feature:topic:impl -.-> :core:designsystem
143+
:feature:topic:impl -.-> :core:ui
144+
:feature:topic:impl -.-> :feature:topic:api
101145
:sync:work -.-> :core:analytics
102146
:sync:work -.-> :core:data
103147
:sync:work -.-> :core:notifications

0 commit comments

Comments
 (0)