diff --git a/.editorconfig b/.editorconfig index 7be3f8784..6c8c930bc 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,3 +5,13 @@ ij_kotlin_allow_trailing_comma=true ij_kotlin_allow_trailing_comma_on_call_site=true ktlint_function_naming_ignore_when_annotated_with=Composable, Test +ktlint_standard_backing-property-naming = disabled +ktlint_standard_binary-expression-wrapping = disabled +ktlint_standard_chain-method-continuation = disabled +ktlint_standard_class-signature = disabled +ktlint_standard_condition-wrapping = disabled +ktlint_standard_function-expression-body = disabled +ktlint_standard_function-literal = disabled +ktlint_standard_function-type-modifier-spacing = disabled +ktlint_standard_multiline-loop = disabled +ktlint_standard_function-signature = disabled diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index b1aee6f66..1b4ee8f5a 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -93,7 +93,9 @@ jobs: continue-on-error: false if: steps.screenshotsverify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository run: | - echo "::error::Screenshot tests failed, please create a PR in your fork first." && exit 1 + echo "::error::Screenshot tests failed, please create a PR in your fork first." + echo "Your fork's CI will take screenshots for your fork." + exit 1 # Runs if previous job failed - name: Generate new screenshots if verification failed and it's a PR @@ -166,7 +168,7 @@ jobs: timeout-minutes: 55 strategy: matrix: - api-level: [26, 30] + api-level: [26] steps: - name: Delete unnecessary tools 🔧 diff --git a/README.md b/README.md index 02143a043..79d037d28 100644 --- a/README.md +++ b/README.md @@ -205,7 +205,7 @@ To run the tests execute the following gradle tasks: - `connectedDemoDebugAndroidTest` run all instrumented tests against the `demoDebug` variant. **Note:** You should not run `./gradlew test` or `./gradlew connectedAndroidTest` as this will execute -tests against _all_ build variants which is both unecessary and will result in failures as only the +tests against _all_ build variants which is both unnecessary and will result in failures as only the `demoDebug` variant is supported. No other variants have any tests (although this might change in future). ## Screenshot tests diff --git a/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png index 912fca4c7..2f2254310 100644 Binary files a/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png and b/app/src/testDemo/screenshots/compactWidth_compactHeight_showsNavigationBar.png differ diff --git a/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png index 30873b584..36079dcf1 100644 Binary files a/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png and b/app/src/testDemo/screenshots/compactWidth_expandedHeight_showsNavigationBar.png differ diff --git a/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png index 668d69146..237d6d5b3 100644 Binary files a/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png and b/app/src/testDemo/screenshots/compactWidth_mediumHeight_showsNavigationBar.png differ diff --git a/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png index 1daf5ec34..24a4fe157 100644 Binary files a/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png and b/app/src/testDemo/screenshots/expandedWidth_compactHeight_showsNavigationBar.png differ diff --git a/app/src/testDemo/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png b/app/src/testDemo/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png index e2dffaf01..7f983c424 100644 Binary files a/app/src/testDemo/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png and b/app/src/testDemo/screenshots/expandedWidth_expandedHeight_showsNavigationRail.png differ diff --git a/app/src/testDemo/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png b/app/src/testDemo/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png index c5b7fe883..1f1db205c 100644 Binary files a/app/src/testDemo/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png and b/app/src/testDemo/screenshots/expandedWidth_mediumHeight_showsNavigationRail.png differ diff --git a/app/src/testDemo/screenshots/insets_snackbar_compact_medium.png b/app/src/testDemo/screenshots/insets_snackbar_compact_medium.png index aae785a47..b7cee54bd 100644 Binary files a/app/src/testDemo/screenshots/insets_snackbar_compact_medium.png and b/app/src/testDemo/screenshots/insets_snackbar_compact_medium.png differ diff --git a/app/src/testDemo/screenshots/insets_snackbar_compact_medium_noSnackbar.png b/app/src/testDemo/screenshots/insets_snackbar_compact_medium_noSnackbar.png index d37f02c65..fa334578b 100644 Binary files a/app/src/testDemo/screenshots/insets_snackbar_compact_medium_noSnackbar.png and b/app/src/testDemo/screenshots/insets_snackbar_compact_medium_noSnackbar.png differ diff --git a/app/src/testDemo/screenshots/insets_snackbar_expanded_expanded.png b/app/src/testDemo/screenshots/insets_snackbar_expanded_expanded.png index 253b6be4c..3f185dd62 100644 Binary files a/app/src/testDemo/screenshots/insets_snackbar_expanded_expanded.png and b/app/src/testDemo/screenshots/insets_snackbar_expanded_expanded.png differ diff --git a/app/src/testDemo/screenshots/insets_snackbar_medium_medium.png b/app/src/testDemo/screenshots/insets_snackbar_medium_medium.png index 3e7171bf4..514f5f000 100644 Binary files a/app/src/testDemo/screenshots/insets_snackbar_medium_medium.png and b/app/src/testDemo/screenshots/insets_snackbar_medium_medium.png differ diff --git a/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.png b/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.png index 4bc5d2b1c..624d588e8 100644 Binary files a/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.png and b/app/src/testDemo/screenshots/mediumWidth_compactHeight_showsNavigationBar.png differ diff --git a/app/src/testDemo/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png b/app/src/testDemo/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png index 79f808f44..7d7d697e7 100644 Binary files a/app/src/testDemo/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png and b/app/src/testDemo/screenshots/mediumWidth_expandedHeight_showsNavigationRail.png differ diff --git a/app/src/testDemo/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png b/app/src/testDemo/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png index f914a0454..887213791 100644 Binary files a/app/src/testDemo/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png and b/app/src/testDemo/screenshots/mediumWidth_mediumHeight_showsNavigationRail.png differ diff --git a/app/src/testDemo/screenshots/snackbar_compact_medium.png b/app/src/testDemo/screenshots/snackbar_compact_medium.png index 7676de40a..f29835e64 100644 Binary files a/app/src/testDemo/screenshots/snackbar_compact_medium.png and b/app/src/testDemo/screenshots/snackbar_compact_medium.png differ diff --git a/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png b/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png index ff9ed7669..9602e2a4d 100644 Binary files a/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png and b/app/src/testDemo/screenshots/snackbar_compact_medium_noSnackbar.png differ diff --git a/app/src/testDemo/screenshots/snackbar_expanded_expanded.png b/app/src/testDemo/screenshots/snackbar_expanded_expanded.png index 841a02eaf..1a26bc96d 100644 Binary files a/app/src/testDemo/screenshots/snackbar_expanded_expanded.png and b/app/src/testDemo/screenshots/snackbar_expanded_expanded.png differ diff --git a/app/src/testDemo/screenshots/snackbar_medium_medium.png b/app/src/testDemo/screenshots/snackbar_medium_medium.png index 2800575b8..f50dfd9f2 100644 Binary files a/app/src/testDemo/screenshots/snackbar_medium_medium.png and b/app/src/testDemo/screenshots/snackbar_medium_medium.png differ diff --git a/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt index 0e5cb45bb..afe47eeee 100644 --- a/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt @@ -15,6 +15,7 @@ */ import com.google.samples.apps.nowinandroid.configureKotlinJvm +import com.google.samples.apps.nowinandroid.libs import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.dependencies @@ -29,7 +30,7 @@ class JvmLibraryConventionPlugin : Plugin { } configureKotlinJvm() dependencies { - "testImplementation"(kotlin("test")) + add("testImplementation", libs.findLibrary("kotlin.test").get()) } } } diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidInstrumentedTests.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidInstrumentedTests.kt index d0c26e4e6..c51dac5c9 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidInstrumentedTests.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidInstrumentedTests.kt @@ -30,6 +30,6 @@ import org.gradle.api.Project internal fun LibraryAndroidComponentsExtension.disableUnnecessaryAndroidTests( project: Project, ) = beforeVariants { - it.enableAndroidTest = it.enableAndroidTest + it.androidTest.enable = it.androidTest.enable && project.projectDir.resolve("src/androidTest").exists() } diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index de9224e22..b359a5207 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -16,7 +16,13 @@ dependencyResolutionManagement { repositories { - google() + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } mavenCentral() } versionCatalogs { diff --git a/build.gradle.kts b/build.gradle.kts index 1bf6fc50c..504ccadab 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,13 @@ buildscript { repositories { - google() + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } mavenCentral() // Android Build Server diff --git a/core/designsystem/src/androidUnitTest/screenshots/Background/Background_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_dark_defaultTheme_dynamic.png index 67cafa03d..1b8487b8b 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Background/Background_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Background/Background_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_dark_defaultTheme_notDynamic.png index 3f187d9d2..768b278fe 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Background/Background_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_androidTheme_notDynamic.png index ebcf62c08..ea2af8163 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_defaultTheme_dynamic.png index 7f910a34b..84dcfe3e6 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_defaultTheme_notDynamic.png index 912480c6a..55551f5cf 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Background/Background_light_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png index a9b2c8694..a346576ea 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png index f88a672c4..ff9584511 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png index ebcf62c08..ea2af8163 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png index 6fef6436a..65fab36f9 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png index e619f1332..a162fe3d0 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Background/GradientBackground_light_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png index cf0656fbd..d73b2992e 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png index 9514112f1..08319f0c7 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png index 7774a18bc..ac4c4c234 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png index 8858fb493..121a71a98 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/ButtonLeadingIcon_light_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_androidTheme_notDynamic.png index a5d3d4a3d..3c2da608e 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_defaultTheme_dynamic.png index 01538b44b..cc0bd5fcf 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_defaultTheme_notDynamic.png index cd0c07df1..84aa59b05 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_androidTheme_notDynamic.png index ab113beec..2e63f3058 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_defaultTheme_dynamic.png index fdbbb820d..aa7a82e62 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_defaultTheme_notDynamic.png index b567adf84..3ae722ba8 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/Button_light_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png index a9ba099c0..aeb57a8b2 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png index 6fce27976..4d2bc5e50 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png index ce30b66ba..2a455faea 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png index bb6aa592f..fef62e4d7 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png index c18a86878..d87c4c19b 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png index d2059e4d7..13792665b 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Button/OutlineButton_light_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png index 5881f76b7..85a215412 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png index 4b5c91914..9381f22ab 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png index f2e863865..1873be71b 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png index 1e3b04e50..25f14ba48 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png index 865368ca1..2a60bba9b 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png index be73f060d..e1ce90025 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChipSelected_light_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png index 364f59a47..7016cf9e0 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png index 8f90977fd..7d777e9c2 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png index 5303eb64e..2bda37bd0 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_fontScale2.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_fontScale2.png index 2dc430ca8..6a2286403 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_fontScale2.png and b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_fontScale2.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png index fadd074d8..d65be724c 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png index 2f3749cf3..0fcf31aa8 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png index 0cfaaefae..0dc1958fc 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/FilterChip/FilterChip_light_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png index a1512fa75..7bfc9db14 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png index fe4b54ae2..8be9289be 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png index f912ce3c1..cf236ccc6 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png index 339479779..c2e73ebcd 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png index 92079273a..1806016d4 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png index 24580adf2..a04a52dd4 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButtonUnchecked_light_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png index ce2cdf804..8d26654a3 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png index ce2cdf804..8d26654a3 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png index ce2cdf804..8d26654a3 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png index ce2cdf804..8d26654a3 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png index ce2cdf804..8d26654a3 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png index ce2cdf804..8d26654a3 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/IconButton/IconButton_light_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_1000.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_1000.png index 450d55a09..3388670d1 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_1000.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_1000.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_115.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_115.png index 5aa1eb89a..c1cd57e02 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_115.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_115.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_20.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_20.png index 74309056f..5ec625a8f 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_20.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_20.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_724.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_724.png index 03bf6709e..051715376 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_724.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_animation_724.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png index cf35893fd..e6171872d 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png index 013aac763..55dd863dd 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png index 19265495c..3123ab438 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png index 156fc1983..f04e7cbba 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png index 36d79ab6c..0dcc25a80 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png index 89ea5e37c..79b982f4f 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/LoadingWheel_light_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png index 022ea15eb..2b4050b99 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png index 0a7be72c2..f4f478ccc 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png index ddc43ab6a..a516a5589 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png index 071ab0a04..cea88ddd4 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png index 7170dec31..2a5d017a7 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png index 6829b0f78..5b0b9a1b7 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/LoadingWheel/OverlayLoadingWheel_light_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png index b2a0fb99c..70a9cdf06 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png index 8836faebc..ca35ee3df 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png index a4abd2d5b..13f887e37 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_fontScale2.png b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_fontScale2.png index 97bbb0892..469e070cb 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_fontScale2.png and b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_fontScale2.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png index a526e36c7..3858cd12a 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png index 5e27d2497..4049f8c90 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png index f5671cb14..a3be52a80 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Navigation/Navigation_light_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png index bdf5d18f3..ee19e0d0c 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png index 15cb061a0..1bbfd6218 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png index 074f3dc8c..8f56f13f0 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_fontScale2.png b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_fontScale2.png index f62ea3ced..547788564 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_fontScale2.png and b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_fontScale2.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png index 5c38870dc..dde09305e 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png index 0564b3881..9af3202ec 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png index 759641c93..2df7822b9 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Tabs/Tabs_light_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png index 522dcd301..a2c979061 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_defaultTheme_dynamic.png index 13345c365..210d6c96d 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_defaultTheme_notDynamic.png index d6cfb48d0..55fe716df 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_fontScale2.png b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_fontScale2.png index 475707556..a7c5bb8d0 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_fontScale2.png and b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_fontScale2.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_androidTheme_notDynamic.png index 38ebe8b42..7d93422fd 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_defaultTheme_dynamic.png index 00144ba15..b085ad53e 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_defaultTheme_notDynamic.png index 53b1da266..63347e1eb 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/Tag/Tag_light_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_androidTheme_notDynamic.png index 753c13605..b4157fc79 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_dynamic.png index 1c2d9b3ec..24b53763b 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_notDynamic.png index 1baa2362c..cea432900 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_dark_defaultTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_fontScale2.png b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_fontScale2.png index 234304db1..d497ed77d 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_fontScale2.png and b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_fontScale2.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_androidTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_androidTheme_notDynamic.png index 7c0348b04..c998e25de 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_androidTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_androidTheme_notDynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_dynamic.png b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_dynamic.png index fbf61adc4..f063b0cd6 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_dynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_dynamic.png differ diff --git a/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_notDynamic.png b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_notDynamic.png index 078378bea..ca5c4e912 100644 Binary files a/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_notDynamic.png and b/core/designsystem/src/androidUnitTest/screenshots/TopAppBar/TopAppBar_light_defaultTheme_notDynamic.png differ diff --git a/feature/bookmarks/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt b/feature/bookmarks/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt index 54e75d5a0..bba39e5e6 100644 --- a/feature/bookmarks/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt +++ b/feature/bookmarks/src/androidInstrumentedTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt @@ -18,7 +18,6 @@ package com.google.samples.apps.nowinandroid.feature.bookmarks import androidx.activity.ComponentActivity import androidx.compose.runtime.CompositionLocalProvider -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.test.assertCountEquals import androidx.compose.ui.test.assertHasClickAction import androidx.compose.ui.test.filter @@ -33,6 +32,7 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performScrollToNode import androidx.lifecycle.Lifecycle +import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.testing.TestLifecycleOwner import com.google.samples.apps.nowinandroid.core.testing.data.userNewsResourcesTestData import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState diff --git a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenLoading_foldable.png b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenLoading_foldable.png index f362c445d..56b0f5a2e 100644 Binary files a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenLoading_foldable.png and b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenLoading_foldable.png differ diff --git a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenLoading_phone.png b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenLoading_phone.png index 8d02e5985..5a7abf9da 100644 Binary files a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenLoading_phone.png and b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenLoading_phone.png differ diff --git a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenLoading_tablet.png b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenLoading_tablet.png index e6f6a527a..005957228 100644 Binary files a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenLoading_tablet.png and b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenLoading_tablet.png differ diff --git a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_foldable.png b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_foldable.png index f5ca39c3a..fd9fd6875 100644 Binary files a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_foldable.png and b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_foldable.png differ diff --git a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_phone.png b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_phone.png index 7a3f99d7c..96cc8ca9a 100644 Binary files a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_phone.png and b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_phone.png differ diff --git a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_phone_dark.png b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_phone_dark.png index 3a14048b5..13233bc93 100644 Binary files a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_phone_dark.png and b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_phone_dark.png differ diff --git a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_tablet.png b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_tablet.png index 97458f73b..bf0c2b4b6 100644 Binary files a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_tablet.png and b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedAndLoading_tablet.png differ diff --git a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedFeed_foldable.png b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedFeed_foldable.png index 0b539aeca..67112f6d1 100644 Binary files a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedFeed_foldable.png and b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedFeed_foldable.png differ diff --git a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedFeed_phone.png b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedFeed_phone.png index b19c8d708..ffb09165c 100644 Binary files a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedFeed_phone.png and b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedFeed_phone.png differ diff --git a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedFeed_tablet.png b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedFeed_tablet.png index bdf44b2a3..37dbe6e92 100644 Binary files a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedFeed_tablet.png and b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenPopulatedFeed_tablet.png differ diff --git a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_foldable.png b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_foldable.png index b095c1a7a..9c8263d08 100644 Binary files a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_foldable.png and b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_foldable.png differ diff --git a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_phone.png b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_phone.png index 140fa8d6d..0f01ae89a 100644 Binary files a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_phone.png and b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_phone.png differ diff --git a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_phone_dark.png b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_phone_dark.png index 5d90732a0..1fe072ccf 100644 Binary files a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_phone_dark.png and b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_phone_dark.png differ diff --git a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_tablet.png b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_tablet.png index 3dd62e765..a3d03661b 100644 Binary files a/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_tablet.png and b/feature/foryou/src/androidUnitTest/screenshots/ForYouScreenTopicSelection_tablet.png differ diff --git a/feature/search/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt b/feature/search/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt index a62965b52..1b866cec2 100644 --- a/feature/search/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt +++ b/feature/search/src/androidUnitTest/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt @@ -41,6 +41,7 @@ import org.junit.Rule import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertIs +import kotlin.test.assertNull /** * To learn more about how this test handles Flows created with stateIn, see @@ -122,6 +123,43 @@ class SearchViewModelTest { assertEquals(SearchNotReady, viewModel.searchResultUiState.value) } + @Test + fun emptySearchText_isNotAddedToRecentSearches() = runTest { + viewModel.onSearchTriggered("") + + val recentSearchQueriesStream = getRecentQueryUseCase() + val recentSearchQueries = recentSearchQueriesStream.first() + val recentSearchQuery = recentSearchQueries.firstOrNull() + + assertNull(recentSearchQuery) + } + + @Test + fun searchTextWithThreeSpaces_isEmptyQuery() = runTest { + searchContentsRepository.addNewsResources(newsResourcesTestData) + searchContentsRepository.addTopics(topicsTestData) + val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() } + + viewModel.onSearchQueryChanged(" ") + + assertIs(viewModel.searchResultUiState.value) + + collectJob.cancel() + } + + @Test + fun searchTextWithThreeSpacesAndOneLetter_isEmptyQuery() = runTest { + searchContentsRepository.addNewsResources(newsResourcesTestData) + searchContentsRepository.addTopics(topicsTestData) + val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() } + + viewModel.onSearchQueryChanged(" a") + + assertIs(viewModel.searchResultUiState.value) + + collectJob.cancel() + } + @Test fun whenToggleNewsResourceSavedIsCalled_bookmarkStateIsUpdated() = runTest { val newsResourceId = "123" diff --git a/feature/search/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt b/feature/search/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt index 64e2fdd15..6bff98954 100644 --- a/feature/search/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt +++ b/feature/search/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt @@ -534,6 +534,7 @@ private fun SearchTextField( .focusRequester(focusRequester) .onKeyEvent { if (it.key == Key.Enter) { + if (searchQuery.isBlank()) return@onKeyEvent false onSearchExplicitlyTriggered() true } else { @@ -548,6 +549,7 @@ private fun SearchTextField( ), keyboardActions = KeyboardActions( onSearch = { + if (searchQuery.isBlank()) return@KeyboardActions onSearchExplicitlyTriggered() }, ), diff --git a/feature/search/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt b/feature/search/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt index 59afb6dfa..339f1cf6b 100644 --- a/feature/search/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt +++ b/feature/search/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt @@ -58,7 +58,7 @@ class SearchViewModel( flowOf(SearchResultUiState.SearchNotReady) } else { searchQuery.flatMapLatest { query -> - if (query.length < SEARCH_QUERY_MIN_LENGTH) { + if (query.trim().length < SEARCH_QUERY_MIN_LENGTH) { flowOf(SearchResultUiState.EmptyQuery) } else { getSearchContentsUseCase(query) @@ -101,6 +101,7 @@ class SearchViewModel( * search query in the search text field, defining this method. */ fun onSearchTriggered(query: String) { + if (query.isBlank()) return viewModelScope.launch { recentSearchRepository.insertOrReplaceRecentSearch(searchQuery = query) } diff --git a/generateModuleGraphs.sh b/generateModuleGraphs.sh index 3c3583e67..5307d2932 100755 --- a/generateModuleGraphs.sh +++ b/generateModuleGraphs.sh @@ -27,7 +27,8 @@ then echo "The 'dot' command is not found. This is required to generate SVGs from the Graphviz files." echo "Installation instructions:" echo " - On macOS: You can install Graphviz using Homebrew with the command: 'brew install graphviz'" - echo " - On Ubuntu: You can install Graphviz using APT with the command: 'sudo apt-get install graphviz'" + echo " - On Ubuntu: You can install Graphviz using APT with the command: 'sudo apt install graphviz'" + echo " - Others: Visit https://graphviz.org/download/" exit 1 fi diff --git a/gradle/init.gradle.kts b/gradle/init.gradle.kts index fe79fa01e..44dc41200 100644 --- a/gradle/init.gradle.kts +++ b/gradle/init.gradle.kts @@ -14,10 +14,10 @@ * limitations under the License. */ -val ktlintVersion = "1.0.1" +val ktlintVersion = "1.4.0" initscript { - val spotlessVersion = "6.23.3" + val spotlessVersion = "6.25.0" repositories { mavenCentral() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7e284a44f..90734f8ba 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ accompanist = "0.36.0" androidDesugarJdkLibs = "2.1.3" # AGP and tools should be updated together androidGradlePlugin = "8.7.2" -androidTools = "31.7.2" +androidTools = "31.7.3" androidxActivity = "1.9.3" androidxBrowser = "1.8.0" androidxComposeBom = "2024.11.00" @@ -24,7 +24,7 @@ androidxTestRunner = "1.6.2" androidxTracing = "1.3.0-alpha02" androidxUiAutomator = "2.3.0" androidxWindowManager = "1.3.0" -androidxWork = "2.10.0" +androidxWork = "2.10.1" coil = "3.0.3" dependencyGuard = "0.5.0" jacoco = "0.8.7" @@ -37,7 +37,7 @@ logback = "1.5.12" material3adaptive = "1.0.1" moduleGraph = "2.7.1" robolectric = "4.14" -roborazzi = "1.32.2" +roborazzi = "1.36.0" secrets = "2.0.1" truth = "1.4.4" turbine = "1.1.0" diff --git a/lint/build.gradle.kts b/lint/build.gradle.kts index 99a057362..f1722fa78 100644 --- a/lint/build.gradle.kts +++ b/lint/build.gradle.kts @@ -38,7 +38,7 @@ kotlin { dependencies { compileOnly(libs.kotlin.stdlib) compileOnly(libs.lint.api) + testImplementation(libs.kotlin.test) testImplementation(libs.lint.checks) testImplementation(libs.lint.tests) - testImplementation(kotlin("test")) } diff --git a/settings.gradle.kts b/settings.gradle.kts index b11358e53..292ca5b67 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,7 +17,13 @@ pluginManagement { includeBuild("build-logic") repositories { - google() + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } mavenCentral() gradlePluginPortal() } @@ -29,7 +35,13 @@ dependencyResolutionManagement { // Fix target versions: Kotlin 2.0.0-Beta1 // repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { - google() + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } mavenCentral() } }