Merge pull request #365 from kvyatkovskys/feature/v_0.6.25

fixed the issue with locale to calculate days in month
kvyatkovskys · Aug 2, 2024 · 010b5f2 · 010b5f2
2 parents 5e037b4 + 6304346
commit 010b5f2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/Example/KVKCalendar.xcodeproj/project.pbxproj b/Example/KVKCalendar.xcodeproj/project.pbxproj
@@ -607,6 +607,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES = YES;
 			};
 			name = Debug;
 		};
@@ -659,6 +660,7 @@
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				VALIDATE_PRODUCT = YES;
+				_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES = YES;
 			};
 			name = Release;
 		};

diff --git a/KVKCalendar.podspec b/KVKCalendar.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'KVKCalendar'
-  s.version          = '0.6.24'
+  s.version          = '0.6.25'
   s.summary          = 'A most fully customization calendar for Apple platforms.'
 
   s.description      = <<-DESC

diff --git a/Sources/KVKCalendar/CalendarData.swift b/Sources/KVKCalendar/CalendarData.swift
@@ -90,7 +90,8 @@ struct CalendarData {
 
         let formatterDay = DateFormatter()
         formatterDay.dateFormat = "EE"
-        formatterDay.locale = style.locale
+        // MARK: here we have to use `en_US` locale
+        formatterDay.locale = Locale(identifier: "en_US")
         let days = arrDates.map({ Day(type: DayType(rawValue: formatterDay.string(from: $0).uppercased()) ?? .empty, date: $0, data: []) })
         return days
     }

diff --git a/Sources/KVKCalendar/MonthView.swift b/Sources/KVKCalendar/MonthView.swift
@@ -428,12 +428,11 @@ extension MonthView: UICollectionViewDelegate, UICollectionViewDelegateFlowLayou
 
         let month = parameters.monthData.data.months[index.section]
         setHeaderTitleAndNotify(month.date)
-        guard style.month.autoSelectionDateWhenScrolling else { return }
         let newDate = parameters.monthData.findNextDateInMonth(month)
-        guard parameters.monthData.date != newDate else { return }
-
-        parameters.monthData.date = newDate
         willSelectDate?(newDate)
+
+        guard style.month.autoSelectionDateWhenScrolling && parameters.monthData.date != newDate else { return }
+        parameters.monthData.date = newDate
         reload()
     }
 
@@ -452,12 +451,11 @@ extension MonthView: UICollectionViewDelegate, UICollectionViewDelegateFlowLayou
 
         let month = parameters.monthData.data.months[visibleIndex]
         setHeaderTitleAndNotify(month.date)
-        guard style.month.autoSelectionDateWhenScrolling else { return }
         let newDate = parameters.monthData.findNextDateInMonth(month)
-        guard parameters.monthData.date != newDate else { return }
+        willSelectDate?(newDate)
 
+        guard style.month.autoSelectionDateWhenScrolling && parameters.monthData.date != newDate else { return }
         parameters.monthData.date = newDate
-        willSelectDate?(newDate)
         reload()
     }
 
@@ -467,9 +465,11 @@ extension MonthView: UICollectionViewDelegate, UICollectionViewDelegateFlowLayou
 
         switch style.month.selectionMode {
         case .multiple:
-            parameters.monthData.selectedDates = parameters.monthData.updateSelectedDates(parameters.monthData.selectedDates,
-                                                                                          date: date,
-                                                                                          calendar: style.calendar)
+            parameters.monthData.selectedDates = parameters.monthData.updateSelectedDates(
+                parameters.monthData.selectedDates,
+                date: date,
+                calendar: style.calendar
+            )
             didSelectDates(parameters.monthData.selectedDates.compactMap({ $0 }), indexPath: item.indexPath)
         case .single:
             didSelectDates([date], indexPath: item.indexPath)
@@ -487,7 +487,6 @@ extension MonthView: UICollectionViewDelegate, UICollectionViewDelegateFlowLayou
 
         let width: CGFloat
         let height: CGFloat
-
         let heightSectionHeader = style.month.heightSectionHeader
         switch style.month.scrollDirection {
         case .horizontal:
@@ -503,17 +502,14 @@ extension MonthView: UICollectionViewDelegate, UICollectionViewDelegateFlowLayou
             } else {
                 width = 0
             }
-
             var superViewHeight = collectionView.bounds.height
             if !style.month.isHiddenSectionHeader && superViewHeight >= heightSectionHeader {
                 superViewHeight -= heightSectionHeader
             }
-
             height = superViewHeight / CGFloat(item.weeks)
         @unknown default:
             fatalError()
         }
-
         return CGSize(width: width, height: height)
     }
 
@@ -534,7 +530,6 @@ extension MonthView: UICollectionViewDelegate, UICollectionViewDelegateFlowLayou
         guard !style.month.isHiddenSectionHeader else { return .zero }
 
         let item = getActualCachedDay(indexPath: IndexPath(row: 0, section: section))
-
         if let date = item.day?.date, let size = delegate?.sizeForHeader(date, type: .month) {
             return size
         } else {