Merge pull request #259 from juliansteenbakker/feat/darwin

imp: migrate to shared apple base

Author: juliansteenbakker

darwin/flutter_ble_peripheral.podspec

@@ -0,0 +1,28 @@
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
+# Run `pod lib lint flutter_ble_peripheral.podspec' to validate before publishing.
+#
+Pod::Spec.new do |s|
+  s.name             = 'flutter_ble_peripheral'
+  s.version          = '1.3.0'
+  s.summary          = 'This plugin enables a device to be set into peripheral mode, and advertise custom
+                          services and characteristics.'
+  s.description      = <<-DESC
+This plugin enables a device to be set into peripheral mode, and advertise custom
+  services and characteristics.
+                       DESC
+  s.homepage         = 'https://github.com/juliansteenbakker/flutter_ble_peripheral'
+  s.license          = { :file => '../LICENSE' }
+  s.author           = { 'Julian Steenbakker' => '[email protected]' }
+  s.source           = { :path => '.' }
+  s.source_files = 'flutter_ble_peripheral/Sources/flutter_ble_peripheral/**/*.swift'
+  s.ios.dependency 'Flutter'
+  s.osx.dependency 'FlutterMacOS'
+  s.ios.deployment_target = '13.0'
+  s.osx.deployment_target = '10.15'
+
+  # Flutter.framework does not contain a i386 slice.
+  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
+  s.swift_version = '5.0'
+  s.resource_bundles = {'flutter_ble_central_privacy' => ['flutter_ble_peripheral/Sources/flutter_ble_peripheral/Resources/PrivacyInfo.xcprivacy']}
+end

darwin/flutter_ble_peripheral/Package.swift

@@ -0,0 +1,25 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "flutter_ble_peripheral",
+    platforms: [
+        .iOS("13.0"),
+        .macOS("10.15")
+    ],
+    products: [
+        .library(name: "flutter-ble-peripheral", targets: ["flutter_ble_peripheral"])
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "flutter_ble_peripheral",
+            dependencies: [],
+            resources: [
+                .process("Resources"),
+            ]
+        )
+    ]
+)

ios/Classes/callbacks/PeripheralManagerDelegate.swift renamed to darwin/flutter_ble_peripheral/Sources/flutter_ble_peripheral/Delegates/PeripheralManagerDelegate.swift

