xfy
c8921e8641
WeekPager had no height constraint (unlike CalendarPager which uses pagerModifier with gridHeightPx), causing the pager to freely expand instead of staying at the computed single-row height. Also, WeekPager used 2dp row padding while CalendarMonthPage uses ROW_PADDING_DP (4dp), creating a height mismatch at the switch point. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
75 lines
2.5 KiB
Kotlin
75 lines
2.5 KiB
Kotlin
package plus.rua.project.ui
|
|
|
|
import androidx.compose.foundation.layout.Row
|
|
import androidx.compose.foundation.layout.fillMaxWidth
|
|
import androidx.compose.foundation.layout.padding
|
|
import androidx.compose.foundation.pager.HorizontalPager
|
|
import androidx.compose.foundation.pager.PagerDefaults
|
|
import androidx.compose.foundation.pager.rememberPagerState
|
|
import androidx.compose.runtime.Composable
|
|
import androidx.compose.runtime.LaunchedEffect
|
|
import androidx.compose.runtime.remember
|
|
import androidx.compose.runtime.snapshotFlow
|
|
import androidx.compose.ui.Modifier
|
|
import androidx.compose.ui.unit.dp
|
|
import kotlinx.coroutines.flow.drop
|
|
import kotlinx.datetime.DatePeriod
|
|
import kotlinx.datetime.LocalDate
|
|
import kotlinx.datetime.plus
|
|
|
|
/**
|
|
* 周视图分页器，折叠状态下显示选中日期所在周，支持左右滑动切换周。
|
|
*
|
|
* @param selectedDate 当前选中日期
|
|
* @param today 今天的日期
|
|
* @param onDateClick 日期点击回调
|
|
* @param onWeekChanged 周切换回调，滑动到新周时触发，参数为该周周一日期
|
|
* @param modifier 外部布局修饰符
|
|
*/
|
|
@Composable
|
|
fun WeekPager(
|
|
selectedDate: LocalDate,
|
|
today: LocalDate,
|
|
onDateClick: (LocalDate) -> Unit,
|
|
onWeekChanged: (LocalDate) -> Unit,
|
|
modifier: Modifier = Modifier
|
|
) {
|
|
val initialWeekMonday = remember { selectedDate.toWeekMonday() }
|
|
val pagerState = rememberPagerState(
|
|
initialPage = START_PAGE,
|
|
pageCount = { Int.MAX_VALUE }
|
|
)
|
|
|
|
LaunchedEffect(pagerState) {
|
|
snapshotFlow { pagerState.settledPage }.drop(1).collect { page ->
|
|
val weekMonday = pageToWeekMonday(page, initialWeekMonday)
|
|
onWeekChanged(weekMonday)
|
|
}
|
|
}
|
|
|
|
HorizontalPager(
|
|
state = pagerState,
|
|
beyondViewportPageCount = 1,
|
|
flingBehavior = PagerDefaults.flingBehavior(state = pagerState),
|
|
modifier = modifier
|
|
) { page ->
|
|
val weekMonday = pageToWeekMonday(page, initialWeekMonday)
|
|
Row(
|
|
modifier = Modifier
|
|
.fillMaxWidth()
|
|
.padding(vertical = ROW_PADDING_DP.dp)
|
|
) {
|
|
(0 until 7).forEach { dayOffset ->
|
|
val date = weekMonday.plus(DatePeriod(days = dayOffset))
|
|
DayCell(
|
|
date = date,
|
|
isCurrentMonth = true,
|
|
isSelected = date == selectedDate,
|
|
isToday = date == today,
|
|
onClick = { onDateClick(date) },
|
|
modifier = Modifier.weight(1f)
|
|
)
|
|
}
|
|
}
|
|
}
|
|
} |