flutter update (#1203)

Picovoice · Jan 15, 2024 · 0fcc1c3 · 0fcc1c3
1 parent edd54c1
commit 0fcc1c3
Show file tree

Hide file tree

Showing 8 changed files with 128 additions and 139 deletions.
diff --git a/binding/flutter/CHANGELOG.md b/binding/flutter/CHANGELOG.md
@@ -55,4 +55,7 @@
 * Improved error reporting
 
 ## [3.0.1] - 2023-11-17
-* Update native packages
+* Update native packages
+
+## [3.0.2] - 2024-01-15
+* Address locale issue
diff --git a/binding/flutter/android/src/main/java/ai/picovoice/flutter/porcupine/PorcupinePlugin.java b/binding/flutter/android/src/main/java/ai/picovoice/flutter/porcupine/PorcupinePlugin.java
@@ -1,5 +1,5 @@
 //
-// Copyright 2020-2023 Picovoice Inc.
+// Copyright 2020-2024 Picovoice Inc.
 //
 // You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE"
 // file accompanying this source.
@@ -53,7 +53,7 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin
     public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
         Method method;
         try {
-            method = Method.valueOf(call.method.toUpperCase());
+            method = Method.valueOf(call.method);
         } catch (IllegalArgumentException e) {
             result.error(
                     PorcupineRuntimeException.class.getSimpleName(),

diff --git a/binding/flutter/ios/Classes/SwiftPorcupinePlugin.swift b/binding/flutter/ios/Classes/SwiftPorcupinePlugin.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2020-2023 Picovoice Inc.
+// Copyright 2020-2024 Picovoice Inc.
 //
 // You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE"
 // file accompanying this source.
@@ -33,7 +33,7 @@ public class SwiftPorcupinePlugin: NSObject, FlutterPlugin {
     }
 
     public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
-        guard let method = Method(rawValue: call.method.uppercased()) else {
+        guard let method = Method(rawValue: call.method) else {
             result(errorToFlutterError(
                 PorcupineRuntimeError("Porcupine method '\(call.method)' is not a valid function")))
             return

diff --git a/binding/flutter/lib/porcupine.dart b/binding/flutter/lib/porcupine.dart
@@ -1,5 +1,5 @@
 //
-// Copyright 2020-2023 Picovoice Inc.
+// Copyright 2020-2024 Picovoice Inc.
 //
 // You may not use this file except in compliance with the license. A copy of the license is located in the "LICENSE"
 // file accompanying this source.
@@ -48,6 +48,17 @@ enum BuiltInKeyword {
   TERMINATOR
 }
 
+enum _NativeFunctions {
+  // ignore:constant_identifier_names
+  FROM_BUILTIN_KEYWORDS,
+  // ignore:constant_identifier_names
+  FROM_KEYWORD_PATHS,
+  // ignore:constant_identifier_names
+  PROCESS,
+  // ignore:constant_identifier_names
+  DELETE
+}
+
 class Porcupine {
   static final MethodChannel _channel = MethodChannel("porcupine");
 
@@ -101,7 +112,7 @@ class Porcupine {
 
     try {
       Map<String, dynamic> result = Map<String, dynamic>.from(
-          await _channel.invokeMethod('from_builtin_keywords', {
+          await _channel.invokeMethod(_NativeFunctions.FROM_BUILTIN_KEYWORDS.name, {
         'accessKey': accessKey,
         'modelPath': modelPath,
         'keywords': keywordValues,
@@ -146,7 +157,7 @@ class Porcupine {
 
     try {
       Map<String, dynamic> result = Map<String, dynamic>.from(
-          await _channel.invokeMethod('from_keyword_paths', {
+          await _channel.invokeMethod(_NativeFunctions.FROM_KEYWORD_PATHS.name, {
         'accessKey': accessKey,
         'modelPath': modelPath,
         'keywordPaths': keywordPaths,
@@ -175,7 +186,7 @@ class Porcupine {
   Future<int> process(List<int>? frame) async {
     try {
       int keywordIndex = await _channel
-          .invokeMethod('process', {'handle': _handle, 'frame': frame});
+          .invokeMethod(_NativeFunctions.PROCESS.name, {'handle': _handle, 'frame': frame});
 
       return keywordIndex;
     } on PlatformException catch (error) {
@@ -188,7 +199,7 @@ class Porcupine {
   /// Frees memory that was allocated for Porcupine
   Future<void> delete() async {
     if (_handle != null) {
-      await _channel.invokeMethod('delete', {'handle': _handle});
+      await _channel.invokeMethod(_NativeFunctions.DELETE.name, {'handle': _handle});
       _handle = null;
     }
   }

diff --git a/binding/flutter/pubspec.lock b/binding/flutter/pubspec.lock
@@ -42,14 +42,14 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.16.0"
+    version: "1.15.0"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.2.0"
   ffi:
     dependency: transitive
     description:
@@ -95,13 +95,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.4"
   meta:
     dependency: transitive
     description:
@@ -115,7 +108,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.0"
   path_provider:
     dependency: "direct main"
     description:
@@ -197,7 +190,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
@@ -232,14 +225,21 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.3"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   win32:
     dependency: transitive
     description:
@@ -255,5 +255,5 @@ packages:
     source: hosted
     version: "0.2.0"
 sdks:
-  dart: ">=2.17.0-0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"
   flutter: ">=2.8.1"
diff --git a/binding/flutter/pubspec.yaml b/binding/flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: porcupine_flutter
 description: A Flutter plugin for Picovoice's Porcupine offline wake word engine.
-version: 3.0.1
+version: 3.0.2
 homepage: https://picovoice.ai/
 repository: https://github.com/Picovoice/porcupine/
 documentation: https://picovoice.ai/docs/porcupine/