From 766fdc2a6a356f6903e330145d7c62f1594d893b Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Fri, 31 May 2024 09:21:32 +0100 Subject: [PATCH] Update all dependencies (#2248) --- .../auth/data/googlesignin/AuthUserMapper.kt | 2 ++ .../googlesignin/GoogleSignInEventListener.kt | 2 ++ .../signin/GoogleSignInEventListenerSample.kt | 2 ++ .../mapper/AccountUiModelMapper.kt | 2 ++ .../horologist/composables/MarqueeText.kt | 2 +- .../composables/DatePickerInteractionTest.kt | 2 +- .../SquareSegmentedProgressIndicatorTest.kt | 2 +- .../pager/VerticalPagerIndicatorPreview.kt | 30 +++++++++++++++++++ .../compose/pager/VerticalPageIndicator.kt | 24 +++++++++------ .../compose/layout/FillMaxRectangleTest.kt | 4 +-- .../compose/pager/PagerScreenTest.kt | 2 +- .../FontScaleIndependentTest_12.0.sp.png | 4 +-- .../FontScaleIndependentTest_16.0.sp.png | 4 +-- .../FontScaleIndependentTest_20.0.sp.png | 4 +-- .../FontScaleIndependentTest_24.0.sp.png | 4 +-- .../FontScaleIndependentTest_30.0.sp.png | 4 +-- .../FontScaleIndependentTest_34.0.sp.png | 4 +-- .../FontScaleIndependentTest_40.0.sp.png | 4 +-- gradle/libs.versions.toml | 16 +++++----- .../composables/screens/MetricsScreenTest.kt | 2 -- .../audio/SystemAudioRepositoryTest.kt | 2 +- .../mediasample/work/BaseAppTest.kt | 2 +- .../media/ui/MediaPlayerA11yScreenshotTest.kt | 2 -- .../media/ui/MediaPlayerDeviceScreenTest.kt | 2 -- .../ui/tiles/MediaCollectionsTileTest.kt | 2 -- ...es_MediaCollectionsTileTest_smallRound.png | 4 +-- ....tiles_MediaCollectionsTileTest_square.png | 4 +-- ...1yScreenshotTest_mediaPlayerSmallRound.png | 4 +-- ...erA11yScreenshotTest_mediaPlayerSquare.png | 4 +-- ...DeviceScreenTest_mediaPlayerLargeRound.png | 4 +-- ...ayerDeviceScreenTest_mediaPlayerScreen.png | 4 +-- ...DeviceScreenTest_mediaPlayerSmallRound.png | 4 +-- ...ayerDeviceScreenTest_mediaPlayerSquare.png | 4 +-- 33 files changed, 99 insertions(+), 63 deletions(-) create mode 100644 compose-layout/src/debug/java/com/google/android/horologist/compose/pager/VerticalPagerIndicatorPreview.kt diff --git a/auth/data/src/main/java/com/google/android/horologist/auth/data/googlesignin/AuthUserMapper.kt b/auth/data/src/main/java/com/google/android/horologist/auth/data/googlesignin/AuthUserMapper.kt index 1a3574aa36..305809814f 100644 --- a/auth/data/src/main/java/com/google/android/horologist/auth/data/googlesignin/AuthUserMapper.kt +++ b/auth/data/src/main/java/com/google/android/horologist/auth/data/googlesignin/AuthUserMapper.kt @@ -14,6 +14,8 @@ * limitations under the License. */ +@file:Suppress("DEPRECATION") + package com.google.android.horologist.auth.data.googlesignin import com.google.android.gms.auth.api.signin.GoogleSignInAccount diff --git a/auth/data/src/main/java/com/google/android/horologist/auth/data/googlesignin/GoogleSignInEventListener.kt b/auth/data/src/main/java/com/google/android/horologist/auth/data/googlesignin/GoogleSignInEventListener.kt index def95206c3..afef0cc5f5 100644 --- a/auth/data/src/main/java/com/google/android/horologist/auth/data/googlesignin/GoogleSignInEventListener.kt +++ b/auth/data/src/main/java/com/google/android/horologist/auth/data/googlesignin/GoogleSignInEventListener.kt @@ -14,6 +14,8 @@ * limitations under the License. */ +@file:Suppress("DEPRECATION") + package com.google.android.horologist.auth.data.googlesignin import com.google.android.gms.auth.api.signin.GoogleSignInAccount diff --git a/auth/sample/wear/src/main/java/com/google/android/horologist/auth/sample/screens/googlesignin/signin/GoogleSignInEventListenerSample.kt b/auth/sample/wear/src/main/java/com/google/android/horologist/auth/sample/screens/googlesignin/signin/GoogleSignInEventListenerSample.kt index b7fd4f0e7c..4554cd913f 100644 --- a/auth/sample/wear/src/main/java/com/google/android/horologist/auth/sample/screens/googlesignin/signin/GoogleSignInEventListenerSample.kt +++ b/auth/sample/wear/src/main/java/com/google/android/horologist/auth/sample/screens/googlesignin/signin/GoogleSignInEventListenerSample.kt @@ -14,6 +14,8 @@ * limitations under the License. */ +@file:Suppress("DEPRECATION") + package com.google.android.horologist.auth.sample.screens.googlesignin.signin import android.util.Log diff --git a/auth/ui/src/main/java/com/google/android/horologist/auth/ui/googlesignin/mapper/AccountUiModelMapper.kt b/auth/ui/src/main/java/com/google/android/horologist/auth/ui/googlesignin/mapper/AccountUiModelMapper.kt index d13d436223..97921fd830 100644 --- a/auth/ui/src/main/java/com/google/android/horologist/auth/ui/googlesignin/mapper/AccountUiModelMapper.kt +++ b/auth/ui/src/main/java/com/google/android/horologist/auth/ui/googlesignin/mapper/AccountUiModelMapper.kt @@ -14,6 +14,8 @@ * limitations under the License. */ +@file:Suppress("DEPRECATION") + package com.google.android.horologist.auth.ui.googlesignin.mapper import com.google.android.gms.auth.api.signin.GoogleSignInAccount diff --git a/composables/src/main/java/com/google/android/horologist/composables/MarqueeText.kt b/composables/src/main/java/com/google/android/horologist/composables/MarqueeText.kt index 31da57b623..45234360a6 100644 --- a/composables/src/main/java/com/google/android/horologist/composables/MarqueeText.kt +++ b/composables/src/main/java/com/google/android/horologist/composables/MarqueeText.kt @@ -105,7 +105,7 @@ public fun MarqueeText( .semantics { focused = true } .basicMarquee( iterations = Int.MAX_VALUE, - delayMillis = pauseTime.inWholeMilliseconds.toInt(), + repeatDelayMillis = pauseTime.inWholeMilliseconds.toInt(), initialDelayMillis = pauseTime.inWholeMilliseconds.toInt(), spacing = MarqueeSpacing(followGap), velocity = marqueeDpPerSecond, diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/DatePickerInteractionTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/DatePickerInteractionTest.kt index a073d9b9ac..7fc778586f 100644 --- a/composables/src/test/kotlin/com/google/android/horologist/composables/DatePickerInteractionTest.kt +++ b/composables/src/test/kotlin/com/google/android/horologist/composables/DatePickerInteractionTest.kt @@ -39,7 +39,7 @@ import java.time.LocalDate @RunWith(RobolectricTestRunner::class) @Config( - sdk = [30], + sdk = [33], qualifiers = "w227dp-h227dp-small-notlong-round-watch-xhdpi-keyshidden-nonav", ) @GraphicsMode(GraphicsMode.Mode.NATIVE) diff --git a/composables/src/test/kotlin/com/google/android/horologist/composables/SquareSegmentedProgressIndicatorTest.kt b/composables/src/test/kotlin/com/google/android/horologist/composables/SquareSegmentedProgressIndicatorTest.kt index 969931409e..239c382b9d 100644 --- a/composables/src/test/kotlin/com/google/android/horologist/composables/SquareSegmentedProgressIndicatorTest.kt +++ b/composables/src/test/kotlin/com/google/android/horologist/composables/SquareSegmentedProgressIndicatorTest.kt @@ -31,7 +31,7 @@ import org.junit.Test import org.robolectric.annotation.Config @Config( - sdk = [30], + sdk = [33], qualifiers = "w227dp-h227dp-small-notlong-notround-watch-xhdpi-keyshidden-nonav", ) class SquareSegmentedProgressIndicatorTest : diff --git a/compose-layout/src/debug/java/com/google/android/horologist/compose/pager/VerticalPagerIndicatorPreview.kt b/compose-layout/src/debug/java/com/google/android/horologist/compose/pager/VerticalPagerIndicatorPreview.kt new file mode 100644 index 0000000000..fb4675378b --- /dev/null +++ b/compose-layout/src/debug/java/com/google/android/horologist/compose/pager/VerticalPagerIndicatorPreview.kt @@ -0,0 +1,30 @@ +/* + * Copyright 2024 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. + */ + +package com.google.android.horologist.compose.pager + +import androidx.compose.foundation.pager.PagerState +import androidx.compose.runtime.Composable +import androidx.wear.compose.ui.tooling.preview.WearPreviewDevices + +@WearPreviewDevices +@Composable +fun VerticalPagerIndicatorPreview() { + val state = PagerState(1) { + 10 + } + VerticalPageIndicator(pageIndicatorState = PageScreenIndicatorState(state)) +} diff --git a/compose-layout/src/main/java/com/google/android/horologist/compose/pager/VerticalPageIndicator.kt b/compose-layout/src/main/java/com/google/android/horologist/compose/pager/VerticalPageIndicator.kt index 51bee91534..c8e7276191 100644 --- a/compose-layout/src/main/java/com/google/android/horologist/compose/pager/VerticalPageIndicator.kt +++ b/compose-layout/src/main/java/com/google/android/horologist/compose/pager/VerticalPageIndicator.kt @@ -16,6 +16,8 @@ package com.google.android.horologist.compose.pager +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.shape.CircleShape import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -47,16 +49,20 @@ fun VerticalPageIndicator( spacing: Dp = 4.dp, indicatorShape: Shape = CircleShape, ) { - HorizontalPageIndicator( - pageIndicatorState = pageIndicatorState, + Box( modifier = modifier + .fillMaxSize() .rotate(90f) .scale(scaleY = -1f, scaleX = 1f), - indicatorStyle = indicatorStyle, - selectedColor = selectedColor, - unselectedColor = unselectedColor, - indicatorSize = indicatorSize, - spacing = spacing, - indicatorShape = indicatorShape, - ) + ) { + HorizontalPageIndicator( + pageIndicatorState = pageIndicatorState, + indicatorStyle = indicatorStyle, + selectedColor = selectedColor, + unselectedColor = unselectedColor, + indicatorSize = indicatorSize, + spacing = spacing, + indicatorShape = indicatorShape, + ) + } } diff --git a/compose-layout/src/test/java/com/google/android/horologist/compose/layout/FillMaxRectangleTest.kt b/compose-layout/src/test/java/com/google/android/horologist/compose/layout/FillMaxRectangleTest.kt index d58504ad89..74922a93f7 100644 --- a/compose-layout/src/test/java/com/google/android/horologist/compose/layout/FillMaxRectangleTest.kt +++ b/compose-layout/src/test/java/com/google/android/horologist/compose/layout/FillMaxRectangleTest.kt @@ -42,7 +42,7 @@ class FillMaxRectangleTest { @Test @Config( - sdk = [30], + sdk = [33], qualifiers = "w227dp-h227dp-small-notlong-notround-watch-xhdpi-keyshidden-nonav", ) fun testSquare() { @@ -58,7 +58,7 @@ class FillMaxRectangleTest { @Test @Config( - sdk = [30], + sdk = [33], qualifiers = "w227dp-h227dp-small-notlong-round-watch-xhdpi-keyshidden-nonav", ) fun testCircle() { diff --git a/compose-layout/src/test/java/com/google/android/horologist/compose/pager/PagerScreenTest.kt b/compose-layout/src/test/java/com/google/android/horologist/compose/pager/PagerScreenTest.kt index 43bc731918..aaab6e8307 100644 --- a/compose-layout/src/test/java/com/google/android/horologist/compose/pager/PagerScreenTest.kt +++ b/compose-layout/src/test/java/com/google/android/horologist/compose/pager/PagerScreenTest.kt @@ -59,7 +59,7 @@ import org.robolectric.annotation.Config @MediumTest @RunWith(RobolectricTestRunner::class) @Config( - sdk = [30], + sdk = [33], qualifiers = "w227dp-h227dp-small-notlong-round-watch-xhdpi-keyshidden-nonav", ) @Ignore("Failing with robolectric") diff --git a/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_12.0.sp.png b/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_12.0.sp.png index 5c0961c61b..4a6911e4a9 100644 --- a/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_12.0.sp.png +++ b/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_12.0.sp.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c305efc7e706d5a521bee23440a42652a5e4f3aacf33d9f63682499ad840e939 -size 7667 +oid sha256:d1fbc6e74a7e378b0d246a2d2c8d5aec26e3194c55394a511733e701b2e4e6b7 +size 7772 diff --git a/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_16.0.sp.png b/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_16.0.sp.png index d99cea36f0..07ae959119 100644 --- a/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_16.0.sp.png +++ b/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_16.0.sp.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:265dcbed46bee5eb318287756d1b0a1dfa88b21cff3ad3b04af2a56184754d06 -size 11494 +oid sha256:0866ce84df1da24d84578b72e4df549b27f3e7a0b85c69fd7c519e15c7d95f4e +size 11587 diff --git a/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_20.0.sp.png b/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_20.0.sp.png index 0e1b6ac67e..3ceda7e999 100644 --- a/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_20.0.sp.png +++ b/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_20.0.sp.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62f01bdec6fd3d9d53c4b65c97db59092fa40ec4407dfcb3df9280368e663272 -size 18247 +oid sha256:b89b63645305a890b1fffbfda41fd98d009687bf652ace87d1a1cbd96eb23a12 +size 17273 diff --git a/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_24.0.sp.png b/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_24.0.sp.png index 37de03e48e..d8a158cc7e 100644 --- a/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_24.0.sp.png +++ b/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_24.0.sp.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee13592c51fd4bcbec80f11d21963c6210be7e81a0e6178357f79126aa8b360d -size 25111 +oid sha256:3ee85e6e612d297dfb9d8ec890aa7743e91f3790cb92fadfa6a418e3c063e1ad +size 24355 diff --git a/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_30.0.sp.png b/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_30.0.sp.png index 8c9ff83b4e..7b3275c57d 100644 --- a/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_30.0.sp.png +++ b/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_30.0.sp.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6724863c9d2898cefb42118a30e0974819609d5d11e52dcb40882693fbc46065 -size 32799 +oid sha256:09622aadbfca812e9b5a6846d348024dc62637948a0bf0a01b11506065115220 +size 30528 diff --git a/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_34.0.sp.png b/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_34.0.sp.png index fe79d793d7..44997e89f0 100644 --- a/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_34.0.sp.png +++ b/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_34.0.sp.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3c58d48c25fe4a5afd0ef5d71fcbbe37a54c9705d811f29b2eed5976a9ad3d2 -size 36435 +oid sha256:db0878086a0ab46e3d0869b86c9d21e5f9d85a6f114930f14f9433bb688554f4 +size 34046 diff --git a/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_40.0.sp.png b/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_40.0.sp.png index 15c179355d..6a80a00f90 100644 --- a/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_40.0.sp.png +++ b/compose-layout/src/test/snapshots/images/FontScaleIndependentTest_40.0.sp.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c249bb0a9db383dbf8517438d3743be519190530e5d095f821c2f2100d11d25c -size 45856 +oid sha256:ee8915a576c446f0cc079df773ec233375e822968e120d10325e9de5c4892527 +size 43002 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 950d592c2c..9639115946 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,8 +14,8 @@ androidx-test-runner = "1.6.0-beta01" androidx-wear-watchface = "1.2.1" androidxActivity = "1.9.0" androidxCore = "1.13.1" -androidxLifecycle = "2.8.0" -androidxNavigation = "2.8.0-beta01" +androidxLifecycle = "2.8.1" +androidxNavigation = "2.8.0-beta02" androidxPhoneInteractions = "1.1.0-alpha04" androidxRemoteInteractions = "1.1.0-alpha02" androidxStartup = "1.1.1" @@ -28,9 +28,9 @@ annotation = "1.0.1" app-cash-turbine = "1.1.0" com-squareup-okhttp3 = "5.0.0-alpha.14" com-squareup-retrofit2 = "2.11.0" -compose = "1.7.0-beta01" +compose = "1.7.0-beta02" compose-compiler = "1.5.14" -compose-material3 = "1.3.0-beta01" +compose-material3 = "1.3.0-beta02" composesnapshot = "-" dependencyAnalysis = "1.32.0" dokka = "1.9.20" @@ -56,9 +56,9 @@ runtimeTracing = "1.0.0-beta01" spotless = "6.25.0" tiles-tooling-preview = "1.3.0" truth = "1.4.2" -wearcompose = "1.4.0-beta01" +wearcompose = "1.4.0-beta02" wearToolingPreview = "1.0.0" -appcompat = "1.6.1" +appcompat = "1.7.0" material = "1.12.0" wearInput = "1.2.0-alpha02" @@ -188,8 +188,8 @@ moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "mosh moshi-kotlin-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi" } okio = { module = "com.squareup.okio:okio", version.ref = "okio" } playservices-auth = { module = "com.google.android.gms:play-services-auth", version.ref = "playServicesAuth" } -playservices-base = "com.google.android.gms:play-services-base:18.4.0" -playservices-wearable = "com.google.android.gms:play-services-wearable:18.1.0" +playservices-base = "com.google.android.gms:play-services-base:18.5.0" +playservices-wearable = "com.google.android.gms:play-services-wearable:18.2.0" protobuf-kotlin-lite = { module = "com.google.protobuf:protobuf-kotlin-lite", version.ref = "protobuf" } retrofit2-convertermoshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "com-squareup-retrofit2" } retrofit2-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "com-squareup-retrofit2" } diff --git a/health/composables/src/test/java/com/google/android/horologist/health/composables/screens/MetricsScreenTest.kt b/health/composables/src/test/java/com/google/android/horologist/health/composables/screens/MetricsScreenTest.kt index 7327e96f5c..8704c82d35 100644 --- a/health/composables/src/test/java/com/google/android/horologist/health/composables/screens/MetricsScreenTest.kt +++ b/health/composables/src/test/java/com/google/android/horologist/health/composables/screens/MetricsScreenTest.kt @@ -143,7 +143,6 @@ class MetricsScreenTest : WearLegacyScreenTest() { } @Config( - sdk = [30], qualifiers = largeScreen, ) @Test @@ -179,7 +178,6 @@ class MetricsScreenTest : WearLegacyScreenTest() { } @Config( - sdk = [30], qualifiers = smallScreen, ) @Test diff --git a/media/audio/src/test/java/com/google/android/horologist/audio/SystemAudioRepositoryTest.kt b/media/audio/src/test/java/com/google/android/horologist/audio/SystemAudioRepositoryTest.kt index 90f385c974..1cbf2c1326 100644 --- a/media/audio/src/test/java/com/google/android/horologist/audio/SystemAudioRepositoryTest.kt +++ b/media/audio/src/test/java/com/google/android/horologist/audio/SystemAudioRepositoryTest.kt @@ -40,7 +40,7 @@ import android.media.MediaRouter as MediaRouterLegacy @MediumTest @RunWith(RobolectricTestRunner::class) @Config( - sdk = [30], + sdk = [33], ) class SystemAudioRepositoryTest { private lateinit var mediaRouter: MediaRouter diff --git a/media/sample/src/test/java/com/google/android/horologist/mediasample/work/BaseAppTest.kt b/media/sample/src/test/java/com/google/android/horologist/mediasample/work/BaseAppTest.kt index 7821771411..f0dc5580f6 100644 --- a/media/sample/src/test/java/com/google/android/horologist/mediasample/work/BaseAppTest.kt +++ b/media/sample/src/test/java/com/google/android/horologist/mediasample/work/BaseAppTest.kt @@ -25,7 +25,7 @@ import org.robolectric.annotation.Config import org.robolectric.annotation.GraphicsMode @RunWith(RobolectricTestRunner::class) -@Config(application = HiltTestApplication::class, sdk = [30]) +@Config(application = HiltTestApplication::class, sdk = [33]) @GraphicsMode(GraphicsMode.Mode.NATIVE) abstract class BaseAppTest { @get:Rule diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerA11yScreenshotTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerA11yScreenshotTest.kt index d8b17cfd51..82f2b20d54 100644 --- a/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerA11yScreenshotTest.kt +++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerA11yScreenshotTest.kt @@ -35,7 +35,6 @@ class MediaPlayerA11yScreenshotTest : WearLegacyA11yTest() { } @Config( - sdk = [30], qualifiers = "+w192dp-h192dp", ) @Test @@ -44,7 +43,6 @@ class MediaPlayerA11yScreenshotTest : WearLegacyA11yTest() { } @Config( - sdk = [30], qualifiers = "w180dp-h180dp-small-notlong-notround-watch-xhdpi-keyshidden-nonav", ) @Test diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerDeviceScreenTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerDeviceScreenTest.kt index 1850b344f4..9a0e1c69fe 100644 --- a/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerDeviceScreenTest.kt +++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/MediaPlayerDeviceScreenTest.kt @@ -33,7 +33,6 @@ class MediaPlayerDeviceScreenTest : WearLegacyScreenTest() { } @Config( - sdk = [30], qualifiers = "+w192dp-h192dp", ) @Test @@ -42,7 +41,6 @@ class MediaPlayerDeviceScreenTest : WearLegacyScreenTest() { } @Config( - sdk = [30], qualifiers = "w192dp-h192dp-small-notlong-round-watch-hdpi-keyshidden-nonav", ) @Test diff --git a/media/ui/src/test/java/com/google/android/horologist/media/ui/tiles/MediaCollectionsTileTest.kt b/media/ui/src/test/java/com/google/android/horologist/media/ui/tiles/MediaCollectionsTileTest.kt index e2d5369de1..86853c0eb2 100644 --- a/media/ui/src/test/java/com/google/android/horologist/media/ui/tiles/MediaCollectionsTileTest.kt +++ b/media/ui/src/test/java/com/google/android/horologist/media/ui/tiles/MediaCollectionsTileTest.kt @@ -35,7 +35,6 @@ class MediaCollectionsTileTest : WearLegacyScreenTest() { } @Config( - sdk = [30], qualifiers = "+w192dp-h192dp", ) @Test @@ -44,7 +43,6 @@ class MediaCollectionsTileTest : WearLegacyScreenTest() { } @Config( - sdk = [30], qualifiers = "w192dp-h192dp-small-notlong-round-watch-hdpi-keyshidden-nonav", ) @Test diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_smallRound.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_smallRound.png index 3d8229a5ce..4c58161443 100644 --- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_smallRound.png +++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_smallRound.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e513ca6bd8815ef94755d24756d3430ac0a8b76b6ef5119e434efa5bd568bd7 -size 18679 +oid sha256:1555270c8c640f99effb066ad1faf366763062dcbe3a8866f03c296f0bb77483 +size 18417 diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_square.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_square.png index 4fb4651d5a..792743c9a1 100644 --- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_square.png +++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui.tiles_MediaCollectionsTileTest_square.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3d4d6389563b941b5e08fc695e354cd0efd87cf928007f813eebeef6707007a -size 13807 +oid sha256:ea51d6ccec2f5539b41076adbafed46d0f5ff7800e5790b76df14625e489b769 +size 13493 diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerA11yScreenshotTest_mediaPlayerSmallRound.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerA11yScreenshotTest_mediaPlayerSmallRound.png index 52c911a2de..6fee80d610 100644 --- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerA11yScreenshotTest_mediaPlayerSmallRound.png +++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerA11yScreenshotTest_mediaPlayerSmallRound.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d211eb28ce934cccdb2797915d3c1ca5a01a40bad5877d8f3a9e8e4bf05ead5d -size 82078 +oid sha256:c1fd18de79ee2028ea3ed6e68fe85be8d64d721c4030213d94c2d1be5349a3f4 +size 95393 diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerA11yScreenshotTest_mediaPlayerSquare.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerA11yScreenshotTest_mediaPlayerSquare.png index 5a5cea3011..25cbf2ffdf 100644 --- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerA11yScreenshotTest_mediaPlayerSquare.png +++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerA11yScreenshotTest_mediaPlayerSquare.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c38addb8b7d568da546ccd28b722f2a40a57dbde2311bcee332cd24fbff2d7f5 -size 69022 +oid sha256:1e860597b593257377d374e815b2c53d9961f73695fc120f3c8a9d29a5d03372 +size 81050 diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerLargeRound.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerLargeRound.png index fa3b244270..fb7e8cb661 100644 --- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerLargeRound.png +++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerLargeRound.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0e79729350ead4551f23dc25642fb1f3e9ca5642f911da09b2a7774665e78a4 -size 107243 +oid sha256:5437361a1f709e80e10c49f4953b50ce0c20244c079718552b5c6cf634e531a1 +size 107227 diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerScreen.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerScreen.png index fa3b244270..fb7e8cb661 100644 --- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerScreen.png +++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerScreen.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0e79729350ead4551f23dc25642fb1f3e9ca5642f911da09b2a7774665e78a4 -size 107243 +oid sha256:5437361a1f709e80e10c49f4953b50ce0c20244c079718552b5c6cf634e531a1 +size 107227 diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSmallRound.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSmallRound.png index abec2e6889..a2e041c2fc 100644 --- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSmallRound.png +++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSmallRound.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:835d39a7a68e3db2591785c45bc73498bfd76bfa87f249abd646079fccc58aad -size 82241 +oid sha256:a94b8b4d05e61feef256ee23f8dede3d19e5062c39a6020a1f4811dd6960c18d +size 82756 diff --git a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSquare.png b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSquare.png index bbed4018a1..8ce3b27f28 100644 --- a/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSquare.png +++ b/media/ui/src/test/snapshots/images/com.google.android.horologist.media.ui_MediaPlayerDeviceScreenTest_mediaPlayerSquare.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f46210fd2b584cdf567d032e589c406cffcc9ddf5319bda3239ffa96a321eb47 -size 52637 +oid sha256:5eca51430ce42a5d3e6163657b731fe41c064280948dddd7faf202b4414145b1 +size 52916