Merge pull request #56 from shilangyu/feat/check-availability

kvs-coder · web-flow · commit ff0d261e51f0 · 2023-03-30T17:38:14.000+02:00
Add isAvailable method
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@
 .pub/
 
 build/
+pubspec.lock
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '9.0'
+platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -4,8 +4,8 @@ PODS:
     - Flutter
   - health_kit_reporter (2.1.0):
     - Flutter
-    - HealthKitReporter
-  - HealthKitReporter (2.0.0)
+    - HealthKitReporter (= 3.0.0)
+  - HealthKitReporter (3.0.0)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
@@ -25,11 +25,11 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/health_kit_reporter/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
-  health_kit_reporter: c42352ae9e6ba3035618f27aec723833487ceab3
-  HealthKitReporter: 85bbd047c01cf75fe8958de380048363c31b48d8
+  health_kit_reporter: cc8b2973fd907efbafc8cb48795fd4af59e00a4e
+  HealthKitReporter: 3511fd29070917a255fa60df7f415c2007f74b73
 
-PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa
+PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.12.0
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -353,7 +353,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -445,7 +445,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -495,7 +495,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -5,58 +5,58 @@ packages:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      url: "https://pub.dev"
     source: hosted
-    version: "2.8.2"
+    version: "2.10.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
+      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.2.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      sha256: "1989d917fbe8e6b39806207df5a3fdd3d816cbd090fac2ce26fb45e9a71476e5"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -66,14 +66,16 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      url: "https://pub.dartlang.org"
+      sha256: "861dd7a5c15606de973211095a7e18df5cafa7474e5bc196896da8e9d0eb39cd"
+      url: "https://pub.dev"
     source: hosted
     version: "5.0.0+4"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "60a02e35c59420d8a4af29a722512adc3c544206adf0338e0dfa902b463bf8e8"
+      url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
   flutter_test:
@@ -88,46 +90,60 @@ packages:
       relative: true
     source: path
     version: "2.1.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.5"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.11"
+    version: "0.12.13"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      url: "https://pub.dev"
     source: hosted
-    version: "0.1.4"
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.dartlang.org"
+      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "075f927ebbab4262ace8d0b283929ac5410c0ac4e7fc123c76429564facfb757"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
   sky_engine:
@@ -139,58 +155,66 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.9.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.16"
   timezone:
     dependency: transitive
     description:
       name: timezone
-      url: "https://pub.dartlang.org"
+      sha256: f60f389b14643ee90a3ab96ae414f77b0472e3817b5b4bf5cc9ce81ec0113f78
+      url: "https://pub.dev"
     source: hosted
     version: "0.7.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
 sdks:
-  dart: ">=2.17.0-0 <3.0.0"
+  dart: ">=2.18.0 <3.0.0"
   flutter: ">=1.20.0"
