Skip to content
This repository was archived by the owner on Oct 12, 2024. It is now read-only.

Commit 11f0572

Browse files
committed
Add ktlint to project
1 parent 727ad1d commit 11f0572

File tree

69 files changed

+191
-253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+191
-253
lines changed

core/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ version = '4.0.0'
66
apply plugin: 'com.android.library'
77
apply plugin: 'kotlin-android'
88
apply plugin: 'kotlin-android-extensions'
9+
apply from: '../ktlint.gradle'
910

1011
android {
1112
compileSdkVersion buildConfig.compileSdk

core/src/main/java/com/alamkanak/weekview/AllDayEventsUpdater.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,9 @@ internal class AllDayEventsUpdater<T>(
200200
}
201201

202202
private val RectF.isValidAllDayEventRect: Boolean
203-
get() = (left < right
204-
&& left < view.width
205-
&& top < view.height
206-
&& right > config.timeColumnWidth
207-
&& bottom > 0)
208-
203+
get() = (left < right &&
204+
left < view.width &&
205+
top < view.height &&
206+
right > config.timeColumnWidth &&
207+
bottom > 0)
209208
}

core/src/main/java/com/alamkanak/weekview/BackgroundGridDrawer.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,4 @@ internal class BackgroundGridDrawer(
7979

8080
canvas.drawLines(hourLines, config.hourSeparatorPaint)
8181
}
82-
8382
}

core/src/main/java/com/alamkanak/weekview/DateTimeInterpreter.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,16 @@ internal class DefaultDateTimeInterpreter(
3737
val time = calendar.withTime(hour, minutes = 0)
3838
return sdfTime.format(time.time)
3939
}
40-
4140
}
4241

4342
internal interface DateFormatProvider {
4443
val is24HourFormat: Boolean
4544
}
4645

47-
internal class RealDateFormatProvider (
46+
internal class RealDateFormatProvider(
4847
private val context: Context
4948
) : DateFormatProvider {
5049

5150
override val is24HourFormat: Boolean
5251
get() = DateFormat.is24HourFormat(context)
53-
5452
}
55-
56-

core/src/main/java/com/alamkanak/weekview/DayBackgroundDrawer.kt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,18 @@ internal class DayBackgroundDrawer(
5454
}
5555
}
5656

57-
private fun drawPastAndFutureRect(startX: Float, startY: Float, endX: Float, pastPaint: Paint,
58-
futurePaint: Paint, height: Float, canvas: Canvas) {
57+
private fun drawPastAndFutureRect(
58+
startX: Float,
59+
startY: Float,
60+
endX: Float,
61+
pastPaint: Paint,
62+
futurePaint: Paint,
63+
height: Float,
64+
canvas: Canvas
65+
) {
5966
val now = now()
6067
val beforeNow = (now.hour + now.minute / MINUTES_PER_HOUR) * config.hourHeight
6168
canvas.drawRect(startX, startY, endX, startY + beforeNow, pastPaint)
6269
canvas.drawRect(startX, startY + beforeNow, endX, height, futurePaint)
6370
}
64-
6571
}

core/src/main/java/com/alamkanak/weekview/DayLabelDrawer.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,4 @@ internal class DayLabelDrawer<T>(
6060
private fun <E> SparseArray<E>.get(key: Int, providerIfEmpty: () -> E): E {
6161
return get(key) ?: providerIfEmpty.invoke()
6262
}
63-
6463
}

core/src/main/java/com/alamkanak/weekview/Defaults.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,5 @@ internal class Defaults {
2626
val displayMetrics = context.resources.displayMetrics
2727
return applyDimension(COMPLEX_UNIT_SP, textSize.toFloat(), displayMetrics).toInt()
2828
}
29-
3029
}
31-
3230
}

core/src/main/java/com/alamkanak/weekview/DrawingContext.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,4 @@ internal class DrawingContext(
5050
if (config.isSingleDay) it + singleDayMargin else it
5151
}
5252
}
53-
5453
}

core/src/main/java/com/alamkanak/weekview/EmptyViewLongPressListener.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ interface OnEmptyViewLongPressListener {
1717
* @param time A [Calendar] with the date and time of the clicked position
1818
*/
1919
fun onEmptyViewLongPress(time: Calendar)
20-
2120
}

