major update

RKCalendar.xcodeproj/xcuserdata/rafi.xcuserdatad/xcschemes/xcschememanagement.plist → .swiftpm/xcode/xcuserdata/ringo.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -10,5 +10,18 @@
 			<integer>0</integer>
 		</dict>
 	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>RKCalendar</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>RKCalendarTests</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
 </dict>
 </plist>

Example.txt

@@ -0,0 +1,179 @@
+import SwiftUI
+import RKCalendar
+
+
+
+enum TestOptions: String {
+    case singleDate
+    case dateRange
+    case multiDate
+    case disabled
+    case timeSetting
+    case weekly
+    case horizontal
+}
+
+extension TestOptions: Identifiable {
+    var id: RawValue { rawValue }
+}
+
+struct ContentView : View {
+
+    @State var isPresented: TestOptions?
+
+    @StateObject var rkManager1 = RKManager(calendar: Calendar.current, minimumDate: Date().addingTimeInterval(-60*60*24*60), maximumDate: Date().addingTimeInterval(60*60*24*90), mode: .singleDate)
+
+    @StateObject var rkManager2 = RKManager(calendar: Calendar.current, minimumDate: Date().addingTimeInterval(-60*60*24*60), maximumDate: Date().addingTimeInterval(60*60*24*90), mode: .dateRange) // automatically goes to mode=2 after start selection, and vice versa.
+
+    @StateObject var rkManager3 = RKManager(calendar: Calendar.current, minimumDate: Date().addingTimeInterval(-60*60*24*60), maximumDate: Date().addingTimeInterval(60*60*24*90), mode: .multiDate)
+
+    @StateObject var rkManager4 = RKManager(calendar: Calendar.current, minimumDate: Date().addingTimeInterval(-60*60*24*60), maximumDate: Date().addingTimeInterval(60*60*24*90), mode: .singleDate)
+
+    @StateObject var rkManager5 = RKManager(calendar: Calendar.current, minimumDate: Date().addingTimeInterval(-60*60*24*60), maximumDate: Date().addingTimeInterval(60*60*24*90), mode: .singleDate)
+
+    @StateObject var rkManager6 = RKManager(calendar: Calendar.current, minimumDate: Date().addingTimeInterval(-60*60*24*60), maximumDate: Date().addingTimeInterval(60*60*24*90), mode: .singleDate)
+
+    @StateObject var rkManager7 = RKManager(calendar: Calendar.current, minimumDate: Date().addingTimeInterval(-60*60*24*60), maximumDate: Date().addingTimeInterval(60*60*24*90), mode: .singleDate)
+
+
+    var body: some View {
+        VStack (spacing: 10) {
+            Group {
+                Button(action: { isPresented = .singleDate }) {
+                    Text("Example 1 - Single Date Selection").foregroundColor(.blue)
+                }
+                Text(getTextFromDate(rkManager1.selectedDate))
+
+                Button(action: { isPresented = .dateRange }) {
+                    VStack {
+                        Text("Example 2 - Range of Dates Selection").foregroundColor(.blue)
+                        Text("(end date > start date)").foregroundColor(.blue)
+                    }
+                }
+                VStack {
+                    Text(getTextFromDate(rkManager2.startDate))
+                    Text(getTextFromDate(rkManager2.endDate))
+                }
+
+                Button(action: { isPresented = .multiDate }) {
+                    Text("Example 3 - Multiple Dates Selection ").foregroundColor(.blue)
+                }
+                datesView(dates: rkManager3.selectedDates)
+            }
+            Group {
+                Button(action: { isPresented = .disabled }) {
+                    Text("Example 4 - Disabled Dates Setting").foregroundColor(.blue)
+                }
+                datesView(dates: rkManager4.disabledDates)
+
+                Button(action: { isPresented = .timeSetting }) {
+                    Text("Example 5 - Time setting on long press").foregroundColor(.blue)
+                }
+                Text(getTextFromDateTime(rkManager5.selectedDate))
+
+                Button(action: { isPresented = .weekly }) {
+                    Text("Example 6 - Weekly view").foregroundColor(.blue)
+                }
+                Text(getTextFromDate(rkManager6.selectedDate))
+
+                Button(action: { isPresented = .horizontal }) {
+                    Text("Example 7 - Horizontal view with paging").foregroundColor(.blue)
+                }
+                Text(getTextFromDate(rkManager7.selectedDate))
+            }
+        }
+        .sheet(item: $isPresented) { selection in
+            switch selection {
+                case .singleDate: RKCalendarView().environmentObject(rkManager1)
+                case .dateRange: RKCalendarView().environmentObject(rkManager2)
+                case .multiDate: RKCalendarView().environmentObject(rkManager3)
+                case .disabled: RKCalendarView().environmentObject(rkManager4)
+                case .timeSetting: RKCalendarView().environmentObject(rkManager5)
+                case .weekly: RKCalendarView().environmentObject(rkManager6)
+                case .horizontal: RKCalendarView().environmentObject(rkManager7)
+            }
+        }
+        .onAppear(perform: startUp)
+        .navigationViewStyle(StackNavigationViewStyle())
+    }
+
+    func datesView(dates: [Date], _ withTime: Bool = false) -> some View {
+        ScrollView (.horizontal) {
+            HStack {
+                ForEach(dates, id: \.self) { date in
+                    withTime ? Text(getTextFromDateTime(date)) : Text(getTextFromDate(date))
+                }
+            }
+        }.padding(.horizontal, 5)
+    }
+
+    func startUp() {
+
+        // example of horizontal view
+        // rkManager1.isVertical = false
+
+        // example of pre-setting selected dates
+        let testOnDates = [Date().addingTimeInterval(60*60*24), Date().addingTimeInterval(60*60*24*2)]
+        rkManager3.selectedDates.append(contentsOf: testOnDates)
+
+        // example of some foreground colors
+        rkManager3.colors.weekdayHeaderColor = Color.blue
+        rkManager3.colors.monthHeaderColor = Color.green
+        rkManager3.colors.textColor = Color.blue
+        rkManager3.colors.disabledColor = Color.red
+
+        // example of pre-setting disabled dates
+        let testOffDates = [
+            Date().addingTimeInterval(60*60*24*4),
+            Date().addingTimeInterval(60*60*24*5),
+            Date().addingTimeInterval(60*60*24*7)]
+        rkManager4.disabledDates.append(contentsOf: testOffDates)
+
+        // example of allowing time (hh:mm) to be set and displayed on a long press
+        // example to display in Japanese
+        rkManager5.locale = Locale(identifier: "ja")
+        rkManager5.displayTime = true
+
+        // example of weekly view with "paging"
+        rkManager6.isVertical = false
+        rkManager6.isWeeklyView = true
+        rkManager6.isContinuous = false
+        rkManager6.colors.weekdayHeaderColor = Color.blue
+        rkManager6.colors.monthHeaderColor = Color.green
+
+        // example of horizontal monthly view with "paging"
+        rkManager7.isVertical = false
+        rkManager7.isContinuous = false
+        rkManager7.colors.weekdayHeaderColor = Color.blue
+        rkManager7.colors.monthHeaderColor = Color.green
+    }
+
+    func getDateTimeAsString(_ date: Date?) -> String {
+        if date == nil { return "" }
+        let format = DateFormatter()
+        format.dateFormat = "yyyy-MM-dd-HH-mm"
+        format.timeZone = TimeZone.current
+        format.locale = Locale.current
+        return format.string(from: date!)
+    }
+
+    func getTextFromDate(_ date: Date?) -> String {
+        if date == nil { return "" }
+        let formatter = DateFormatter()
+        formatter.timeZone = TimeZone.current
+        formatter.locale = Locale.current
+        formatter.dateFormat = "EEEE, MMMM d, yyyy"
+        return formatter.string(from: date!)
+    }
+
+    func getTextFromDateTime(_ date: Date?) -> String {
+        if date == nil { return "" }
+        let formatter = DateFormatter()
+        formatter.timeZone = TimeZone.current
+        formatter.locale = Locale.current
+        formatter.dateFormat = "EEEE, MMMM d HH:mm, yyyy"
+        return formatter.string(from: date!)
+    }
+
+}
+

