- Code formatting

- Updated version for prerelease Signed-off-by: Ayon Das <[email protected]>
AS-Devs · Nov 6, 2022 · 9e6828f · 9e6828f
1 parent 0c04571
commit 9e6828f
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -76,4 +76,9 @@
 
 ## 0.2.0-dev.4
 
-* App bundle build issue fix.
+* App bundle build issue fix.
+
+## 0.2.0-dev.5
+
+* Removed unnecessary platform exceptions.
+* Updated dependencies.
diff --git a/android/src/main/kotlin/dev/asdevs/signalr_flutter/SignalRFlutterPlugin.kt b/android/src/main/kotlin/dev/asdevs/signalr_flutter/SignalRFlutterPlugin.kt
@@ -2,7 +2,6 @@ package dev.asdevs.signalr_flutter
 
 import android.os.Handler
 import android.os.Looper
-import androidx.annotation.NonNull
 
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import microsoft.aspnet.signalr.client.ConnectionState
@@ -23,12 +22,12 @@ class SignalrFlutterPlugin : FlutterPlugin, SignalrApi.SignalRHostApi {
     private lateinit var signalrApi: SignalrApi.SignalRPlatformApi
 
     override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
-        SignalrApi.SignalRHostApi.setup(flutterPluginBinding.binaryMessenger, this);
+        SignalrApi.SignalRHostApi.setup(flutterPluginBinding.binaryMessenger, this)
         signalrApi = SignalrApi.SignalRPlatformApi(flutterPluginBinding.binaryMessenger)
     }
 
     override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-        SignalrApi.SignalRHostApi.setup(binding.binaryMessenger, null);
+        SignalrApi.SignalRHostApi.setup(binding.binaryMessenger, null)
     }
 
     override fun connect(

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -53,7 +53,9 @@ class _MyAppState extends State<MyApp> {
                   style: Theme.of(context).textTheme.headline6),
               Padding(
                 padding: const EdgeInsets.only(top: 20.0),
-                child: ElevatedButton(onPressed: _buttonTapped, child: const Text("Invoke Method")),
+                child: ElevatedButton(
+                    onPressed: _buttonTapped,
+                    child: const Text("Invoke Method")),
               )
             ],
           ),
