年视图网格: 改用 spacedBy 统一行列间距,月份顶部对齐
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
parent
d9326668a4
commit
bad536617d
@ -98,38 +98,22 @@ fun YearGridView(
|
|||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.weight(1f)
|
.weight(1f)
|
||||||
.padding(horizontal = 4.dp),
|
.padding(horizontal = 4.dp),
|
||||||
verticalArrangement = Arrangement.Top
|
verticalArrangement = Arrangement.spacedBy(12.dp)
|
||||||
) {
|
) {
|
||||||
(0 until 4).forEach { row ->
|
(0 until 4).forEach { row ->
|
||||||
val verticalPadding = when (row) {
|
|
||||||
0 -> Modifier.padding(top = 8.dp)
|
|
||||||
3 -> Modifier.padding(bottom = 8.dp)
|
|
||||||
else -> Modifier
|
|
||||||
}
|
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = Modifier.fillMaxWidth(),
|
||||||
.fillMaxWidth()
|
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
||||||
.weight(1f)
|
|
||||||
.then(verticalPadding),
|
|
||||||
horizontalArrangement = Arrangement.SpaceBetween
|
|
||||||
) {
|
) {
|
||||||
(0 until 3).forEach { col ->
|
(0 until 3).forEach { col ->
|
||||||
val month = row * 3 + col + 1
|
val month = row * 3 + col + 1
|
||||||
val horizontalPadding = when (col) {
|
|
||||||
0 -> Modifier.padding(end = 4.dp)
|
|
||||||
1 -> Modifier.padding(horizontal = 4.dp)
|
|
||||||
2 -> Modifier.padding(start = 4.dp)
|
|
||||||
else -> Modifier
|
|
||||||
}
|
|
||||||
MiniMonth(
|
MiniMonth(
|
||||||
year = year,
|
year = year,
|
||||||
month = month,
|
month = month,
|
||||||
isSelected = month == selectedMonth,
|
isSelected = month == selectedMonth,
|
||||||
today = today,
|
today = today,
|
||||||
onClick = { onMonthClick(month) },
|
onClick = { onMonthClick(month) },
|
||||||
modifier = Modifier
|
modifier = Modifier.weight(1f)
|
||||||
.weight(1f)
|
|
||||||
.then(horizontalPadding)
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user