Lint fixes

.editorconfig

@@ -9,7 +9,19 @@ trim_trailing_whitespace = true
 [*.{kt,kts}]
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
-ktlint_standard_multiline-if-else = disabled
+ktlint_standard_multiline-expression-wrapping = disabled
+# string-template-indent requires multiline-expression-wrapping to be enabled
+ktlint_standard_string-template-indent = disabled
+ktlint_standard_parameter-list-wrapping = disabled
+ktlint_standard_function-signature = disabled
+ktlint_standard_blank-line-before-declaration = disabled
+ktlint_standard_value-argument-comment = disabled
+ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_standard_annotation = disabled
+max_line_length = 200
+
+[**/test/**/*.kt]
+ktlint_experimental = disabled
 
 [*.md]
 trim_trailing_whitespace = false

compose/src/main/java/com/kizitonwose/calendar/compose/CalendarLayoutInfo.kt

@@ -13,7 +13,6 @@ import com.kizitonwose.calendar.core.CalendarMonth
  */
 class CalendarLayoutInfo(info: LazyListLayoutInfo, private val month: (Int) -> CalendarMonth) :
     LazyListLayoutInfo by info {
-
     /**
      * The list of [CalendarItemInfo] representing all the currently visible months.
      */

compose/src/main/java/com/kizitonwose/calendar/compose/CalendarState.kt

@@ -76,7 +76,6 @@ class CalendarState internal constructor(
     outDateStyle: OutDateStyle,
     visibleItemState: VisibleItemState?,
 ) : ScrollableState {
-
     /** Backing state for [startMonth] */
     private var _startMonth by mutableStateOf(startMonth)
 

compose/src/main/java/com/kizitonwose/calendar/compose/heatmapcalendar/HeatMapCalendarState.kt

@@ -72,7 +72,6 @@ class HeatMapCalendarState internal constructor(
     firstDayOfWeek: DayOfWeek,
     visibleItemState: VisibleItemState?,
 ) : ScrollableState {
-
     /** Backing state for [startMonth] */
     private var _startMonth by mutableStateOf(startMonth)
 

compose/src/main/java/com/kizitonwose/calendar/compose/weekcalendar/WeekCalendarLayoutInfo.kt

@@ -16,7 +16,6 @@ class WeekCalendarLayoutInfo(
     info: LazyListLayoutInfo,
     private val getIndexData: (Int) -> Week,
 ) : LazyListLayoutInfo by info {
-
     /**
      * The list of [WeekCalendarItemInfo] representing all the currently visible weeks.
      */

compose/src/main/java/com/kizitonwose/calendar/compose/weekcalendar/WeekCalendarState.kt

@@ -78,7 +78,6 @@ class WeekCalendarState internal constructor(
     firstDayOfWeek: DayOfWeek,
     visibleItemState: VisibleItemState?,
 ) : ScrollableState {
-
     /**
      * The adjusted first date on the calendar to ensure proper alignment
      * of the provided [firstDayOfWeek].

compose/src/test/java/com/kizitonwose/calendar/compose/CalendarStateTests.kt

@@ -9,7 +9,6 @@ import java.time.LocalDate
 import java.time.YearMonth
 
 class CalendarStateTests {
-
     @Test
     fun `start month update is reflected in the state`() {
         val now = YearMonth.now()

compose/src/test/java/com/kizitonwose/calendar/compose/HeatMapCalendarStateTests.kt

@@ -9,7 +9,6 @@ import java.time.LocalDate
 import java.time.YearMonth
 
 class HeatMapCalendarStateTests {
-
     @Test
     fun `start month update is reflected in the state`() {
         val now = YearMonth.now()

compose/src/test/java/com/kizitonwose/calendar/compose/StateSaverTests.kt

@@ -19,7 +19,6 @@ import java.time.YearMonth
  * state restoration (e.g via rotation) will likely not happen often.
  */
 class StateSaverTests {
-
     @Test
     fun `month calendar state can be restored`() {
         val now = YearMonth.now()

compose/src/test/java/com/kizitonwose/calendar/compose/WeekCalendarStateTests.kt

@@ -9,7 +9,6 @@ import java.time.DayOfWeek
 import java.time.LocalDate
 
 class WeekCalendarStateTests {
-
     @Test
     fun `start date update is reflected in the state`() {
         val now = LocalDate.now()

core/src/main/java/com/kizitonwose/calendar/core/Extensions.kt

@@ -4,7 +4,7 @@ import java.time.DayOfWeek
 import java.time.LocalDate
 import java.time.YearMonth
 import java.time.temporal.WeekFields
-import java.util.*
+import java.util.Locale
 
 /**
  * Returns the days of week values such that the desired
@@ -15,7 +15,7 @@ import java.util.*
 @JvmOverloads
 fun daysOfWeek(firstDayOfWeek: DayOfWeek = firstDayOfWeekFromLocale()): List<DayOfWeek> {
     val pivot = 7 - firstDayOfWeek.ordinal
-    val daysOfWeek = DayOfWeek.values()
+    val daysOfWeek = DayOfWeek.entries
     // Order `daysOfWeek` array so that firstDayOfWeek is at the start position.
     return (daysOfWeek.takeLast(pivot) + daysOfWeek.dropLast(pivot))
 }

data/src/main/java/com/kizitonwose/calendar/data/MonthData.kt

@@ -17,7 +17,6 @@ data class MonthData internal constructor(
     private val inDays: Int,
     private val outDays: Int,
 ) {
-
     private val totalDays = inDays + month.lengthOfMonth() + outDays
 
     private val firstDay = month.atStartOfMonth().minusDays(inDays.toLong())
@@ -54,9 +53,11 @@ fun getCalendarMonthData(
     val inDays = firstDayOfWeek.daysUntil(firstDay.dayOfWeek)
     val outDays = (inDays + month.lengthOfMonth()).let { inAndMonthDays ->
         val endOfRowDays = if (inAndMonthDays % 7 != 0) 7 - (inAndMonthDays % 7) else 0
-        val endOfGridDays = if (outDateStyle == OutDateStyle.EndOfRow) 0 else run {
+        val endOfGridDays = if (outDateStyle == OutDateStyle.EndOfRow) {
+            0
+        } else {
             val weeksInMonth = (inAndMonthDays + endOfRowDays) / 7
-            return@run (6 - weeksInMonth) * 7
+            (6 - weeksInMonth) * 7
         }
         return@let endOfRowDays + endOfGridDays
     }

data/src/test/java/com/kizitonwose/calendar/data/HeatMapDataTests.kt

@@ -15,7 +15,6 @@ import java.time.Month.OCTOBER
 import java.time.YearMonth
 
 class HeatMapDataTests {
-
     private val october2022 = YearMonth.of(2022, OCTOBER)
     private val november2022 = YearMonth.of(2022, NOVEMBER)
     private val december2022 = YearMonth.of(2022, DECEMBER)

data/src/test/java/com/kizitonwose/calendar/data/MonthDataTests.kt

@@ -15,7 +15,6 @@ import java.time.Month.NOVEMBER
 import java.time.YearMonth
 
 class MonthDataTests {
-
     private val may2019 = YearMonth.of(2019, MAY)
     private val november2019 = YearMonth.of(2019, NOVEMBER)
     private val firstDayOfWeek = DayOfWeek.MONDAY

data/src/test/java/com/kizitonwose/calendar/data/WeekDataTests.kt

@@ -13,7 +13,6 @@ import java.time.Month.NOVEMBER
 import java.time.YearMonth
 
 class WeekDataTests {
-
     private val may2019 = YearMonth.of(2019, MAY)
     private val november2019 = YearMonth.of(2019, NOVEMBER)
     private val firstDayOfWeek = DayOfWeek.MONDAY

sample/src/androidTest/java/com/kizitonwose/calendar/sample/CalendarComposeTests.kt

@@ -45,7 +45,6 @@ import java.time.temporal.WeekFields
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class CalendarComposeTests {
-
     @get:Rule
     val composeTestRule = createComposeRule()
 
@@ -132,11 +131,11 @@ class CalendarComposeTests {
             .size.height
 
         assertEquals(
-            /* expected = */
+            // expected
             monthHeight.value,
-            /* actual = */
+            // actual
             headerHeight.value + firstDayHeight.value * weeksInMonth,
-            /* delta = */
+            // delta
             firstDayHeight.value, // Account for when larger adjacent month is used as calendar height.
         )
         assertNotEquals(0, headerHeight)

sample/src/androidTest/java/com/kizitonwose/calendar/sample/CalendarViewTests.kt

@@ -42,7 +42,6 @@ import java.time.YearMonth
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class CalendarViewTests {
-
     @get:Rule
     val homeScreenRule = ActivityScenarioRule(CalendarViewActivity::class.java)
 

sample/src/androidTest/java/com/kizitonwose/calendar/sample/WeekCalendarViewTests.kt

@@ -31,7 +31,6 @@ import java.time.YearMonth
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class WeekCalendarViewTests {
-
     @get:Rule
     val homeScreenRule = ActivityScenarioRule(CalendarViewActivity::class.java)
 

sample/src/main/java/com/kizitonwose/calendar/sample/HomeActivity.kt

@@ -8,7 +8,6 @@ import com.kizitonwose.calendar.sample.databinding.HomeActivityBinding
 import com.kizitonwose.calendar.sample.view.CalendarViewActivity
 
 class HomeActivity : AppCompatActivity() {
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val binding = HomeActivityBinding.inflate(layoutInflater)

sample/src/main/java/com/kizitonwose/calendar/sample/compose/CalendarComposeActivity.kt

@@ -27,7 +27,6 @@ import com.kizitonwose.calendar.sample.shared.dateRangeDisplayText
 import kotlinx.coroutines.launch
 
 class CalendarComposeActivity : AppCompatActivity() {
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {

sample/src/main/java/com/kizitonwose/calendar/sample/compose/Example2PageHighlight.kt

@@ -114,7 +114,9 @@ fun Modifier.backgroundHighlight(
             ) {
                 padding(vertical = padding)
                     .background(color = continuousSelectionColor)
-            } else this
+            } else {
+                this
+            }
         }
         DayPosition.OutDate -> {
             textColor(Color.Transparent)
@@ -123,7 +125,9 @@ fun Modifier.backgroundHighlight(
             ) {
                 padding(vertical = padding)
                     .background(color = continuousSelectionColor)
-            } else this
+            } else {
+                this
+            }
         }
     }
 }
@@ -199,7 +203,9 @@ fun Modifier.backgroundHighlightLegacy(
             ) {
                 padding(vertical = padding)
                     .background(color = selectionColor)
-            } else this
+            } else {
+                this
+            }
         }
         DayPosition.OutDate -> {
             textColor(Color.Transparent)
@@ -208,7 +214,9 @@ fun Modifier.backgroundHighlightLegacy(
             ) {
                 padding(vertical = padding)
                     .background(color = selectionColor)
-            } else this
+            } else {
+                this
+            }
         }
     }
 }

sample/src/main/java/com/kizitonwose/calendar/sample/compose/Example3Page.kt

@@ -61,7 +61,7 @@ import com.kizitonwose.calendar.sample.shared.generateFlights
 import kotlinx.coroutines.launch
 import java.time.DayOfWeek
 import java.time.YearMonth
-import java.util.*
+import java.util.Locale
 
 private val flights = generateFlights().groupBy { it.time.toLocalDate() }
 

sample/src/main/java/com/kizitonwose/calendar/sample/shared/ContinuousSelectionHelper.kt

@@ -11,7 +11,9 @@ import kotlin.LazyThreadSafetyMode.NONE
 
 data class DateSelection(val startDate: LocalDate? = null, val endDate: LocalDate? = null) {
     val daysBetween by lazy(NONE) {
-        if (startDate == null || endDate == null) null else {
+        if (startDate == null || endDate == null) {
+            null
+        } else {
             ChronoUnit.DAYS.between(startDate, endDate)
         }
     }

sample/src/main/java/com/kizitonwose/calendar/sample/shared/Utils.kt

@@ -9,7 +9,7 @@ import java.time.DayOfWeek
 import java.time.Month
 import java.time.YearMonth
 import java.time.format.TextStyle
-import java.util.*
+import java.util.Locale
 
 fun YearMonth.displayText(short: Boolean = false): String {
     return "${this.month.displayText(short = short)} ${this.year}"

sample/src/main/java/com/kizitonwose/calendar/sample/view/BaseFragment.kt

@@ -13,7 +13,6 @@ interface HasToolbar {
 interface HasBackButton
 
 abstract class BaseFragment(@LayoutRes layoutRes: Int) : Fragment(layoutRes) {
-
     abstract val titleRes: Int?
 
     val activityToolbar: Toolbar

sample/src/main/java/com/kizitonwose/calendar/sample/view/CalendarViewActivity.kt

@@ -10,7 +10,6 @@ import com.kizitonwose.calendar.sample.R
 import com.kizitonwose.calendar.sample.databinding.CalendarViewActivityBinding
 
 class CalendarViewActivity : AppCompatActivity() {
-
     internal lateinit var binding: CalendarViewActivityBinding
 
     private val examplesAdapter = CalendarViewOptionsAdapter {

sample/src/main/java/com/kizitonwose/calendar/sample/view/CalendarViewOptionsAdapter.kt

@@ -37,7 +37,6 @@ val horizontal = Animation(
 
 class CalendarViewOptionsAdapter(val onClick: (ExampleItem) -> Unit) :
     RecyclerView.Adapter<CalendarViewOptionsAdapter.HomeOptionsViewHolder>() {
-
     val examples = listOf(
         ExampleItem(
             R.string.example_1_title,
@@ -99,7 +98,6 @@ class CalendarViewOptionsAdapter(val onClick: (ExampleItem) -> Unit) :
 
     inner class HomeOptionsViewHolder(private val binding: CalendarViewOptionsItemViewBinding) :
         RecyclerView.ViewHolder(binding.root) {
-
         init {
             itemView.setOnClickListener {
                 onClick(examples[bindingAdapterPosition])

sample/src/main/java/com/kizitonwose/calendar/sample/view/Example1Fragment.kt

@@ -35,7 +35,6 @@ import java.time.LocalDate
 import java.time.YearMonth
 
 class Example1Fragment : BaseFragment(R.layout.example_1_fragment), HasToolbar {
-
     override val toolbar: Toolbar?
         get() = null
 

sample/src/main/java/com/kizitonwose/calendar/sample/view/Example2Fragment.kt

@@ -26,7 +26,6 @@ import java.time.YearMonth
 import java.time.format.DateTimeFormatter
 
 class Example2Fragment : BaseFragment(R.layout.example_2_fragment), HasToolbar, HasBackButton {
-
     override val toolbar: Toolbar
         get() = binding.exTwoToolbar
 

sample/src/main/java/com/kizitonwose/calendar/sample/view/Example3Fragment.kt

@@ -32,13 +32,12 @@ import java.time.DayOfWeek
 import java.time.LocalDate
 import java.time.YearMonth
 import java.time.format.DateTimeFormatter
-import java.util.*
+import java.util.UUID
 
 data class Event(val id: String, val text: String, val date: LocalDate)
 
 class Example3EventsAdapter(val onClick: (Event) -> Unit) :
     RecyclerView.Adapter<Example3EventsAdapter.Example3EventsViewHolder>() {
-
     val events = mutableListOf<Event>()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Example3EventsViewHolder {
@@ -55,7 +54,6 @@ class Example3EventsAdapter(val onClick: (Event) -> Unit) :
 
     inner class Example3EventsViewHolder(private val binding: Example3EventItemViewBinding) :
         RecyclerView.ViewHolder(binding.root) {
-
         init {
             itemView.setOnClickListener {
                 onClick(events[bindingAdapterPosition])
@@ -69,7 +67,6 @@ class Example3EventsAdapter(val onClick: (Event) -> Unit) :
 }
 
 class Example3Fragment : BaseFragment(R.layout.example_3_fragment), HasBackButton {
-
     private val eventsAdapter = Example3EventsAdapter {
         AlertDialog.Builder(requireContext())
             .setMessage(R.string.example_3_dialog_delete_confirmation)

sample/src/main/java/com/kizitonwose/calendar/sample/view/Example4Fragment.kt

@@ -36,7 +36,6 @@ import java.time.YearMonth
 import java.time.format.DateTimeFormatter
 
 class Example4Fragment : BaseFragment(R.layout.example_4_fragment), HasToolbar, HasBackButton {
-
     override val toolbar: Toolbar
         get() = binding.exFourToolbar
 

sample/src/main/java/com/kizitonwose/calendar/sample/view/Example5Fragment.kt

@@ -34,7 +34,6 @@ import java.time.YearMonth
 
 class Example5FlightsAdapter :
     RecyclerView.Adapter<Example5FlightsAdapter.Example5FlightsViewHolder>() {
-
     val flights = mutableListOf<Flight>()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Example5FlightsViewHolder {
@@ -51,7 +50,6 @@ class Example5FlightsAdapter :
 
     inner class Example5FlightsViewHolder(val binding: Example5EventItemViewBinding) :
         RecyclerView.ViewHolder(binding.root) {
-
         fun bind(flight: Flight) {
             binding.itemFlightDateText.apply {
                 text = flightDateTimeFormatter.format(flight.time)
@@ -68,7 +66,6 @@ class Example5FlightsAdapter :
 }
 
 class Example5Fragment : BaseFragment(R.layout.example_5_fragment), HasToolbar {
-
     override val toolbar: Toolbar?
         get() = null