(Calendar) Fix internal state reset #27

Don't reset to null, but to selection data.
maxkeppeler · Feb 19, 2023 · 9afa3d6 · 9afa3d6
1 parent e1d36c6
commit 9afa3d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/calendar/src/main/java/com/maxkeppeler/sheets/calendar/CalendarState.kt b/calendar/src/main/java/com/maxkeppeler/sheets/calendar/CalendarState.kt
@@ -262,9 +262,11 @@ internal class CalendarState(
  }
 
  override fun reset() {
- date.value = null
+ date.value = selection.dateValue
  dates.clear()
+ dates.addAll(selection.datesValue)
  range.clear()
+ range.addAll(selection.rangeValue)
  }
 
  companion object {

diff --git a/...dar/src/main/java/com/maxkeppeler/sheets/calendar/views/CalendarBaseSelectionComponent.kt b/...dar/src/main/java/com/maxkeppeler/sheets/calendar/views/CalendarBaseSelectionComponent.kt
@@ -68,15 +68,13 @@ internal fun CalendarBaseSelectionComponent(
  onYearView: LazyListScope.() -> Unit
 ) {
 
- val baseModifier = modifier
- .sizeIn(
- maxHeight = BaseConstants.DYNAMIC_SIZE_MAX,
- maxWidth = BaseConstants.DYNAMIC_SIZE_MAX
- )
- .then(
+ val baseModifier = modifier.then(
  when (orientation) {
  LibOrientation.PORTRAIT -> Modifier.padding(top = dimensionResource(RC.dimen.scd_normal_100))
- LibOrientation.LANDSCAPE -> Modifier
+ LibOrientation.LANDSCAPE -> Modifier.sizeIn(
+ maxHeight = BaseConstants.DYNAMIC_SIZE_MAX,
+ maxWidth = BaseConstants.DYNAMIC_SIZE_MAX
+ )
  }
  )