From e001701b07545164e0c3a2aef88c582896ebd51c Mon Sep 17 00:00:00 2001 From: Fabian Freund Date: Wed, 11 Mar 2026 18:33:22 +0100 Subject: [PATCH] upgrade deps --- .github/workflows/build.yml | 4 +- app/pubspec.yaml | 8 +- .../flutter_mozilla_components/pubspec.yaml | 2 +- packages/flutter_tor/lib/src/tor_api.g.dart | 174 +++++++----------- packages/flutter_tor/pubspec.yaml | 2 +- .../lib/src/pigeons/locales.g.dart | 59 +++--- packages/locale_resolver/pubspec.yaml | 2 +- .../lib/src/pigeons/intent.g.dart | 73 +++----- packages/simple_intent_receiver/pubspec.yaml | 2 +- .../lib/src/pigeons/speech_to_text.g.dart | 58 ++---- packages/speech_to_text_dialog/pubspec.yaml | 2 +- 11 files changed, 141 insertions(+), 245 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8ba3782..5e8d1286 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,12 +88,12 @@ jobs: - name: Build APK working-directory: app - run: flutter build apk --release --target-platform android-arm,android-arm64 --split-per-abi --no-tree-shake-icons + run: flutter build apk --release --target-platform android-arm,android-arm64 --split-per-abi - name: Build App Bundle if: steps.build-type.outputs.is_prerelease == 'false' working-directory: app - run: flutter build appbundle --target-platform android-arm,android-arm64 --no-tree-shake-icons + run: flutter build appbundle --target-platform android-arm,android-arm64 - name: Create github artifact release (Prerelease) if: steps.build-type.outputs.is_prerelease == 'true' diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 21ad9a19..e288d5bf 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -31,19 +31,19 @@ dependencies: flutter_auto_size_text: ^5.0.0 flutter_hooks: ^0.21.3+1 flutter_markdown: ^0.7.7+1 - flutter_material_design_icons: ^1.1.7447 + flutter_material_design_icons: ^2.0.0+7447 flutter_mozilla_components: path: ../packages/flutter_mozilla_components flutter_reorderable_grid_view: ^5.5.3 flutter_slidable: ^4.0.3 - flutter_svg: ^2.2.3 + flutter_svg: ^2.2.4 flutter_tor: path: ../packages/flutter_tor go_router: ^17.1.0 google_fonts: ^8.0.2 graphview: ^1.5.1 home_widget: ^0.9.0 - hooks_riverpod: ^3.2.1 + hooks_riverpod: ^3.3.1 html: ^0.15.6 http: ^1.6.0 intl: ^0.20.2 @@ -84,7 +84,7 @@ dependencies: speech_to_text_dialog: path: ../packages/speech_to_text_dialog sqlite3: ^2.9.4 - sqlite3_flutter_libs: 0.5.41 + sqlite3_flutter_libs: "0.5.41" synchronized: ^3.4.0 text_scroll: ^0.2.1 timeago: ^3.7.1 diff --git a/packages/flutter_mozilla_components/pubspec.yaml b/packages/flutter_mozilla_components/pubspec.yaml index 9ff0918f..4c5a85a3 100644 --- a/packages/flutter_mozilla_components/pubspec.yaml +++ b/packages/flutter_mozilla_components/pubspec.yaml @@ -18,7 +18,7 @@ dev_dependencies: flutter_test: sdk: flutter lint: ^2.8.0 - pigeon: ^26.1.10 + pigeon: ^26.2.3 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/flutter_tor/lib/src/tor_api.g.dart b/packages/flutter_tor/lib/src/tor_api.g.dart index 36594c9c..a4a00beb 100644 --- a/packages/flutter_tor/lib/src/tor_api.g.dart +++ b/packages/flutter_tor/lib/src/tor_api.g.dart @@ -15,11 +15,7 @@ PlatformException _createConnectionError(String channelName) { ); } -List wrapResponse({ - Object? result, - PlatformException? error, - bool empty = false, -}) { +List wrapResponse({Object? result, PlatformException? error, bool empty = false}) { if (empty) { return []; } @@ -28,48 +24,37 @@ List wrapResponse({ } return [error.code, error.message, error.details]; } - bool _deepEquals(Object? a, Object? b) { if (a is List && b is List) { return a.length == b.length && - a.indexed.every( - ((int, dynamic) item) => _deepEquals(item.$2, b[item.$1]), - ); + a.indexed + .every(((int, dynamic) item) => _deepEquals(item.$2, b[item.$1])); } if (a is Map && b is Map) { - return a.length == b.length && - a.entries.every( - (MapEntry entry) => - (b as Map).containsKey(entry.key) && - _deepEquals(entry.value, b[entry.key]), - ); + return a.length == b.length && a.entries.every((MapEntry entry) => + (b as Map).containsKey(entry.key) && + _deepEquals(entry.value, b[entry.key])); } return a == b; } + /// Transport types for Tor connections enum TransportType { /// Direct Tor connection (no bridges) none, - /// obfs4 pluggable transport obfs4, - /// Snowflake pluggable transport (default broker) snowflake, - /// Snowflake via AMP cache snowflakeAmp, - /// Meek pluggable transport meek, - /// Meek via Azure CDN meekAzure, - /// WebTunnel pluggable transport webtunnel, - /// Custom bridge lines (passthrough) custom, } @@ -110,8 +95,7 @@ class TorConfiguration { } Object encode() { - return _toList(); - } + return _toList(); } static TorConfiguration decode(Object result) { result as List; @@ -138,7 +122,8 @@ class TorConfiguration { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()); + int get hashCode => Object.hashAll(_toList()) +; } /// Current Tor status @@ -177,8 +162,7 @@ class TorStatus { } Object encode() { - return _toList(); - } + return _toList(); } static TorStatus decode(Object result) { result as List; @@ -205,7 +189,8 @@ class TorStatus { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()); + int get hashCode => Object.hashAll(_toList()) +; } /// Log message from Tor @@ -226,12 +211,15 @@ class TorLogMessage { int timestamp; List _toList() { - return [severity, message, timestamp]; + return [ + severity, + message, + timestamp, + ]; } Object encode() { - return _toList(); - } + return _toList(); } static TorLogMessage decode(Object result) { result as List; @@ -256,9 +244,11 @@ class TorLogMessage { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()); + int get hashCode => Object.hashAll(_toList()) +; } + class _PigeonCodec extends StandardMessageCodec { const _PigeonCodec(); @override @@ -266,16 +256,16 @@ class _PigeonCodec extends StandardMessageCodec { if (value is int) { buffer.putUint8(4); buffer.putInt64(value); - } else if (value is TransportType) { + } else if (value is TransportType) { buffer.putUint8(129); writeValue(buffer, value.index); - } else if (value is TorConfiguration) { + } else if (value is TorConfiguration) { buffer.putUint8(130); writeValue(buffer, value.encode()); - } else if (value is TorStatus) { + } else if (value is TorStatus) { buffer.putUint8(131); writeValue(buffer, value.encode()); - } else if (value is TorLogMessage) { + } else if (value is TorLogMessage) { buffer.putUint8(132); writeValue(buffer, value.encode()); } else { @@ -286,14 +276,14 @@ class _PigeonCodec extends StandardMessageCodec { @override Object? readValueOfType(int type, ReadBuffer buffer) { switch (type) { - case 129: + case 129: final value = readValue(buffer) as int?; return value == null ? null : TransportType.values[value]; - case 130: + case 130: return TorConfiguration.decode(readValue(buffer)!); - case 131: + case 131: return TorStatus.decode(readValue(buffer)!); - case 132: + case 132: return TorLogMessage.decode(readValue(buffer)!); default: return super.readValueOfType(type, buffer); @@ -307,10 +297,8 @@ class TorApi { /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. TorApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty - ? '.$messageChannelSuffix' - : ''; + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -320,16 +308,13 @@ class TorApi { /// Start Tor with the given configuration /// Returns a Future to avoid blocking the main thread Future startTor(TorConfiguration config) async { - final pigeonVar_channelName = - 'dev.flutter.pigeon.flutter_tor.TorApi.startTor$pigeonVar_messageChannelSuffix'; + final pigeonVar_channelName = 'dev.flutter.pigeon.flutter_tor.TorApi.startTor$pigeonVar_messageChannelSuffix'; final pigeonVar_channel = BasicMessageChannel( pigeonVar_channelName, pigeonChannelCodec, binaryMessenger: pigeonVar_binaryMessenger, ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send( - [config], - ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send([config]); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); @@ -351,8 +336,7 @@ class TorApi { /// Stop Tor Future stopTor() async { - final pigeonVar_channelName = - 'dev.flutter.pigeon.flutter_tor.TorApi.stopTor$pigeonVar_messageChannelSuffix'; + final pigeonVar_channelName = 'dev.flutter.pigeon.flutter_tor.TorApi.stopTor$pigeonVar_messageChannelSuffix'; final pigeonVar_channel = BasicMessageChannel( pigeonVar_channelName, pigeonChannelCodec, @@ -375,8 +359,7 @@ class TorApi { /// Get current status Future getStatus() async { - final pigeonVar_channelName = - 'dev.flutter.pigeon.flutter_tor.TorApi.getStatus$pigeonVar_messageChannelSuffix'; + final pigeonVar_channelName = 'dev.flutter.pigeon.flutter_tor.TorApi.getStatus$pigeonVar_messageChannelSuffix'; final pigeonVar_channel = BasicMessageChannel( pigeonVar_channelName, pigeonChannelCodec, @@ -404,8 +387,7 @@ class TorApi { /// Request a new Tor identity (new circuit) Future requestNewIdentity() async { - final pigeonVar_channelName = - 'dev.flutter.pigeon.flutter_tor.TorApi.requestNewIdentity$pigeonVar_messageChannelSuffix'; + final pigeonVar_channelName = 'dev.flutter.pigeon.flutter_tor.TorApi.requestNewIdentity$pigeonVar_messageChannelSuffix'; final pigeonVar_channel = BasicMessageChannel( pigeonVar_channelName, pigeonChannelCodec, @@ -437,76 +419,54 @@ abstract class TorLogApi { /// Called when status changes void onStatusChanged(TorStatus status); - static void setUp( - TorLogApi? api, { - BinaryMessenger? binaryMessenger, - String messageChannelSuffix = '', - }) { - messageChannelSuffix = messageChannelSuffix.isNotEmpty - ? '.$messageChannelSuffix' - : ''; + static void setUp(TorLogApi? api, {BinaryMessenger? binaryMessenger, String messageChannelSuffix = '',}) { + messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_tor.TorLogApi.onLogMessage$messageChannelSuffix', - pigeonChannelCodec, - binaryMessenger: binaryMessenger, - ); + 'dev.flutter.pigeon.flutter_tor.TorLogApi.onLogMessage$messageChannelSuffix', pigeonChannelCodec, + binaryMessenger: binaryMessenger); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.flutter_tor.TorLogApi.onLogMessage was null.', - ); + assert(message != null, + 'Argument for dev.flutter.pigeon.flutter_tor.TorLogApi.onLogMessage was null.'); final List args = (message as List?)!; final TorLogMessage? arg_log = (args[0] as TorLogMessage?); - assert( - arg_log != null, - 'Argument for dev.flutter.pigeon.flutter_tor.TorLogApi.onLogMessage was null, expected non-null TorLogMessage.', - ); + assert(arg_log != null, + 'Argument for dev.flutter.pigeon.flutter_tor.TorLogApi.onLogMessage was null, expected non-null TorLogMessage.'); try { api.onLogMessage(arg_log!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse( - error: PlatformException(code: 'error', message: e.toString()), - ); + } catch (e) { + return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); } }); } } { final pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_tor.TorLogApi.onStatusChanged$messageChannelSuffix', - pigeonChannelCodec, - binaryMessenger: binaryMessenger, - ); + 'dev.flutter.pigeon.flutter_tor.TorLogApi.onStatusChanged$messageChannelSuffix', pigeonChannelCodec, + binaryMessenger: binaryMessenger); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.flutter_tor.TorLogApi.onStatusChanged was null.', - ); + assert(message != null, + 'Argument for dev.flutter.pigeon.flutter_tor.TorLogApi.onStatusChanged was null.'); final List args = (message as List?)!; final TorStatus? arg_status = (args[0] as TorStatus?); - assert( - arg_status != null, - 'Argument for dev.flutter.pigeon.flutter_tor.TorLogApi.onStatusChanged was null, expected non-null TorStatus.', - ); + assert(arg_status != null, + 'Argument for dev.flutter.pigeon.flutter_tor.TorLogApi.onStatusChanged was null, expected non-null TorStatus.'); try { api.onStatusChanged(arg_status!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse( - error: PlatformException(code: 'error', message: e.toString()), - ); + } catch (e) { + return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); } }); } @@ -518,13 +478,9 @@ class IPtProxyController { /// Constructor for [IPtProxyController]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - IPtProxyController({ - BinaryMessenger? binaryMessenger, - String messageChannelSuffix = '', - }) : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty - ? '.$messageChannelSuffix' - : ''; + IPtProxyController({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -532,16 +488,13 @@ class IPtProxyController { final String pigeonVar_messageChannelSuffix; Future start(TransportType proxyType, String proxy) async { - final pigeonVar_channelName = - 'dev.flutter.pigeon.flutter_tor.IPtProxyController.start$pigeonVar_messageChannelSuffix'; + final pigeonVar_channelName = 'dev.flutter.pigeon.flutter_tor.IPtProxyController.start$pigeonVar_messageChannelSuffix'; final pigeonVar_channel = BasicMessageChannel( pigeonVar_channelName, pigeonChannelCodec, binaryMessenger: pigeonVar_binaryMessenger, ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send( - [proxyType, proxy], - ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send([proxyType, proxy]); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); @@ -562,16 +515,13 @@ class IPtProxyController { } Future stop(TransportType proxyType) async { - final pigeonVar_channelName = - 'dev.flutter.pigeon.flutter_tor.IPtProxyController.stop$pigeonVar_messageChannelSuffix'; + final pigeonVar_channelName = 'dev.flutter.pigeon.flutter_tor.IPtProxyController.stop$pigeonVar_messageChannelSuffix'; final pigeonVar_channel = BasicMessageChannel( pigeonVar_channelName, pigeonChannelCodec, binaryMessenger: pigeonVar_binaryMessenger, ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send( - [proxyType], - ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send([proxyType]); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); diff --git a/packages/flutter_tor/pubspec.yaml b/packages/flutter_tor/pubspec.yaml index 83702308..64c4eb74 100644 --- a/packages/flutter_tor/pubspec.yaml +++ b/packages/flutter_tor/pubspec.yaml @@ -16,7 +16,7 @@ dev_dependencies: flutter_test: sdk: flutter lint: ^2.8.0 - pigeon: ^26.1.10 + pigeon: ^26.2.3 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/locale_resolver/lib/src/pigeons/locales.g.dart b/packages/locale_resolver/lib/src/pigeons/locales.g.dart index 8a48b580..ab677b69 100644 --- a/packages/locale_resolver/lib/src/pigeons/locales.g.dart +++ b/packages/locale_resolver/lib/src/pigeons/locales.g.dart @@ -14,39 +14,40 @@ PlatformException _createConnectionError(String channelName) { message: 'Unable to establish connection on channel: "$channelName".', ); } - bool _deepEquals(Object? a, Object? b) { if (a is List && b is List) { return a.length == b.length && - a.indexed.every( - ((int, dynamic) item) => _deepEquals(item.$2, b[item.$1]), - ); + a.indexed + .every(((int, dynamic) item) => _deepEquals(item.$2, b[item.$1])); } if (a is Map && b is Map) { - return a.length == b.length && - a.entries.every( - (MapEntry entry) => - (b as Map).containsKey(entry.key) && - _deepEquals(entry.value, b[entry.key]), - ); + return a.length == b.length && a.entries.every((MapEntry entry) => + (b as Map).containsKey(entry.key) && + _deepEquals(entry.value, b[entry.key])); } return a == b; } + class LocalizedResult { - LocalizedResult({required this.languageName, this.countryName}); + LocalizedResult({ + required this.languageName, + this.countryName, + }); String languageName; String? countryName; List _toList() { - return [languageName, countryName]; + return [ + languageName, + countryName, + ]; } Object encode() { - return _toList(); - } + return _toList(); } static LocalizedResult decode(Object result) { result as List; @@ -70,9 +71,11 @@ class LocalizedResult { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()); + int get hashCode => Object.hashAll(_toList()) +; } + class _PigeonCodec extends StandardMessageCodec { const _PigeonCodec(); @override @@ -80,7 +83,7 @@ class _PigeonCodec extends StandardMessageCodec { if (value is int) { buffer.putUint8(4); buffer.putInt64(value); - } else if (value is LocalizedResult) { + } else if (value is LocalizedResult) { buffer.putUint8(129); writeValue(buffer, value.encode()); } else { @@ -91,7 +94,7 @@ class _PigeonCodec extends StandardMessageCodec { @override Object? readValueOfType(int type, ReadBuffer buffer) { switch (type) { - case 129: + case 129: return LocalizedResult.decode(readValue(buffer)!); default: return super.readValueOfType(type, buffer); @@ -103,33 +106,23 @@ class LocaleResolver { /// Constructor for [LocaleResolver]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - LocaleResolver({ - BinaryMessenger? binaryMessenger, - String messageChannelSuffix = '', - }) : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty - ? '.$messageChannelSuffix' - : ''; + LocaleResolver({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); final String pigeonVar_messageChannelSuffix; - Future resolve( - String languageTag, - String targetLangouageTag, - ) async { - final pigeonVar_channelName = - 'dev.flutter.pigeon.locale_resolver.LocaleResolver.resolve$pigeonVar_messageChannelSuffix'; + Future resolve(String languageTag, String targetLangouageTag) async { + final pigeonVar_channelName = 'dev.flutter.pigeon.locale_resolver.LocaleResolver.resolve$pigeonVar_messageChannelSuffix'; final pigeonVar_channel = BasicMessageChannel( pigeonVar_channelName, pigeonChannelCodec, binaryMessenger: pigeonVar_binaryMessenger, ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send( - [languageTag, targetLangouageTag], - ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send([languageTag, targetLangouageTag]); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); diff --git a/packages/locale_resolver/pubspec.yaml b/packages/locale_resolver/pubspec.yaml index dff763fd..f9ba7cb8 100644 --- a/packages/locale_resolver/pubspec.yaml +++ b/packages/locale_resolver/pubspec.yaml @@ -16,7 +16,7 @@ dev_dependencies: flutter_test: sdk: flutter lint: ^2.8.0 - pigeon: ^26.1.10 + pigeon: ^26.2.3 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/simple_intent_receiver/lib/src/pigeons/intent.g.dart b/packages/simple_intent_receiver/lib/src/pigeons/intent.g.dart index 43836e71..070b0674 100644 --- a/packages/simple_intent_receiver/lib/src/pigeons/intent.g.dart +++ b/packages/simple_intent_receiver/lib/src/pigeons/intent.g.dart @@ -8,11 +8,7 @@ import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; -List wrapResponse({ - Object? result, - PlatformException? error, - bool empty = false, -}) { +List wrapResponse({Object? result, PlatformException? error, bool empty = false}) { if (empty) { return []; } @@ -21,25 +17,21 @@ List wrapResponse({ } return [error.code, error.message, error.details]; } - bool _deepEquals(Object? a, Object? b) { if (a is List && b is List) { return a.length == b.length && - a.indexed.every( - ((int, dynamic) item) => _deepEquals(item.$2, b[item.$1]), - ); + a.indexed + .every(((int, dynamic) item) => _deepEquals(item.$2, b[item.$1])); } if (a is Map && b is Map) { - return a.length == b.length && - a.entries.every( - (MapEntry entry) => - (b as Map).containsKey(entry.key) && - _deepEquals(entry.value, b[entry.key]), - ); + return a.length == b.length && a.entries.every((MapEntry entry) => + (b as Map).containsKey(entry.key) && + _deepEquals(entry.value, b[entry.key])); } return a == b; } + class Intent { Intent({ this.fromPackageName, @@ -74,8 +66,7 @@ class Intent { } Object encode() { - return _toList(); - } + return _toList(); } static Intent decode(Object result) { result as List; @@ -103,9 +94,11 @@ class Intent { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()); + int get hashCode => Object.hashAll(_toList()) +; } + class _PigeonCodec extends StandardMessageCodec { const _PigeonCodec(); @override @@ -113,7 +106,7 @@ class _PigeonCodec extends StandardMessageCodec { if (value is int) { buffer.putUint8(4); buffer.putInt64(value); - } else if (value is Intent) { + } else if (value is Intent) { buffer.putUint8(129); writeValue(buffer, value.encode()); } else { @@ -124,7 +117,7 @@ class _PigeonCodec extends StandardMessageCodec { @override Object? readValueOfType(int type, ReadBuffer buffer) { switch (type) { - case 129: + case 129: return Intent.decode(readValue(buffer)!); default: return super.readValueOfType(type, buffer); @@ -137,48 +130,32 @@ abstract class IntentEvents { void onIntentReceived(int sequence, Intent intent); - static void setUp( - IntentEvents? api, { - BinaryMessenger? binaryMessenger, - String messageChannelSuffix = '', - }) { - messageChannelSuffix = messageChannelSuffix.isNotEmpty - ? '.$messageChannelSuffix' - : ''; + static void setUp(IntentEvents? api, {BinaryMessenger? binaryMessenger, String messageChannelSuffix = '',}) { + messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived$messageChannelSuffix', - pigeonChannelCodec, - binaryMessenger: binaryMessenger, - ); + 'dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived$messageChannelSuffix', pigeonChannelCodec, + binaryMessenger: binaryMessenger); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived was null.', - ); + assert(message != null, + 'Argument for dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived was null.'); final List args = (message as List?)!; final int? arg_sequence = (args[0] as int?); - assert( - arg_sequence != null, - 'Argument for dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived was null, expected non-null int.', - ); + assert(arg_sequence != null, + 'Argument for dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived was null, expected non-null int.'); final Intent? arg_intent = (args[1] as Intent?); - assert( - arg_intent != null, - 'Argument for dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived was null, expected non-null Intent.', - ); + assert(arg_intent != null, + 'Argument for dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived was null, expected non-null Intent.'); try { api.onIntentReceived(arg_sequence!, arg_intent!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse( - error: PlatformException(code: 'error', message: e.toString()), - ); + } catch (e) { + return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); } }); } diff --git a/packages/simple_intent_receiver/pubspec.yaml b/packages/simple_intent_receiver/pubspec.yaml index 4345316f..efdd67db 100644 --- a/packages/simple_intent_receiver/pubspec.yaml +++ b/packages/simple_intent_receiver/pubspec.yaml @@ -16,7 +16,7 @@ dev_dependencies: flutter_test: sdk: flutter lint: ^2.8.0 - pigeon: ^26.1.10 + pigeon: ^26.2.3 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/speech_to_text_dialog/lib/src/pigeons/speech_to_text.g.dart b/packages/speech_to_text_dialog/lib/src/pigeons/speech_to_text.g.dart index 612b76ce..1665f8e2 100644 --- a/packages/speech_to_text_dialog/lib/src/pigeons/speech_to_text.g.dart +++ b/packages/speech_to_text_dialog/lib/src/pigeons/speech_to_text.g.dart @@ -15,11 +15,7 @@ PlatformException _createConnectionError(String channelName) { ); } -List wrapResponse({ - Object? result, - PlatformException? error, - bool empty = false, -}) { +List wrapResponse({Object? result, PlatformException? error, bool empty = false}) { if (empty) { return []; } @@ -29,6 +25,7 @@ List wrapResponse({ return [error.code, error.message, error.details]; } + class _PigeonCodec extends StandardMessageCodec { const _PigeonCodec(); @override @@ -55,13 +52,9 @@ class SpeechToTextApi { /// Constructor for [SpeechToTextApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - SpeechToTextApi({ - BinaryMessenger? binaryMessenger, - String messageChannelSuffix = '', - }) : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty - ? '.$messageChannelSuffix' - : ''; + SpeechToTextApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -76,16 +69,13 @@ class SpeechToTextApi { /// The [locale] parameter specifies the language locale for recognition /// (e.g., 'en-US', 'de-DE'). If null, uses the device default. Future showDialog({String? locale}) async { - final pigeonVar_channelName = - 'dev.flutter.pigeon.speech_to_text_dialog.SpeechToTextApi.showDialog$pigeonVar_messageChannelSuffix'; + final pigeonVar_channelName = 'dev.flutter.pigeon.speech_to_text_dialog.SpeechToTextApi.showDialog$pigeonVar_messageChannelSuffix'; final pigeonVar_channel = BasicMessageChannel( pigeonVar_channelName, pigeonChannelCodec, binaryMessenger: pigeonVar_binaryMessenger, ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send( - [locale], - ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send([locale]); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); @@ -116,43 +106,29 @@ abstract class SpeechToTextEvents { /// recognition failed or was cancelled. void onTextReceived(String text); - static void setUp( - SpeechToTextEvents? api, { - BinaryMessenger? binaryMessenger, - String messageChannelSuffix = '', - }) { - messageChannelSuffix = messageChannelSuffix.isNotEmpty - ? '.$messageChannelSuffix' - : ''; + static void setUp(SpeechToTextEvents? api, {BinaryMessenger? binaryMessenger, String messageChannelSuffix = '',}) { + messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.speech_to_text_dialog.SpeechToTextEvents.onTextReceived$messageChannelSuffix', - pigeonChannelCodec, - binaryMessenger: binaryMessenger, - ); + 'dev.flutter.pigeon.speech_to_text_dialog.SpeechToTextEvents.onTextReceived$messageChannelSuffix', pigeonChannelCodec, + binaryMessenger: binaryMessenger); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.speech_to_text_dialog.SpeechToTextEvents.onTextReceived was null.', - ); + assert(message != null, + 'Argument for dev.flutter.pigeon.speech_to_text_dialog.SpeechToTextEvents.onTextReceived was null.'); final List args = (message as List?)!; final String? arg_text = (args[0] as String?); - assert( - arg_text != null, - 'Argument for dev.flutter.pigeon.speech_to_text_dialog.SpeechToTextEvents.onTextReceived was null, expected non-null String.', - ); + assert(arg_text != null, + 'Argument for dev.flutter.pigeon.speech_to_text_dialog.SpeechToTextEvents.onTextReceived was null, expected non-null String.'); try { api.onTextReceived(arg_text!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse( - error: PlatformException(code: 'error', message: e.toString()), - ); + } catch (e) { + return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); } }); } diff --git a/packages/speech_to_text_dialog/pubspec.yaml b/packages/speech_to_text_dialog/pubspec.yaml index 167cb753..e7b2ee9e 100644 --- a/packages/speech_to_text_dialog/pubspec.yaml +++ b/packages/speech_to_text_dialog/pubspec.yaml @@ -16,7 +16,7 @@ dev_dependencies: flutter_test: sdk: flutter lint: ^2.8.0 - pigeon: ^26.1.10 + pigeon: ^26.2.3 flutter: plugin: