IssueTracker

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)
}