Skip to content

Commit c2f9701

Browse files
committed
raise targetSdk to 34
1 parent d86ed5a commit c2f9701

File tree

10 files changed

+15
-21
lines changed

10 files changed

+15
-21
lines changed

buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Base.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ object Base {
44
const val versionCode = 37
55
const val versionName = "1.36"
66
const val minSDK = 21
7-
const val currentSDK = 33
7+
const val currentSDK = 34
88
}

core/src/main/java/com/example/util/simpletimetracker/core/utils/TouchDetectors.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ class SwipeDetector(
109109
private val detector = GestureDetectorCompat(
110110
context,
111111
object : GestureDetector.SimpleOnGestureListener() {
112-
override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
112+
override fun onScroll(e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
113+
if (e1 == null) return false
113114
val angle = Math.toDegrees(atan2(e1.y - e2.y, e2.x - e1.x).toDouble())
114115

115116
// Right

features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/colorSelection/customView/ColorSelectionView.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@ class ColorSelectionView @JvmOverloads constructor(
8080
initGradientPaint(w.toFloat(), h.toFloat())
8181
}
8282

83-
override fun onDraw(canvas: Canvas?) {
84-
if (canvas == null) return
85-
83+
override fun onDraw(canvas: Canvas) {
8684
// Draw base color.
8785
mainPaint.color = floatArrayOf(colorHue, 1f, 1f)
8886
.let(Color::HSVToColor)

features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/duration/customView/DurationView.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ class DurationView @JvmOverloads constructor(
5050
setMeasuredDimension(w, h)
5151
}
5252

53-
override fun onDraw(canvas: Canvas?) {
54-
if (canvas == null) return
55-
53+
override fun onDraw(canvas: Canvas) {
5654
val w = width.toFloat()
5755
val h = height.toFloat()
5856

features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/customView/RecordsCalendarView.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,7 @@ class RecordsCalendarView @JvmOverloads constructor(
197197
setMeasuredDimension(w, h)
198198
}
199199

200-
override fun onDraw(canvas: Canvas?) {
201-
if (canvas == null) return
200+
override fun onDraw(canvas: Canvas) {
202201
if (data.isEmpty()) return
203202

204203
val w = width.toFloat()

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/customView/BarChartView.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ class BarChartView @JvmOverloads constructor(
113113
setMeasuredDimension(w, h)
114114
}
115115

116-
override fun onDraw(canvas: Canvas?) {
117-
if (canvas == null || bars.isEmpty()) return
116+
override fun onDraw(canvas: Canvas) {
117+
if (bars.isEmpty()) return
118118

119119
val w = width.toFloat()
120120
val h = height.toFloat()

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/customView/SeriesCalendarView.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ class SeriesCalendarView @JvmOverloads constructor(
9595
setMeasuredDimension(w, h)
9696
}
9797

98-
override fun onDraw(canvas: Canvas?) {
99-
if (canvas == null) return
100-
98+
override fun onDraw(canvas: Canvas) {
10199
val w = width.toFloat()
102100
val h = height.toFloat()
103101

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/customView/SeriesView.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ class SeriesView @JvmOverloads constructor(
7474
}
7575

7676
@Suppress("UNUSED_VARIABLE")
77-
override fun onDraw(canvas: Canvas?) {
78-
if (canvas == null || data.isEmpty()) return
77+
override fun onDraw(canvas: Canvas) {
78+
if (data.isEmpty()) return
7979

8080
val w = width.toFloat()
8181
val h = height.toFloat()

features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/pieChart/PieChartView.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ class PieChartView @JvmOverloads constructor(
8383
setMeasuredDimension(w, h)
8484
}
8585

86-
override fun onDraw(canvas: Canvas?) {
87-
if (canvas == null || segments.isEmpty()) return
86+
override fun onDraw(canvas: Canvas) {
87+
if (segments.isEmpty()) return
8888

8989
val w = width.toFloat()
9090
val h = height.toFloat()

features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/universal/customView/IconStackView.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ class IconStackView @JvmOverloads constructor(
5353
setMeasuredDimension(w, h)
5454
}
5555

56-
override fun onDraw(canvas: Canvas?) {
57-
if (canvas == null || data.isEmpty()) return
56+
override fun onDraw(canvas: Canvas) {
57+
if (data.isEmpty()) return
5858

5959
val w = width.toFloat()
6060
val h = height.toFloat()

0 commit comments

Comments
 (0)