Skip to content

Commit 6ffb85d

Browse files
committed
Updated
1. Moved enum. 2. reduced code 3. changed enum name
1 parent 8255e7e commit 6ffb85d

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

Sources/JTAppleCalendar/CalendarEnums.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,11 @@ public enum SelectionRangePosition: Int {
118118
case left = 1, middle, right, full, none
119119
}
120120

121+
/// Between month segments, the range selection can either be visually disconnected or connected
122+
public enum RangeSelectionMode {
123+
case segmented, continuous
124+
}
125+
121126
/// Signifies whether or not a selection was done programatically or by the user
122127
public enum SelectionType: String {
123128
/// Selection type

Sources/JTAppleCalendar/JTACMonthQueryFunctions.swift

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -314,13 +314,7 @@ extension JTACMonthView {
314314
let selectedDates = self.selectedDatesSet
315315
if !selectedDates.contains(date) || selectedDates.isEmpty { return .none }
316316

317-
let restrictToSection: Bool
318-
if self.rangeSelectionMode == .segmentedRange {
319-
restrictToSection = true
320-
} else {
321-
restrictToSection = false
322-
}
323-
317+
let restrictToSection = self.rangeSelectionMode == .segmented
324318
let validSelectedIndexes = self.validForwardAndBackwordSelectedIndexes(forIndexPath: indexPath, restrictToSection: restrictToSection)
325319
let dateBeforeIsSelected = validSelectedIndexes.backIndex != nil
326320
let dateAfterIsSelected = validSelectedIndexes.forwardIndex != nil

Sources/JTAppleCalendar/JTACMonthView.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,8 @@ open class JTACMonthView: UICollectionView {
6868
open var allowsRangedSelection: Bool = false {
6969
didSet { allowsMultipleSelection = true }
7070
}
71-
72-
public enum RangeSelectionMode {
73-
case segmentedRange, continuousRange
74-
}
7571

76-
open var rangeSelectionMode: RangeSelectionMode = .segmentedRange
72+
open var rangeSelectionMode: RangeSelectionMode = .segmented
7773

7874
/// The object that acts as the delegate of the calendar view.
7975
weak open var calendarDelegate: JTACMonthViewDelegate? {

0 commit comments

Comments
 (0)