feat: outofrange logic for calendarmodel

Author: mtktsl

Sources/OBCalendar/Examples/DemoCalendar.swift

@@ -64,7 +64,7 @@ struct DemoCalendar: View {
         OBCalendar(years: years) { model,scrollProxy in 
             ZStack {
                 let day = model.day
-                if day.dateType == .currentMonth {
+                if case .insideRange(.currentMonth) = model.day.dateType {
                     Text("\(day.day)")
                         .foregroundColor(
                             selectedDate == day.date
@@ -78,8 +78,8 @@ struct DemoCalendar: View {
             .frame(width: 35, height: 35)
             .background(
                 ContentBuilder.buildContent {
-                    if selectedDate == model.day.date
-                        && model.day.dateType == .currentMonth {
+                    if selectedDate == model.day.date,
+                       case .insideRange(.currentMonth) = model.day.dateType {
                         Circle()
                             .foregroundColor(.green)
                     }

Sources/OBCalendar/Model/CalendarModel.swift

@@ -25,17 +25,21 @@ public enum CalendarModel {
             case previousMonth
             case nextMonth
             case currentMonth
-            case outOfRange
+        }
+        
+        public enum RangeType {
+            case outOfRange(DateType)
+            case insideRange(DateType)
         }
 
         public let day: Int
         public let date: Date
-        public let dateType: DateType
+        public let dateType: RangeType
     }
 }
 
 extension Array where Element == CalendarModel.Year {
-    mutating func appendDay(number: Int, date: Date, dateType: CalendarModel.Day.DateType) {
+    mutating func appendDay(number: Int, date: Date, dateType: CalendarModel.Day.RangeType) {
         let lastMonths = self[self.endIndex-1].months
         self[self.endIndex-1]
             .months[lastMonths.endIndex-1]

Sources/OBCalendar/OBCalendar.swift

@@ -117,7 +117,7 @@ public struct OBCalendar<
     ) { model, scrollProxy in
 
         ZStack {
-            if model.day.dateType == .currentMonth {
+            if case .insideRange(.currentMonth) = model.day.dateType {
                 Text("\(model.day.day)")
             } else {
                 placeholderView

Sources/OBCalendar/Utility/CalendarModelBuilder.swift

@@ -56,7 +56,7 @@ public enum CalendarModelBuilder {
             result.appendDay(
                 number: currentDay,
                 date: currentDate,
-                dateType: .currentMonth
+                dateType: .insideRange(.currentMonth)
             )
 
             if let nextDay = calendar.date(byAdding: .day, value: 1, to: currentDate) {
@@ -118,8 +118,12 @@ extension CalendarModelBuilder {
                     number: calendar.component(.day, from: dateToBeAdded),
                     date: dateToBeAdded,
                     dateType: dateToBeAdded < startingDate
-                    ? .outOfRange
-                    : .previousMonth
+                    ? .outOfRange(
+                        calendar.compare(dateToBeAdded, to: startingDate, toGranularity: .month) == .orderedSame
+                        ? .currentMonth
+                        : .previousMonth
+                    )
+                    : .insideRange(.previousMonth)
                 )
             }
         }
@@ -151,8 +155,12 @@ extension CalendarModelBuilder {
                     number: number,
                     date: dateToBeAdded,
                     dateType: dateToBeAdded > endingDate
-                    ? .outOfRange
-                    : .nextMonth
+                    ? .outOfRange(
+                        calendar.compare(dateToBeAdded, to: endingDate, toGranularity: .month) == .orderedSame
+                        ? .currentMonth
+                        : .nextMonth
+                    )
+                    : .insideRange(.nextMonth)
                 )
             }
         }