From 36506e7efd3ba963b03c46c9e40aca157f1a7495 Mon Sep 17 00:00:00 2001 From: Jon Bo Date: Mon, 17 Nov 2025 22:29:19 -0300 Subject: [PATCH] upgrade ios and fix some references --- ios/Podfile | 2 +- ios/Podfile.lock | 119 ++++++++++++++++-- lib/main.dart | 2 +- lib/screens/device_pairing_screen.dart | 5 +- linux/flutter/generated_plugins.cmake | 1 + macos/Flutter/GeneratedPluginRegistrant.swift | 2 + 6 files changed, 118 insertions(+), 13 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 620e46e..1b6ef80 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '13.0' +platform :ios, '15.6' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 288038f..0fc51d9 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,49 +1,148 @@ PODS: + - audio_session (0.0.1): + - Flutter + - DKImagePickerController/Core (4.3.9): + - DKImagePickerController/ImageDataManager + - DKImagePickerController/Resource + - DKImagePickerController/ImageDataManager (4.3.9) + - DKImagePickerController/PhotoGallery (4.3.9): + - DKImagePickerController/Core + - DKPhotoGallery + - DKImagePickerController/Resource (4.3.9) + - DKPhotoGallery (0.0.19): + - DKPhotoGallery/Core (= 0.0.19) + - DKPhotoGallery/Model (= 0.0.19) + - DKPhotoGallery/Preview (= 0.0.19) + - DKPhotoGallery/Resource (= 0.0.19) + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Core (0.0.19): + - DKPhotoGallery/Model + - DKPhotoGallery/Preview + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Model (0.0.19): + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Preview (0.0.19): + - DKPhotoGallery/Model + - DKPhotoGallery/Resource + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Resource (0.0.19): + - SDWebImage + - SwiftyGif + - ffmpeg_kit_flutter_new_min (7.1.1): + - ffmpeg_kit_flutter_new_min/min (= 7.1.1) + - Flutter + - ffmpeg_kit_flutter_new_min/min (7.1.1): + - Flutter + - file_picker (0.0.1): + - DKImagePickerController/PhotoGallery + - Flutter - Flutter (1.0.0) - - flutter_sound (9.28.0): + - flutter_blue_plus_darwin (0.0.2): + - Flutter + - FlutterMacOS + - flutter_local_notifications (0.0.1): + - Flutter + - just_audio (0.0.1): + - Flutter + - FlutterMacOS + - opus_flutter_ios (0.0.2): - Flutter - - flutter_sound_core (= 9.28.0) - - flutter_sound_core (9.28.0) - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - permission_handler_apple (9.3.0): - Flutter + - record_ios (1.1.0): + - Flutter + - SDWebImage (5.21.3): + - SDWebImage/Core (= 5.21.3) + - SDWebImage/Core (5.21.3) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS + - SwiftyGif (5.4.5) + - url_launcher_ios (0.0.1): + - Flutter + - whisper_ggml (1.0.1): + - Flutter DEPENDENCIES: + - audio_session (from `.symlinks/plugins/audio_session/ios`) + - ffmpeg_kit_flutter_new_min (from `.symlinks/plugins/ffmpeg_kit_flutter_new_min/ios`) + - file_picker (from `.symlinks/plugins/file_picker/ios`) - Flutter (from `Flutter`) - - flutter_sound (from `.symlinks/plugins/flutter_sound/ios`) + - flutter_blue_plus_darwin (from `.symlinks/plugins/flutter_blue_plus_darwin/darwin`) + - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) + - just_audio (from `.symlinks/plugins/just_audio/darwin`) + - opus_flutter_ios (from `.symlinks/plugins/opus_flutter_ios/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) + - record_ios (from `.symlinks/plugins/record_ios/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) + - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) + - whisper_ggml (from `.symlinks/plugins/whisper_ggml/ios`) SPEC REPOS: trunk: - - flutter_sound_core + - DKImagePickerController + - DKPhotoGallery + - SDWebImage + - SwiftyGif EXTERNAL SOURCES: + audio_session: + :path: ".symlinks/plugins/audio_session/ios" + ffmpeg_kit_flutter_new_min: + :path: ".symlinks/plugins/ffmpeg_kit_flutter_new_min/ios" + file_picker: + :path: ".symlinks/plugins/file_picker/ios" Flutter: :path: Flutter - flutter_sound: - :path: ".symlinks/plugins/flutter_sound/ios" + flutter_blue_plus_darwin: + :path: ".symlinks/plugins/flutter_blue_plus_darwin/darwin" + flutter_local_notifications: + :path: ".symlinks/plugins/flutter_local_notifications/ios" + just_audio: + :path: ".symlinks/plugins/just_audio/darwin" + opus_flutter_ios: + :path: ".symlinks/plugins/opus_flutter_ios/ios" path_provider_foundation: :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" + record_ios: + :path: ".symlinks/plugins/record_ios/ios" shared_preferences_foundation: :path: ".symlinks/plugins/shared_preferences_foundation/darwin" + url_launcher_ios: + :path: ".symlinks/plugins/url_launcher_ios/ios" + whisper_ggml: + :path: ".symlinks/plugins/whisper_ggml/ios" SPEC CHECKSUMS: + audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0 + DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c + DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 + ffmpeg_kit_flutter_new_min: 85493896be79f45e846b5c9b23a3bf73eb284c4a + file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 - flutter_sound: b9236a5875299aaa4cef1690afd2f01d52a3f890 - flutter_sound_core: 427465f72d07ab8c3edbe8ffdde709ddacd3763c + flutter_blue_plus_darwin: 20a08bfeaa0f7804d524858d3d8744bcc1b6dbc3 + flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100 + just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed + opus_flutter_ios: 6c80747e297077787910a39146d698a15a37c82a path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d + record_ios: f75fa1d57f840012775c0e93a38a7f3ceea1a374 + SDWebImage: 16309af6d214ba3f77a7c6f6fdda888cb313a50a shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 + SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 + url_launcher_ios: 694010445543906933d732453a59da0a173ae33d + whisper_ggml: 383283d526f6c91024c16bf65b707cc08568a685 -PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e +PODFILE CHECKSUM: ae9e65fc23486119b8e977fd41d9213f251e537a COCOAPODS: 1.16.2 diff --git a/lib/main.dart b/lib/main.dart index 4580ead..21d09d9 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -12,7 +12,7 @@ void main() async { // Initialize Opus codec for audio decoding (required for Omi device recordings) try { - await opus_dart.initOpus(await opus_flutter.load()); + opus_dart.initOpus(await opus_flutter.load()); debugPrint('[Main] Opus codec initialized successfully'); } catch (e) { debugPrint('[Main] Failed to initialize Opus codec: $e'); diff --git a/lib/screens/device_pairing_screen.dart b/lib/screens/device_pairing_screen.dart index 0c230a3..a834b26 100644 --- a/lib/screens/device_pairing_screen.dart +++ b/lib/screens/device_pairing_screen.dart @@ -152,9 +152,12 @@ class _DevicePairingScreenState extends ConsumerState { } final discoveredDevices = ref.watch(discoveredOmiDevicesProvider); - final connectedDevice = ref.watch(connectedOmiDeviceProvider); + final connectedDeviceAsync = ref.watch(connectedOmiDeviceProvider); final connectionState = ref.watch(omiConnectionStateProvider); + // Extract the actual device from AsyncValue + final connectedDevice = connectedDeviceAsync.valueOrNull; + return Scaffold( appBar: AppBar( title: const Text('Omi Device'), diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index cf0c42e..f0a557a 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -8,6 +8,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + whisper_ggml ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 01f2655..385cbad 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -6,6 +6,7 @@ import FlutterMacOS import Foundation import audio_session +import ffmpeg_kit_flutter_new_min import file_picker import flutter_blue_plus_darwin import flutter_local_notifications @@ -17,6 +18,7 @@ import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin")) + FFmpegKitFlutterPlugin.register(with: registry.registrar(forPlugin: "FFmpegKitFlutterPlugin")) FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin")) FlutterBluePlusPlugin.register(with: registry.registrar(forPlugin: "FlutterBluePlusPlugin")) FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))