A fully functional Android app built entirely with Kotlin and Jetpack Compose
Merge branch 'main' into replace-testharness
Don Turner2d610b0775d7
diff --cc app/build.gradle.ktsindex b2cf6151c,a7cd78f75..44a2bbfb5--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@@ -116,8 -118,9 +118,9 @@@ dependenciesandroidTestImplementation(projects.core.testing)androidTestImplementation(projects.core.dataTest)androidTestImplementation(projects.core.datastoreTest)+ androidTestImplementation(libs.androidx.test.espresso.core)androidTestImplementation(libs.androidx.navigation.testing)- androidTestImplementation(libs.accompanist.testharness)+ androidTestImplementation(libs.androidx.compose.ui.test)androidTestImplementation(libs.hilt.android.testing)baselineProfile(projects.benchmarks)diff --cc app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.ktindex 219259f5d,5d2e12b5c..03cf653ae--- a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt+++ b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt@@@ -19,15 -19,17 +19,18 @@@ package com.google.samples.apps.nowinanimport androidx.compose.foundation.layout.BoxWithConstraintsimport androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApiimport androidx.compose.material3.windowsizeclass.WindowSizeClass+ import androidx.compose.runtime.Composable+import androidx.compose.ui.test.DeviceConfigurationOverride+import androidx.compose.ui.test.ForcedSizeimport androidx.compose.ui.test.assertIsDisplayedimport androidx.compose.ui.test.junit4.createAndroidComposeRuleimport androidx.compose.ui.test.onNodeWithTag+ import androidx.compose.ui.unit.Dpimport androidx.compose.ui.unit.DpSizeimport androidx.compose.ui.unit.dp-import com.google.accompanist.testharness.TestHarnessimport com.google.samples.apps.nowinandroid.core.data.repository.CompositeUserNewsResourceRepositoryimport com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor+ import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitorimport com.google.samples.apps.nowinandroid.core.rules.GrantPostNotificationsPermissionRuleimport com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepositoryimport com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository@@@ -90,17 -95,9 +96,11 @@@ class NavigationUiTest@Testfun compactWidth_compactHeight_showsNavigationBar() {composeTestRule.setContent {- TestHarness(size = DpSize(400.dp, 400.dp)) {+ DeviceConfigurationOverride(+ DeviceConfigurationOverride.ForcedSize(DpSize(400.dp, 400.dp)),+ ) {BoxWithConstraints {- NiaApp(- windowSizeClass = WindowSizeClass.calculateFromSize(- DpSize(maxWidth, maxHeight),- ),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- )+ NiaApp(fakeAppState(maxWidth, maxHeight))}}}@@@ -112,17 -109,9 +112,11 @@@@Testfun mediumWidth_compactHeight_showsNavigationRail() {composeTestRule.setContent {- TestHarness(size = DpSize(610.dp, 400.dp)) {+ DeviceConfigurationOverride(+ DeviceConfigurationOverride.ForcedSize(DpSize(610.dp, 400.dp)),+ ) {BoxWithConstraints {- NiaApp(- windowSizeClass = WindowSizeClass.calculateFromSize(- DpSize(maxWidth, maxHeight),- ),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- )+ NiaApp(fakeAppState(maxWidth, maxHeight))}}}@@@ -134,17 -123,9 +128,11 @@@@Testfun expandedWidth_compactHeight_showsNavigationRail() {composeTestRule.setContent {- TestHarness(size = DpSize(900.dp, 400.dp)) {+ DeviceConfigurationOverride(+ DeviceConfigurationOverride.ForcedSize(DpSize(900.dp, 400.dp)),+ ) {BoxWithConstraints {- NiaApp(- windowSizeClass = WindowSizeClass.calculateFromSize(- DpSize(maxWidth, maxHeight),- ),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- )+ NiaApp(fakeAppState(maxWidth, maxHeight))}}}@@@ -156,17 -137,9 +144,11 @@@@Testfun compactWidth_mediumHeight_showsNavigationBar() {composeTestRule.setContent {- TestHarness(size = DpSize(400.dp, 500.dp)) {+ DeviceConfigurationOverride(+ DeviceConfigurationOverride.ForcedSize(DpSize(400.dp, 500.dp)),+ ) {BoxWithConstraints {- NiaApp(- windowSizeClass = WindowSizeClass.calculateFromSize(- DpSize(maxWidth, maxHeight),- ),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- )+ NiaApp(fakeAppState(maxWidth, maxHeight))}}}@@@ -178,17 -151,9 +160,11 @@@@Testfun mediumWidth_mediumHeight_showsNavigationRail() {composeTestRule.setContent {- TestHarness(size = DpSize(610.dp, 500.dp)) {+ DeviceConfigurationOverride(+ DeviceConfigurationOverride.ForcedSize(DpSize(610.dp, 500.dp)),+ ) {BoxWithConstraints {- NiaApp(- windowSizeClass = WindowSizeClass.calculateFromSize(- DpSize(maxWidth, maxHeight),- ),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- )+ NiaApp(fakeAppState(maxWidth, maxHeight))}}}@@@ -200,17 -165,9 +176,11 @@@@Testfun expandedWidth_mediumHeight_showsNavigationRail() {composeTestRule.setContent {- TestHarness(size = DpSize(900.dp, 500.dp)) {+ DeviceConfigurationOverride(+ DeviceConfigurationOverride.ForcedSize(DpSize(900.dp, 500.dp)),+ ) {BoxWithConstraints {- NiaApp(- windowSizeClass = WindowSizeClass.calculateFromSize(- DpSize(maxWidth, maxHeight),- ),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- )+ NiaApp(fakeAppState(maxWidth, maxHeight))}}}@@@ -222,17 -179,9 +192,11 @@@@Testfun compactWidth_expandedHeight_showsNavigationBar() {composeTestRule.setContent {- TestHarness(size = DpSize(400.dp, 1000.dp)) {+ DeviceConfigurationOverride(+ DeviceConfigurationOverride.ForcedSize(DpSize(400.dp, 1000.dp)),+ ) {BoxWithConstraints {- NiaApp(- windowSizeClass = WindowSizeClass.calculateFromSize(- DpSize(maxWidth, maxHeight),- ),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- )+ NiaApp(fakeAppState(maxWidth, maxHeight))}}}@@@ -244,17 -193,9 +208,11 @@@@Testfun mediumWidth_expandedHeight_showsNavigationRail() {composeTestRule.setContent {- TestHarness(size = DpSize(610.dp, 1000.dp)) {+ DeviceConfigurationOverride(+ DeviceConfigurationOverride.ForcedSize(DpSize(610.dp, 1000.dp)),+ ) {BoxWithConstraints {- NiaApp(- windowSizeClass = WindowSizeClass.calculateFromSize(- DpSize(maxWidth, maxHeight),- ),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- )+ NiaApp(fakeAppState(maxWidth, maxHeight))}}}@@@ -266,17 -207,9 +224,11 @@@@Testfun expandedWidth_expandedHeight_showsNavigationRail() {composeTestRule.setContent {- TestHarness(size = DpSize(900.dp, 1000.dp)) {+ DeviceConfigurationOverride(+ DeviceConfigurationOverride.ForcedSize(DpSize(900.dp, 1000.dp)),+ ) {BoxWithConstraints {- NiaApp(- windowSizeClass = WindowSizeClass.calculateFromSize(- DpSize(maxWidth, maxHeight),- ),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- )+ NiaApp(fakeAppState(maxWidth, maxHeight))}}}diff --cc app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.ktindex f6a615601,b2eabe2ed..aa9ac4941--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt@@@ -86,17 -82,7 +82,7 @@@ import com.google.samples.apps.nowinandExperimentalComposeUiApi::class,)@Composable- fun NiaApp(- windowSizeClass: WindowSizeClass,- networkMonitor: NetworkMonitor,- userNewsResourceRepository: UserNewsResourceRepository,- modifier: Modifier = Modifier,- appState: NiaAppState = rememberNiaAppState(- networkMonitor = networkMonitor,- windowSizeClass = windowSizeClass,- userNewsResourceRepository = userNewsResourceRepository,- ),- ) {-fun NiaApp(appState: NiaAppState) {++fun NiaApp(appState: NiaAppState, modifier: Modifier = Modifier) {val shouldShowGradientBackground =appState.currentTopLevelDestination == TopLevelDestination.FOR_YOUvar showSettingsDialog by rememberSaveable { mutableStateOf(false) }diff --cc app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.ktindex 808a2f2d8,83ca1bb3d..8b99b0847--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt@@@ -20,13 -20,10 +20,11 @@@ import android.util.Loimport androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApiimport androidx.compose.material3.windowsizeclass.WindowSizeClassimport androidx.compose.runtime.CompositionLocalProvider- import androidx.compose.ui.Modifierimport androidx.compose.ui.platform.LocalInspectionMode- import androidx.compose.ui.platform.testTag+import androidx.compose.ui.test.DeviceConfigurationOverride+import androidx.compose.ui.test.ForcedSizeimport androidx.compose.ui.test.junit4.createAndroidComposeRule-import androidx.compose.ui.test.onRoot+import androidx.compose.ui.test.onNodeWithTagimport androidx.compose.ui.unit.Dpimport androidx.compose.ui.unit.DpSizeimport androidx.compose.ui.unit.dp@@@ -144,18 -143,19 +146,19 @@@ class NiaAppScreenSizesScreenshotTestsCompositionLocalProvider(LocalInspectionMode provides true,) {- TestHarness(size = DpSize(width, height)) {- BoxWithConstraints {- NiaTheme {- val fakeAppState = rememberNiaAppState(- windowSizeClass = WindowSizeClass.calculateFromSize(- DpSize(maxWidth, maxHeight),- ),- networkMonitor = networkMonitor,- userNewsResourceRepository = userNewsResourceRepository,- timeZoneMonitor = timeZoneMonitor,- )- NiaApp(fakeAppState)- }+ DeviceConfigurationOverride(+ override = DeviceConfigurationOverride.ForcedSize(DpSize(width, height)),+ ) {+ NiaTheme {- NiaApp(++ val fakeAppState = rememberNiaAppState(+ windowSizeClass = WindowSizeClass.calculateFromSize(+ DpSize(width, height),+ ),+ networkMonitor = networkMonitor,+ userNewsResourceRepository = userNewsResourceRepository,- modifier = Modifier.testTag(appTestTag),++ timeZoneMonitor = timeZoneMonitor,+ )++ NiaApp(fakeAppState)}}}diff --cc core/screenshot-testing/build.gradle.ktsindex 000000000,4e9a931b0..fb23cf057mode 000000,100644..100644--- a/core/screenshot-testing/build.gradle.kts+++ b/core/screenshot-testing/build.gradle.kts@@@ -1,0 -1,34 +1,34 @@@+ /*+ * Copyright 2022 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.+ */+ plugins {+ alias(libs.plugins.nowinandroid.android.library)+ alias(libs.plugins.nowinandroid.android.library.compose)+ alias(libs.plugins.nowinandroid.android.hilt)+ }++ android {+ namespace = "com.google.samples.apps.nowinandroid.core.screenshottesting"+ }++ dependencies {+ api(libs.roborazzi)- implementation(libs.accompanist.testharness)++ implementation(libs.androidx.compose.ui.test)+ implementation(libs.androidx.activity.compose)+ implementation(libs.androidx.compose.ui.test)+ implementation(libs.robolectric)+ implementation(projects.core.common)+ implementation(projects.core.designsystem)+ }diff --cc gradle/libs.versions.tomlindex 5b64a6801,7b1318c7a..e60f8bcd2--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@@ -8,8 -8,7 +8,8 @@@ androidxActivity = "1.8.0androidxAppCompat = "1.6.1"androidxBrowser = "1.6.0"androidxComposeBom = "2024.02.00"+ androidxComposeCompiler = "1.5.8"+androidxComposeUiTest = "1.7.0-alpha03"- androidxComposeCompiler = "1.5.7"androidxComposeRuntimeTracing = "1.0.0-beta01"androidxCore = "1.12.0"androidxCoreSplashscreen = "1.0.1"@@@ -72,7 -72,8 +72,8 @@@ androidx-compose-material-iconsExtendeandroidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }+ androidx-compose-runtime-tracing = { group = "androidx.compose.runtime", name = "runtime-tracing", version.ref = "androidxComposeRuntimeTracing" }-androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4" }+androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "androidxComposeUiTest" }androidx-compose-ui-testManifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }