Skip to content

Commit efa4fe1

Browse files
Jaehwa-NohJaehwa-Noh
committed
Merge branch 'android-remote-main' into fix-snackbar
Change-Id: I31feea30d14d801d224ee311fd740132246d383b
2 parents 23ba734 + 717f2db commit efa4fe1

File tree

129 files changed

+91
-91
lines changed

Some content is hidden

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

129 files changed

+91
-91
lines changed

‎app-nia-catalog/dependencies/releaseRuntimeClasspath.txt‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
androidx.activity:activity-compose:1.9.3
22
androidx.activity:activity-ktx:1.9.3
33
androidx.activity:activity:1.9.3
4-
androidx.annotation:annotation-experimental:1.4.0
5-
androidx.annotation:annotation-jvm:1.8.0
6-
androidx.annotation:annotation:1.8.0
4+
androidx.annotation:annotation-experimental:1.4.1
5+
androidx.annotation:annotation-jvm:1.8.1
6+
androidx.annotation:annotation:1.8.1
77
androidx.appcompat:appcompat-resources:1.6.1
88
androidx.arch.core:core-common:2.2.0
99
androidx.arch.core:core-runtime:2.2.0
1010
androidx.autofill:autofill:1.0.0
1111
androidx.browser:browser:1.8.0
12-
androidx.collection:collection-jvm:1.4.0
13-
androidx.collection:collection-ktx:1.4.0
14-
androidx.collection:collection:1.4.0
15-
androidx.compose.animation:animation-android:1.7.0
16-
androidx.compose.animation:animation-core-android:1.7.0
17-
androidx.compose.animation:animation-core:1.7.0
18-
androidx.compose.animation:animation:1.7.0
19-
androidx.compose.foundation:foundation-android:1.7.0
20-
androidx.compose.foundation:foundation-layout-android:1.7.0
21-
androidx.compose.foundation:foundation-layout:1.7.0
22-
androidx.compose.foundation:foundation:1.7.0
12+
androidx.collection:collection-jvm:1.4.4
13+
androidx.collection:collection-ktx:1.4.4
14+
androidx.collection:collection:1.4.4
15+
androidx.compose.animation:animation-android:1.7.5
16+
androidx.compose.animation:animation-core-android:1.7.5
17+
androidx.compose.animation:animation-core:1.7.5
18+
androidx.compose.animation:animation:1.7.5
19+
androidx.compose.foundation:foundation-android:1.7.5
20+
androidx.compose.foundation:foundation-layout-android:1.7.5
21+
androidx.compose.foundation:foundation-layout:1.7.5
22+
androidx.compose.foundation:foundation:1.7.5
2323
androidx.compose.material3.adaptive:adaptive-android:1.0.0
2424
androidx.compose.material3.adaptive:adaptive:1.0.0
25-
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.0
26-
androidx.compose.material3:material3-adaptive-navigation-suite:1.3.0
27-
androidx.compose.material3:material3-android:1.3.0
28-
androidx.compose.material3:material3:1.3.0
29-
androidx.compose.material:material-icons-core-android:1.7.0
30-
androidx.compose.material:material-icons-core:1.7.0
31-
androidx.compose.material:material-icons-extended-android:1.7.0
32-
androidx.compose.material:material-icons-extended:1.7.0
33-
androidx.compose.material:material-ripple-android:1.7.0
34-
androidx.compose.material:material-ripple:1.7.0
35-
androidx.compose.runtime:runtime-android:1.7.0
36-
androidx.compose.runtime:runtime-saveable-android:1.7.0
37-
androidx.compose.runtime:runtime-saveable:1.7.0
38-
androidx.compose.runtime:runtime:1.7.0
39-
androidx.compose.ui:ui-android:1.7.0
40-
androidx.compose.ui:ui-geometry-android:1.7.0
41-
androidx.compose.ui:ui-geometry:1.7.0
42-
androidx.compose.ui:ui-graphics-android:1.7.0
43-
androidx.compose.ui:ui-graphics:1.7.0
44-
androidx.compose.ui:ui-text-android:1.7.0
45-
androidx.compose.ui:ui-text:1.7.0
46-
androidx.compose.ui:ui-tooling-preview-android:1.7.0
47-
androidx.compose.ui:ui-tooling-preview:1.7.0
48-
androidx.compose.ui:ui-unit-android:1.7.0
49-
androidx.compose.ui:ui-unit:1.7.0
50-
androidx.compose.ui:ui-util-android:1.7.0
51-
androidx.compose.ui:ui-util:1.7.0
52-
androidx.compose.ui:ui:1.7.0
53-
androidx.compose:compose-bom:2024.09.00
25+
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.1
26+
androidx.compose.material3:material3-adaptive-navigation-suite:1.3.1
27+
androidx.compose.material3:material3-android:1.3.1
28+
androidx.compose.material3:material3:1.3.1
29+
androidx.compose.material:material-icons-core-android:1.7.5
30+
androidx.compose.material:material-icons-core:1.7.5
31+
androidx.compose.material:material-icons-extended-android:1.7.5
32+
androidx.compose.material:material-icons-extended:1.7.5
33+
androidx.compose.material:material-ripple-android:1.7.5
34+
androidx.compose.material:material-ripple:1.7.5
35+
androidx.compose.runtime:runtime-android:1.7.5
36+
androidx.compose.runtime:runtime-saveable-android:1.7.5
37+
androidx.compose.runtime:runtime-saveable:1.7.5
38+
androidx.compose.runtime:runtime:1.7.5
39+
androidx.compose.ui:ui-android:1.7.5
40+
androidx.compose.ui:ui-geometry-android:1.7.5
41+
androidx.compose.ui:ui-geometry:1.7.5
42+
androidx.compose.ui:ui-graphics-android:1.7.5
43+
androidx.compose.ui:ui-graphics:1.7.5
44+
androidx.compose.ui:ui-text-android:1.7.5
45+
androidx.compose.ui:ui-text:1.7.5
46+
androidx.compose.ui:ui-tooling-preview-android:1.7.5
47+
androidx.compose.ui:ui-tooling-preview:1.7.5
48+
androidx.compose.ui:ui-unit-android:1.7.5
49+
androidx.compose.ui:ui-unit:1.7.5
50+
androidx.compose.ui:ui-util-android:1.7.5
51+
androidx.compose.ui:ui-util:1.7.5
52+
androidx.compose.ui:ui:1.7.5
53+
androidx.compose:compose-bom:2024.11.00
5454
androidx.concurrent:concurrent-futures:1.1.0
5555
androidx.core:core-ktx:1.13.1
5656
androidx.core:core:1.13.1

