Merge pull request #363 from kvyatkovskys/feature/v_0.6.24

version up 0.6.24
kvyatkovskys · Jul 6, 2024 · fbf1c75 · fbf1c75
2 parents 5e19b14 + 71e068d
commit fbf1c75
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 62 deletions.
diff --git a/Example/KVKCalendar.xcodeproj/project.pbxproj b/Example/KVKCalendar.xcodeproj/project.pbxproj
@@ -283,8 +283,9 @@
 		607FACC81AFB9204008FA782 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 1320;
+				LastUpgradeCheck = 1600;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
@@ -296,9 +297,6 @@
 						LastSwiftMigration = 1020;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
-					F9E6F6F8281F0C13000AEADD = {
-						DevelopmentTeam = H2NQL66JNC;
-					};
 				};
 			};
 			buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "KVKCalendar" */;
@@ -557,6 +555,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -615,6 +614,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -668,8 +668,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = KVKCalendar_Example.entitlements;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = P44LMMDHV3;
 				INFOPLIST_FILE = KVKCalendar/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -695,8 +696,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = KVKCalendar_Example.entitlements;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = P44LMMDHV3;
 				INFOPLIST_FILE = KVKCalendar/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -720,7 +722,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 3D1741B81199E2ED13C0E0BC /* Pods-KVKCalendar_Tests.debug.xcconfig */;
 			buildSettings = {
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = P44LMMDHV3;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -746,7 +748,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = BBA5555F4434EF626F6DCFF0 /* Pods-KVKCalendar_Tests.release.xcconfig */;
 			buildSettings = {
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = P44LMMDHV3;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -771,7 +773,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = KVKCalendar_Example.entitlements;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
-				DEVELOPMENT_TEAM = H2NQL66JNC;
+				DEVELOPMENT_TEAM = P44LMMDHV3;
 				INFOPLIST_FILE = "$(SRCROOT)/KVKCalendar_Example_SwiftUI-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
@@ -798,7 +800,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = KVKCalendar_Example.entitlements;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
-				DEVELOPMENT_TEAM = H2NQL66JNC;
+				DEVELOPMENT_TEAM = P44LMMDHV3;
 				INFOPLIST_FILE = "$(SRCROOT)/KVKCalendar_Example_SwiftUI-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;

diff --git a/Example/KVKCalendar.xcodeproj/xcshareddata/xcschemes/KVKCalendar-Example.xcscheme b/Example/KVKCalendar.xcodeproj/xcshareddata/xcschemes/KVKCalendar-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/KVKCalendar.xcodeproj/xcshareddata/xcschemes/KVKCalendar_Example_SwiftUI.xcscheme b/Example/KVKCalendar.xcodeproj/xcshareddata/xcschemes/KVKCalendar_Example_SwiftUI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/KVKCalendar.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/KVKCalendar.xcscheme
diff --git a/KVKCalendar.podspec b/KVKCalendar.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'KVKCalendar'
-  s.version          = '0.6.23'
+  s.version          = '0.6.24'
   s.summary          = 'A most fully customization calendar for Apple platforms.'
 
   s.description      = <<-DESC

diff --git a/Sources/KVKCalendar/Calendar+Extension.swift b/Sources/KVKCalendar/Calendar+Extension.swift
@@ -296,7 +296,7 @@ extension UIRectCorner {
 
 }
 
-public protocol KVKCellIdentifierProxy: AnyObject {
+protocol KVKCellIdentifierProxy: AnyObject {
 
     static var kvkIdentifier: String { get }
 
@@ -312,33 +312,13 @@ extension UIView: KVKCellIdentifierProxy {
 
 public protocol KVKDequeueProxyProtocol: AnyObject {}
 
-//public extension KVKDequeueProxyProtocol {
-//
-//    func kvkDequeueCell<T, U: KVKCellIdentifierProxy>(type: CalendarType,
-//                                                      view: T,
-//                                                      id: String = U.kvkIdentifier,
-//                                                      indexPath: IndexPath? = nil,
-//                                                      configure: (U) -> Void) -> U? {
-//        switch type {
-//
-//        case .month:
-//            if let cell = (view as? UITableView)?.kvkDequeueCell(id: id,
-//                                                                 indexPath: indexPath,
-//                                                                 configure: configure) {
-//                return cell
-//            } else {
-//                return nil
-//            }
-//        default:
-//            return nil
-//        }
-//    }
-//
-//}
-
 public extension KVKDequeueProxyProtocol where Self: UITableView {
 
-    func kvkDequeueCell<T: UITableViewCell>(id: String = T.kvkIdentifier, indexPath: IndexPath? = nil, configure: (T) -> Void) -> T {
+    func kvkDequeueCell<T: UITableViewCell>(
+        id: String = T.kvkIdentifier,
+        indexPath: IndexPath? = nil,
+        configure: (T) -> Void
+    ) -> T {
         kvkRegister(T.self)
 
         let cell: T
@@ -372,7 +352,11 @@ public extension KVKDequeueProxyProtocol where Self: UITableView {
 
 public extension KVKDequeueProxyProtocol where Self: UICollectionView {
 
-    func kvkDequeueCell<T: UICollectionViewCell>(id: String = T.kvkIdentifier, indexPath: IndexPath, configure: (T) -> Void) -> T {
+    func kvkDequeueCell<T: UICollectionViewCell>(
+        id: String = T.kvkIdentifier,
+        indexPath: IndexPath,
+        configure: (T) -> Void
+    ) -> T {
         kvkRegister(T.self, id: id)
 
         let cell: T
@@ -406,7 +390,7 @@ extension UITableView: KVKDequeueProxyProtocol {}
 extension UICollectionView: KVKDequeueProxyProtocol {}
 
 @available(iOS 13.4, *)
-extension UIView: UIPointerInteractionDelegate {
+extension UIView: @retroactive UIPointerInteractionDelegate {
 
     func addPointInteraction() {
         let interaction = UIPointerInteraction(delegate: self)

diff --git a/Sources/KVKCalendar/DayView.swift b/Sources/KVKCalendar/DayView.swift
@@ -57,6 +57,7 @@ public final class DayView: UIView {
     }
 
     func reloadData(_ events: [Event]) {
+        scrollableWeekView.reloadCustomCornerHeaderViewIfNeeded()
         parameters.data.recurringEvents = events.filter { $0.recurringType != .none }
         parameters.data.events = parameters.data.filterEvents(events, date: parameters.data.date)
         timelinePage.timelineView?.create(dates: [parameters.data.date],

diff --git a/Sources/KVKCalendar/KVKCalendarView+Extension.swift b/Sources/KVKCalendar/KVKCalendarView+Extension.swift
@@ -189,16 +189,15 @@ extension KVKCalendarView {
         case .authorized:
             completion(true)
         default:
-            //           temporary disabled
-            //            if #available(iOS 17.0, *) {
-            //                store.requestFullAccessToEvents { (access, error) in
-            //                    proxyCompletion(access: access, status: status, error: error)
-            //                }
-            //            } else {
-            store.requestAccess(to: .event) { (access, error) in
-                proxyCompletion(access: access, status: status, error: error)
+            if #available(iOS 17.0, *) {
+                store.requestFullAccessToEvents { (access, error) in
+                    proxyCompletion(access: access, status: status, error: error)
+                }
+            } else {
+                store.requestAccess(to: .event) { (access, error) in
+                    proxyCompletion(access: access, status: status, error: error)
+                }
             }
-            //            }
         }
     }
 

diff --git a/Sources/KVKCalendar/ScrollableWeekView.swift b/Sources/KVKCalendar/ScrollableWeekView.swift
@@ -80,7 +80,7 @@ final class ScrollableWeekView: UIView {
         layout.scrollDirection = .horizontal
         return layout
     }()
-
+    private let customCornerHeaderViewTag = -1001
     private var titleView: ScrollableWeekHeaderTitleView?
     private let bottomLineView = UIView()
     private let cornerBtn: UIButton = {
@@ -198,7 +198,7 @@ extension ScrollableWeekView: CalendarSettingProtocol {
         }
     }
 
-    func setUI(relad: Bool = false) {
+    func setUI(reload: Bool = false) {
         bottomLineView.backgroundColor = params.style.headerScroll.bottomLineColor
 
         subviews.forEach { $0.removeFromSuperview() }
@@ -234,17 +234,36 @@ extension ScrollableWeekView: CalendarSettingProtocol {
         scrollToDate(date, animated: true)
     }
 
+    func reloadCustomCornerHeaderViewIfNeeded() {
+        if let cornerHeader = dataSource?.dequeueCornerHeader(
+            date: date,
+            frame: CGRect(x: 0, y: 0,
+                          width: leftOffsetWithAdditionalTime,
+                          height: bounds.height),
+            type: type
+        ) {
+            cornerHeader.tag = customCornerHeaderViewTag
+            for subview in subviews where subview.tag == customCornerHeaderViewTag {
+                subview.removeFromSuperview()
+            }
+            addSubview(cornerHeader)
+        }
+    }
+
     private func setupViews(mainFrame: inout CGRect) {
         if let customView = dataSource?.willDisplayHeaderView(date: date, frame: mainFrame, type: type) {
             params.weeks = []
             collectionView.reloadData()
             addSubview(customView)
         } else {
-            if let cornerHeader = dataSource?.dequeueCornerHeader(date: date,
-                                                                  frame: CGRect(x: 0, y: 0,
-                                                                                width: leftOffsetWithAdditionalTime,
-                                                                                height: bounds.height),
-                                                                  type: type) {
+            if let cornerHeader = dataSource?.dequeueCornerHeader(
+                date: date,
+                frame: CGRect(x: 0, y: 0,
+                              width: leftOffsetWithAdditionalTime,
+                              height: bounds.height),
+                type: type
+            ) {
+                cornerHeader.tag = customCornerHeaderViewTag
                 addSubview(cornerHeader)
                 mainFrame.origin.x = cornerHeader.frame.width
                 mainFrame.size.width -= cornerHeader.frame.width

diff --git a/Sources/KVKCalendar/SwiftUI+Extensions.swift b/Sources/KVKCalendar/SwiftUI+Extensions.swift
@@ -108,16 +108,16 @@ struct ItemsMenu_Previews: PreviewProvider {
     }
 }
 
-public struct StatefulPreviewWrapper<Value, Content: View>: View {
+struct StatefulPreviewWrapper<Value, Content: View>: View {
     @State var value: Value
     var content: (Binding<Value>) -> Content
 
-    public var body: some View {
+    var body: some View {
         content($value)
     }
 
-    public init(_ value: Value,
-                content: @escaping (Binding<Value>) -> Content) {
+    init(_ value: Value,
+         content: @escaping (Binding<Value>) -> Content) {
         self._value = State(wrappedValue: value)
         self.content = content
     }

diff --git a/Sources/KVKCalendar/WeekView.swift b/Sources/KVKCalendar/WeekView.swift
@@ -62,6 +62,7 @@ final class WeekView: UIView {
     }
 
     func reloadData(_ events: [Event]) {
+        scrollableWeekView.reloadCustomCornerHeaderViewIfNeeded()
         parameters.data.recurringEvents = events.filter { $0.recurringType != .none }
         parameters.data.events = parameters.data.filterEvents(events, dates: parameters.visibleDates)
         timelinePage.timelineView?.create(dates: parameters.visibleDates,