Package.swift

@@ -0,0 +1,29 @@
+// swift-tools-version:5.7
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "RKCalendar",
+    platforms: [.iOS(.v16), .macOS(.v13)],
+    products: [
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .library(
+            name: "RKCalendar",
+            targets: ["RKCalendar"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        // .package(url: /* package url */, from: "1.0.0"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .target(
+            name: "RKCalendar",
+            dependencies: []),
+        .testTarget(
+            name: "RKCalendarTests",
+            dependencies: ["RKCalendar"]),
+    ]
+)

README.md

@@ -1,51 +1,136 @@
 # RKCalendar
-SwiftUI Simple Calendar / Date Picker for iOS
+
+**RKCalendar** is a SwiftUI Calendar / Date Picker for iOS and MacOS.
+
+
+### Features include:
+
+- minimum and maximum calendar dates selectable,
+- single date selection, 
+- range of dates selection, 
+- multi-dates selection, 
+- disabled dates setting,
+- time selection,
+- horizontal view,
+- weekly view.
+
 
 ### Light Mode
 <img src="https://github.com/RaffiKian/RKCalendar/blob/master/RKCalendar/Images/demo-app-light-mode-1.png" alt="demo app first screenshot" width="260"/> <img src="https://github.com/RaffiKian/RKCalendar/blob/master/RKCalendar/Images/demo-app-light-mode-2.png" alt="demo app first screenshot" width="260"/> 
 ### Dark Mode
 <img src="https://github.com/RaffiKian/RKCalendar/blob/master/RKCalendar/Images/demo-app-dark-mode-1.png" alt="demo app first screenshot" width="260"/> <img src="https://github.com/RaffiKian/RKCalendar/blob/master/RKCalendar/Images/demo-app-dark-mode-2.png" alt="demo app first screenshot" width="260"/> 
 
