Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Card Padding #2284

Merged
merged 2 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public fun Card(
backgroundPainter = backgroundPainter,
contentColor = contentColor,
enabled = enabled,
contentPadding = PaddingValues(0.dp),
contentPadding = contentPadding,
shape = shape,
role = role,
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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!")
}
}
}
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading