Bug fixes.

Author: jasudev

AxisContributionExample/Shared/Extensions/Date+Extensions.swift

@@ -31,4 +31,10 @@ extension Date {
     var startOfDay: Date {
         return Calendar.current.startOfDay(for: self)
     }
+    
+    var day: Int {
+        let calendar = Calendar.current
+        let components = calendar.dateComponents([.day], from: self)
+        return components.day ?? 1
+    }
 }

Sources/AxisContribution/Extentions/Date+Extensions.swift

@@ -33,7 +33,7 @@ extension Date {
         while date <= toDate {
             dates.append(date)
             guard let newDate = Calendar.current.date(byAdding: .day, value: 7, to: date) else { break }
-            date = newDate
+            date = newDate.startOfWeek
         }
         return dates
     }
@@ -55,17 +55,16 @@ extension Date {
     var datesInWeek: [Date] {
         var dates: [Date] = []
         for i in 0..<7 {
-            if let date = Calendar.current.date(byAdding: .day, value: i, to: startOfWeek) {
+            if let date = Calendar.current.date(byAdding: .weekday, value: i, to: startOfWeek) {
                 dates.append(date)
             }
         }
         return dates
     }
 
     var isToday: Bool {
-        let gregorian = Calendar(identifier: .gregorian)
-        let currentDate = gregorian.dateComponents([.day, .month, .year], from: self)
-        let today = gregorian.dateComponents([.day, .month, .year], from: Date())
+        let currentDate = Calendar.current.dateComponents([.day, .month, .year], from: self)
+        let today = Calendar.current.dateComponents([.day, .month, .year], from: Date())
         return currentDate == today
     }
 
@@ -88,9 +87,8 @@ extension Date {
     }
 
     var startOfWeek: Date {
-        var gregorian = Calendar(identifier: .gregorian)
-        gregorian.firstWeekday = 1
-        let monday = gregorian.date(from: gregorian.dateComponents([.yearForWeekOfYear, .weekOfYear], from: self))
+        let current = Calendar.current
+        let monday = current.date(from: current.dateComponents([.yearForWeekOfYear, .weekOfYear], from: self))
         return monday!
     }
 

Sources/AxisContribution/Model/ACData.swift

@@ -29,10 +29,10 @@ import SwiftUI
 public class ACData: Equatable {
 
     /// Current date.
-    var date: Date
+    public var date: Date
 
     /// The number contributed to the current date.
-    var count: Int
+    public var count: Int
 
     /// Initializes `ACData`
     /// - Parameters: