Bug fixed: First month date selection & separation enabled

Author: Alberto Aznar

DateScrollPicker.podspec

@@ -13,7 +13,7 @@ s.ios.deployment_target = '10.0'
 s.name              = 'DateScrollPicker'
 s.summary           = 'Fully customizable date scroll view with picker feature for iOS written in Swift 5'
 s.description       = 'DateScrollPicker create a view with a UICollectionView. This collection has infinite cells with dates. You can customize all this cells with your own fonts and colors.'
-s.version           = '1.0.1'
+s.version           = '1.0.2'
 
 # ―――  Spec License  ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
 

DateScrollPicker/Classes/DateScrollPicker.swift

@@ -36,7 +36,14 @@ open class DateScrollPicker: UIView {
     /// //////////////////////////////////////////////////////////////////////////
     /// Object that configure `DateScrollPicker` view. You can setup `DateScrollPicker` with
     /// your own parameters. See also `DateScrollPickerFormat` implementation.
-    open var format = DateScrollPickerFormat()
+    open var format = DateScrollPickerFormat() {
+        didSet {
+            if !format.separatorEnabled {
+                dateItems = dateItems.filter({ $0.separator == false })
+                collectionView.reloadData()
+            }
+        }
+    }
 
 
     override init(frame: CGRect) {
@@ -50,7 +57,7 @@ open class DateScrollPicker: UIView {
     }
 
     open override func draw(_ rect: CGRect) {
-        selectToday(animated: false)
+        // selectToday(animated: false)
     }
 
     private func commonInit() {
@@ -70,16 +77,12 @@ open class DateScrollPicker: UIView {
         let monthEndDate = monthStartDate.addMonth(1)!
         var currentDate = monthStartDate
 
-        if format.separatorEnabled {
-            dateItems.append(DateScrollItem(date: currentDate, selected: false, separator: true))
-        }
+        dateItems.append(DateScrollItem(date: currentDate, selected: false, separator: true))
         while currentDate < monthEndDate {
-            dateItems.append(DateScrollItem(date: currentDate, selected: currentDate == Date.today(), separator: false))
+            dateItems.append(DateScrollItem(date: currentDate, selected: false, separator: false))
             currentDate = currentDate.addDays(1)!
         }
-        if format.separatorEnabled {
-            dateItems.append(DateScrollItem(date: monthEndDate, selected: false, separator: true))
-        }
+        dateItems.append(DateScrollItem(date: monthEndDate, selected: false, separator: true))
     }
 
     private func setupCollection() {
@@ -96,7 +99,7 @@ open class DateScrollPicker: UIView {
 extension DateScrollPicker: DateScrollPickerInterface {
 
     open func selectToday(animated: Bool? = nil) {
-        selectDate(Date.today())
+        selectDate(Date.today(), animated: animated)
     }
 
     open func scrollToDate(date: Date, animated: Bool? = nil) {
@@ -110,14 +113,14 @@ extension DateScrollPicker: DateScrollPickerInterface {
 extension DateScrollPicker {
 
     private func indexPath(date: Date) -> IndexPath? {
-        guard let index = dateItems.firstIndex(where: {$0.date == date}) else { return nil }
+        guard let index = dateItems.firstIndex(where: {$0.date == date && $0.separator == false }) else { return nil }
         return IndexPath(item: index, section: 0)
     }
 
-    private func selectDate(_ date: Date) {
+    private func selectDate(_ date: Date, animated: Bool? = nil) {
         guard let indexPath = indexPath(date: date) else { return }
         selectItemAt(indexPath)
-        scrollToDate(date: dateItems[indexPath.item].date)
+        scrollToDate(date: dateItems[indexPath.item].date, animated: animated)
     }
 
     private func selectItemAt(_ indexPath: IndexPath) {

Example/DateScrollPicker/Info.plist

@@ -41,7 +41,6 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>

Example/DateScrollPicker/ViewController.swift

@@ -31,17 +31,19 @@ class ViewController: UIViewController {
     override var preferredStatusBarStyle: UIStatusBarStyle {
         return .lightContent
     }
+    
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        // goToday()
+    }
 }
 
 // HANDLERS
 
 extension ViewController {
 
     @objc func didPressTodayButton(_ sender: UIButton) {
-        dateScrollPicker.selectToday()
-        dateScrollPicker2.selectToday()
-        dateScrollPicker3.selectToday()
-        dateScrollPicker4.selectToday()
+        goToday()
     }
 }
 
@@ -157,10 +159,18 @@ extension ViewController {
         format.separatorBackgroundColor = UIColor.white.withAlphaComponent(0.3)
         format.separatorTopFont = UIFont(name: "Volte-Regular3", size: 22)!
         format.separatorTopFont = UIFont(name: "Volte-Regular2", size: 20)!
+        format.separatorEnabled = false
         dateScrollPicker4.format = format
         dateScrollPicker4.delegate = self
         dateScrollPicker4.dataSource = self
     }
+    
+    private func goToday() {
+        dateScrollPicker.selectToday()
+        dateScrollPicker2.selectToday()
+        dateScrollPicker3.selectToday()
+        dateScrollPicker4.selectToday()
+    }
 }
 
 // DELEGATES

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - DateScrollPicker (1.0.0)
+  - DateScrollPicker (1.0.2)
 
 DEPENDENCIES:
   - DateScrollPicker (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  DateScrollPicker: 27f11ce6213d69c6c64ba83a823f348642b2aa6f
+  DateScrollPicker: b77f11f147aa12ed0a90b53ff40e77d0935ff302
 
 PODFILE CHECKSUM: c24bf58c0465fe9acaa42046819f831bed4a7f85