core/src/main/java/com/alamkanak/weekview/EventCache.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ internal class EventCache<T> {
1515

1616
fun covers(fetchRange: FetchRange): Boolean {
1717
return fetchedRange?.let {
18-
it.previous == fetchRange.previous
19-
&& it.current == fetchRange.current
20-
&& it.next == fetchRange.next
18+
it.previous == fetchRange.previous &&
19+
it.current == fetchRange.current &&
20+
it.next == fetchRange.next
2121
} ?: false
2222
}
2323

@@ -49,5 +49,4 @@ internal class EventCache<T> {
4949
this.nextPeriodEvents = nextPeriodEvents
5050
this.fetchedRange = fetchedRange
5151
}
52-
5352
}

core/src/main/java/com/alamkanak/weekview/EventChip.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,4 @@ internal data class EventChip<T>(
6666
e.x > it.left && e.x < it.right && e.y > it.top && e.y < it.bottom
6767
} ?: false
6868
}
69-
7069
}

core/src/main/java/com/alamkanak/weekview/EventChipCache.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,4 @@ internal class EventChipCache<T> {
7171
removeAt(index)
7272
add(index, element)
7373
}
74-
7574
}

core/src/main/java/com/alamkanak/weekview/EventChipDrawer.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,5 +271,4 @@ internal class EventChipDrawer<T>(
271271
paint.strokeWidth = event.style.borderWidth.toFloat()
272272
paint.style = Paint.Style.STROKE
273273
}
274-
275274
}

core/src/main/java/com/alamkanak/weekview/EventChipRectCalculator.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,4 @@ internal class EventChipRectCalculator<T>(
6767

6868
return RectF(left, top, right, bottom)
6969
}
70-
7170
}

core/src/main/java/com/alamkanak/weekview/EventChipsExpander.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ internal class EventChipsExpander<T>(
143143
fun add(eventChip: EventChip<T>) {
144144
eventChips.add(eventChip)
145145
}
146-
147146
}
148147

149148
/**
@@ -173,7 +172,6 @@ internal class EventChipsExpander<T>(
173172
fun fits(eventChip: EventChip<T>): Boolean {
174173
return isEmpty || !eventChips.last().event.collidesWith(eventChip.event)
175174
}
176-
177175
}
178176

179177
private val List<Int>.isContinuous: Boolean
@@ -191,5 +189,4 @@ internal class EventChipsExpander<T>(
191189
}
192190
return results
193191
}
194-
195192
}

core/src/main/java/com/alamkanak/weekview/EventChipsProvider.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,5 +98,4 @@ internal class EventChipsProvider<T>(
9898
}
9999
return eventSplitter.split(event).map { EventChip(it, event, null) }
100100
}
101-
102101
}

core/src/main/java/com/alamkanak/weekview/EventsDrawer.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ internal class SingleEventsDrawer<T>(
3434
.filter { it.rect != null }
3535
.forEach { eventChipDrawer.draw(it, canvas, paint) }
3636
}
37-
3837
}
3938

4039
internal class AllDayEventsDrawer<T>(
@@ -79,5 +78,4 @@ internal class AllDayEventsDrawer<T>(
7978
override fun clear() {
8079
cache.clearAllDayEventLayouts()
8180
}
82-
8381
}

core/src/main/java/com/alamkanak/weekview/HeaderRowDrawer.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,4 @@ internal class HeaderRowDrawer<T>(
5454

5555
canvas.drawLine(0f, topMargin, width.toFloat(), topMargin, paint)
5656
}
57-
5857
}

core/src/main/java/com/alamkanak/weekview/HeaderRowHeightUpdater.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ internal class HeaderRowHeightUpdater<T>(
2424
private fun refreshHeaderHeight(drawingContext: DrawingContext) {
2525
val dateRange = drawingContext.dateRangeWithStartPixels.map { it.first }
2626
val visibleEvents = cache.getAllDayEventsInRange(dateRange)
27-
2827
config.hasEventInHeader = visibleEvents.isNotEmpty()
2928
config.refreshHeaderHeight()
3029
}
31-
3230
}

core/src/main/java/com/alamkanak/weekview/MonthChangeListener.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@ interface OnMonthChangeListener<T> {
1818
* @return The list of [WeekViewDisplayable] of the provided month
1919
*/
2020
fun onMonthChange(startDate: Calendar, endDate: Calendar): List<WeekViewDisplayable<T>>
21-
2221
}

