Merge branch 'main' into main

Author: DennisMoschina

.github/workflows/firebase-hosting-pull-request.yml

@@ -8,6 +8,22 @@ permissions:
   contents: read
   pull-requests: write
 jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get flutter version
+        run: echo "flutter_version=`cat .flutter_version`" >> $GITHUB_ENV
+        id: flutter_version
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          cache: true
+          flutter-version: ${{ env.flutter_version }}
+      - run: flutter analyze
+      - run: (cd example && flutter build web --dart-define=BUILD_COMMIT=$(git
+          rev-parse --short HEAD) --dart-define=BUILD_BRANCH=$(git rev-parse
+          --abbrev-ref HEAD))
   build_and_preview:
     if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
     runs-on: ubuntu-latest

example/lib/main.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:example/widgets/button_state_widget.dart';
 import 'package:example/widgets/fota/firmware_update.dart';
+import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 import 'package:open_earable_flutter/open_earable_flutter.dart';
 import 'package:example/global_theme.dart';
 import 'package:flutter/material.dart';
@@ -152,9 +153,30 @@ class MyAppState extends State<MyApp> {
                             trailing: _buildTrailingWidget(device.id,
                                 Theme.of(context).colorScheme.secondary),
                             onTap: () async {
-                              Wearable wearable = await _wearableManager
-                                  .connectToDevice(device);
-                              provider.setSelectedPeripheral(wearable);
+                              try {
+                                Wearable wearable = await _wearableManager
+                                    .connectToDevice(device);
+                                provider.setSelectedPeripheral(wearable);
+                              } catch (e) {
+                                String message = _wearableManager
+                                    .deviceErrorMessage(e, device.name);
+                                if (context.mounted) {
+                                  showPlatformDialog(
+                                    context: context,
+                                    builder: (context) => PlatformAlertDialog(
+                                      title: PlatformText('Connection Error'),
+                                      content: PlatformText(message),
+                                      actions: [
+                                        PlatformDialogAction(
+                                          onPressed: () =>
+                                              Navigator.of(context).pop(),
+                                          child: PlatformText('OK'),
+                                        ),
+                                      ],
+                                    ),
+                                  );
+                                }
+                              }
                             },
                           ),
                           if (index != discoveredDevices.length - 1)
@@ -246,7 +268,8 @@ class MyAppState extends State<MyApp> {
               if (_connectedDevice is ButtonManager)
                 GroupedBox(
                   title: "Button State",
-                  child: ButtonStateWidget(buttonManager: _connectedDevice as ButtonManager),
+                  child: ButtonStateWidget(
+                      buttonManager: _connectedDevice as ButtonManager),
                 ),
               if (_connectedDevice is FrequencyPlayer)
                 GroupedBox(

example/pubspec.lock

@@ -45,10 +45,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   clock:
     dependency: transitive
     description:
@@ -190,6 +190,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
+  flutter_platform_widgets:
+    dependency: "direct main"
+    description:
+      name: flutter_platform_widgets
+      sha256: "22a86564cb6cc0b93637c813ca91b0b1f61c2681a31e0f9d77590c1fa9f12020"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.0.0"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -308,18 +316,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.17"
+    version: "0.12.18"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.1"
+    version: "0.13.0"
   mcumgr_flutter:
     dependency: "direct main"
     description:
@@ -568,10 +576,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: "19a78f63e83d3a61f00826d09bc2f60e191bf3504183c001262be6ac75589fb8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.4"
+    version: "0.7.8"
   tuple:
     dependency: transitive
     description:

example/pubspec.yaml

@@ -42,6 +42,7 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
   flutter_colorpicker: ^1.1.0
+  flutter_platform_widgets: ^9.0.0
   meta: ^1.16.0
   bloc: ^9.1.0
   flutter_svg: ^2.0.17

lib/open_earable_flutter.dart

@@ -5,6 +5,7 @@ import 'dart:async';
 import 'package:logger/logger.dart';
 import 'package:meta/meta.dart';
 import 'package:open_earable_flutter/src/managers/exg/exg_factory.dart';
+import 'package:open_earable_flutter/src/exceptions/device_exception.dart';
 import 'package:open_earable_flutter/src/models/devices/cosinuss_one_factory.dart';
 import 'package:open_earable_flutter/src/models/devices/esense_factory.dart';
 import 'package:open_earable_flutter/src/models/devices/open_earable_factory.dart';
@@ -195,7 +196,7 @@ class WearableManager {
   }) async {
     if (_connectedIds.contains(device.id)) {
       logger.w('Device ${device.id} is already connected');
-      throw Exception('Device is already connected');
+      throw AlreadyConnectedException();
     }
     _connectingStreamController.add(device);
 
@@ -228,9 +229,9 @@ class WearableManager {
       }
       _connectedIds.remove(device.id);
       await _bleManager.disconnect(device.id);
-      throw Exception('Device is currently not supported');
+      throw UnsupportedDeviceException();
     } else {
-      throw Exception('Failed to connect to device');
+      throw ConnectionFailedException();
     }
   }
 
@@ -254,12 +255,25 @@ class WearableManager {
         );
         connectedWearables.add(wearable);
       } catch (e) {
-        logger.e('Failed to connect to system device ${device.id}: $e');
+        logger.e(
+          'Failed to connect to system device ${device.id}: ${deviceErrorMessage(e, device.name)}',
+        );
       }
     }
     return connectedWearables;
   }
 
+  String deviceErrorMessage(dynamic e, String deviceName) {
+    return switch (e) {
+      UnsupportedDeviceException _ => 'Device "$deviceName" is not supported.',
+      AlreadyConnectedException _ =>
+        'Device "$deviceName" is already connected.',
+      ConnectionFailedException _ =>
+        'Failed to connect to device "$deviceName". Please try again.',
+      _ => e.toString(),
+    };
+  }
+
   void addPairingRule(PairingRule rule) {
     _pairingManager.addRule(rule);
   }
@@ -294,7 +308,9 @@ class WearableManager {
           try {
             await connectToDevice(discoveredDevice);
           } catch (e) {
-            logger.e('Error auto connecting device ${discoveredDevice.id}: $e');
+            logger.e(
+              'Error auto connecting device ${discoveredDevice.id}: ${deviceErrorMessage(e, discoveredDevice.name)}',
+            );
           }
         }
       });

lib/src/exceptions/device_exception.dart

@@ -0,0 +1,15 @@
+sealed class DeviceException implements Exception {
+  const DeviceException();
+}
+
+class UnsupportedDeviceException extends DeviceException {
+  const UnsupportedDeviceException();
+}
+
+class AlreadyConnectedException extends DeviceException {
+  const AlreadyConnectedException();
+}
+
+class ConnectionFailedException extends DeviceException {
+  const ConnectionFailedException();
+}