@@ -12,7 +12,7 @@ import CoreLocation
 extension FlutterBlePeripheralManager: CBPeripheralManagerDelegate {
 
     func peripheralManagerDidUpdateState(_ peripheral: CBPeripheralManager) {
-        var state: PeripheralState
+        var state: FlutterBlePeripheralState
         switch peripheral.state {
         case .poweredOn:
             state = .idle

ios/Classes/FlutterBlePeripheralManager.swift renamed to darwin/flutter_ble_peripheral/Sources/flutter_ble_peripheral/FlutterBlePeripheralManager.swift

@@ -45,7 +45,7 @@ class FlutterBlePeripheralManager : NSObject {
 //
 //    var txSubscriptions = Set<UUID>()
 
-    func start(advertiseData: PeripheralData) {
+    func start(advertiseData: FlutterBlePeripheralData) {
         var dataToBeAdvertised: [String: Any]! = [:]
         if (advertiseData.uuids != nil) {
             dataToBeAdvertised[CBAdvertisementDataServiceUUIDsKey] = advertiseData.uuids!.map { CBUUID(string: $0) }

ios/Classes/SwiftFlutterBlePeripheralPlugin.swift renamed to darwin/flutter_ble_peripheral/Sources/flutter_ble_peripheral/FlutterBlePeripheralPlugin.swift

@@ -4,11 +4,16 @@
  * BSD-style license that can be found in the LICENSE file.
  */
 
+#if os(iOS)
 import Flutter
 import UIKit
+#else
+import FlutterMacOS
+import AppKit
+#endif
 import CoreLocation
 
-public class SwiftFlutterBlePeripheralPlugin: NSObject, FlutterPlugin {
+public class FlutterBlePeripheralPlugin: NSObject, FlutterPlugin {
 
     private let flutterBlePeripheralManager: FlutterBlePeripheralManager
 
@@ -22,10 +27,16 @@ public class SwiftFlutterBlePeripheralPlugin: NSObject, FlutterPlugin {
     }
 
     public static func register(with registrar: FlutterPluginRegistrar) {
-        let instance = SwiftFlutterBlePeripheralPlugin(stateChangedHandler: StateChangedHandler(registrar: registrar))
+        let instance = FlutterBlePeripheralPlugin(stateChangedHandler: StateChangedHandler(registrar: registrar))
+        
+#if os(iOS)
+        let messenger = registrar.messenger()
+#else
+        let messenger = registrar.messenger
+#endif
 
         // Method channel
-        let methodChannel = FlutterMethodChannel(name: "dev.steenbakker.flutter_ble_peripheral/ble_state", binaryMessenger: registrar.messenger())
+        let methodChannel = FlutterMethodChannel(name: "dev.steenbakker.flutter_ble_peripheral/ble_state", binaryMessenger: messenger)
         registrar.addMethodCallDelegate(instance, channel: methodChannel)
 
         // Event channels
@@ -40,11 +51,11 @@ public class SwiftFlutterBlePeripheralPlugin: NSObject, FlutterPlugin {
         case "stop":
             stopPeripheral(result)
         case "isAdvertising":
-            result(stateChangedHandler.state == PeripheralState.advertising)
+            result(stateChangedHandler.state == FlutterBlePeripheralState.advertising)
         case "isSupported":
             isSupported(result)
         case "isConnected":
-            result(stateChangedHandler.state == PeripheralState.connected)
+            result(stateChangedHandler.state == FlutterBlePeripheralState.connected)
         case "openBluetoothSettings":
             openAppSettings()
             result(nil)
@@ -57,7 +68,7 @@ public class SwiftFlutterBlePeripheralPlugin: NSObject, FlutterPlugin {
 
     private func startPeripheral(_ call: FlutterMethodCall, _ result: @escaping FlutterResult) {
         let map = call.arguments as? Dictionary<String, Any>
-        let advertiseData = PeripheralData(
+        let advertiseData = FlutterBlePeripheralData(
             uuid: map?["serviceUuid"] as? String ,
             localName: map?["localName"] as? String,
             uuids: map?["serviceUuids"] as? [String] ,
@@ -68,7 +79,7 @@ public class SwiftFlutterBlePeripheralPlugin: NSObject, FlutterPlugin {
 
     private func stopPeripheral(_ result: @escaping FlutterResult) {
         flutterBlePeripheralManager.peripheralManager.stopAdvertising()
-        stateChangedHandler.publishPeripheralState(state: PeripheralState.idle)
+        stateChangedHandler.publishPeripheralState(state: FlutterBlePeripheralState.idle)
         result(nil)
     }
 
@@ -82,11 +93,13 @@ public class SwiftFlutterBlePeripheralPlugin: NSObject, FlutterPlugin {
     }
 
     private func openAppSettings() {
-        if let url = URL(string: UIApplication.openSettingsURLString) {
-            if UIApplication.shared.canOpenURL(url) {
-                UIApplication.shared.open(url, options: [:], completionHandler: nil)
+#if os(iOS)
+            if let settingsUrl = URL(string: UIApplication.openSettingsURLString) {
+                UIApplication.shared.open(settingsUrl)
             }
-        }
+#else
+            NSWorkspace.shared.open(URL(fileURLWithPath: "/System/Applications/System Settings.app"))
+#endif
     }
 
 //    private func sendData(_ call: FlutterMethodCall,

ios/Classes/handlers/DataReceivedHandler.swift renamed to darwin/flutter_ble_peripheral/Sources/flutter_ble_peripheral/Handlers/DataReceivedHandler.swift

@@ -6,23 +6,33 @@
 //
 
 import Foundation
+#if os(iOS)
+import Flutter
+#else
+import FlutterMacOS
+#endif
 
 public class StateChangedHandler: NSObject, FlutterStreamHandler {
 
     private var eventSink: FlutterEventSink?
 
-    var state: PeripheralState = PeripheralState.idle
+    var state: FlutterBlePeripheralState = FlutterBlePeripheralState.idle
 
     private let eventChannel: FlutterEventChannel
 
     init(registrar: FlutterPluginRegistrar) {
+#if os(iOS)
+        let messenger = registrar.messenger()
+#else
+        let messenger = registrar.messenger
+#endif
         eventChannel = FlutterEventChannel(name: "dev.steenbakker.flutter_ble_peripheral/ble_state_changed",
-                                               binaryMessenger: registrar.messenger())
+                                               binaryMessenger: messenger)
         super.init()
         eventChannel.setStreamHandler(self)
     }
 
-    func publishPeripheralState(state: PeripheralState) {
+    func publishPeripheralState(state: FlutterBlePeripheralState) {
         self.state = state
         if let eventSink = self.eventSink {
             eventSink(state.rawValue)

ios/Classes/handlers/MtuChangedHandler.swift renamed to darwin/flutter_ble_peripheral/Sources/flutter_ble_peripheral/Handlers/MtuChangedHandler.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-class PeripheralData {
+class FlutterBlePeripheralData {
     var uuid: String?
     var uuids: [String]?
     var localName: String?     //CBAdvertisementDataLocalNameKey

ios/Classes/handlers/StateChangedHandler.swift renamed to darwin/flutter_ble_peripheral/Sources/flutter_ble_peripheral/Handlers/StateChangedHandler.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-enum PeripheralState : Int{
+enum FlutterBlePeripheralState : Int{
 //    case idle, unauthorized, unsupported, advertising, connected
     /// Status is not (yet) determined.
     case unknown