Skip to content

Commit

Permalink
Fix issue #4 - use CalendarView without Horizontal
Browse files Browse the repository at this point in the history
  • Loading branch information
@WojciechOsak
WojciechOsak committed May 25, 2024
1 parent 7b6b994 commit cc1f72b
Showing 1 changed file with 170 additions and 178 deletions.
348 changes: 170 additions & 178 deletions calendar/src/commonMain/kotlin/io/wojciechosak/calendar/view/CalendarView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,204 +46,196 @@ import kotlinx.datetime.plus
*/
@Composable
fun CalendarView(
config: MutableState<CalendarConfig>,
horizontalArrangement: Arrangement.Horizontal = Arrangement.SpaceEvenly,
verticalArrangement: Arrangement.Vertical = Arrangement.SpaceEvenly,
isActiveDay: (LocalDate) -> Boolean = { LocalDate.today() == it },
day: @Composable (DayState) -> Unit = { dayState ->
CalendarDay(dayState)
},
header: @Composable (month: Month, year: Int) -> Unit = { month, year ->
MonthHeader(month, year)
},
dayOfWeekLabel: @Composable (dayOfWeek: DayOfWeek) -> Unit = { dayOfWeek ->
Text(
dayOfWeek.name.substring(IntRange(0, 2)),
fontSize = 12.sp,
textAlign = TextAlign.Center,
)
},
selectionMode: SelectionMode = SelectionMode.Single,
onDateSelected: (List<LocalDate>) -> Unit = {},
rangeConfig: RangeConfig? = null,
modifier: Modifier = Modifier,
config: MutableState<CalendarConfig>,
horizontalArrangement: Arrangement.Horizontal = Arrangement.SpaceEvenly,
verticalArrangement: Arrangement.Vertical = Arrangement.SpaceEvenly,
isActiveDay: (LocalDate) -> Boolean = { LocalDate.today() == it },
day: @Composable (DayState) -> Unit = { dayState ->
CalendarDay(dayState)
},
header: @Composable (month: Month, year: Int) -> Unit = { month, year ->
MonthHeader(month, year)
},
dayOfWeekLabel: @Composable (dayOfWeek: DayOfWeek) -> Unit = { dayOfWeek ->
Text(
dayOfWeek.name.substring(IntRange(0, 2)),
fontSize = 12.sp,
textAlign = TextAlign.Center,
)
},
selectionMode: SelectionMode = SelectionMode.Single,
onDateSelected: (List<LocalDate>) -> Unit = {},
rangeConfig: RangeConfig? = null,
modifier: Modifier = Modifier,
) {
val yearMonth by remember { mutableStateOf(config.value.monthYear) }
val daysInCurrentMonth by remember {
mutableStateOf(
monthLength(
year = yearMonth.year,
month = yearMonth.month,
),
)
}
val previousMonthDays by remember { mutableStateOf(calculateVisibleDaysOfPreviousMonth(yearMonth)) }
val nextMonthDays by remember {
mutableStateOf(
if (config.value.showNextMonthDays) {
calculateVisibleDaysOfNextMonth(
yearMonth,
)
} else {
0
},
)
}
Column {
if (config.value.showHeader) {
header(yearMonth.month, yearMonth.year)
}
val yearMonth = config.value.monthYear
val daysInCurrentMonth = monthLength(
year = yearMonth.year,
month = yearMonth.month,
)
val previousMonthDays = calculateVisibleDaysOfPreviousMonth(yearMonth)
val nextMonthDays = if (config.value.showNextMonthDays) {
calculateVisibleDaysOfNextMonth(
yearMonth,
)
} else {
0
}
Column {
if (config.value.showHeader) {
header(yearMonth.month, yearMonth.year)
}

LazyVerticalGrid(
columns = GridCells.Fixed(7),
horizontalArrangement = horizontalArrangement,
verticalArrangement = verticalArrangement,
userScrollEnabled = false,
modifier = modifier,
) {
val state = config.value
val weekDaysCount = if (state.showWeekdays) 7 else 0
LazyVerticalGrid(
columns = GridCells.Fixed(7),
horizontalArrangement = horizontalArrangement,
verticalArrangement = verticalArrangement,
userScrollEnabled = false,
modifier = modifier,
) {
val state = config.value
val weekDaysCount = if (state.showWeekdays) 7 else 0

items(previousMonthDays + daysInCurrentMonth + nextMonthDays + weekDaysCount) { iteration ->
Item(
iteration = iteration,
config = config,
weekDaysCount = weekDaysCount,
previousMonthDays = previousMonthDays,
daysInCurrentMonth = daysInCurrentMonth,
dayOfWeekLabel = dayOfWeekLabel,
yearMonth = yearMonth,
state = state,
selectionMode = selectionMode,
onDateSelected = onDateSelected,
isActiveDay = isActiveDay,
rangeConfig = rangeConfig,
day = day,
)
}
}
}
items(previousMonthDays + daysInCurrentMonth + nextMonthDays + weekDaysCount) { iteration ->
Item(
iteration = iteration,
config = config,
weekDaysCount = weekDaysCount,
previousMonthDays = previousMonthDays,
daysInCurrentMonth = daysInCurrentMonth,
dayOfWeekLabel = dayOfWeekLabel,
yearMonth = yearMonth,
state = state,
selectionMode = selectionMode,
onDateSelected = onDateSelected,
isActiveDay = isActiveDay,
rangeConfig = rangeConfig,
day = day,
)
}
}
}
}