‎app/dependencies/prodReleaseRuntimeClasspath.txt‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -10,55 +10,55 @@ androidx.arch.core:core-common:2.2.0
1010
androidx.arch.core:core-runtime:2.2.0
1111
androidx.autofill:autofill:1.0.0
1212
androidx.browser:browser:1.8.0
13-
androidx.collection:collection-jvm:1.4.2
14-
androidx.collection:collection-ktx:1.4.2
15-
androidx.collection:collection:1.4.2
16-
androidx.compose.animation:animation-android:1.7.0
17-
androidx.compose.animation:animation-core-android:1.7.0
18-
androidx.compose.animation:animation-core:1.7.0
19-
androidx.compose.animation:animation:1.7.0
20-
androidx.compose.foundation:foundation-android:1.7.0
21-
androidx.compose.foundation:foundation-layout-android:1.7.0
22-
androidx.compose.foundation:foundation-layout:1.7.0
23-
androidx.compose.foundation:foundation:1.7.0
13+
androidx.collection:collection-jvm:1.4.4
14+
androidx.collection:collection-ktx:1.4.4
15+
androidx.collection:collection:1.4.4
16+
androidx.compose.animation:animation-android:1.7.5
17+
androidx.compose.animation:animation-core-android:1.7.5
18+
androidx.compose.animation:animation-core:1.7.5
19+
androidx.compose.animation:animation:1.7.5
20+
androidx.compose.foundation:foundation-android:1.7.5
21+
androidx.compose.foundation:foundation-layout-android:1.7.5
22+
androidx.compose.foundation:foundation-layout:1.7.5
23+
androidx.compose.foundation:foundation:1.7.5
2424
androidx.compose.material3.adaptive:adaptive-android:1.0.0
2525
androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0
2626
androidx.compose.material3.adaptive:adaptive-layout:1.0.0
2727
androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0
2828
androidx.compose.material3.adaptive:adaptive-navigation:1.0.0
2929
androidx.compose.material3.adaptive:adaptive:1.0.0
30-
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.0
31-
androidx.compose.material3:material3-adaptive-navigation-suite:1.3.0
32-
androidx.compose.material3:material3-android:1.3.0
33-
androidx.compose.material3:material3-window-size-class-android:1.3.0
34-
androidx.compose.material3:material3-window-size-class:1.3.0
35-
androidx.compose.material3:material3:1.3.0
36-
androidx.compose.material:material-icons-core-android:1.7.0
37-
androidx.compose.material:material-icons-core:1.7.0
38-
androidx.compose.material:material-icons-extended-android:1.7.0
39-
androidx.compose.material:material-icons-extended:1.7.0
40-
androidx.compose.material:material-ripple-android:1.7.0
41-
androidx.compose.material:material-ripple:1.7.0
42-
androidx.compose.runtime:runtime-android:1.7.1
43-
androidx.compose.runtime:runtime-saveable-android:1.7.1
44-
androidx.compose.runtime:runtime-saveable:1.7.1
45-
androidx.compose.runtime:runtime-tracing:1.0.0-beta01
46-
androidx.compose.runtime:runtime:1.7.1
47-
androidx.compose.ui:ui-android:1.7.0
48-
androidx.compose.ui:ui-geometry-android:1.7.0
49-
androidx.compose.ui:ui-geometry:1.7.0
50-
androidx.compose.ui:ui-graphics-android:1.7.0
51-
androidx.compose.ui:ui-graphics:1.7.0
52-
androidx.compose.ui:ui-text-android:1.7.0
53-
androidx.compose.ui:ui-text:1.7.0
54-
androidx.compose.ui:ui-tooling-preview-android:1.7.0
55-
androidx.compose.ui:ui-tooling-preview:1.7.0
56-
androidx.compose.ui:ui-unit-android:1.7.0
57-
androidx.compose.ui:ui-unit:1.7.0
58-
androidx.compose.ui:ui-util-android:1.7.0
59-
androidx.compose.ui:ui-util:1.7.0
60-
androidx.compose.ui:ui:1.7.0
61-
androidx.compose:compose-bom:2024.09.00
30+
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.1
31+
androidx.compose.material3:material3-adaptive-navigation-suite:1.3.1
32+
androidx.compose.material3:material3-android:1.3.1
33+
androidx.compose.material3:material3-window-size-class-android:1.3.1
34+
androidx.compose.material3:material3-window-size-class:1.3.1
35+
androidx.compose.material3:material3:1.3.1
36+
androidx.compose.material:material-icons-core-android:1.7.5
37+
androidx.compose.material:material-icons-core:1.7.5
38+
androidx.compose.material:material-icons-extended-android:1.7.5
39+
androidx.compose.material:material-icons-extended:1.7.5
40+
androidx.compose.material:material-ripple-android:1.7.5
41+
androidx.compose.material:material-ripple:1.7.5
42+
androidx.compose.runtime:runtime-android:1.7.5
43+
androidx.compose.runtime:runtime-saveable-android:1.7.5
44+
androidx.compose.runtime:runtime-saveable:1.7.5
45+
androidx.compose.runtime:runtime-tracing:1.7.5
46+
androidx.compose.runtime:runtime:1.7.5
47+
androidx.compose.ui:ui-android:1.7.5
48+
androidx.compose.ui:ui-geometry-android:1.7.5
49+
androidx.compose.ui:ui-geometry:1.7.5
50+
androidx.compose.ui:ui-graphics-android:1.7.5
51+
androidx.compose.ui:ui-graphics:1.7.5
52+
androidx.compose.ui:ui-text-android:1.7.5
53+
androidx.compose.ui:ui-text:1.7.5
54+
androidx.compose.ui:ui-tooling-preview-android:1.7.5
55+
androidx.compose.ui:ui-tooling-preview:1.7.5
56+
androidx.compose.ui:ui-unit-android:1.7.5
57+
androidx.compose.ui:ui-unit:1.7.5
58+
androidx.compose.ui:ui-util-android:1.7.5
59+
androidx.compose.ui:ui-util:1.7.5
60+
androidx.compose.ui:ui:1.7.5
61+
androidx.compose:compose-bom:2024.11.00
6262
androidx.concurrent:concurrent-futures:1.1.0
6363
androidx.core:core-ktx:1.13.1
6464
androidx.core:core-splashscreen:1.0.1

‎app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png‎

-107 Bytes

‎app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png‎

-66 Bytes

‎app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png‎

-2 Bytes

‎app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png‎

-81 Bytes

‎app/src/testDemo/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png‎

-20 Bytes

‎app/src/testDemo/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png‎

-71 Bytes

‎app/src/testDemo/screenshots/insets_snackbar_compact_medium.png‎

951 Bytes

‎app/src/testDemo/screenshots/insets_snackbar_compact_medium_noSnackbar.png‎

32 Bytes

0 commit comments

Comments
 (0)