Fix lint

kizitonwose · Jul 26, 2024 · d19831b · d19831b
1 parent 2ff8895
commit d19831b
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 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
@@ -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/...ultiplatform/library/src/commonMain/kotlin/com/kizitonwose/calendar/core/format/Format.kt b/...ultiplatform/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/...y/src/commonMain/kotlin/com/kizitonwose/calendar/core/serializers/YearMonthSerializers.kt b/...y/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<YearMonth> {
-
     override val descriptor: SerialDescriptor =
         PrimitiveSerialDescriptor("com.kizitonwose.calendar.core.YearMonth", PrimitiveKind.STRING)
 
@@ -44,7 +43,6 @@ public object YearMonthIso8601Serializer : KSerializer<YearMonth> {
  * JSON example: `{"year":2020,"month":12}`
  */
 public object YearMonthComponentSerializer : KSerializer<YearMonth> {
-
     override val descriptor: SerialDescriptor =
         buildClassSerialDescriptor("com.kizitonwose.calendar.core.YearMonth") {
             element<Int>("year")

diff --git a/...ibrary/src/commonMain/kotlin/com/kizitonwose/calendar/core/serializers/YearSerializers.kt b/...ibrary/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<Year> {
-
     override val descriptor: SerialDescriptor =
         PrimitiveSerialDescriptor("com.kizitonwose.calendar.core.Year", PrimitiveKind.STRING)
 
@@ -44,7 +43,6 @@ public object YearIso8601Serializer : KSerializer<Year> {
  * JSON example: `{"year":2020}`
  */
 public object YearComponentSerializer : KSerializer<Year> {
-
     override val descriptor: SerialDescriptor =
         buildClassSerialDescriptor("com.kizitonwose.calendar.core.Year") {
             element<Int>("year")

diff --git a/...multiplatform/library/src/commonTest/kotlin/com/kizitonwose/calendar/data/YearDataTest.kt b/...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
@@ -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
@@ -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
@@ -185,7 +185,6 @@ fun rememberFirstVisibleYearAfterScroll(state: YearCalendarState): CalendarYear
     return visibleYear.value
 }
 
-
 private val CalendarLayoutInfo.completelyVisibleMonths: List<CalendarMonth>
     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
@@ -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
@@ -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
@@ -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
@@ -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)
-Original file line number
+Diff line change
@@ Expand Up / @@ -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.
      *
@@ Expand Down @@