add new device toastification ui

Author: oldrev

client/lib/devices/borneo/lyfi/views/acclimation_screen.dart

@@ -160,6 +160,7 @@ class AcclimationScreen extends StatelessWidget {
         title: Text('Update acclimation settings succeed.'),
         autoCloseDuration: const Duration(seconds: 5),
         closeOnClick: true,
+        style: ToastificationStyle.fillColored,
         type: ToastificationType.success,
       );
     });

client/lib/view_models/devices/device_discovery_view_model.dart

@@ -212,7 +212,6 @@ class DeviceDiscoveryViewModel extends AbstractScreenViewModel with ViewModelEve
   }
 
   Future<void> _onNewDeviceEntityAdded(NewDeviceEntityAddedEvent event) async {
-    // TODO show a toast or snackbar
     try {
       _discoveredDevices.value.removeWhere((x) => x.fingerprint == event.device.fingerprint);
       _discoveredDevices.value = List.from(_discoveredDevices.value);

client/lib/views/devices/device_discovery_screen.dart

@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gettext/flutter_gettext/context_ext.dart';
 import 'package:logger/logger.dart';
 import 'package:provider/provider.dart';
+import 'package:toastification/toastification.dart';
 
 import '../../services/device_manager.dart';
 import '../../view_models/devices/device_discovery_view_model.dart';
@@ -246,31 +247,27 @@ class NewDeviceAddedSnackBarListener extends StatelessWidget {
     return Selector<DeviceDiscoveryViewModel, DeviceEntity?>(
       selector: (_, viewModel) => viewModel.lastestAddedDevice,
       builder: (context, lastestAdded, child) {
-        final vm = context.read<DeviceDiscoveryViewModel>();
         if (lastestAdded != null) {
           WidgetsBinding.instance.addPostFrameCallback((_) {
-            ScaffoldMessenger.of(context)
-                .showSnackBar(
-                  SnackBar(
-                    duration: Duration(seconds: 3),
-                    content: Text(
-                      context.translate(
-                        'New device "{deviceName}" has been added.',
-                        nArgs: {'deviceName': lastestAdded.name},
-                      ),
-                      style: Theme.of(
-                        context,
-                      ).textTheme.bodyMedium?.copyWith(color: Theme.of(context).colorScheme.onTertiaryContainer),
-                    ),
-                    backgroundColor: Theme.of(context).colorScheme.tertiaryContainer,
-                  ),
-                )
-                .closed
-                .then((_) {
-                  if (!vm.isDisposed) {
-                    vm.clearAddedDevice();
-                  }
-                });
+            toastification.dismissAll();
+            toastification.show(
+              context: context,
+              type: ToastificationType.success,
+              style: ToastificationStyle.fillColored,
+              title: Text(context.translate('A new device has been added.')),
+              description: Text(lastestAdded.name),
+              autoCloseDuration: const Duration(seconds: 3),
+              icon: const Icon(Icons.device_hub),
+            );
+
+            // 在 toast 关闭后清除状态
+            /*
+            Future.delayed(const Duration(seconds: 3), () {
+              if (!vm.isDisposed) {
+                vm.clearAddedDevice();
+              }
+            });
+            */
           });
         }
         return child!;
@@ -329,71 +326,74 @@ class DeviceDiscoveryScreen extends StatelessWidget {
           Navigator.of(context).pop(vm.newDeviceCount > 0);
         }
       },
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.stretch,
-        mainAxisSize: MainAxisSize.max,
-        children: [
-          Container(
-            color: Theme.of(context).colorScheme.surface,
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                // Input Fields
-                SmartConfigFormPanel(),
-                SizedBox(height: 8),
-                // Start/Stop Button
-                Container(
-                  padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-                  width: double.infinity,
-                  child: StartStopButton(),
-                ),
-                SizedBox(height: 16),
-              ],
-            ),
-          ),
-          ValueListenableBuilder<List<SupportedDeviceDescriptor>>(
-            valueListenable: vm.discoveredDevices,
-            builder: (context, devices, child) => devices.isNotEmpty ? child! : const SizedBox(height: 0),
-            child: Container(
-              padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
-              child: Text(context.translate('Discovered Devices:'), style: Theme.of(context).textTheme.titleMedium),
+      child: GestureDetector(
+        onTap: () => FocusScope.of(context).unfocus(),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          mainAxisSize: MainAxisSize.max,
+          children: [
+            Container(
+              color: Theme.of(context).colorScheme.surface,
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  // Input Fields
+                  SmartConfigFormPanel(),
+                  SizedBox(height: 8),
+                  // Start/Stop Button
+                  Container(
+                    padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                    width: double.infinity,
+                    child: StartStopButton(),
+                  ),
+                  SizedBox(height: 16),
+                ],
+              ),
             ),
-          ),
-          Expanded(
-            child: ValueListenableBuilder<List<SupportedDeviceDescriptor>>(
+            ValueListenableBuilder<List<SupportedDeviceDescriptor>>(
               valueListenable: vm.discoveredDevices,
-              builder:
-                  (context, value, child) => ListView.separated(
-                    separatorBuilder:
-                        (BuildContext context, int index) => DecoratedBox(
-                          decoration: BoxDecoration(color: Theme.of(context).colorScheme.surfaceContainer),
-                          child: Divider(height: 1, indent: 16, color: Theme.of(context).colorScheme.surface),
-                        ),
-                    itemCount: vm.discoveredDevices.value.length,
-                    itemBuilder: (context, index) {
-                      final user = vm.discoveredDevices.value[index];
-                      return ListTile(
-                        tileColor: Theme.of(context).colorScheme.surfaceContainer,
-                        title: Text(user.name, style: Theme.of(context).textTheme.bodyLarge),
-                        subtitle: Text(user.address.toString(), style: Theme.of(context).textTheme.bodySmall),
-                        trailing: Consumer<DeviceDiscoveryViewModel>(
-                          builder:
-                              (context, vm, child) => IconButton.filledTonal(
-                                onPressed:
-                                    vm.isBusy || vm.isDiscovering
-                                        ? null
-                                        : () => _showAddDeviceSheet(context, vm, vm.discoveredDevices.value[index]),
-                                icon: child as Icon,
-                              ),
-                          child: Icon(Icons.add_outlined),
-                        ),
-                      );
-                    },
-                  ),
+              builder: (context, devices, child) => devices.isNotEmpty ? child! : const SizedBox(height: 0),
+              child: Container(
+                padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
+                child: Text(context.translate('Discovered Devices:'), style: Theme.of(context).textTheme.titleMedium),
+              ),
             ),
-          ),
-          NewDeviceAddedSnackBarListener(child: SizedBox()),
-        ],
+            Expanded(
+              child: ValueListenableBuilder<List<SupportedDeviceDescriptor>>(
+                valueListenable: vm.discoveredDevices,
+                builder:
+                    (context, value, child) => ListView.separated(
+                      separatorBuilder:
+                          (BuildContext context, int index) => DecoratedBox(
+                            decoration: BoxDecoration(color: Theme.of(context).colorScheme.surfaceContainer),
+                            child: Divider(height: 1, indent: 16, color: Theme.of(context).colorScheme.surface),
+                          ),
+                      itemCount: vm.discoveredDevices.value.length,
+                      itemBuilder: (context, index) {
+                        final user = vm.discoveredDevices.value[index];
+                        return ListTile(
+                          tileColor: Theme.of(context).colorScheme.surfaceContainer,
+                          title: Text(user.name, style: Theme.of(context).textTheme.bodyLarge),
+                          subtitle: Text(user.address.toString(), style: Theme.of(context).textTheme.bodySmall),
+                          trailing: Consumer<DeviceDiscoveryViewModel>(
+                            builder:
+                                (context, vm, child) => IconButton.filledTonal(
+                                  onPressed:
+                                      vm.isBusy || vm.isDiscovering
+                                          ? null
+                                          : () => _showAddDeviceSheet(context, vm, vm.discoveredDevices.value[index]),
+                                  icon: child as Icon,
+                                ),
+                            child: Icon(Icons.add_outlined),
+                          ),
+                        );
+                      },
+                    ),
+              ),
+            ),
+            NewDeviceAddedSnackBarListener(child: SizedBox()),
+          ],
+        ),
       ),
     );
   }