@Composable
private fun Item(
iteration: Int,
config: MutableState<CalendarConfig>,
weekDaysCount: Int,
previousMonthDays: Int,
daysInCurrentMonth: Int,
dayOfWeekLabel: @Composable (DayOfWeek) -> Unit,
yearMonth: MonthYear,
state: CalendarConfig,
selectionMode: SelectionMode,
onDateSelected: (List<LocalDate>) -> Unit,
isActiveDay: (LocalDate) -> Boolean,
rangeConfig: RangeConfig?,
day: @Composable (DayState) -> Unit,
iteration: Int,
config: MutableState<CalendarConfig>,
weekDaysCount: Int,
previousMonthDays: Int,
daysInCurrentMonth: Int,
dayOfWeekLabel: @Composable (DayOfWeek) -> Unit,
yearMonth: MonthYear,
state: CalendarConfig,
selectionMode: SelectionMode,
onDateSelected: (List<LocalDate>) -> Unit,
isActiveDay: (LocalDate) -> Boolean,
rangeConfig: RangeConfig?,
day: @Composable (DayState) -> Unit,
) {
val isWeekdayLabel = state.showWeekdays && iteration < weekDaysCount
val previousMonthDay =
iteration >= weekDaysCount && iteration < weekDaysCount + previousMonthDays
val nextMonthDay =
iteration >= weekDaysCount + previousMonthDays + daysInCurrentMonth
var newDate = LocalDate(year = yearMonth.year, month = yearMonth.month, dayOfMonth = 1)
val isWeekdayLabel = state.showWeekdays && iteration < weekDaysCount
val previousMonthDay =
iteration >= weekDaysCount && iteration < weekDaysCount + previousMonthDays
val nextMonthDay =
iteration >= weekDaysCount + previousMonthDays + daysInCurrentMonth
var newDate = LocalDate(year = yearMonth.year, month = yearMonth.month, dayOfMonth = 1)

if (previousMonthDay && config.value.showPreviousMonthDays) {
newDate = newDate.plus(iteration - weekDaysCount - previousMonthDays, DateTimeUnit.DAY)
} else if (nextMonthDay && config.value.showNextMonthDays) {
newDate = newDate
.plus(1, DateTimeUnit.MONTH)
.plus(
iteration - previousMonthDays - weekDaysCount - daysInCurrentMonth,
DateTimeUnit.DAY,
)
} else if (!isWeekdayLabel) {
newDate = newDate.plus(iteration - previousMonthDays - weekDaysCount, DateTimeUnit.DAY)
}
newDate = newDate.plus(state.dayOfWeekOffset, DateTimeUnit.DAY)
if (previousMonthDay && config.value.showPreviousMonthDays) {
newDate = newDate.plus(iteration - weekDaysCount - previousMonthDays, DateTimeUnit.DAY)
} else if (nextMonthDay && config.value.showNextMonthDays) {
newDate = newDate
.plus(1, DateTimeUnit.MONTH)
.plus(
iteration - previousMonthDays - weekDaysCount - daysInCurrentMonth,
DateTimeUnit.DAY,
)
} else if (!isWeekdayLabel) {
newDate = newDate.plus(iteration - previousMonthDays - weekDaysCount, DateTimeUnit.DAY)
}
newDate = newDate.plus(state.dayOfWeekOffset, DateTimeUnit.DAY)

if (state.showWeekdays && iteration + state.dayOfWeekOffset < 7 + state.dayOfWeekOffset) {
val dayOfWeekIndex =
if (iteration + state.dayOfWeekOffset >= DayOfWeek.entries.size) {
iteration + state.dayOfWeekOffset - DayOfWeek.entries.size
} else if (iteration + state.dayOfWeekOffset < 0) {
DayOfWeek.entries.size + iteration + state.dayOfWeekOffset
} else {
iteration + state.dayOfWeekOffset
}
dayOfWeekLabel(DayOfWeek.entries[dayOfWeekIndex])
} else if ((!state.showPreviousMonthDays && previousMonthDay) || (!state.showNextMonthDays && nextMonthDay)) {
Text("")
} else {
val selectedDates = config.value.selectedDates
Box(
modifier = Modifier.passTouchGesture {
val selectionList = selectDate(
date = newDate,
mode = selectionMode,
list = config.value.selectedDates,
)
config.value = config.value.copy(selectedDates = selectionList)
onDateSelected(selectionList)
}.drawRange(
selectedDates = selectedDates,
date = newDate,
config = rangeConfig,
),
) {
day(
DayState(
date = newDate,
isActiveDay = isActiveDay(newDate),
isForPreviousMonth = previousMonthDay,
isForNextMonth = nextMonthDay,
enabled = newDate >= state.minDate && newDate <= state.maxDate,
),
)
}
}
if (state.showWeekdays && iteration + state.dayOfWeekOffset < 7 + state.dayOfWeekOffset) {
val dayOfWeekIndex =
if (iteration + state.dayOfWeekOffset >= DayOfWeek.entries.size) {
iteration + state.dayOfWeekOffset - DayOfWeek.entries.size
} else if (iteration + state.dayOfWeekOffset < 0) {
DayOfWeek.entries.size + iteration + state.dayOfWeekOffset
} else {
iteration + state.dayOfWeekOffset
}
dayOfWeekLabel(DayOfWeek.entries[dayOfWeekIndex])
} else if ((!state.showPreviousMonthDays && previousMonthDay) || (!state.showNextMonthDays && nextMonthDay)) {
Text("")
} else {
val selectedDates = config.value.selectedDates
Box(
modifier = Modifier.passTouchGesture {
val selectionList = selectDate(
date = newDate,
mode = selectionMode,
list = config.value.selectedDates,
)
config.value = config.value.copy(selectedDates = selectionList)
onDateSelected(selectionList)
}.drawRange(
selectedDates = selectedDates,
date = newDate,
config = rangeConfig,
),
) {
day(
DayState(
date = newDate,
isActiveDay = isActiveDay(newDate),
isForPreviousMonth = previousMonthDay,
isForNextMonth = nextMonthDay,
enabled = newDate >= state.minDate && newDate <= state.maxDate,
),
)
}
}
}

