TextStyle is broken for contentColor [319671246]

Fixed

Bug

Status Update

No update yet.

Description

ma...@gmail.com

created issue #1

Jan 11, 2024 08:42PM

Jetpack Compose version: 1.2.0-beta02

instead of broken content color for icons there are also bug with text

@Composable
fun ExpandableItem(
modifier: Modifier = Modifier,
visibleContent: @Composable RowScope.(Boolean) -> Unit,
expandableContent: @Composable ColumnScope.(Boolean) -> Unit,
initialState: Boolean = false,
verticalArrangement: Arrangement.Vertical = Arrangement.Top,
shape: RoundedCornerShape = RoundedCornerShape(20.dp),
color: Color = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
) {
val haptics = LocalHapticFeedback.current
Column(
Modifier
.animateContentSize()
.then(modifier)
.container(
color = color,
resultPadding = 0.dp,
shape = shape
)
) {
var expanded by rememberSaveable { mutableStateOf(initialState) }
val rotation by animateFloatAsState(if (expanded) 180f else 0f)
Row(
modifier = Modifier
.clip(shape)
.clickable {
haptics.performHapticFeedback(
HapticFeedbackType.LongPress
)
expanded = !expanded
}
.padding(8.dp),
verticalAlignment = Alignment.CenterVertically
) {
Row(Modifier.weight(1f)) {
visibleContent(expanded)
}
EnhancedIconButton(
containerColor = Color.Transparent,
contentColor = LocalContentColor.current,
enableAutoShadowAndBorder = false,
onClick = { expanded = !expanded }
) {
Icon(
imageVector = Icons.Rounded.KeyboardArrowDown,
contentDescription = null,
modifier = Modifier.rotate(rotation)
)
}
}
AnimatedVisibility(expanded) {
Column(verticalArrangement = verticalArrangement) {
Spacer(modifier = Modifier.height(8.dp))
expandableContent(expanded)
Spacer(modifier = Modifier.height(8.dp))
}
}
}
}

this code gives EnhancedIconButton black color instead of needed one, moreover, the text inside visible content is also black!!!!!!!!!!

BUT container modifier provides it and all were okay on previous version

fun Modifier.container(
shape: Shape = RoundedCornerShape(16.dp),
color: Color = Color.Unspecified,
resultPadding: Dp = 4.dp,
borderColor: Color? = null,
autoShadowElevation: Dp = 1.dp,
clip: Boolean = true,
composeColorOnTopOfBackground: Boolean = true,
isShadowClip: Boolean = false,
isStandaloneContainer: Boolean = true
) = composed {
val localContainerShape = LocalContainerShape.current
val resultShape = localContainerShape ?: shape
val settingsState = LocalSettingsState.current
val colorScheme = MaterialTheme.colorScheme
val color1 = if (color.isUnspecified) {
colorScheme.surfaceColorAtElevation(1.dp)
} else {
if (composeColorOnTopOfBackground) color.compositeOver(colorScheme.background)
else color
}

val density = LocalDensity.current

val genericModifier = Modifier.drawWithCache {
val outline = resultShape.createOutline(
size,
layoutDirection,
density
)
onDrawWithContent {
drawOutline(
outline = outline,
color = color1
)
if (settingsState.borderWidth > 0.dp) {
drawOutline(
outline = outline,
color = borderColor ?: colorScheme.outlineVariant(0.1f, color1),
style = Stroke(with(density) { settingsState.borderWidth.toPx() })
)
}
drawContent()
}
}

val cornerModifier = Modifier
.background(
color = color1,
shape = resultShape
)
.border(
width = LocalSettingsState.current.borderWidth,
color = borderColor ?: colorScheme.outlineVariant(0.1f, color1),
shape = resultShape
)

this
.materialShadow(
shape = resultShape,
elevation = animateDpAsState(
if (settingsState.borderWidth > 0.dp) {
0.dp
} else autoShadowElevation.coerceAtLeast(0.dp)
).value,
enabled = if (isStandaloneContainer) {
LocalSettingsState.current.drawContainerShadows
} else true,
isClipped = isShadowClip
)
.then(
if (resultShape is CornerBasedShape) cornerModifier
else genericModifier
)
.then(if (clip) Modifier.clip(resultShape) else Modifier)
.then(if (resultPadding > 0.dp) Modifier.padding(resultPadding) else Modifier)
}

