diff --git a/shared/src/commonMain/kotlin/plus/rua/project/ui/YearGridView.kt b/shared/src/commonMain/kotlin/plus/rua/project/ui/YearGridView.kt index 677978b..ad3b9f8 100644 --- a/shared/src/commonMain/kotlin/plus/rua/project/ui/YearGridView.kt +++ b/shared/src/commonMain/kotlin/plus/rua/project/ui/YearGridView.kt @@ -98,38 +98,22 @@ fun YearGridView( .fillMaxWidth() .weight(1f) .padding(horizontal = 4.dp), - verticalArrangement = Arrangement.Top + verticalArrangement = Arrangement.spacedBy(12.dp) ) { (0 until 4).forEach { row -> - val verticalPadding = when (row) { - 0 -> Modifier.padding(top = 8.dp) - 3 -> Modifier.padding(bottom = 8.dp) - else -> Modifier - } Row( - modifier = Modifier - .fillMaxWidth() - .weight(1f) - .then(verticalPadding), - horizontalArrangement = Arrangement.SpaceBetween + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp) ) { (0 until 3).forEach { col -> 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( year = year, month = month, isSelected = month == selectedMonth, today = today, onClick = { onMonthClick(month) }, - modifier = Modifier - .weight(1f) - .then(horizontalPadding) + modifier = Modifier.weight(1f) ) } }