Skip to content

Commit 207ceac

Browse files
authored
Use Renderers for update and drawing operations (alamkanak#163)
* Use Renderers for update and drawing operations * Fix broken tests
1 parent 01643c9 commit 207ceac

27 files changed

+876
-1046
lines changed

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

Lines changed: 0 additions & 156 deletions
This file was deleted.

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

Lines changed: 0 additions & 76 deletions
This file was deleted.

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package com.alamkanak.weekview
22

3-
import com.alamkanak.weekview.Constants.DAY_IN_MILLIS
43
import java.text.SimpleDateFormat
54
import java.util.Calendar
65
import java.util.Locale
76
import kotlin.math.roundToInt
87

8+
internal const val DAY_IN_MILLIS = 1000L * 60L * 60L * 24L
9+
910
internal interface Duration {
1011
val inMillis: Int
1112
}
@@ -20,6 +21,11 @@ internal inline class Hours(val hours: Int) : Duration {
2021
get() = hours * (60 * 60 * 1_000)
2122
}
2223

24+
internal inline class Minutes(val minutes: Int) : Duration {
25+
override val inMillis: Int
26+
get() = minutes * (60 * 1_000)
27+
}
28+
2329
internal inline class Millis(val millis: Int) : Duration {
2430
override val inMillis: Int
2531
get() = millis
@@ -76,6 +82,10 @@ internal operator fun Calendar.minusAssign(days: Days) {
7682
add(Calendar.DATE, days.days * (-1))
7783
}
7884

85+
internal operator fun Calendar.minusAssign(minutes: Minutes) {
86+
add(Calendar.MINUTE, minutes.minutes * (-1))
87+
}
88+
7989
internal operator fun Calendar.plus(hours: Hours): Calendar {
8090
return copy().apply {
8191
add(Calendar.HOUR_OF_DAY, hours.hours)
@@ -120,18 +130,6 @@ internal fun Calendar.isBefore(other: Calendar) = timeInMillis < other.timeInMil
120130

121131
internal fun Calendar.isAfter(other: Calendar) = timeInMillis > other.timeInMillis
122132

123-
internal fun Calendar.isBetween(
124-
lhs: Calendar,
125-
rhs: Calendar,
126-
inclusive: Boolean = false
127-
): Boolean {
128-
return if (inclusive) {
129-
timeInMillis >= lhs.timeInMillis && timeInMillis <= rhs.timeInMillis
130-
} else {
131-
timeInMillis > lhs.timeInMillis && timeInMillis < rhs.timeInMillis
132-
}
133-
}
134-
135133
internal val Calendar.isBeforeToday: Boolean
136134
get() = isBefore(today())
137135

0 commit comments

Comments
 (0)