From 623f0bf86ab6f167f6a1eb418d42117822c942e5 Mon Sep 17 00:00:00 2001
From: MIYANARI Junki <junqi@users.noreply.github.com>
Date: Sun, 17 Sep 2023 05:49:33 +0900
Subject: [PATCH] Request FullAccess on iOS17+ (#497)

* fix: request FullAccess on iOS17 or later

* update iOS integration description

* fix: iOS build test & Android build test
---
 .github/workflows/dart.yml                  |  5 ++++-
 README.md                                   |  7 +++++++
 android/build.gradle                        |  4 ++--
 example/android/app/build.gradle            |  2 +-
 ios/Classes/SwiftDeviceCalendarPlugin.swift | 21 ++++++++++++++++-----
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 25401783..e839df99 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -34,8 +34,11 @@ jobs:
           flutter build apk
   test-ios:
     name: iOS build test
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '15.0-beta'
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
diff --git a/README.md b/README.md
index 893f2f89..2af1e99d 100644
--- a/README.md
+++ b/README.md
@@ -111,4 +111,11 @@ For iOS 10+ support, you'll need to modify the `Info.plist` to add the following
 <string>Access contacts for event attendee editing.</string>
 ```
 
+For iOS 17+ support, add the following key/value pair as well.
+
+```xml
+<key>NSCalendarsFullAccessUsageDescription</key>
+<string>Access most functions for calendar viewing and editing.</string>
+```
+
 Note that on iOS, this is a Swift plugin. There is a known issue being tracked [here](https://github.com/flutter/flutter/issues/16049) by the Flutter team, where adding a plugin developed in Swift to an Objective-C project causes problems. If you run into such issues, please look at the suggested workarounds there.
diff --git a/android/build.gradle b/android/build.gradle
index c74125b7..139fb8e5 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -25,13 +25,13 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 19
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'proguard-rules.pro'
     }
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index dd924715..776dc817 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -30,7 +30,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.builttoroam.devicecalendarexample"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 31
         versionCode 1
         versionName "1.0"
diff --git a/ios/Classes/SwiftDeviceCalendarPlugin.swift b/ios/Classes/SwiftDeviceCalendarPlugin.swift
index 35d242db..f37d1a5a 100644
--- a/ios/Classes/SwiftDeviceCalendarPlugin.swift
+++ b/ios/Classes/SwiftDeviceCalendarPlugin.swift
@@ -1056,15 +1056,26 @@ public class SwiftDeviceCalendarPlugin: NSObject, FlutterPlugin, EKEventViewDele
             completion(true)
             return
         }
-        eventStore.requestAccess(to: .event, completion: {
-            (accessGranted: Bool, _: Error?) in
-            completion(accessGranted)
-        })
+        if #available(iOS 17, *) {
+            eventStore.requestFullAccessToEvents {
+                (accessGranted: Bool, _: Error?) in
+                completion(accessGranted)
+            }
+        } else {
+            eventStore.requestAccess(to: .event, completion: {
+                (accessGranted: Bool, _: Error?) in
+                completion(accessGranted)
+            })
+        }
     }
 
     private func hasEventPermissions() -> Bool {
         let status = EKEventStore.authorizationStatus(for: .event)
-        return status == EKAuthorizationStatus.authorized
+        if #available(iOS 17, *) {
+            return status == EKAuthorizationStatus.fullAccess
+        } else {
+            return status == EKAuthorizationStatus.authorized
+        }
     }
 }