From f3191aeac9366362854085916faf0335b33351aa Mon Sep 17 00:00:00 2001 From: xfy Date: Thu, 14 May 2026 13:56:15 +0800 Subject: [PATCH] Move WeekdayHeader out of pager to keep it fixed across pages Co-Authored-By: Claude Opus 4.7 --- .../commonMain/kotlin/plus/rua/project/ui/CalendarMonthPage.kt | 2 -- .../commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthPage.kt b/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthPage.kt index 050a960..e7a02ec 100644 --- a/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthPage.kt +++ b/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthPage.kt @@ -27,8 +27,6 @@ fun CalendarMonthPage( } Column(modifier = modifier) { - WeekdayHeader(modifier = Modifier.fillMaxWidth()) - days.chunked(7).forEach { week -> Row( modifier = Modifier diff --git a/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt b/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt index 9d8b76b..84d9f4a 100644 --- a/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt +++ b/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt @@ -2,6 +2,7 @@ package plus.rua.project.ui import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.statusBarsPadding import androidx.compose.runtime.Composable @@ -32,6 +33,7 @@ fun CalendarMonthView( month = currentMonth, weekNumber = viewModel.getIsoWeekNumber(viewModel.selectedDate) ) + WeekdayHeader(modifier = Modifier.fillMaxWidth()) CalendarPager( selectedDate = viewModel.selectedDate, today = today,