File tree Expand file tree Collapse file tree 4 files changed +21
-8
lines changed
core/src/main/java/com/alamkanak/weekview Expand file tree Collapse file tree 4 files changed +21
-8
lines changed Original file line number Diff line number Diff line change @@ -1057,6 +1057,7 @@ class WeekView<T : Any> @JvmOverloads constructor(
1057
1057
* Returns the scrolling speed factor in horizontal direction.
1058
1058
*/
1059
1059
@PublicApi
1060
+ @Deprecated(" This value is no longer being taken into account." )
1060
1061
var xScrollingSpeed: Float
1061
1062
get() = configWrapper.xScrollingSpeed
1062
1063
set(value) {
@@ -1067,6 +1068,10 @@ class WeekView<T : Any> @JvmOverloads constructor(
1067
1068
* Returns whether WeekView can fling horizontally.
1068
1069
*/
1069
1070
@PublicApi
1071
+ @Deprecated(
1072
+ message = " Use isHorizontalScrollingEnabled instead." ,
1073
+ replaceWith = ReplaceWith (" isHorizontalScrollingEnabled" )
1074
+ )
1070
1075
var isHorizontalFlingEnabled: Boolean
1071
1076
get() = configWrapper.horizontalFlingEnabled
1072
1077
set(value) {
@@ -1086,6 +1091,7 @@ class WeekView<T : Any> @JvmOverloads constructor(
1086
1091
/* *
1087
1092
* Returns whether WeekView can fling vertically.
1088
1093
*/
1094
+ @Deprecated(" This value is no longer being taken into account." )
1089
1095
@PublicApi
1090
1096
var isVerticalFlingEnabled: Boolean
1091
1097
get() = configWrapper.verticalFlingEnabled
@@ -1094,6 +1100,7 @@ class WeekView<T : Any> @JvmOverloads constructor(
1094
1100
}
1095
1101
1096
1102
@PublicApi
1103
+ @Deprecated(" This value is no longer being taken into account." )
1097
1104
var scrollDuration: Int
1098
1105
get() = configWrapper.scrollDuration
1099
1106
set(value) {
Original file line number Diff line number Diff line change @@ -113,10 +113,14 @@ internal class WeekViewConfig(
113
113
var daySeparatorStrokeWidth: Int = 0
114
114
115
115
// Scrolling
116
+ @Deprecated(" No longer used" )
116
117
var xScrollingSpeed: Float = 0f
118
+ @Deprecated(" No longer used" )
117
119
var verticalFlingEnabled: Boolean = false
120
+ @Deprecated(" No longer used" )
118
121
var horizontalFlingEnabled: Boolean = false
119
122
var horizontalScrollingEnabled: Boolean = false
123
+ @Deprecated(" No longer used" )
120
124
var scrollDuration: Int = 0
121
125
122
126
// Time range
Original file line number Diff line number Diff line change @@ -252,12 +252,14 @@ internal class WeekViewConfigWrapper(
252
252
config.maxHour = value
253
253
}
254
254
255
+ @Deprecated(" No longer used" )
255
256
var xScrollingSpeed: Float
256
257
get() = config.xScrollingSpeed
257
258
set(value) {
258
259
config.xScrollingSpeed = value
259
260
}
260
261
262
+ @Deprecated(" No longer used" )
261
263
var horizontalFlingEnabled: Boolean
262
264
get() = config.horizontalFlingEnabled
263
265
set(value) {
@@ -270,12 +272,14 @@ internal class WeekViewConfigWrapper(
270
272
config.horizontalScrollingEnabled = value
271
273
}
272
274
275
+ @Deprecated(" No longer used" )
273
276
var verticalFlingEnabled: Boolean
274
277
get() = config.verticalFlingEnabled
275
278
set(value) {
276
279
config.verticalFlingEnabled = value
277
280
}
278
281
282
+ @Deprecated(" No longer used" )
279
283
var scrollDuration: Int
280
284
get() = config.scrollDuration
281
285
set(value) {
Original file line number Diff line number Diff line change @@ -92,9 +92,11 @@ internal class WeekViewGestureHandler<T : Any>(
92
92
// Calculate the new origin after scroll.
93
93
when (currentScrollDirection) {
94
94
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
+ )
98
100
onInvalidation()
99
101
}
100
102
Vertical -> {
@@ -113,11 +115,7 @@ internal class WeekViewGestureHandler<T : Any>(
113
115
velocityX : Float ,
114
116
velocityY : Float
115
117
): Boolean {
116
- if (currentFlingDirection.isHorizontal && ! config.horizontalFlingEnabled) {
117
- return true
118
- }
119
-
120
- if (currentFlingDirection.isVertical && ! config.verticalFlingEnabled) {
118
+ if (currentFlingDirection.isHorizontal && ! config.horizontalScrollingEnabled) {
121
119
return true
122
120
}
123
121
You can’t perform that action at this time.
0 commit comments