Added option for a startOfWeek that starts on Monday. Issue# melvitax#74

Author: melvitax

Playground.playground/Contents.swift

@@ -206,6 +206,9 @@ now.adjust(hour: 12, minute: 0, second: 0)
 now.dateFor(.startOfDay)
 now.dateFor(.endOfDay)
 now.dateFor(.startOfWeek)
+var calendar = Calendar(identifier: .gregorian)
+calendar.firstWeekday = 2
+now.dateFor(.startOfWeek, calendar: calendar)
 now.dateFor(.endOfWeek)
 now.dateFor(.startOfMonth)
 now.dateFor(.endOfMonth)

README.md

@@ -48,6 +48,13 @@ let startOfWeek = date.dateFor(.startOfWeek)
 let nearest5Hours = date.dateFor(.nearestHour(hour:5))
 ```
 
+Forcing a week to start on monday
+```Swift
+var calendar = Calendar(identifier: .gregorian)
+calendar = 2 // sets the week to start on the second day.. monday
+now.dateFor(.startOfWeek, calendar: calendar)
+```
+
 Time since...
 
 ```Swift

Sources/DateHelper.swift

@@ -362,15 +362,14 @@ public extension Date {
 
     // MARK: Date for...
 
-    func dateFor(_ type:DateForType) -> Date {
+    func dateFor(_ type:DateForType, calendar:Calendar = Calendar.current) -> Date {
         switch type {
         case .startOfDay:
             return adjust(hour: 0, minute: 0, second: 0)
         case .endOfDay:
             return adjust(hour: 23, minute: 59, second: 59)
         case .startOfWeek:
-            let offset = component(.weekday)!-1
-            return adjust(.day, offset: -(offset))
+            return calendar.date(from: calendar.dateComponents([.yearForWeekOfYear, .weekOfYear], from: self))!
         case .endOfWeek:
             let offset = 7 - component(.weekday)!
             return adjust(.day, offset: offset)