private fun selectDate(
date: LocalDate,
mode: SelectionMode,
list: List<LocalDate>,
date: LocalDate,
mode: SelectionMode,
list: List<LocalDate>,
): List<LocalDate> {
if (list.firstOrNull() == date) return list
val result = mutableListOf<LocalDate>()
result.addAll(list)
when (mode) {
is SelectionMode.Multiply -> {
result.add(0, date)
if (result.size > mode.bufferSize) {
result.removeLast()
}
}
if (list.firstOrNull() == date) return list
val result = mutableListOf<LocalDate>()
result.addAll(list)
when (mode) {
is SelectionMode.Multiply -> {
result.add(0, date)
if (result.size > mode.bufferSize) {
result.removeLast()
}
}

SelectionMode.Range -> {
result.add(0, date)
if (result.size > 2) {
result.clear()
result.add(0, date)
}
}
SelectionMode.Range -> {
result.add(0, date)
if (result.size > 2) {
result.clear()
result.add(0, date)
}
}

SelectionMode.Single -> {
result.clear()
result.add(date)
}
}
return result
SelectionMode.Single -> {
result.clear()
result.add(date)
}
}
return result
}

private fun calculateVisibleDaysOfPreviousMonth(monthYear: MonthYear): Int {
val (month, year) = monthYear
return LocalDate(year = year, month = month, dayOfMonth = 1).dayOfWeek.ordinal
val (month, year) = monthYear
return LocalDate(year = year, month = month, dayOfMonth = 1).dayOfWeek.ordinal
}

private fun calculateVisibleDaysOfNextMonth(monthYear: MonthYear): Int {
val (month, year) = monthYear
val daysInMonth = monthLength(month, year)
val lastMonthDay = LocalDate(year = year, month = month, dayOfMonth = daysInMonth)
return 6 - lastMonthDay.dayOfWeek.ordinal
val (month, year) = monthYear
val daysInMonth = monthLength(month, year)
val lastMonthDay = LocalDate(year = year, month = month, dayOfMonth = daysInMonth)
return 6 - lastMonthDay.dayOfWeek.ordinal
}

0 comments on commit cc1f72b

Please sign in to comment.