@@ -88,8 +90,8 @@ class _MyAppState extends State<MyApp> {
 
   void _buttonTapped() async {
     try {
-      final result =
-          await signalR.invokeMethod("<Your Method Name>", arguments: ["<Your Method Arguments>"]);
+      final result = await signalR.invokeMethod("<Your Method Name>",
+          arguments: ["<Your Method Arguments>"]);
       print(result);
     } catch (e) {
       print(e);

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -108,7 +108,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.2.0-dev.4"
+    version: "0.2.0-dev.5"
   sky_engine:
     dependency: transitive
     description: flutter

diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart
@@ -18,8 +18,8 @@ void main() {
     // Verify that platform version is retrieved.
     expect(
       find.byWidgetPredicate(
-        (Widget widget) => widget is Text &&
-                           widget.data!.startsWith('Running on:'),
+        (Widget widget) =>
+            widget is Text && widget.data!.startsWith('Running on:'),
       ),
       findsOneWidget,
     );

diff --git a/lib/signalr_api.dart b/lib/signalr_api.dart
@@ -59,9 +59,11 @@ class ConnectionOptions {
       hubName: pigeonMap['hubName'] as String?,
       queryString: pigeonMap['queryString'] as String?,
       hubMethods: (pigeonMap['hubMethods'] as List<Object?>?)?.cast<String?>(),
-      headers: (pigeonMap['headers'] as Map<Object?, Object?>?)?.cast<String?, String?>(),
-      transport:
-          pigeonMap['transport'] != null ? Transport.values[pigeonMap['transport']! as int] : null,
+      headers: (pigeonMap['headers'] as Map<Object?, Object?>?)
+          ?.cast<String?, String?>(),
+      transport: pigeonMap['transport'] != null
+          ? Transport.values[pigeonMap['transport']! as int]
+          : null,
     );
   }
 }
@@ -89,8 +91,9 @@ class StatusChangeResult {
     final Map<Object?, Object?> pigeonMap = message as Map<Object?, Object?>;
     return StatusChangeResult(
       connectionId: pigeonMap['connectionId'] as String?,
-      status:
-          pigeonMap['status'] != null ? ConnectionStatus.values[pigeonMap['status']! as int] : null,
+      status: pigeonMap['status'] != null
+          ? ConnectionStatus.values[pigeonMap['status']! as int]
+          : null,
       errorMessage: pigeonMap['errorMessage'] as String?,
     );
   }
@@ -124,7 +127,8 @@ class SignalRHostApi {
   /// Constructor for [SignalRHostApi].  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.
-  SignalRHostApi({BinaryMessenger? binaryMessenger}) : _binaryMessenger = binaryMessenger;
+  SignalRHostApi({BinaryMessenger? binaryMessenger})
+      : _binaryMessenger = binaryMessenger;
   final BinaryMessenger? _binaryMessenger;
 
   static const MessageCodec<Object?> codec = _SignalRHostApiCodec();
@@ -133,15 +137,16 @@ class SignalRHostApi {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
         'dev.flutter.pigeon.SignalRHostApi.connect', codec,
         binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object?>[arg_connectionOptions]) as Map<Object?, Object?>?;
+    final Map<Object?, Object?>? replyMap = await channel
+        .send(<Object?>[arg_connectionOptions]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error =
+          (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -161,14 +166,16 @@ class SignalRHostApi {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
         'dev.flutter.pigeon.SignalRHostApi.reconnect', codec,
         binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel.send(null) as Map<Object?, Object?>?;
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(null) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error =
+          (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -188,14 +195,16 @@ class SignalRHostApi {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
         'dev.flutter.pigeon.SignalRHostApi.stop', codec,
         binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel.send(null) as Map<Object?, Object?>?;
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(null) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error =
+          (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -210,14 +219,16 @@ class SignalRHostApi {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
         'dev.flutter.pigeon.SignalRHostApi.isConnected', codec,
         binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel.send(null) as Map<Object?, Object?>?;
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(null) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error =
+          (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -233,19 +244,22 @@ class SignalRHostApi {
     }
   }
 
-  Future<String> invokeMethod(String arg_methodName, List<String?> arg_arguments) async {
+  Future<String> invokeMethod(
+      String arg_methodName, List<String?> arg_arguments) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
         'dev.flutter.pigeon.SignalRHostApi.invokeMethod', codec,
         binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object?>[arg_methodName, arg_arguments]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_methodName, arg_arguments])
+            as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error =
+          (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -291,7 +305,8 @@ abstract class SignalRPlatformApi {
 
   Future<void> onStatusChange(StatusChangeResult statusChangeResult);
   Future<void> onNewMessage(String hubName, String message);
-  static void setup(SignalRPlatformApi? api, {BinaryMessenger? binaryMessenger}) {
+  static void setup(SignalRPlatformApi? api,
+      {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
           'dev.flutter.pigeon.SignalRPlatformApi.onStatusChange', codec,
@@ -303,7 +318,8 @@ abstract class SignalRPlatformApi {
           assert(message != null,
               'Argument for dev.flutter.pigeon.SignalRPlatformApi.onStatusChange was null.');
           final List<Object?> args = (message as List<Object?>?)!;
-          final StatusChangeResult? arg_statusChangeResult = (args[0] as StatusChangeResult?);
+          final StatusChangeResult? arg_statusChangeResult =
+              (args[0] as StatusChangeResult?);
           assert(arg_statusChangeResult != null,
               'Argument for dev.flutter.pigeon.SignalRPlatformApi.onStatusChange was null, expected non-null StatusChangeResult.');
           await api.onStatusChange(arg_statusChangeResult!);

diff --git a/lib/signalr_flutter.dart b/lib/signalr_flutter.dart
@@ -115,9 +115,11 @@ class SignalR extends SignalrPlatformInterface implements SignalRPlatformApi {
 
   /// Invoke any server method with optional [arguments].
   @override
-  Future<String> invokeMethod(String methodName, {List<String>? arguments}) async {
+  Future<String> invokeMethod(String methodName,
+      {List<String>? arguments}) async {
     try {
-      return await _signalrApi.invokeMethod(methodName, arguments ?? List.empty());
+      return await _signalrApi.invokeMethod(
+          methodName, arguments ?? List.empty());
     } catch (e) {
       return Future.error(e);
     }

diff --git a/pigeons/signalr_api.dart b/pigeons/signalr_api.dart
@@ -61,6 +61,7 @@ void configurePigeon(PigeonOptions opts) {
     dartOut: '../lib/signalr_api.dart',
     objcHeaderOut: 'ios/Classes/signalr_api.h',
     objcSourceOut: 'ios/Classes/signalr_api.m',
-    javaOut: 'android/src/main/java/dev/asdevs/signalr_flutter/Signalr_Api.java',
+    javaOut:
+        'android/src/main/java/dev/asdevs/signalr_flutter/Signalr_Api.java',
   );
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: signalr_flutter
 description: A flutter plugin for .net SignalR client. This client is for ASP.Net SignalR, not for .Net Core SignalR.
-version: 0.2.0-dev.4
+version: 0.2.0-dev.5
 homepage: https://pub.dev/packages/signalr_flutter
 
 environment: