From 409b2bd2834150aca18ead40cb2f878761314621 Mon Sep 17 00:00:00 2001 From: BerkkanB Date: Mon, 31 Jan 2022 14:39:00 +0300 Subject: [PATCH] January to January issue fixed --- app/src/main/java/com/dt/calendarwork/MainActivity.kt | 8 ++++---- .../java/com/dt/composedatepicker/CalendarMonthView.kt | 2 +- .../dt/composedatepicker/CalendarMonthViewOneColumn.kt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/dt/calendarwork/MainActivity.kt b/app/src/main/java/com/dt/calendarwork/MainActivity.kt index 8921a4a..3b9c37b 100644 --- a/app/src/main/java/com/dt/calendarwork/MainActivity.kt +++ b/app/src/main/java/com/dt/calendarwork/MainActivity.kt @@ -34,13 +34,13 @@ class MainActivity : ComponentActivity() { @Composable fun MainScreen() { val calendar = Calendar.getInstance() - calendar.set(Calendar.YEAR, 2022) - calendar.set(Calendar.MONTH, 1) + calendar.set(Calendar.YEAR, 2021) + calendar.set(Calendar.MONTH, 5) calendar.set(Calendar.DAY_OF_MONTH, 1) val calendarMax = Calendar.getInstance() - calendarMax.set(Calendar.YEAR, 2032) - calendarMax.set(Calendar.MONTH, 9) + calendarMax.set(Calendar.YEAR, 2022) + calendarMax.set(Calendar.MONTH, 0) calendar.set(Calendar.DAY_OF_MONTH, 1) val (open, setOpen) = remember { diff --git a/library/src/main/java/com/dt/composedatepicker/CalendarMonthView.kt b/library/src/main/java/com/dt/composedatepicker/CalendarMonthView.kt index 40ffd32..806de89 100644 --- a/library/src/main/java/com/dt/composedatepicker/CalendarMonthView.kt +++ b/library/src/main/java/com/dt/composedatepicker/CalendarMonthView.kt @@ -114,7 +114,7 @@ fun MonthItem( } } private fun checkDate(minYear: Int,maxYear: Int,selectedYear: Int,minMonth: Int,maxMonth: Int,numberOfElement: Int):Boolean{ - if(minMonth==0) return true + if (minYear == maxYear) return numberOfElement in minMonth..maxMonth if (selectedYear==minYear){ return numberOfElement>=minMonth diff --git a/library/src/main/java/com/dt/composedatepicker/CalendarMonthViewOneColumn.kt b/library/src/main/java/com/dt/composedatepicker/CalendarMonthViewOneColumn.kt index 91b5bd6..dfb76fc 100644 --- a/library/src/main/java/com/dt/composedatepicker/CalendarMonthViewOneColumn.kt +++ b/library/src/main/java/com/dt/composedatepicker/CalendarMonthViewOneColumn.kt @@ -108,7 +108,7 @@ private fun checkDate( maxMonth: Int, numberOfElement: Int, ): Boolean { - if (minMonth == 0) return true + if (minYear == maxYear) return numberOfElement in minMonth..maxMonth if (selectedYear == minYear) { return numberOfElement >= minMonth