From e3836b3c07cd52e4d6609a3ccc1f10b01530f070 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Mon, 1 Jul 2024 09:26:18 +0100 Subject: [PATCH 1/2] Fix Card --- .../horologist/compose/material/Card.kt | 2 +- .../horologist/compose/material/CardTest.kt | 109 ++++++++++++++++++ ...ompose.material_CardTest_withLongClick.png | 3 + ...al_CardTest_withLongClickCustomPadding.png | 3 + ...ose.material_CardTest_withoutLongClick.png | 3 + ...CardTest_withoutLongClickCustomPadding.png | 3 + 6 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 compose-material/src/test/java/com/google/android/horologist/compose/material/CardTest.kt create mode 100644 compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withLongClick.png create mode 100644 compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withLongClickCustomPadding.png create mode 100644 compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withoutLongClick.png create mode 100644 compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withoutLongClickCustomPadding.png diff --git a/compose-material/src/main/java/com/google/android/horologist/compose/material/Card.kt b/compose-material/src/main/java/com/google/android/horologist/compose/material/Card.kt index 083f56130e..674a582aa3 100644 --- a/compose-material/src/main/java/com/google/android/horologist/compose/material/Card.kt +++ b/compose-material/src/main/java/com/google/android/horologist/compose/material/Card.kt @@ -91,7 +91,7 @@ public fun Card( backgroundPainter = backgroundPainter, contentColor = contentColor, enabled = enabled, - contentPadding = PaddingValues(0.dp), + contentPadding = contentPadding, shape = shape, role = role, ) { diff --git a/compose-material/src/test/java/com/google/android/horologist/compose/material/CardTest.kt b/compose-material/src/test/java/com/google/android/horologist/compose/material/CardTest.kt new file mode 100644 index 0000000000..d7de31bea0 --- /dev/null +++ b/compose-material/src/test/java/com/google/android/horologist/compose/material/CardTest.kt @@ -0,0 +1,109 @@ +/* + * Copyright 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.android.horologist.compose.material + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.wear.compose.material.Text +import com.google.android.horologist.screenshots.rng.WearLegacyComponentTest +import org.junit.Test + +class CardTest : WearLegacyComponentTest() { + + @Test + fun withoutLongClick() { + runComponentTest { + Card( + onClick = { }, + ) { + Column( + modifier = Modifier.fillMaxWidth(), + ) { + Text("Hello, Card") + + androidx.wear.compose.material.Button(onClick = { }) { + Text("Click me!") + } + } + } + } + } + + @Test + fun withLongClick() { + runComponentTest { + Card( + onClick = { }, + onLongClick = { }, + ) { + Column( + modifier = Modifier.fillMaxWidth(), + ) { + Text("Hello, Card") + + androidx.wear.compose.material.Button(onClick = { }) { + Text("Click me!") + } + } + } + } + } + + @Test + fun withoutLongClickCustomPadding() { + runComponentTest { + Card( + onClick = { }, + contentPadding = PaddingValues(20.dp), + ) { + Column( + modifier = Modifier.fillMaxWidth(), + ) { + Text("Hello, Card") + + androidx.wear.compose.material.Button(onClick = { }) { + Text("Click me!") + } + } + } + } + } + + @Test + fun withLongClickCustomPadding() { + runComponentTest { + Card( + onClick = { }, + onLongClick = { }, + contentPadding = PaddingValues(20.dp), + ) { + Column( + modifier = Modifier.fillMaxWidth(), + ) { + Text("Hello, Card") + + androidx.wear.compose.material.Button(onClick = { }) { + Text("Click me!") + } + } + } + } + } +} diff --git a/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withLongClick.png b/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withLongClick.png new file mode 100644 index 0000000000..111508bf87 --- /dev/null +++ b/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withLongClick.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f72f75afe2ac13d8e8b5b834e9761f7bf43f436ef396876f03a4e451f8a13644 +size 22696 diff --git a/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withLongClickCustomPadding.png b/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withLongClickCustomPadding.png new file mode 100644 index 0000000000..4e9f8efdc0 --- /dev/null +++ b/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withLongClickCustomPadding.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e47f95d2f71aaf3f16ec729ccc2c8e86aa6eb1ba084a5c73fcf517cccb3a6670 +size 27332 diff --git a/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withoutLongClick.png b/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withoutLongClick.png new file mode 100644 index 0000000000..111508bf87 --- /dev/null +++ b/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withoutLongClick.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f72f75afe2ac13d8e8b5b834e9761f7bf43f436ef396876f03a4e451f8a13644 +size 22696 diff --git a/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withoutLongClickCustomPadding.png b/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withoutLongClickCustomPadding.png new file mode 100644 index 0000000000..4e9f8efdc0 --- /dev/null +++ b/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardTest_withoutLongClickCustomPadding.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e47f95d2f71aaf3f16ec729ccc2c8e86aa6eb1ba084a5c73fcf517cccb3a6670 +size 27332 From b6681070b0786705a97db55a2ba82cb8961177c5 Mon Sep 17 00:00:00 2001 From: yschimke Date: Mon, 1 Jul 2024 08:44:26 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A4=96=20Updates=20screenshots?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...roid.horologist.compose.material_CardA11yTest_material.png | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardA11yTest_material.png b/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardA11yTest_material.png index 90287c2db4..ae04f4fa69 100644 --- a/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardA11yTest_material.png +++ b/compose-material/src/test/snapshots/images/com.google.android.horologist.compose.material_CardA11yTest_material.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a45c9902806d7096f206176c9a8328b4497e73dfaa3e0d07dda9fc655e99f8de -size 29741 +oid sha256:02f7a1520f5ea47f8e2c6e90f09b3604cbfa84eee016fcaadd4e56eeead6f06d +size 37749