Merge pull request #3 from wojteklembryk/master

Controller configuration extended to disable date range changes

Author: ilia3546

Fastis.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name             = 'Fastis'
-  s.version          = '1.0.9'
+  s.version          = '1.0.10'
   s.summary          = "Simple date picker created using JTAppleCalendar library"
   s.description      = <<-DESC
   Fastis is a fully customizable UI component for picking dates and ranges created using JTAppleCalendar library.
                        DESC
-   
+
   s.homepage         = 'https://github.com/retailcrm/Fastis'
   s.social_media_url = 'https://retailcrm.pro'
   s.screenshot       = 'https://github.com/retailcrm/Fastis/raw/master/Documentation/top_screen.jpg'

README.md

@@ -84,7 +84,7 @@ Run `carthage update` to build the framework, drag the following framework into
 
 - `Fastis.framework`
 - `SnapKit.framewok`
-- `PrettyCards.framework` 
+- `PrettyCards.framework`
 - `JTAppleCalendar.framework`
 
 ### Swift Package Manager
@@ -164,6 +164,7 @@ var initialValue: Value? = nil
 var minimumDate: Date? = nil
 var maximumDate: Date? = nil
 var selectMonthOnHeaderTap: Bool = true
+var allowDateRangeChanges: Bool = true
 ```
 
 - `shortcuts`- Shortcuts array. Default value is `[]`. See [Shortcuts](#shortcuts) section
@@ -174,6 +175,7 @@ var selectMonthOnHeaderTap: Bool = true
 - `minimumDate`-  Minimal selection date. Dates less then current will be markes as unavailable. Default value is `nil`.
 - `maximumDate`- Maximum selection date. Dates greather then current will be markes as unavailable. Default value is `nil`.
 - `selectMonthOnHeaderTap` (Only for `.range` mode) - Set this variable to `true` if you want to allow select date ranges by tapping on months. Default value is `true`.
+- `allowDateRangeChanges` (Only for `.range` mode) - Set this variable to `false` if you want to if you want to disable date range changes. Next tap after selecting range will start new range selection. Default value is `true`.
 
 ### Shortcuts
 
@@ -227,4 +229,4 @@ let fastisController = FastisController(mode: .range, config: customConfig)
 
 ## License
 
-Fastis is released under the MIT license. See LICENSE for details.
+Fastis is released under the MIT license. See LICENSE for details.

Source/Views/Controller.swift

@@ -150,6 +150,14 @@ public class FastisController<Value: FastisValue>: UIViewController, JTACMonthVi
         }
     }
 
+    /**
+     Allow date range changes
+     
+     Set this variable to `false` if you want to disable date range changes.
+     Next tap after selecting range will start new range selection.
+     */
+    public var allowDateRangeChanges: Bool = true
+    
     /**
     Maximum selection date. Dates greather then current will be markes as unavailable
     */
@@ -332,7 +340,11 @@ public class FastisController<Value: FastisValue>: UIViewController, JTACMonthVi
             var newValue: FastisRange!
             if let currentValue = self.value as? FastisRange {
 
-                if date.isInSameDay(in: self.currentCalendar, date: currentValue.fromDate) {
+                let dateRangeChangesDisabled = !allowDateRangeChanges
+                let rangeSelected = !currentValue.fromDate.isInSameDay(date: currentValue.toDate)
+                if dateRangeChangesDisabled && rangeSelected  {
+                    newValue = .from(date.startOfDay(in: self.currentCalendar), to: date.endOfDay(in: self.currentCalendar))
+                } else if date.isInSameDay(in: self.currentCalendar, date: currentValue.fromDate) {
                     let newToDate = date.endOfDay(in: self.currentCalendar)
                     newValue = .from(currentValue.fromDate, to: newToDate)
                 } else if date.isInSameDay(in: self.currentCalendar, date: currentValue.toDate) {
@@ -493,7 +505,6 @@ extension FastisController where Value == FastisRange {
             return self.privateSelectMonthOnHeaderTap
         }
     }
-    
 }
 
 extension FastisController where Value == Date {