Skip to content

Commit f31fdb3

Browse files
mlykotommlykotom
committed
Merge branch 'main' into mlykotom/tz-perf-improvement
Change-Id: Id49a580012629163ec4a3663d95ab71b98910220 # Conflicts: # app/dependencies/prodReleaseRuntimeClasspath.txt # app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt # gradle/libs.versions.toml
2 parents 8b56fd3 + 76d0e43 commit f31fdb3

File tree

81 files changed

+300
-241
lines changed

Some content is hidden

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

81 files changed

+300
-241
lines changed

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

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,58 @@
11
androidx.activity:activity-compose:1.8.0
22
androidx.activity:activity-ktx:1.8.0
33
androidx.activity:activity:1.8.0
4-
androidx.annotation:annotation-experimental:1.3.1
4+
androidx.annotation:annotation-experimental:1.4.0
55
androidx.annotation:annotation-jvm:1.7.0
66
androidx.annotation:annotation:1.7.0
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.6.0
12-
androidx.collection:collection-jvm:1.3.0
13-
androidx.collection:collection:1.3.0
14-
androidx.compose.animation:animation-android:1.5.4
15-
androidx.compose.animation:animation-core-android:1.5.4
16-
androidx.compose.animation:animation-core:1.5.4
17-
androidx.compose.animation:animation:1.5.4
18-
androidx.compose.foundation:foundation-android:1.5.4
19-
androidx.compose.foundation:foundation-layout-android:1.5.4
20-
androidx.compose.foundation:foundation-layout:1.5.4
21-
androidx.compose.foundation:foundation:1.5.4
22-
androidx.compose.material3:material3:1.1.2
23-
androidx.compose.material:material-icons-core-android:1.5.4
24-
androidx.compose.material:material-icons-core:1.5.4
25-
androidx.compose.material:material-icons-extended-android:1.5.4
26-
androidx.compose.material:material-icons-extended:1.5.4
27-
androidx.compose.material:material-ripple-android:1.5.4
28-
androidx.compose.material:material-ripple:1.5.4
29-
androidx.compose.runtime:runtime-android:1.5.4
30-
androidx.compose.runtime:runtime-saveable-android:1.5.4
31-
androidx.compose.runtime:runtime-saveable:1.5.4
32-
androidx.compose.runtime:runtime:1.5.4
33-
androidx.compose.ui:ui-android:1.5.4
34-
androidx.compose.ui:ui-geometry-android:1.5.4
35-
androidx.compose.ui:ui-geometry:1.5.4
36-
androidx.compose.ui:ui-graphics-android:1.5.4
37-
androidx.compose.ui:ui-graphics:1.5.4
38-
androidx.compose.ui:ui-text-android:1.5.4
39-
androidx.compose.ui:ui-text:1.5.4
40-
androidx.compose.ui:ui-tooling-preview-android:1.5.4
41-
androidx.compose.ui:ui-tooling-preview:1.5.4
42-
androidx.compose.ui:ui-unit-android:1.5.4
43-
androidx.compose.ui:ui-unit:1.5.4
44-
androidx.compose.ui:ui-util-android:1.5.4
45-
androidx.compose.ui:ui-util:1.5.4
46-
androidx.compose.ui:ui:1.5.4
47-
androidx.compose:compose-bom:2023.10.01
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.6.1
16+
androidx.compose.animation:animation-core-android:1.6.1
17+
androidx.compose.animation:animation-core:1.6.1
18+
androidx.compose.animation:animation:1.6.1
19+
androidx.compose.foundation:foundation-android:1.6.1
20+
androidx.compose.foundation:foundation-layout-android:1.6.1
21+
androidx.compose.foundation:foundation-layout:1.6.1
22+
androidx.compose.foundation:foundation:1.6.1
23+
androidx.compose.material3:material3-android:1.2.0
24+
androidx.compose.material3:material3:1.2.0
25+
androidx.compose.material:material-icons-core-android:1.6.1
26+
androidx.compose.material:material-icons-core:1.6.1
27+
androidx.compose.material:material-icons-extended-android:1.6.1
28+
androidx.compose.material:material-icons-extended:1.6.1
29+
androidx.compose.material:material-ripple-android:1.6.1
30+
androidx.compose.material:material-ripple:1.6.1
31+
androidx.compose.runtime:runtime-android:1.6.1
32+
androidx.compose.runtime:runtime-saveable-android:1.6.1
33+
androidx.compose.runtime:runtime-saveable:1.6.1
34+
androidx.compose.runtime:runtime:1.6.1
35+
androidx.compose.ui:ui-android:1.6.1
36+
androidx.compose.ui:ui-geometry-android:1.6.1
37+
androidx.compose.ui:ui-geometry:1.6.1
38+
androidx.compose.ui:ui-graphics-android:1.6.1
39+
androidx.compose.ui:ui-graphics:1.6.1
40+
androidx.compose.ui:ui-text-android:1.6.1
41+
androidx.compose.ui:ui-text:1.6.1
42+
androidx.compose.ui:ui-tooling-preview-android:1.6.1
43+
androidx.compose.ui:ui-tooling-preview:1.6.1
44+
androidx.compose.ui:ui-unit-android:1.6.1
45+
androidx.compose.ui:ui-unit:1.6.1
46+
androidx.compose.ui:ui-util-android:1.6.1
47+
androidx.compose.ui:ui-util:1.6.1
48+
androidx.compose.ui:ui:1.6.1
49+
androidx.compose:compose-bom:2024.02.00
4850
androidx.concurrent:concurrent-futures:1.1.0
4951
androidx.core:core-ktx:1.12.0
5052
androidx.core:core:1.12.0
5153
androidx.customview:customview-poolingcontainer:1.0.0
5254
androidx.customview:customview:1.0.0
53-
androidx.emoji2:emoji2:1.4.0
55+
androidx.emoji2:emoji2:1.3.0
5456
androidx.exifinterface:exifinterface:1.3.6
5557
androidx.fragment:fragment:1.5.1
5658
androidx.interpolator:interpolator:1.0.0

