From acf12ddcb88a98e2a8882ade3f204b6ea0f80cfb Mon Sep 17 00:00:00 2001 From: Kizito Nwose Date: Fri, 26 Jul 2024 17:42:45 +0200 Subject: [PATCH] Fix lint --- .../kotlin/com/kizitonwose/calendar/core/Year.kt | 1 - .../com/kizitonwose/calendar/core/format/Format.kt | 6 +++++- .../core/serializers/YearMonthSerializers.kt | 2 -- .../calendar/core/serializers/YearSerializers.kt | 2 -- .../com/kizitonwose/calendar/data/YearDataTest.kt | 1 - .../src/commonMain/kotlin/Example2PageHighlight.kt | 12 ++++++++---- .../sample/src/commonMain/kotlin/Example6Page.kt | 6 ++++-- .../sample/src/commonMain/kotlin/Utils.kt | 2 -- .../com/kizitonwose/calendar/data/YearDataTest.kt | 1 - .../calendar/sample/compose/Example2PageHighlight.kt | 12 ++++++++---- .../calendar/sample/compose/Example6Page.kt | 6 ++++-- .../calendar/sample/view/Example4Fragment.kt | 6 ++++-- 12 files changed, 33 insertions(+), 24 deletions(-) diff --git a/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/Year.kt b/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/Year.kt index f6a43968..e0861d37 100644 --- a/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/Year.kt +++ b/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/Year.kt @@ -107,7 +107,6 @@ public fun Year.isLeap(): Boolean = Year.isLeap(year) */ public fun Year.length(): Int = if (isLeap()) 366 else 365 - /** * Returns the [LocalDate] at the specified [dayOfYear] in this year. * diff --git a/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/format/Format.kt b/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/format/Format.kt index 9910ea67..cc837660 100644 --- a/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/format/Format.kt +++ b/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/format/Format.kt @@ -9,7 +9,11 @@ import kotlinx.datetime.LocalDate import kotlinx.datetime.format.char private val ISO_YEAR_MONTH by lazy { - LocalDate.Format { year(); char('-'); monthNumber() } + LocalDate.Format { + year() + char('-') + monthNumber() + } } private val ISO_YEAR by lazy { diff --git a/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/serializers/YearMonthSerializers.kt b/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/serializers/YearMonthSerializers.kt index b4025eeb..64fffe95 100644 --- a/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/serializers/YearMonthSerializers.kt +++ b/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/serializers/YearMonthSerializers.kt @@ -26,7 +26,6 @@ import kotlinx.serialization.encoding.encodeStructure * @see YearMonth.toString */ public object YearMonthIso8601Serializer : KSerializer { - override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("com.kizitonwose.calendar.core.YearMonth", PrimitiveKind.STRING) @@ -44,7 +43,6 @@ public object YearMonthIso8601Serializer : KSerializer { * JSON example: `{"year":2020,"month":12}` */ public object YearMonthComponentSerializer : KSerializer { - override val descriptor: SerialDescriptor = buildClassSerialDescriptor("com.kizitonwose.calendar.core.YearMonth") { element("year") diff --git a/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/serializers/YearSerializers.kt b/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/serializers/YearSerializers.kt index e3ec0844..557942b2 100644 --- a/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/serializers/YearSerializers.kt +++ b/compose-multiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/serializers/YearSerializers.kt @@ -26,7 +26,6 @@ import kotlinx.serialization.encoding.encodeStructure * @see Year.toString */ public object YearIso8601Serializer : KSerializer { - override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("com.kizitonwose.calendar.core.Year", PrimitiveKind.STRING) @@ -44,7 +43,6 @@ public object YearIso8601Serializer : KSerializer { * JSON example: `{"year":2020}` */ public object YearComponentSerializer : KSerializer { - override val descriptor: SerialDescriptor = buildClassSerialDescriptor("com.kizitonwose.calendar.core.Year") { element("year") diff --git a/compose-multiplatform/library/src/commonTest/kotlin/com/kizitonwose/calendar/data/YearDataTest.kt b/compose-multiplatform/library/src/commonTest/kotlin/com/kizitonwose/calendar/data/YearDataTest.kt index 1cb74a27..da9ee0c4 100644 --- a/compose-multiplatform/library/src/commonTest/kotlin/com/kizitonwose/calendar/data/YearDataTest.kt +++ b/compose-multiplatform/library/src/commonTest/kotlin/com/kizitonwose/calendar/data/YearDataTest.kt @@ -12,7 +12,6 @@ import kotlin.test.Test import kotlin.test.assertEquals class YearDataTest { - @Test @JsName("test1") fun `year data is accurate with non-leap year`() { diff --git a/compose-multiplatform/sample/src/commonMain/kotlin/Example2PageHighlight.kt b/compose-multiplatform/sample/src/commonMain/kotlin/Example2PageHighlight.kt index 59c40f0b..03f78536 100644 --- a/compose-multiplatform/sample/src/commonMain/kotlin/Example2PageHighlight.kt +++ b/compose-multiplatform/sample/src/commonMain/kotlin/Example2PageHighlight.kt @@ -111,7 +111,8 @@ fun Modifier.backgroundHighlight( DayPosition.InDate -> { textColor(Color.Transparent) - if (startDate != null && endDate != null && + if (startDate != null && + endDate != null && isInDateBetweenSelection(day.date, startDate, endDate) ) { padding(vertical = padding) @@ -123,7 +124,8 @@ fun Modifier.backgroundHighlight( DayPosition.OutDate -> { textColor(Color.Transparent) - if (startDate != null && endDate != null && + if (startDate != null && + endDate != null && isOutDateBetweenSelection(day.date, startDate, endDate) ) { padding(vertical = padding) @@ -208,7 +210,8 @@ fun Modifier.backgroundHighlightLegacy( DayPosition.InDate -> { textColor(Color.Transparent) - if (startDate != null && endDate != null && + if (startDate != null && + endDate != null && isInDateBetweenSelection(day.date, startDate, endDate) ) { padding(vertical = padding) @@ -220,7 +223,8 @@ fun Modifier.backgroundHighlightLegacy( DayPosition.OutDate -> { textColor(Color.Transparent) - if (startDate != null && endDate != null && + if (startDate != null && + endDate != null && isOutDateBetweenSelection(day.date, startDate, endDate) ) { padding(vertical = padding) diff --git a/compose-multiplatform/sample/src/commonMain/kotlin/Example6Page.kt b/compose-multiplatform/sample/src/commonMain/kotlin/Example6Page.kt index 2aecec71..f61f9b51 100644 --- a/compose-multiplatform/sample/src/commonMain/kotlin/Example6Page.kt +++ b/compose-multiplatform/sample/src/commonMain/kotlin/Example6Page.kt @@ -274,8 +274,10 @@ private fun getMonthWithYear( val firstItem = visibleItemsInfo.first() val daySizePx = with(density) { daySize.toPx() } if ( - firstItem.size < daySizePx * 3 || // Ensure the Month + Year text can fit. - firstItem.offset < layoutInfo.viewportStartOffset && // Ensure the week row size - 1 is visible. + // Ensure the Month + Year text can fit. + firstItem.size < daySizePx * 3 || + // Ensure the week row size - 1 is visible. + firstItem.offset < layoutInfo.viewportStartOffset && (layoutInfo.viewportStartOffset - firstItem.offset > daySizePx) ) { visibleItemsInfo[1].month.yearMonth diff --git a/compose-multiplatform/sample/src/commonMain/kotlin/Utils.kt b/compose-multiplatform/sample/src/commonMain/kotlin/Utils.kt index ea08723c..d894f57e 100644 --- a/compose-multiplatform/sample/src/commonMain/kotlin/Utils.kt +++ b/compose-multiplatform/sample/src/commonMain/kotlin/Utils.kt @@ -185,7 +185,6 @@ fun rememberFirstVisibleYearAfterScroll(state: YearCalendarState): CalendarYear return visibleYear.value } - private val CalendarLayoutInfo.completelyVisibleMonths: List get() { val visibleItemsInfo = this.visibleMonthsInfo.toMutableList() @@ -258,6 +257,5 @@ suspend fun LazyListState.animateScrollAndCenterItem(index: Int) { } } - val YearMonth.next: YearMonth get() = this.plus(1, DateTimeUnit.MONTH) val YearMonth.previous: YearMonth get() = this.minus(1, DateTimeUnit.MONTH) diff --git a/data/src/test/java/com/kizitonwose/calendar/data/YearDataTest.kt b/data/src/test/java/com/kizitonwose/calendar/data/YearDataTest.kt index ec38befe..ef864114 100644 --- a/data/src/test/java/com/kizitonwose/calendar/data/YearDataTest.kt +++ b/data/src/test/java/com/kizitonwose/calendar/data/YearDataTest.kt @@ -10,7 +10,6 @@ import java.time.Year import java.time.YearMonth class YearDataTest { - @Test fun `year data is accurate with non-leap year`() { val year = Year.of(2019) diff --git a/sample/src/main/java/com/kizitonwose/calendar/sample/compose/Example2PageHighlight.kt b/sample/src/main/java/com/kizitonwose/calendar/sample/compose/Example2PageHighlight.kt index a90030f2..50a9269d 100644 --- a/sample/src/main/java/com/kizitonwose/calendar/sample/compose/Example2PageHighlight.kt +++ b/sample/src/main/java/com/kizitonwose/calendar/sample/compose/Example2PageHighlight.kt @@ -109,7 +109,8 @@ fun Modifier.backgroundHighlight( } DayPosition.InDate -> { textColor(Color.Transparent) - if (startDate != null && endDate != null && + if (startDate != null && + endDate != null && isInDateBetweenSelection(day.date, startDate, endDate) ) { padding(vertical = padding) @@ -120,7 +121,8 @@ fun Modifier.backgroundHighlight( } DayPosition.OutDate -> { textColor(Color.Transparent) - if (startDate != null && endDate != null && + if (startDate != null && + endDate != null && isOutDateBetweenSelection(day.date, startDate, endDate) ) { padding(vertical = padding) @@ -198,7 +200,8 @@ fun Modifier.backgroundHighlightLegacy( } DayPosition.InDate -> { textColor(Color.Transparent) - if (startDate != null && endDate != null && + if (startDate != null && + endDate != null && isInDateBetweenSelection(day.date, startDate, endDate) ) { padding(vertical = padding) @@ -209,7 +212,8 @@ fun Modifier.backgroundHighlightLegacy( } DayPosition.OutDate -> { textColor(Color.Transparent) - if (startDate != null && endDate != null && + if (startDate != null && + endDate != null && isOutDateBetweenSelection(day.date, startDate, endDate) ) { padding(vertical = padding) diff --git a/sample/src/main/java/com/kizitonwose/calendar/sample/compose/Example6Page.kt b/sample/src/main/java/com/kizitonwose/calendar/sample/compose/Example6Page.kt index 70856752..ce2eb27f 100644 --- a/sample/src/main/java/com/kizitonwose/calendar/sample/compose/Example6Page.kt +++ b/sample/src/main/java/com/kizitonwose/calendar/sample/compose/Example6Page.kt @@ -275,8 +275,10 @@ private fun getMonthWithYear( val firstItem = visibleItemsInfo.first() val daySizePx = with(density) { daySize.toPx() } if ( - firstItem.size < daySizePx * 3 || // Ensure the Month + Year text can fit. - firstItem.offset < layoutInfo.viewportStartOffset && // Ensure the week row size - 1 is visible. + // Ensure the Month + Year text can fit. + firstItem.size < daySizePx * 3 || + // Ensure the week row size - 1 is visible. + firstItem.offset < layoutInfo.viewportStartOffset && (layoutInfo.viewportStartOffset - firstItem.offset > daySizePx) ) { visibleItemsInfo[1].month.yearMonth diff --git a/sample/src/main/java/com/kizitonwose/calendar/sample/view/Example4Fragment.kt b/sample/src/main/java/com/kizitonwose/calendar/sample/view/Example4Fragment.kt index aefcf2f3..b105d78b 100644 --- a/sample/src/main/java/com/kizitonwose/calendar/sample/view/Example4Fragment.kt +++ b/sample/src/main/java/com/kizitonwose/calendar/sample/view/Example4Fragment.kt @@ -224,13 +224,15 @@ class Example4Fragment : BaseFragment(R.layout.example_4_fragment), HasToolbar, // Make the coloured selection background continuous on the // invisible in and out dates across various months. DayPosition.InDate -> - if (startDate != null && endDate != null && + if (startDate != null && + endDate != null && isInDateBetweenSelection(data.date, startDate, endDate) ) { continuousBgView.applyBackground(rangeMiddleBackground) } DayPosition.OutDate -> - if (startDate != null && endDate != null && + if (startDate != null && + endDate != null && isOutDateBetweenSelection(data.date, startDate, endDate) ) { continuousBgView.applyBackground(rangeMiddleBackground)