core/src/main/java/com/alamkanak/weekview/MonthLoader.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,4 @@ internal class MonthLoader<T>(
2929
.onMonthChange(startDate, endDate)
3030
.map { it.toWeekViewEvent() }
3131
}
32-
3332
}

core/src/main/java/com/alamkanak/weekview/MultiLineDayLabelHeightUpdater.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,4 @@ internal class MultiLineDayLabelHeightUpdater<T>(
7474
private fun <E> SparseArray<E>.get(key: Int, providerIfEmpty: () -> E): E {
7575
return get(key) ?: providerIfEmpty.invoke()
7676
}
77-
7877
}

core/src/main/java/com/alamkanak/weekview/NowLineDrawer.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,4 @@ internal class NowLineDrawer(
5050
val dotMargin = 32f
5151
canvas.drawCircle(startPixel + dotMargin, lineStartY, dotRadius, config.nowDotPaint)
5252
}
53-
5453
}

core/src/main/java/com/alamkanak/weekview/OnEmptyViewClickListener.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ interface OnEmptyViewClickListener {
1717
* @param time A [Calendar] with the date and time of the clicked position
1818
*/
1919
fun onEmptyViewClicked(time: Calendar)
20-
2120
}

core/src/main/java/com/alamkanak/weekview/OnEventClickListener.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ interface OnEventClickListener<T> {
1212
* @param eventRect The [RectF] of the [EventChip]
1313
*/
1414
fun onEventClick(data: T, eventRect: RectF)
15-
1615
}

core/src/main/java/com/alamkanak/weekview/OnEventLongPressListener.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@ interface OnEventLongPressListener<T> {
1818
* @param eventRect The [RectF] of the [EventChip]
1919
*/
2020
fun onEventLongPress(data: T, eventRect: RectF)
21-
2221
}

core/src/main/java/com/alamkanak/weekview/OnRangeChangeListener.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ interface OnRangeChangeListener {
1212
* @param lastVisibleDate The last visible day
1313
*/
1414
fun onRangeChanged(firstVisibleDate: Calendar, lastVisibleDate: Calendar)
15-
1615
}

core/src/main/java/com/alamkanak/weekview/Period.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ internal data class FetchRange(
1414
val current = Period.fromDate(firstVisibleDay)
1515
return FetchRange(current.previous, current, current.next)
1616
}
17-
1817
}
19-
2018
}
2119

2220
internal data class Period(val month: Int, val year: Int) {
@@ -36,13 +34,10 @@ internal data class Period(val month: Int, val year: Int) {
3634
}
3735

3836
internal companion object {
39-
4037
fun fromDate(date: Calendar): Period {
4138
val month = date.month
4239
val year = date.year
4340
return Period(month, year)
4441
}
45-
4642
}
47-
4843
}

core/src/main/java/com/alamkanak/weekview/SavedState.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,4 @@ internal class SavedState : BaseSavedState {
3939
override fun newArray(size: Int): Array<SavedState?> = arrayOfNulls(size)
4040
}
4141
}
42-
4342
}

core/src/main/java/com/alamkanak/weekview/ScrollListener.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ interface ScrollListener {
1111
* @param date The new first visible date
1212
*/
1313
fun onFirstVisibleDateChanged(date: Calendar)
14-
1514
}

core/src/main/java/com/alamkanak/weekview/SingleEventsUpdater.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ internal class SingleEventsUpdater<T>(
4040
}
4141

4242
private val RectF.isValidSingleEventRect: Boolean
43-
get() = (left < right
44-
&& left < view.width
45-
&& top < view.height
46-
&& right > config.timeColumnWidth
47-
&& bottom > config.headerHeight)
48-
43+
get() = (left < right &&
44+
left < view.width &&
45+
top < view.height &&
46+
right > config.timeColumnWidth &&
47+
bottom > config.headerHeight)
4948
}

core/src/main/java/com/alamkanak/weekview/TextLayoutBuilder.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,4 @@ internal object TextLayoutBuilder {
2727
} else {
2828
StaticLayout(text, textPaint, width, alignment, spacingMultiplier, spacingExtra, includePadding)
2929
}
30-
3130
}

core/src/main/java/com/alamkanak/weekview/TimeColumnDrawer.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,4 @@ internal class TimeColumnDrawer(
8484
timeLabelCache.clear()
8585
cacheTimeLabels()
8686
}
87-
8887
}

0 commit comments

Comments
 (0)