revert LocalDate calculations and fix visual error

calendar/src/androidMain/kotlin/com/maxkeppeler/sheets/calendar/models/FormatLocale.android.kt

@@ -1,5 +1,7 @@
 package com.maxkeppeler.sheets.calendar.models
 
+import android.util.Range
+import java.time.LocalDate
 import java.util.*
 
 private fun FormatLocale.Companion.fromLocale(locale: Locale = Locale.getDefault()): FormatLocale {

calendar/src/commonMain/kotlin/com/maxkeppeler/sheets/calendar/models/CalendarSelection.kt

@@ -20,7 +20,7 @@ package com.maxkeppeler.sheets.calendar.models
 import com.maxkeppeker.sheets.core.models.base.BaseSelection
 import com.maxkeppeker.sheets.core.models.base.SelectionButton
 import com.maxkeppeker.sheets.core.utils.BaseConstants
-import com.maxkeppeler.sheets.calendar.LocalDateRange
+import com.maxkeppeler.sheets.calendar.utils.LocalDateRange
 import kotlinx.datetime.LocalDate
 
 /**

calendar/src/commonMain/kotlin/com/maxkeppeler/sheets/calendar/utils/Constants.kt

@@ -15,7 +15,6 @@
  */
 package com.maxkeppeler.sheets.calendar.utils
 
-import com.maxkeppeler.sheets.calendar.now
 import kotlinx.datetime.DateTimeUnit
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.plus
@@ -32,10 +31,10 @@ internal object Constants {
  internal const val DEFAULT_YEAR_SELECTION = false
 
  private val DEFAULT_RANGE_START_DATE = LocalDate(1980, 3, 15)
- private const val DEFAULT_RANGE_END_YEAR_OFFSET = 20L
- private val DEFAULT_RANGE_END_DATE = LocalDate.now().plus(DEFAULT_RANGE_END_YEAR_OFFSET, DateTimeUnit.YEAR).run {
- LocalDate(this.year, 1, 15)
- }
+ private const val DEFAULT_RANGE_END_YEAR_OFFSET = 20
+ private val DEFAULT_RANGE_END_DATE = LocalDate.now().plusYears(DEFAULT_RANGE_END_YEAR_OFFSET)
+ .withMonth(1)
+  .withDayOfMonth(15)
 
  internal val DEFAULT_RANGE = DEFAULT_RANGE_START_DATE..DEFAULT_RANGE_END_DATE
 

calendar/src/commonMain/kotlin/com/maxkeppeler/sheets/calendar/utils/DayOfWeekUtils.kt

@@ -38,8 +38,9 @@ internal fun getDayOfWeekLabels(locale: FormatLocale): Map<DayOfWeek, String> =
  * @return an ordered list of DayOfWeek values starting with the locale's first day of the week
  */
 internal fun getOrderedDaysOfWeek(locale: FormatLocale): List<DayOfWeek> {
- val daysOfWeek = DayOfWeek.entries.toTypedArray()
- val orderedDays = daysOfWeek.sortedBy { (it.isoDayNumber - 1 + 7) % 7 }
+ val firstDayOfWeek = DayOfWeek.MONDAY.isoDayNumber
+ val daysOfWeek = DayOfWeek.entries
+ val orderedDays = daysOfWeek.sortedBy { (it.isoDayNumber - firstDayOfWeek + 7) % 7 }
  return orderedDays
 }