client/lib/views/main_screen.dart

@@ -61,6 +61,7 @@ class NotificationListener extends StatelessWidget {
               context: context,
               title: Text("Error"),
               type: ToastificationType.error,
+              style: ToastificationStyle.fillColored,
               description: Text(
                 vm.errorMessage,
                 style: Theme.of(

client/packages/borneo_kernel/lib/kernel.dart

@@ -135,12 +135,16 @@ final class DefaultKernel implements IKernel {
   }
 
   @override
-  Future<bool> tryBind(Device device, String driverID,
-      {CancellationToken? cancelToken}) async {
+  Future<bool> tryBind(
+    Device device,
+    String driverID, {
+    Duration? timeout,
+    CancellationToken? cancelToken,
+  }) async {
     _ensureStarted();
     assert(_registeredDevices.containsKey(device.id));
     try {
-      await bind(device, driverID, cancelToken: cancelToken);
+      await bind(device, driverID, cancelToken: cancelToken, timeout: timeout);
       return true;
     } on CancelledException catch (_) {
       _logger.w('Device($device) binding cancelled');
@@ -160,7 +164,7 @@ final class DefaultKernel implements IKernel {
 
   @override
   Future<void> bind(Device device, String driverID,
-      {CancellationToken? cancelToken}) async {
+      {Duration? timeout, CancellationToken? cancelToken}) async {
     _ensureStarted();
     assert(_registeredDevices.containsKey(device.id));
     _logger.i('Binding device: `$device` to driver `$driverID`');
@@ -176,7 +180,7 @@ final class DefaultKernel implements IKernel {
 
     final driverInitialized = await driver
         .probe(device, cancelToken: cancelToken)
-        .timeout(kLocalProbeTimeOut);
+        .timeout(timeout ?? kLocalProbeTimeOut);
 
     if (driverInitialized) {
       // Try to activate device
@@ -245,15 +249,14 @@ final class DefaultKernel implements IKernel {
           futures.add(bd.driver
               .heartbeat(bd.device,
                   cancelToken: _heartbeatPollingTaskCancelToken)
-              .timeout(kLocalProbeTimeOut, onTimeout: () => false));
+              .timeout(kHeartbeatPollingInterval)
+              .asCancellable(_heartbeatPollingTaskCancelToken));
           devices.add(bd);
         }
       }
 
       _logger.i('Polling heartbeat for (${devices.length}) bound devices...');
-      final results = await Future.wait(futures)
-          .timeout(kHeartbeatPollingInterval)
-          .asCancellable(_heartbeatPollingTaskCancelToken);
+      final results = await Future.wait(futures);
       for (int i = 0; i < results.length; i++) {
         if (!results[i]) {
           _logger.w('The device(${devices[i].device}) is not responding.');
@@ -268,14 +271,12 @@ final class DefaultKernel implements IKernel {
         _registeredDevices.values.where((x) => !isBound(x.device.id)).toList();
     for (final descriptor in unboundDeviceDescriptors) {
       futures.add(tryBind(descriptor.device, descriptor.driverID,
-              cancelToken: _heartbeatPollingTaskCancelToken)
-          .timeout(kLocalProbeTimeOut));
+          timeout: kLocalProbeTimeOut,
+          cancelToken: _heartbeatPollingTaskCancelToken));
     }
     _logger.i(
         'Polling heartbeat for (${unboundDeviceDescriptors.length}) unbound devices...');
-    final boundResults = await Future.wait(futures)
-        .timeout(kHeartbeatPollingInterval)
-        .asCancellable(_heartbeatPollingTaskCancelToken);
+    final boundResults = await Future.wait(futures);
     for (int i = 0; i < boundResults.length; i++) {
       /*
       if (!boundResults[i]) {

client/packages/borneo_kernel_abstractions/lib/ikernel.dart

@@ -19,11 +19,15 @@ abstract class IKernel implements IDisposable {
 
   BoundDevice getBoundDevice(String deviceID);
 
-  Future<bool> tryBind(Device device, String driverID,
-      {CancellationToken? cancelToken});
+  Future<bool> tryBind(
+    Device device,
+    String driverID, {
+    Duration? timeout,
+    CancellationToken? cancelToken,
+  });
 
   Future<void> bind(Device device, String driverID,
-      {CancellationToken? cancelToken});
+      {Duration? timeout, CancellationToken? cancelToken});
 
   Future<void> unbind(String deviceID, {CancellationToken? cancelToken});
   Future<void> unbindAll({CancellationToken? cancelToken});