refactor: remove redundant icon content description and reorder DayCellImpl params
This commit is contained in:
parent
94861dc2f7
commit
3ca0d334e7
@ -105,9 +105,9 @@ fun DayCell(
|
|||||||
holidayEdgeInfo = holidayEdgeInfo,
|
holidayEdgeInfo = holidayEdgeInfo,
|
||||||
cellIndex = cellIndex,
|
cellIndex = cellIndex,
|
||||||
onClick = onClick,
|
onClick = onClick,
|
||||||
modifier = modifier,
|
|
||||||
interactionSource = interactionSource,
|
interactionSource = interactionSource,
|
||||||
lunarData = lunarData,
|
lunarData = lunarData,
|
||||||
|
modifier = modifier,
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
val computed by produceState(
|
val computed by produceState(
|
||||||
@ -127,9 +127,9 @@ fun DayCell(
|
|||||||
holidayEdgeInfo = holidayEdgeInfo,
|
holidayEdgeInfo = holidayEdgeInfo,
|
||||||
cellIndex = cellIndex,
|
cellIndex = cellIndex,
|
||||||
onClick = onClick,
|
onClick = onClick,
|
||||||
modifier = modifier,
|
|
||||||
interactionSource = interactionSource,
|
interactionSource = interactionSource,
|
||||||
lunarData = computed,
|
lunarData = computed,
|
||||||
|
modifier = modifier,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -145,9 +145,9 @@ private fun DayCellImpl(
|
|||||||
holidayEdgeInfo: HolidayEdgeInfo?,
|
holidayEdgeInfo: HolidayEdgeInfo?,
|
||||||
cellIndex: Int,
|
cellIndex: Int,
|
||||||
onClick: () -> Unit,
|
onClick: () -> Unit,
|
||||||
modifier: Modifier,
|
|
||||||
interactionSource: MutableInteractionSource,
|
interactionSource: MutableInteractionSource,
|
||||||
lunarData: DayCellInfo,
|
lunarData: DayCellInfo,
|
||||||
|
modifier: Modifier,
|
||||||
) {
|
) {
|
||||||
val isBirthday = lunarData.isBirthday
|
val isBirthday = lunarData.isBirthday
|
||||||
var birthdayClickTick by remember(date) { mutableIntStateOf(0) }
|
var birthdayClickTick by remember(date) { mutableIntStateOf(0) }
|
||||||
@ -376,7 +376,7 @@ private fun DayCellImpl(
|
|||||||
if (isBirthday) {
|
if (isBirthday) {
|
||||||
Icon(
|
Icon(
|
||||||
painter = painterResource(R.drawable.ic_birthday_crown),
|
painter = painterResource(R.drawable.ic_birthday_crown),
|
||||||
contentDescription = "生日",
|
contentDescription = null,
|
||||||
tint = Color.Unspecified,
|
tint = Color.Unspecified,
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.align(Alignment.TopStart)
|
.align(Alignment.TopStart)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user