Fixed
Status Update
Comments
jn...@google.com <jn...@google.com> #2
Project: platform/frameworks/support
Branch: androidx-master-dev
commit 815efc4dea3c65634090fd272b5bf9d9cf68d70b
Author: Matvei Malkov <malkov@google.com>
Date: Tue Aug 04 13:35:42 2020
Drawer API polish
Added few paramerets for better customization, refactored samples to make them copyable
Change-Id: I236555ff68b57685c4709ba24a6464e7fba0c10a
Relnote: modifier, backgroundColor, contentColor and scrimColor customization params has been added to Drawers
Fixes: 161804378
Test: should pass
M ui/ui-material/api/current.txt
M ui/ui-material/api/public_plus_experimental_current.txt
M ui/ui-material/api/restricted_current.txt
M ui/ui-material/samples/src/main/java/androidx/compose/material/samples/DrawerSamples.kt
M ui/ui-material/src/androidAndroidTest/kotlin/androidx/compose/material/DrawerTest.kt
M ui/ui-material/src/commonMain/kotlin/androidx/compose/material/Drawer.kt
M ui/ui-material/src/commonMain/kotlin/androidx/compose/material/Scaffold.kt
https://android-review.googlesource.com/1385874
Branch: androidx-master-dev
commit 815efc4dea3c65634090fd272b5bf9d9cf68d70b
Author: Matvei Malkov <malkov@google.com>
Date: Tue Aug 04 13:35:42 2020
Drawer API polish
Added few paramerets for better customization, refactored samples to make them copyable
Change-Id: I236555ff68b57685c4709ba24a6464e7fba0c10a
Relnote: modifier, backgroundColor, contentColor and scrimColor customization params has been added to Drawers
Fixes: 161804378
Test: should pass
M ui/ui-material/api/current.txt
M ui/ui-material/api/public_plus_experimental_current.txt
M ui/ui-material/api/restricted_current.txt
M ui/ui-material/samples/src/main/java/androidx/compose/material/samples/DrawerSamples.kt
M ui/ui-material/src/androidAndroidTest/kotlin/androidx/compose/material/DrawerTest.kt
M ui/ui-material/src/commonMain/kotlin/androidx/compose/material/Drawer.kt
M ui/ui-material/src/commonMain/kotlin/androidx/compose/material/Scaffold.kt
mk...@google.com <mk...@google.com>
ap...@google.com <ap...@google.com> #3
Project: platform/frameworks/support
Branch: androidx-main
commit ee36f5382294f85cee9f20498f71e751b30aa0fc
Author: mkulaha <mkulaha@google.com>
Date: Wed Apr 13 21:19:22 2022
Add enabled parameter to AppCard and TitleCard
Bug: 228869805
Test: Manually checked
Relnote: "Add enabled parameter to AppCard and TitleCard"
Change-Id: Idc48d9088b2f285ba2ecf541ec126f3a79ba7496
M wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Card.kt
M wear/compose/compose-material/api/current.txt
M wear/compose/compose-material/api/restricted_current.txt
M wear/compose/compose-material/api/public_plus_experimental_current.txt
https://android-review.googlesource.com/2064229
Branch: androidx-main
commit ee36f5382294f85cee9f20498f71e751b30aa0fc
Author: mkulaha <mkulaha@google.com>
Date: Wed Apr 13 21:19:22 2022
Add enabled parameter to AppCard and TitleCard
Bug: 228869805
Test: Manually checked
Relnote: "Add enabled parameter to AppCard and TitleCard"
Change-Id: Idc48d9088b2f285ba2ecf541ec126f3a79ba7496
M wear/compose/compose-material/src/commonMain/kotlin/androidx/wear/compose/material/Card.kt
M wear/compose/compose-material/api/current.txt
M wear/compose/compose-material/api/restricted_current.txt
M wear/compose/compose-material/api/public_plus_experimental_current.txt
mk...@google.com <mk...@google.com>
ap...@google.com <ap...@google.com> #4
Project: platform/frameworks/support
Branch: androidx-main
commit e3d0f4f6616e50bda19930ae0277094401052257
Author: mkulaha <mkulaha@google.com>
Date: Thu Apr 14 11:12:24 2022
Add more tests fort AppCard and TitleCard
Bug: 228869805
Test: wear.compose.material.CardTest
Relnote: "Add more tests fort AppCard and TitleCard"
Change-Id: I85391f610a7ff821796a10cf94045d0c009c2803
M wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/CardTest.kt
https://android-review.googlesource.com/2063833
Branch: androidx-main
commit e3d0f4f6616e50bda19930ae0277094401052257
Author: mkulaha <mkulaha@google.com>
Date: Thu Apr 14 11:12:24 2022
Add more tests fort AppCard and TitleCard
Bug: 228869805
Test: wear.compose.material.CardTest
Relnote: "Add more tests fort AppCard and TitleCard"
Change-Id: I85391f610a7ff821796a10cf94045d0c009c2803
M wear/compose/compose-material/src/androidAndroidTest/kotlin/androidx/wear/compose/material/CardTest.kt
Description
Version used: Alpha20
Close if intentional.
I'm using the same component in the list page, and then as one item in the detail page. AppCard requires an onClick, and doesn't allow setting enabled = false.
So I'll have to duplicate the whole AppCard to make it look the same but not clickable. It doesn't make sense for it to have a ripple and do nothing when clicked.
```
@Composable
public fun AppCard(
onClick: () -> Unit,
appName: @Composable () -> Unit,
time: @Composable () -> Unit,
title: @Composable () -> Unit,
modifier: Modifier = Modifier,
appImage: @Composable (() -> Unit)? = null,
backgroundPainter: Painter = CardDefaults.cardBackgroundPainter(),
appColor: Color = MaterialTheme.colors.onSurfaceVariant,
timeColor: Color = MaterialTheme.colors.onSurfaceVariant,
titleColor: Color = MaterialTheme.colors.onSurface,
contentColor: Color = MaterialTheme.colors.onSurfaceVariant,
content: @Composable () -> Unit,
) {
Card(
onClick = onClick,
modifier = modifier,
backgroundPainter = backgroundPainter,
enabled = true,
```