Comments

co...@google.com <co...@google.com> #2Jan 11, 2024 09:10PM

Reassigned to co...@google.com.

Project: platform/frameworks/support
Branch: androidx-master-dev

commit c60f33e229e31ab328ef6b59dab63b264954831c
Author: Alexandre Elias <aelias@google.com>
Date: Fri Jul 10 16:23:09 2020

Semantics no-op cleanups

Partly in response to lmr's broad code review, I did a pass of
superficial API/implementation cleanup. The main changes are:

- I changed each Boolean SemanticsProperty where false is equivalent to
not being present to take "Unit" instead. This is conceptually
clearer: it avoids questions like "can I cancel out a semantics from a
merged child by setting it to false?" Because "property = Unit" looks
weird, I also changed the style of these to "property()".

- I moved the Semantics id generator closer to where it's used, in
SemanticsModifierCore. I made it internal and an AtomicInt.
(Note that integer ids are heavily used in the Android
AccessibilityNodeInfo APIs so I can't simply remove them entirely.)

- I deleted dead code. Some examples include SemanticsHintOverrides,
a public API not connected to anything, and SemanticsPropertyKey
merge() open method which is never called. (In both cases I have
a different plan in mind for accessibility.)

Fixes: 145951226
Fixes: 145955412
Test: existing tests
Relnote: "Single-value semantics properties now use a calling style.
For example, 'semantics { hidden = true }' is now written as:
'semantics { hidden() }'."

Change-Id: Ic1afd12ea22c926babc9662f1804d80b33aa0cfc

M ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/LayoutNodeModifierBenchmark.kt
M ui/ui-core/api/0.1.0-dev15.txt
M ui/ui-core/api/current.txt
M ui/ui-core/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-core/api/public_plus_experimental_current.txt
M ui/ui-core/api/restricted_0.1.0-dev15.txt
M ui/ui-core/api/restricted_current.txt
M ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/graphics/vector/VectorTest.kt
M ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/semantics/SemanticsTests.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidActuals.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidPopup.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Expect.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsConfiguration.kt
D ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsHintOverrides.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsModifier.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsNode.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsOwner.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsWrapper.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.kt
M ui/ui-foundation/api/0.1.0-dev15.txt
M ui/ui-foundation/api/current.txt
M ui/ui-foundation/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-foundation/api/public_plus_experimental_current.txt
M ui/ui-foundation/api/restricted_0.1.0-dev15.txt
M ui/ui-foundation/api/restricted_current.txt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Dialog.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Scroller.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Selectable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Toggleable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/semantics/FoundationSemanticsProperties.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ButtonTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/CardTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/CheckboxScreenshotTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/RadioButtonScreenshotTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ScaffoldTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SnackbarTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SurfaceTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ripple/RippleIndicationTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/TextFieldScreenshotTest.kt
M ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
M ui/ui-material/src/main/java/androidx/ui/material/TextFieldImpl.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/AssertsTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/CallSemanticsActionTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/FindersTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/PrintToStringTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/ScrollToTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/TextActionsTest.kt
M ui/ui-test/src/main/java/androidx/ui/test/Actions.kt
M ui/ui-test/src/main/java/androidx/ui/test/Filters.kt
M ui/ui-text/api/0.1.0-dev15.txt
M ui/ui-text/api/current.txt
M ui/ui-text/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-text/api/public_plus_experimental_current.txt
M ui/ui-text/api/restricted_0.1.0-dev15.txt
M ui/ui-text/api/restricted_current.txt
M ui/ui-text/src/commonMain/kotlin/androidx/ui/text/CoreTextField.kt
M ui/ui-text/src/commonMain/kotlin/androidx/ui/text/TextSemanticsProperties.kt

https://android-review.googlesource.com/1360099

co...@google.com <co...@google.com> #3Jan 11, 2024 09:18PM

Are you saying this is caused by these 2 changes or something else?

https://cs.android.com/androidx/platform/frameworks/support/+/4bc920841d65837b2827116ac407bed763217f97

https://cs.android.com/androidx/platform/frameworks/support/+/0207d845b08b9f30e45d427669484699c55fc762

ma...@gmail.com <ma...@gmail.com> #4Jan 11, 2024 10:03PM

EnhancedIconButton just my wrapper for yours, it's okay, problem happens only on new version, and also broke the text LocalContentColor

This ones shouldn't be black, and they are only on newest version :(

Screenshot_20240111-213903.png

213 KB

View

Download

ma...@gmail.com <ma...@gmail.com> #5Jan 12, 2024 10:25AM

I found where it happens, card provides wrong content color, which is always black if there is no suitalble color for given one, i think fallback should be onSurface instead of black

re...@lunabee.com <re...@lunabee.com> #6Jan 12, 2024 01:07PM

I've made a quick repro project here https://github.com/rlatapy-luna/Compose-Playground/tree/theme/card_content_color

I suspect these changes https://android.googlesource.com/platform/frameworks/support/+/a449529fb64f3c010d1caef5a2308ebf70b6b19b%5E%21/#F7

Message last modified on Jan 12, 2024 01:11PM

Screenshot 2024-01-12 at 14.05.09.png

62 KB

View

Download

Screenshot 2024-01-12 at 14.04.34.png

63 KB

View

Download

co...@google.com <co...@google.com> #7Jan 12, 2024 04:49PM

Accepted by co...@google.com.

Looks like prior to [these changes], contentColor = contentColorFor(containerColor) so it was automatically invalidated when the containerColor changed, after this, they were not.

Looks like is currently impacting *CardColors and would FilledIconColors / FilledIconToggleColors EXCEPT they haven't been updated use a cached object yet.

Message last modified on Jan 12, 2024 04:56PM

ap...@google.com <ap...@google.com> #8Jan 16, 2024 05:29PM

Project: platform/frameworks/support
Branch: androidx-main

commit e7dc654fe9c80bc88b845c4138269583780e268b
Author: Connie Shi <connieshi@google.com>
Date: Fri Jan 12 12:58:47 2024

Fixed bug introduced in 1.2.0-beta02 in `CardDefaults.cardColors` that did not update `contentColor` based on the `containerColor` param value. Updated `CardDefault.elevatedCardColors` and `CardDefault.outlinedCardColors` to prevent this bug.

Bug:

b/319671246

Test: Added tests.
Relnote: "Fixed bug introduced in 1.2.0-beta02 in CardDefaults.cardColors that did not update `contentColor` based on the `containerColor` param value."
Change-Id: Iee041b79156739af98a1d6fc0a0b36bc99ba1586

M compose/material3/material3/src/androidInstrumentedTest/kotlin/androidx/compose/material3/CardTest.kt
M compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Card.kt

https://android-review.googlesource.com/2908637

co...@google.com <co...@google.com> Jan 16, 2024 06:36PM

Marked as fixed.

na...@google.com <na...@google.com> #9Jan 24, 2024 07:53PM

The following release(s) address this bug.It is possible this bug has only been partially addressed:

androidx.compose.material3:material3:1.2.0-rc01
androidx.compose.material3:material3-android:1.2.0-rc01
androidx.compose.material3:material3-desktop:1.2.0-rc01

Issue 319671246

Description

Issue summary

Comments

co...@google.com <co...@google.com> #2Jan 11, 2024 09:10PM

co...@google.com <co...@google.com> #3Jan 11, 2024 09:18PM

ma...@gmail.com <ma...@gmail.com> #4Jan 11, 2024 10:03PM

ma...@gmail.com <ma...@gmail.com> #5Jan 12, 2024 10:25AM

re...@lunabee.com <re...@lunabee.com> #6Jan 12, 2024 01:07PM

co...@google.com <co...@google.com> #7Jan 12, 2024 04:49PM

ap...@google.com <ap...@google.com> #8Jan 16, 2024 05:29PM

co...@google.com <co...@google.com> Jan 16, 2024 06:36PM

na...@google.com <na...@google.com> #9Jan 24, 2024 07:53PM

Add comment

Issue metadata