SwiftUI version

Example/Example For SwiftUI/CalendarView.swift

@@ -9,70 +9,62 @@
 import SwiftUI
 import KVKCalendar
 
-@available(iOS 14.0, *)
+@available(iOS 18.0, *)
 struct CalendarView: View {
-
-    @State private var typeCalendar = CalendarType.day
-    @State private var events: [Event] = []
-    @State private var updatedDate: Date?
-    @State private var orientation: UIInterfaceOrientation = .unknown
-    @ObservedObject private var viewModel = CalendarViewModel()
+
+    @State private var vm = CalendarViewModel()
+    @State private var date = Date()
 
     var body: some View {
-        kvkHandleNavigationView(calendarView)
+        NavigationStack {
+            calendarView
+                .task {
+                    await vm.loadEvents()
+                }
+        }
     }
 
     private var calendarView: some View {
-        CalendarViewDisplayable(events: $events,
-                                type: $typeCalendar,
-                                updatedDate: $updatedDate,
-                                orientation: $orientation)
-        .kvkOnRotate(action: { (newOrientation) in
-            orientation = newOrientation
-        })
-        .onAppear {
-            viewModel.loadEvents { (items) in
-                events = items
-            }
-        }
-        .navigationBarTitle("KVKCalendar", displayMode: .inline)
-        .edgesIgnoringSafeArea(.bottom)
-        .toolbar {
-            ToolbarItem(placement: .navigationBarLeading) {
-                HStack {
-                    ItemsMenu<CalendarType>(type: $typeCalendar,
-                                            items: CalendarType.allCases,
-                                            showCheckmark: true,
-                                            showDropDownIcon: true)
-
-                    Button {
-                        updatedDate = Date()
-                    } label: {
-                        Text("Today")
-                            .font(.headline)
-                            .foregroundColor(.red)
+        KVKCalendarSwiftUIView(type: vm.type,
+                               date: $vm.date,
+                               events: vm.events,
+                               event: $vm.selectedEvent,
+                               style: vm.style)
+            .kvkOnRotate(action: { (newOrientation) in
+                vm.orientation = newOrientation
+            })
+            .toolbar {
+                ToolbarItemGroup(placement: .topBarLeading) {
+                    Picker(vm.type.title, selection: $vm.type) {
+                        ForEach(CalendarType.allCases) { (type) in
+                            Text(type.title)
+                        }
                     }
+                    .tint(.red)
                 }
-            }
-            ToolbarItem(placement: .navigationBarTrailing) {
-                Button {
-                    if let event = viewModel.addNewEvent() {
-                        events.append(event)
+                ToolbarItemGroup(placement: .topBarTrailing) {
+                    if UIDevice.current.userInterfaceIdiom == .phone {
+                        Button {
+                            vm.date = .now
+                        } label: {
+                            Text("Today")
+                                .font(.headline)
+                        }
+                        .tint(.red)
                     }
-                } label: {
-                    Image(systemName: "plus")
-                        .foregroundColor(.red)
+                    Button {
+                        vm.addNewEvent()
+                    } label: {
+                        Image(systemName: "plus")
+                    }
+                    .tint(.red)
                 }
-
             }
-        }
     }
 
 }
 
-@available(iOS 14.0, *)
-struct ContentView_Previews: PreviewProvider {
-    static var previews: some View {
-        CalendarView()
-    }
+@available(iOS 18.0, *)
+#Preview {
+    CalendarView()
 }

Example/Example For SwiftUI/CalendarViewDisplayable.swift

@@ -17,9 +17,6 @@ struct CalendarViewDisplayable: UIViewRepresentable, KVKCalendarSettings, KVKCal
     @Binding var updatedDate: Date?
     @Binding var orientation: UIInterfaceOrientation
 
-    var style: Style {
-        createCalendarStyle()
-    }
     var selectDate = Date()
 
     private var calendar = KVKCalendarView(frame: .zero)

Example/Example For SwiftUI/CalendarViewModel.swift

@@ -6,27 +6,35 @@
 //  Copyright © 2022 CocoaPods. All rights reserved.
 //
 
-import Foundation
+import SwiftUI
 import KVKCalendar
 
-final class CalendarViewModel: ObservableObject, KVKCalendarSettings, KVKCalendarDataModel {
+@available(iOS 17.0, *)
+@Observable final class CalendarViewModel: KVKCalendarSettings, KVKCalendarDataModel {
 
-    // 🤔👹🍻😬🥸
-    // only for example
+    var type = CalendarType.week
+    var orientation: UIInterfaceOrientation = .unknown
     var events: [Event] = []
-
-    var style: KVKCalendar.Style {
-        createCalendarStyle()
+    var date = Date()
+    var selectedEvent: KVKCalendar.Event?
+
+    init() {
+        date = defaultDate
     }
 
-    func loadEvents(completion: @escaping ([Event]) -> Void) {
-        DispatchQueue.main.asyncAfter(wallDeadline: .now() + 3) {
-            self.loadEvents(dateFormat: self.style.timeSystem.format, completion: completion)
+    func loadEvents() async {
+        try? await Task.sleep(nanoseconds: 300_000_000)
+        let result = await loadEvents(dateFormat: style.timeSystem.format)
+        await MainActor.run {
+            events = result
         }
     }
 
-    func addNewEvent() -> Event? {
-         handleNewEvent(Event(ID: "-1"), date: Date())
+    func addNewEvent() {
+        var components = DateComponents(year: date.kvkYear, month: date.kvkMonth, day: date.kvkDay)
+        components.minute = date.kvkMinute + 30
+        guard let newEvent = handleNewEvent(Event(ID: "\(events.count + 1)"), date: components.date ?? date) else { return }
+        events.append(newEvent)
     }
 
 }

Example/KVKCalendar.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 56;
+	objectVersion = 60;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -300,7 +300,7 @@
 				};
 			};
 			buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "KVKCalendar" */;
-			compatibilityVersion = "Xcode 14.0";
+			compatibilityVersion = "Xcode 15.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (

Example/KVKCalendar/KVKCalendarSettings.swift

@@ -13,14 +13,17 @@ import EventKit
 protocol KVKCalendarDataModel {
 
     var events: [Event] { get set }
-    var style: Style { get }
 
 }
 
 protocol KVKCalendarSettings {}
 
 extension KVKCalendarSettings where Self: KVKCalendarDataModel {
 
+    var style: Style {
+        createCalendarStyle()
+    }
+
     func handleChangingEvent(_ event: Event, start: Date?, end: Date?) -> (range: Range<Int>, events: [Event])? {
         var eventTemp = event
         guard let startTemp = start, let endTemp = end else { return nil }
@@ -63,7 +66,7 @@ extension KVKCalendarSettings where Self: KVKCalendarDataModel {
         let endTime = timeFormatter(date: end, format: style.timeSystem.format, local: style.locale)
         newEvent.start = start
         newEvent.end = end
-        newEvent.ID = "\(events.count + 1)"
+        newEvent.uniqID = "\(events.count + 1)"
         newEvent.title = TextEvent(timeline: "\(startTime) - \(endTime)\n new time",
                                    month: "\(startTime) - \(endTime)\n new time",
                                    list: "\(startTime) - \(endTime)\n new time")
@@ -84,18 +87,26 @@ extension KVKCalendarSettings where Self: KVKCalendarDataModel {
     }
 
     func loadEvents(dateFormat: String, completion: ([Event]) -> Void) {
+        completion(prepareEvents(dateFormat: dateFormat))
+    }
+
+    func loadEvents(dateFormat: String) async -> [Event] {
+        prepareEvents(dateFormat: dateFormat)
+    }
+
+    private func prepareEvents(dateFormat: String) -> [Event] {
         let decoder = JSONDecoder()
 
         guard let path = Bundle.main.path(forResource: "events", ofType: "json"),
               let data = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedIfSafe),
-              let result = try? decoder.decode(ItemData.self, from: data) else { return }
+              let result = try? decoder.decode(ItemData.self, from: data) else { return [] }
 
-        let events = result.data.compactMap({ (item) -> Event in
+        return result.data.compactMap({ (item) -> Event in
             let startDate = formatter(date: item.start, local: style.locale)
             let endDate = formatter(date: item.end, local: style.locale)
             let startTime = timeFormatter(date: startDate, format: dateFormat, local: style.locale)
             let endTime = timeFormatter(date: endDate, format: dateFormat, local: style.locale)
-
+            
             var event = Event(ID: item.id)
             event.start = startDate
             event.end = endDate
@@ -127,15 +138,13 @@ extension KVKCalendarSettings where Self: KVKCalendarDataModel {
             }
             return event
         })
-        completion(events)
     }
-
 }
 
 extension KVKCalendarSettings {
 
     var defaultStringDate: String {
-        "14.11.2022"
+        "14.11.2024"
     }
 
     var defaultDate: Date {
@@ -149,7 +158,7 @@ extension KVKCalendarSettings {
     }
 
     func handleCustomEventView(event: Event, style: Style, frame: CGRect) -> EventViewGeneral? {
-        switch event.ID {
+        switch event.uniqID {
         case "2":
             return CustomViewEvent(style: style, event: event, frame: frame)
         case "1400":

Example/KVKCalendar/SceneDelegate.swift

@@ -39,7 +39,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             return navVC
         }
 
-        if #available(iOS 14.0, *) {
+        if #available(iOS 18.0, *) {
 #if DEBUG_SwiftUI
             return UIHostingController(rootView: CalendarView())
 #else