diff --git a/ios/Classes/EventChannel.swift b/ios/Classes/EventChannel.swift
@@ -12,7 +12,7 @@ enum EventChannel: String, CaseIterable {
     case statisticsCollectionQuery = "health_kit_reporter_event_channel_statistics_collection_query"
     case activitySummaryQuery = "health_kit_reporter_event_channel_query_activity_summary"
     case anchoredObjectQuery = "health_kit_reporter_event_channel_anchored_object_query"
-    
+
     func combinedWith(identifier: String) -> String {
         "\(self.rawValue)_\(identifier)"
     }
diff --git a/ios/Classes/Extensions+SwiftHealthKitReporterPlugin.swift b/ios/Classes/Extensions+SwiftHealthKitReporterPlugin.swift
@@ -11,6 +11,7 @@ import HealthKitReporter
 // MARK: - MethodCall
 extension SwiftHealthKitReporterPlugin {
     private enum Method: String {
+        case isAvailable
         case requestAuthorization
         case preferredUnits
         case characteristicsQuery
@@ -38,27 +39,36 @@ extension SwiftHealthKitReporterPlugin {
     }
 
     public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
-        guard let reporter = self.reporter else {
+        guard let method = Method(rawValue: call.method) else {
             result(
                 FlutterError(
                     code: className,
-                    message: "Reporter is nil",
-                    details: nil
+                    message: "Please check the method",
+                    details: "Provided method: \(call.method)"
                 )
             )
             return
         }
-        guard let method = Method(rawValue: call.method) else {
+
+        if method == .isAvailable {
+            result(HealthKitReporter.isHealthDataAvailable)
+            return
+        }
+
+        guard let reporter = self.reporter else {
             result(
                 FlutterError(
                     code: className,
-                    message: "Please check the method",
-                    details: "Provided method: \(call.method)"
+                    message: "HealthKit is not available",
+                    details: nil
                 )
             )
             return
         }
+
         switch method {
+        case .isAvailable:
+            result(HealthKitReporter.isHealthDataAvailable)
         case .requestAuthorization:
             guard let arguments = call.arguments as? [String: [String]] else {
                 throwNoArgumentsError(result: result)
@@ -1540,4 +1550,3 @@ extension SwiftHealthKitReporterPlugin {
         )
     }
 }
-
diff --git a/ios/Classes/StreamHandlerProtocol.swift b/ios/Classes/StreamHandlerProtocol.swift
@@ -13,6 +13,6 @@ public protocol StreamHandlerProtocol: FlutterStreamHandler & NSObjectProtocol {
     var plannedQueries: Set<Query> { get set }
 
     func setQueries(arguments: [String: Any], events: @escaping FlutterEventSink) throws
-    
+
     static func make(with reporter: HealthKitReporter) -> Self
 }
diff --git a/ios/Classes/SwiftHealthKitReporterPlugin.swift b/ios/Classes/SwiftHealthKitReporterPlugin.swift
diff --git a/ios/health_kit_reporter.podspec b/ios/health_kit_reporter.podspec
diff --git a/lib/health_kit_reporter.dart b/lib/health_kit_reporter.dart
diff --git a/pubspec.lock b/pubspec.lock

Original file line number	Diff line number	Diff line change
`@@ -5,3 +5,4 @@`
`5`	`5`	`.pub/`
`6`	`6`
`7`	`7`	`build/`
	`8`	`+pubspec.lock`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ enum EventChannel: String, CaseIterable {`
`12`	`12`	`case statisticsCollectionQuery = "health_kit_reporter_event_channel_statistics_collection_query"`
`13`	`13`	`case activitySummaryQuery = "health_kit_reporter_event_channel_query_activity_summary"`
`14`	`14`	`case anchoredObjectQuery = "health_kit_reporter_event_channel_anchored_object_query"`
`15`		`-`
	`15`	`+`
`16`	`16`	`func combinedWith(identifier: String) -> String {`
`17`	`17`	`"\(self.rawValue)_\(identifier)"`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import HealthKitReporter`
`11`	`11`	`// MARK: - MethodCall`
`12`	`12`	`extension SwiftHealthKitReporterPlugin {`
`13`	`13`	`private enum Method: String {`
	`14`	`+ case isAvailable`
`14`	`15`	`case requestAuthorization`
`15`	`16`	`case preferredUnits`
`16`	`17`	`case characteristicsQuery`
`@@ -38,27 +39,36 @@ extension SwiftHealthKitReporterPlugin {`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {`
`41`		`- guard let reporter = self.reporter else {`
	`42`	`+ guard let method = Method(rawValue: call.method) else {`
`42`	`43`	`result(`
`43`	`44`	`FlutterError(`
`44`	`45`	`code: className,`
`45`		`- message: "Reporter is nil",`
`46`		`- details: nil`
	`46`	`+ message: "Please check the method",`
	`47`	`+ details: "Provided method: \(call.method)"`
`47`	`48`	`)`
`48`	`49`	`)`
`49`	`50`	`return`
`50`	`51`	`}`
`51`		`- guard let method = Method(rawValue: call.method) else {`
	`52`	`+`
	`53`	`+ if method == .isAvailable {`
	`54`	`+ result(HealthKitReporter.isHealthDataAvailable)`
	`55`	`+ return`
	`56`	`+ }`
	`57`	`+`
	`58`	`+ guard let reporter = self.reporter else {`
`52`	`59`	`result(`
`53`	`60`	`FlutterError(`
`54`	`61`	`code: className,`
`55`		`- message: "Please check the method",`
`56`		`- details: "Provided method: \(call.method)"`
	`62`	`+ message: "HealthKit is not available",`
	`63`	`+ details: nil`
`57`	`64`	`)`
`58`	`65`	`)`
`59`	`66`	`return`
`60`	`67`	`}`
	`68`	`+`
`61`	`69`	`switch method {`
	`70`	`+ case .isAvailable:`
	`71`	`+ result(HealthKitReporter.isHealthDataAvailable)`
`62`	`72`	`case .requestAuthorization:`
`63`	`73`	`guard let arguments = call.arguments as? [String: [String]] else {`
`64`	`74`	`throwNoArgumentsError(result: result)`
`@@ -1540,4 +1550,3 @@ extension SwiftHealthKitReporterPlugin {`
`1540`	`1550`	`)`
`1541`	`1551`	`}`
`1542`	`1552`	`}`
`1543`		`-`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ public protocol StreamHandlerProtocol: FlutterStreamHandler & NSObjectProtocol {`
`13`	`13`	`var plannedQueries: Set<Query> { get set }`
`14`	`14`
`15`	`15`	`func setQueries(arguments: [String: Any], events: @escaping FlutterEventSink) throws`
`16`		`-`
	`16`	`+`
`17`	`17`	`static func make(with reporter: HealthKitReporter) -> Self`
`18`	`18`	`}`