Merge pull request #13 from SimformSolutionsPvtLtd/bug-fixes

Fix year reversion bug on month change

Author: bhargavbajani-simformsolutions

Example/Example.xcodeproj/project.xcworkspace/xcuserdata/rizwana.xcuserdatad/UserInterfaceState.xcuserstate

@@ -74,6 +74,7 @@ final class SSDatePickerManager: ObservableObject, DatePickerConfigurationDirect
             currentMonth = currentMonth.getNextMonth(calendar) ?? currentMonth
         case .month:
             currentMonth = currentMonth.getNextYear(calendar) ?? currentMonth
+            updateYearSelection(date: currentMonth)
         case .year:
             guard let year = self.yearRange.last else { return }
             self.updateYearRange(year: year+12)
@@ -87,12 +88,18 @@ final class SSDatePickerManager: ObservableObject, DatePickerConfigurationDirect
             currentMonth = currentMonth.getPreviousMonth(calendar) ?? currentMonth
         case .month:
             currentMonth = currentMonth.getPreviousYear(calendar) ?? currentMonth
+            updateYearSelection(date: currentMonth)
         case .year:
             guard let year = self.yearRange.first else { return }
             self.updateYearRange(year: year-1)
         }
     }
-    
+
+    /// Updates the year selection based on the chosen year.
+    func updateYearSelection(date: Date) {
+        updateYearSelection(year: date.year(calendar))
+    }
+
     /// Checks if a given month is currently selected in the date picker.
     func isSelected(_ month: String) -> Bool {
         month.lowercased() == (selectedDate ?? currentMonth).fullMonth.lowercased()

Sources/SSDateTimePicker/SSDateTimePicker/Common/Date picker/SSDatePickerManager.swift

@@ -60,16 +60,20 @@ final class SSTimePickerManager: ObservableObject {
 
     /// Updates the angle based on the current selected hour.
     func updateCurrentHourAngle() {
-        angle = Double((Int(hourSelected) ?? 12) * 30)
+        let hour = updateWithDefaultHourIfEmpty()
+        angle = Double(hour * 30)
     }
 
     /// Updates the angle based on the current selected minute.
     func updateCurrentMinuteAngle() {
-        angle = Double((Int(minutesSelected) ?? 00) * 6)
+        let minute = updateWithDefaultMinuteIfEmpty()
+        angle = Double(minute * 6)
     }
 
     /// Updates the selected time based on the current hour, minute, and time format.
     func updateSelectedTime() {
+        _ = updateWithDefaultMinuteIfEmpty()
+        _ = updateWithDefaultHourIfEmpty()
         let format = DateFormatter.configure(with: DateFormat.twentyFourHourFormat)
         // get hours for 24-hrs format
         let hour = (Int(hourSelected) ?? 12)
@@ -79,7 +83,25 @@ final class SSTimePickerManager: ObservableObject {
         handleCallback()
         isMinuteClock = false
     }
-    
+
+    // In case if textfield is empty set default minute
+    func updateWithDefaultMinuteIfEmpty() -> Int {
+        let minute = Int(minutesSelected) ?? 00
+        if minutesSelected == "" {
+            minutesSelected = "00"
+        }
+        return minute
+    }
+
+    // In case if textfield is empty set default hour
+    func updateWithDefaultHourIfEmpty() -> Int {
+        let hour = Int(hourSelected) ?? 12
+        if hourSelected == "" {
+            hourSelected = "12"
+        }
+        return hour
+    }
+
     /// Sets up the initial time, angle, and clock view based on the selected time.
     func setUpTimeAndAngle() {
         let calender = Calendar.current

Sources/SSDateTimePicker/SSDateTimePicker/Common/Time picker/SSTimePickerManager.swift

@@ -102,7 +102,7 @@ struct SSClockPicker: View, TimePickerConfigurationDirectAccess {
     private func actionClockNumberSelection(number: Int) {
         if timePickerManager.isMinuteClock {
             let minute = number * 5
-            timePickerManager.minutesSelected = (minute == 60 ? 0 : minute).formattedTime
+            timePickerManager.minutesSelected = (minute == 60 ? 00 : minute).formattedTime
             timePickerManager.updateCurrentMinuteAngle()
         } else {
             timePickerManager.hourSelected = number.formattedTime
@@ -130,6 +130,7 @@ extension SSClockPicker {
             // updating angle for hour if the angle is in between hours
             let roundValue = Int(SSPickerConstants.clockNumberRotationDegree) * Int(round(angle/SSPickerConstants.clockNumberRotationDegree))
             timePickerManager.angle = Double(roundValue)
+            updateHour()
         } else {
             // updating minutes
             let progress = angle / threeSixtyDegree
@@ -139,17 +140,21 @@ extension SSClockPicker {
 
     private func onEnd(value: DragGesture.Value) {
         if !timePickerManager.isMinuteClock {
-            // updating hour value
-            let hour = Int(timePickerManager.angle / SSPickerConstants.clockNumberRotationDegree)
-            timePickerManager.hourSelected = (hour == 0 ? 12 : hour).formattedTime
+            updateHour()
             // updating picker to minutes
             withAnimation {
-                timePickerManager.angle = Double((Int(timePickerManager.minutesSelected) ?? 1) * Int(SSPickerConstants.minuteRotationDegree))
+                timePickerManager.angle = Double((Int(timePickerManager.minutesSelected) ?? 00) * Int(SSPickerConstants.minuteRotationDegree))
                 timePickerManager.isMinuteClock = true
             }
         }
     }
-    
+
+    // updating hour value
+    private func updateHour() {
+        let hour = Int(timePickerManager.angle / SSPickerConstants.clockNumberRotationDegree)
+        timePickerManager.hourSelected = (hour == 0 ? 12 : hour).formattedTime
+    }
+
 }
 
 

Sources/SSDateTimePicker/SSDateTimePicker/Views/Time Picker/SSClockPicker.swift

@@ -61,7 +61,7 @@ struct SSTimeTextField: View, TimePickerConfigurationDirectAccess {
             .fixedSize()
             .cornerRadius(SSPickerConstants.timeFieldCornerRadius)
             .onChange(of: time) { [time] newTime in
-                if Int(newTime) ?? 0 > (isHourField ? 12 : 59) {
+                if Int(newTime) ?? 00 > (isHourField ? 12 : 59) {
                     self.time = time
                 }
                 if self.time.count > charLimit {