‎app/dependencies/prodReleaseRuntimeClasspath.txt‎

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
androidx.activity:activity-compose:1.8.0
22
androidx.activity:activity-ktx:1.8.0
33
androidx.activity:activity:1.8.0
4-
androidx.annotation:annotation-experimental:1.3.1
4+
androidx.annotation:annotation-experimental:1.4.0
55
androidx.annotation:annotation-jvm:1.7.0
66
androidx.annotation:annotation:1.7.0
77
androidx.appcompat:appcompat-resources:1.6.1
@@ -10,45 +10,47 @@ 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.6.0
13-
androidx.collection:collection-jvm:1.3.0
14-
androidx.collection:collection-ktx:1.3.0
15-
androidx.collection:collection:1.3.0
16-
androidx.compose.animation:animation-android:1.5.4
17-
androidx.compose.animation:animation-core-android:1.5.4
18-
androidx.compose.animation:animation-core:1.5.4
19-
androidx.compose.animation:animation:1.5.4
20-
androidx.compose.foundation:foundation-android:1.5.4
21-
androidx.compose.foundation:foundation-layout-android:1.5.4
22-
androidx.compose.foundation:foundation-layout:1.5.4
23-
androidx.compose.foundation:foundation:1.5.4
24-
androidx.compose.material3:material3-window-size-class:1.1.2
25-
androidx.compose.material3:material3:1.1.2
26-
androidx.compose.material:material-icons-core-android:1.5.4
27-
androidx.compose.material:material-icons-core:1.5.4
28-
androidx.compose.material:material-icons-extended-android:1.5.4
29-
androidx.compose.material:material-icons-extended:1.5.4
30-
androidx.compose.material:material-ripple-android:1.5.4
31-
androidx.compose.material:material-ripple:1.5.4
32-
androidx.compose.runtime:runtime-android:1.5.4
33-
androidx.compose.runtime:runtime-saveable-android:1.5.4
34-
androidx.compose.runtime:runtime-saveable:1.5.4
13+
androidx.collection:collection-jvm:1.4.0
14+
androidx.collection:collection-ktx:1.4.0
15+
androidx.collection:collection:1.4.0
16+
androidx.compose.animation:animation-android:1.6.1
17+
androidx.compose.animation:animation-core-android:1.6.1
18+
androidx.compose.animation:animation-core:1.6.1
19+
androidx.compose.animation:animation:1.6.1
20+
androidx.compose.foundation:foundation-android:1.6.1
21+
androidx.compose.foundation:foundation-layout-android:1.6.1
22+
androidx.compose.foundation:foundation-layout:1.6.1
23+
androidx.compose.foundation:foundation:1.6.1
24+
androidx.compose.material3:material3-android:1.2.0
25+
androidx.compose.material3:material3-window-size-class-android:1.2.0
26+
androidx.compose.material3:material3-window-size-class:1.2.0
27+
androidx.compose.material3:material3:1.2.0
28+
androidx.compose.material:material-icons-core-android:1.6.1
29+
androidx.compose.material:material-icons-core:1.6.1
30+
androidx.compose.material:material-icons-extended-android:1.6.1
31+
androidx.compose.material:material-icons-extended:1.6.1
32+
androidx.compose.material:material-ripple-android:1.6.1
33+
androidx.compose.material:material-ripple:1.6.1
34+
androidx.compose.runtime:runtime-android:1.6.1
35+
androidx.compose.runtime:runtime-saveable-android:1.6.1
36+
androidx.compose.runtime:runtime-saveable:1.6.1
3537
androidx.compose.runtime:runtime-tracing:1.0.0-beta01
36-
androidx.compose.runtime:runtime:1.5.4
37-
androidx.compose.ui:ui-android:1.5.4
38-
androidx.compose.ui:ui-geometry-android:1.5.4
39-
androidx.compose.ui:ui-geometry:1.5.4
40-
androidx.compose.ui:ui-graphics-android:1.5.4
41-
androidx.compose.ui:ui-graphics:1.5.4
42-
androidx.compose.ui:ui-text-android:1.5.4
43-
androidx.compose.ui:ui-text:1.5.4
44-
androidx.compose.ui:ui-tooling-preview-android:1.5.4
45-
androidx.compose.ui:ui-tooling-preview:1.5.4
46-
androidx.compose.ui:ui-unit-android:1.5.4
47-
androidx.compose.ui:ui-unit:1.5.4
48-
androidx.compose.ui:ui-util-android:1.5.4
49-
androidx.compose.ui:ui-util:1.5.4
50-
androidx.compose.ui:ui:1.5.4
51-
androidx.compose:compose-bom:2023.10.01
38+
androidx.compose.runtime:runtime:1.6.1
39+
androidx.compose.ui:ui-android:1.6.1
40+
androidx.compose.ui:ui-geometry-android:1.6.1
41+
androidx.compose.ui:ui-geometry:1.6.1
42+
androidx.compose.ui:ui-graphics-android:1.6.1
43+
androidx.compose.ui:ui-graphics:1.6.1
44+
androidx.compose.ui:ui-text-android:1.6.1
45+
androidx.compose.ui:ui-text:1.6.1
46+
androidx.compose.ui:ui-tooling-preview-android:1.6.1
47+
androidx.compose.ui:ui-tooling-preview:1.6.1
48+
androidx.compose.ui:ui-unit-android:1.6.1
49+
androidx.compose.ui:ui-unit:1.6.1
50+
androidx.compose.ui:ui-util-android:1.6.1
51+
androidx.compose.ui:ui-util:1.6.1
52+
androidx.compose.ui:ui:1.6.1
53+
androidx.compose:compose-bom:2024.02.00
5254
androidx.concurrent:concurrent-futures:1.1.0
5355
androidx.core:core-ktx:1.12.0
5456
androidx.core:core-splashscreen:1.0.1
@@ -62,8 +64,8 @@ androidx.datastore:datastore-preferences:1.0.0
6264
androidx.datastore:datastore:1.0.0
6365
androidx.documentfile:documentfile:1.0.0
6466
androidx.drawerlayout:drawerlayout:1.0.0
65-
androidx.emoji2:emoji2-views-helper:1.4.0
66-
androidx.emoji2:emoji2:1.4.0
67+
androidx.emoji2:emoji2-views-helper:1.3.0
68+
androidx.emoji2:emoji2:1.3.0
6769
androidx.exifinterface:exifinterface:1.3.6
6870
androidx.fragment:fragment:1.5.1
6971
androidx.hilt:hilt-common:1.1.0