-**⚠️ WARNING ⚠️** This is an early version of this library that requires Swift 5.1 and Xcode 11 that are currently still in beta.
 
 # Requirements
-- iOS 13.0+
-- Xcode 11+
-- Swift 5.1+
+
+- iOS 14+, MacOS 11+
+- Swift 5.3+
 
 # Installation
-You can integrate RKCalendar into your project manually.
+
+To install this version of `RKCalendar` via the official [Swift Package Manager](https://swift.org/package-manager/).  
+
+Select `Xcode`>`File`> `Add Packages` and use `https://github.com/workingDog/RKCalendar` 
+
 
 # Usage 
 
-//Provide Calendar, minimum and maximum date that can be selected
+Typically create a **RKManager** and pass it to a **RKCalendarView**, for example:
+
+```swift
+import SwiftUI
+import RKCalendar
+
+struct ContentView : View {
+
+    @State var showCalendar = false
+    @StateObject var rkManager = RKManager(calendar: Calendar.current, minimumDate: Date().addingTimeInterval(-60*60*24*60), maximumDate: Date().addingTimeInterval(60*60*24*90), mode: .singleDate)
+
+    var body: some View {
+                Button(action: { showCalendar.toggle() }) {
+                    Text("Example - Single Date Selection").foregroundColor(.blue)
+                }
+                .sheet(isPresented: $showCalendar) { 
+                        RKCalendarView().environmentObject(rkManager) 
+                }     
+        }
+    }
+}
+```
 
-RKManager(calendar: Calendar.current, minimumDate: Date(), maximumDate: Date().addingTimeInterval(60*60*24*365)
+## Calendar minimum and maximum date setting
 
-## Single Date Selection
+Setting the calendar, minimum and maximum dates that can be selected.
 
-//Pass mode 0 to select a single date
+    RKManager(calendar: Calendar.current, minimumDate: Date(), maximumDate: Date().addingTimeInterval(60*60*24*365), mode: .singleDate)
 
-PresentationLink(destination: RKViewController(rkManager : self.exampleOne, mode: 0), label:{
-    Text(getTextFromDate(date: self.exampleOne.selectedDate, mode: 0))
-    }
-)
+## Single date selection
 
-## Start and End Date Selection
+Use mode  *.singleDate* to select a single date.
 
-//Pass mode 1 to select start date
+    RKManager(calendar: Calendar.current, minimumDate: Date(), maximumDate: maxDate, mode: .singleDate)
 
-PresentationLink(destination: RKViewController(rkManager : self.exampleTwo, mode: 1), label:{
-    Text(getTextFromDate(date: self.exampleTwo.startDate, mode: 1))
-    }
-)
+## Range of dates selection
+
+Use mode *.dateRange* to select a contiguous range of dates, from a start date to an end date.
+
+    RKManager(calendar: Calendar.current, minimumDate: Date(), maximumDate: maxDate, mode: .dateRange)
+
+Note, mode *.dateRange* is automatically toggled internally and the end date must be greater than the start date.
+
+## Multi-dates selection
+
+Use mode *.multiDate* for selecting a number of dates.
+
+    RKManager(calendar: Calendar.current, minimumDate: Date(), maximumDate: maxDate, mode: .multiDate)
+
+## Disabled-dates setting
+
+Use any mode and set zero or more dates to be disabled (un-selectable).
+
+For example:
+
+    var rkManager = RKManager(calendar: Calendar.current, minimumDate: Date(), maximumDate: maxDate, mode: .singleDate)
+
+    rkManager.disabledDates.append(contentsOf: [
+        Date().addingTimeInterval(60*60*24*4),
+        Date().addingTimeInterval(60*60*24*5),
+        Date().addingTimeInterval(60*60*24*7)
+    ])
+
+## Time selection
+
+**RKTimeView** allows for a time (hh:mm) selection option on a long press.
+
+Time selection is activated by setting **displayTime=true** in RKManager (default **false**).
+On a long press, a time selection view will popup allowing hours and minutes to be selected.  
+Time selection is available for all modes. For mode ".dateRange", select the start and end dates as usual with a tap, then with a long press, select the time desired.  
+
+## Horizontal view
+
+An  **horizontal view** of the calendar is activated by setting **isVertical=false** in RKManager (default **true**).
+
+
+## Weekly view
+
+An  **weekly view** of the calendar is activated by setting **isWeeklyView=true** in RKManager (default **false**). Note you must also set **isVertical=false**. Currently only works with **isContinuous=false**, that is, horizontal paging only.
+
+
+##  Language
+
+The language of the calendar is activated by setting **locale** in RKManager (default **Local.curent**) to display the months and weeks in the chosen language. 
+
+
+##  Other options
+
+The RKCalendar can be in two scrolling modes, a continuous mode to display a scrolling calendar of months, or a one month at a time (paging) scrolling view. This is activated by setting **isContinuous** in RKManager (default **true**). 
+
+RKCalendar can prevent a user input for the current mode by setting **disabled=true** in RKManager (default **false**).
+
+Various elements of **RKCalendar**, such as the monthly headings, can be colored. This is achieved by customising the relevent **RKManager.colors**.
 
-//Pass mode 2 to select end date
 
-PresentationLink(destination: RKViewController(rkManager : self.exampleTwo, mode: 2), label:{
-    Text(getTextFromDate(date: self.exampleTwo.endDate, mode: 2))
-    }
-)
 
 # License
+
 RKCalendar is available under the MIT license. See the LICENSE file for more info.