Skip to content

Commit 80ee1d9

Browse files
authored
Mark various scrolling attributes as deprecated (alamkanak#148)
1 parent 69d4883 commit 80ee1d9

File tree

4 files changed

+21
-8
lines changed

4 files changed

+21
-8
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,6 +1057,7 @@ class WeekView<T : Any> @JvmOverloads constructor(
10571057
* Returns the scrolling speed factor in horizontal direction.
10581058
*/
10591059
@PublicApi
1060+
@Deprecated("This value is no longer being taken into account.")
10601061
var xScrollingSpeed: Float
10611062
get() = configWrapper.xScrollingSpeed
10621063
set(value) {
@@ -1067,6 +1068,10 @@ class WeekView<T : Any> @JvmOverloads constructor(
10671068
* Returns whether WeekView can fling horizontally.
10681069
*/
10691070
@PublicApi
1071+
@Deprecated(
1072+
message = "Use isHorizontalScrollingEnabled instead.",
1073+
replaceWith = ReplaceWith("isHorizontalScrollingEnabled")
1074+
)
10701075
var isHorizontalFlingEnabled: Boolean
10711076
get() = configWrapper.horizontalFlingEnabled
10721077
set(value) {
@@ -1086,6 +1091,7 @@ class WeekView<T : Any> @JvmOverloads constructor(
10861091
/**
10871092
* Returns whether WeekView can fling vertically.
10881093
*/
1094+
@Deprecated("This value is no longer being taken into account.")
10891095
@PublicApi
10901096
var isVerticalFlingEnabled: Boolean
10911097
get() = configWrapper.verticalFlingEnabled
@@ -1094,6 +1100,7 @@ class WeekView<T : Any> @JvmOverloads constructor(
10941100
}
10951101

10961102
@PublicApi
1103+
@Deprecated("This value is no longer being taken into account.")
10971104
var scrollDuration: Int
10981105
get() = configWrapper.scrollDuration
10991106
set(value) {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,14 @@ internal class WeekViewConfig(
113113
var daySeparatorStrokeWidth: Int = 0
114114

115115
// Scrolling
116+
@Deprecated("No longer used")
116117
var xScrollingSpeed: Float = 0f
118+
@Deprecated("No longer used")
117119
var verticalFlingEnabled: Boolean = false
120+
@Deprecated("No longer used")
118121
var horizontalFlingEnabled: Boolean = false
119122
var horizontalScrollingEnabled: Boolean = false
123+
@Deprecated("No longer used")
120124
var scrollDuration: Int = 0
121125

122126
// Time range

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,14 @@ internal class WeekViewConfigWrapper(
252252
config.maxHour = value
253253
}
254254

255+
@Deprecated("No longer used")
255256
var xScrollingSpeed: Float
256257
get() = config.xScrollingSpeed
257258
set(value) {
258259
config.xScrollingSpeed = value
259260
}
260261

262+
@Deprecated("No longer used")
261263
var horizontalFlingEnabled: Boolean
262264
get() = config.horizontalFlingEnabled
263265
set(value) {
@@ -270,12 +272,14 @@ internal class WeekViewConfigWrapper(
270272
config.horizontalScrollingEnabled = value
271273
}
272274

275+
@Deprecated("No longer used")
273276
var verticalFlingEnabled: Boolean
274277
get() = config.verticalFlingEnabled
275278
set(value) {
276279
config.verticalFlingEnabled = value
277280
}
278281

282+
@Deprecated("No longer used")
279283
var scrollDuration: Int
280284
get() = config.scrollDuration
281285
set(value) {

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,11 @@ internal class WeekViewGestureHandler<T : Any>(
9292
// Calculate the new origin after scroll.
9393
when (currentScrollDirection) {
9494
Left, Right -> {
95-
config.currentOrigin.x -= distanceX * config.xScrollingSpeed
96-
config.currentOrigin.x = min(config.currentOrigin.x, config.maxX)
97-
config.currentOrigin.x = max(config.currentOrigin.x, config.minX)
95+
config.currentOrigin.x -= distanceX
96+
config.currentOrigin.x = config.currentOrigin.x.limit(
97+
minValue = config.minX,
98+
maxValue = config.maxX
99+
)
98100
onInvalidation()
99101
}
100102
Vertical -> {
@@ -113,11 +115,7 @@ internal class WeekViewGestureHandler<T : Any>(
113115
velocityX: Float,
114116
velocityY: Float
115117
): Boolean {
116-
if (currentFlingDirection.isHorizontal && !config.horizontalFlingEnabled) {
117-
return true
118-
}
119-
120-
if (currentFlingDirection.isVertical && !config.verticalFlingEnabled) {
118+
if (currentFlingDirection.isHorizontal && !config.horizontalScrollingEnabled) {
121119
return true
122120
}
123121

0 commit comments

Comments
 (0)