‎app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import com.google.samples.apps.nowinandroid.core.data.repository.UserDataReposit
3838
import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository
3939
import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
4040
import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
41+
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
4142
import com.google.samples.apps.nowinandroid.core.testing.util.DefaultRoborazziOptions
4243
import com.google.samples.apps.nowinandroid.uitesthiltmanifest.HiltComponentActivity
4344
import dagger.hilt.android.testing.BindValue
@@ -144,15 +145,17 @@ class NiaAppScreenSizesScreenshotTests {
144145
) {
145146
TestHarness(size = DpSize(width, height)) {
146147
BoxWithConstraints {
147-
val fakeAppState = rememberNiaAppState(
148-
windowSizeClass = WindowSizeClass.calculateFromSize(
149-
DpSize(maxWidth, maxHeight),
150-
),
151-
networkMonitor = networkMonitor,
152-
userNewsResourceRepository = userNewsResourceRepository,
153-
timeZoneMonitor = timeZoneMonitor,
154-
)
155-
NiaApp(fakeAppState)
148+
NiaTheme {
149+
val fakeAppState = rememberNiaAppState(
150+
windowSizeClass = WindowSizeClass.calculateFromSize(
151+
DpSize(maxWidth, maxHeight),
152+
),
153+
networkMonitor = networkMonitor,
154+
userNewsResourceRepository = userNewsResourceRepository,
155+
timeZoneMonitor = timeZoneMonitor,
156+
)
157+
NiaApp(fakeAppState)
158+
}
156159
}
157160
}
158161
}

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

11.4 KB
Loading

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

16.4 KB
Loading

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

11.4 KB
Loading

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

26.9 KB
Loading

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

32.5 KB
Loading

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

26.5 KB
Loading

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

19.8 KB
Loading

0 commit comments

Comments
 (0)