iOS 18 compitability

reunu · Oct 10, 2024 · 4106b4b · 4106b4b
1 parent 1712188
commit 4106b4b
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 138 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,4 +1,6 @@
 PODS:
+  - device_info_plus (0.0.1):
+    - Flutter
   - Flutter (1.0.0)
   - flutter_blue_plus (0.0.1):
     - Flutter
@@ -13,6 +15,7 @@ PODS:
     - Flutter
   - local_auth_darwin (0.0.1):
     - Flutter
+    - FlutterMacOS
   - maps_launcher (0.0.1):
     - Flutter
   - nfc_manager (0.0.1):
@@ -30,6 +33,7 @@ PODS:
     - Flutter
 
 DEPENDENCIES:
+  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
   - flutter_blue_plus (from `.symlinks/plugins/flutter_blue_plus/ios`)
   - flutter_email_sender (from `.symlinks/plugins/flutter_email_sender/ios`)
@@ -49,6 +53,8 @@ SPEC REPOS:
     - Toast
 
 EXTERNAL SOURCES:
+  device_info_plus:
+    :path: ".symlinks/plugins/device_info_plus/ios"
   Flutter:
     :path: Flutter
   flutter_blue_plus:
@@ -77,20 +83,21 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
+  device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_blue_plus: 4837da7d00cf5d441fdd6635b3a57f936778ea96
   flutter_email_sender: 10a22605f92809a11ef52b2f412db806c6082d40
   flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
-  fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
+  fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
   geolocator_apple: 6cbaf322953988e009e5ecb481f07efece75c450
-  local_auth_darwin: c7e464000a6a89e952235699e32b329457608d98
+  local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
   maps_launcher: 2e5b6a2d664ec6c27f82ffa81b74228d770ab203
   nfc_manager: d7da7cb781f7744b94df5fe9dbca904ac4a0939e
   package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
-  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
-  url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
 
 PODFILE CHECKSUM: d12ef9a5022f3fd11c30e49fae2120b5d47ae021
 

diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-	<dict>
-		<key>com.apple.developer.nfc.readersession.formats</key>
-		<array>
-			<string>NDEF</string>
-			<string>TAG</string>
-		</array>
-	</dict>
-</plist>
+<dict/>
+</plist>
diff --git a/lib/flutter/blue_plus_mockable.dart b/lib/flutter/blue_plus_mockable.dart
@@ -55,7 +55,7 @@ class FlutterBluePlusMockable {
     return FlutterBluePlus.stopScan();
   }
 
-  void setLogLevel(LogLevel level, {color = true}) {
+  Future<void> setLogLevel(LogLevel level, {color = true}) {
     return FlutterBluePlus.setLogLevel(level, color: color);
   }
 
@@ -79,7 +79,8 @@ class FlutterBluePlusMockable {
     return FlutterBluePlus.connectedDevices;
   }
 
-  Future<List<BluetoothDevice>> get systemDevices {
+  Future<List<BluetoothDevice>> Function(List<Guid> withServices)
+      get systemDevices {
     return FlutterBluePlus.systemDevices;
   }
 

diff --git a/lib/scooter_service.dart b/lib/scooter_service.dart
@@ -280,7 +280,8 @@ class ScooterService {
 
   Future<List<BluetoothDevice>> getSystemScooters() async {
     // See if the phone is already connected to a scooter. If so, hook into that.
-    List<BluetoothDevice> systemDevices = await flutterBluePlus.systemDevices;
+    List<BluetoothDevice> systemDevices = await flutterBluePlus
+        .systemDevices([Guid("9a590000-6e67-5d0d-aab9-ad9126b66f91")]);
     List<BluetoothDevice> systemScooters = [];
     List<String> savedScooterIds = await getSavedScooterIds();
     for (var device in systemDevices) {