Refactor app theme colors and remove unused color schemes

- Updated primary and onPrimaryContainer colors in BorneoTheme.
- Removed lightMediumContrastScheme and lightHighContrastScheme methods.
- Removed darkMediumContrastScheme and darkHighContrastScheme methods.
- Cleaned up DeviceDiscoveryViewModel by removing group manager dependency and countdown timer logic.
- Introduced ProvisioningWizardViewModel for handling WiFi provisioning steps.
- Added ProvisioningScreen for the new provisioning wizard UI.
- Updated DeviceDiscoveryScreen to use ProvisioningScreen instead of WifiSelectionScreen.
- Adjusted AboutScreen to use theme colors for better consistency.
- Cleaned up device_discovery_view_model_test by removing FakeGroupManager.

Author: oldrev

client/lib/app/app_theme.dart

@@ -27,9 +27,9 @@ class BorneoTheme {
       brightness: Brightness.light,
       primary: Color(0xff493b72),
       surfaceTint: Color(0xff64568e),
-      onPrimary: Color(0xffffffff),
+      onPrimary: Color(0xffE3D009),
       primaryContainer: Color(0xff6d5f98),
-      onPrimaryContainer: Color(0xffffffff),
+      onPrimaryContainer: Color(0xFFE3D009),
       secondary: Color(0xff625b73),
       onSecondary: Color(0xffffffff),
       secondaryContainer: Color(0xffe9dffc),
@@ -77,116 +77,6 @@ class BorneoTheme {
     return theme(lightScheme());
   }
 
-  static ColorScheme lightMediumContrastScheme() {
-    return const ColorScheme(
-      brightness: Brightness.light,
-      primary: Color(0xff483a70),
-      surfaceTint: Color(0xff64568e),
-      onPrimary: Color(0xffffffff),
-      primaryContainer: Color(0xff6d5f98),
-      onPrimaryContainer: Color(0xffffffff),
-      secondary: Color(0xff453f56),
-      onSecondary: Color(0xffffffff),
-      secondaryContainer: Color(0xff78718a),
-      onSecondaryContainer: Color(0xffffffff),
-      tertiary: Color(0xff66304f),
-      onTertiary: Color(0xffffffff),
-      tertiaryContainer: Color(0xff915576),
-      onTertiaryContainer: Color(0xffffffff),
-      error: Color(0xff8c0009),
-      onError: Color(0xffffffff),
-      errorContainer: Color(0xffda342e),
-      onErrorContainer: Color(0xffffffff),
-      surface: Color(0xfffdf8fd),
-      onSurface: Color(0xff1c1b1f),
-      onSurfaceVariant: Color(0xff45414b),
-      outline: Color(0xff615d67),
-      outlineVariant: Color(0xff7d7983),
-      shadow: Color(0xff000000),
-      scrim: Color(0xff000000),
-      inverseSurface: Color(0xff313034),
-      inversePrimary: Color(0xffcebdfd),
-      primaryFixed: Color(0xff7a6ca6),
-      onPrimaryFixed: Color(0xffffffff),
-      primaryFixedDim: Color(0xff61538b),
-      onPrimaryFixedVariant: Color(0xffffffff),
-      secondaryFixed: Color(0xff78718a),
-      onSecondaryFixed: Color(0xffffffff),
-      secondaryFixedDim: Color(0xff5f5870),
-      onSecondaryFixedVariant: Color(0xffffffff),
-      tertiaryFixed: Color(0xff9f6182),
-      onTertiaryFixed: Color(0xffffffff),
-      tertiaryFixedDim: Color(0xff844969),
-      onTertiaryFixedVariant: Color(0xffffffff),
-      surfaceDim: Color(0xffddd8de),
-      surfaceBright: Color(0xfffdf8fd),
-      surfaceContainerLowest: Color(0xffffffff),
-      surfaceContainerLow: Color(0xfff7f2f7),
-      surfaceContainer: Color(0xfff1ecf2),
-      surfaceContainerHigh: Color(0xffece6ec),
-      surfaceContainerHighest: Color(0xffe6e1e6),
-    );
-  }
-
-  ThemeData lightMediumContrast() {
-    return theme(lightMediumContrastScheme());
-  }
-
-  static ColorScheme lightHighContrastScheme() {
-    return const ColorScheme(
-      brightness: Brightness.light,
-      primary: Color(0xff26184d),
-      surfaceTint: Color(0xff64568e),
-      onPrimary: Color(0xffffffff),
-      primaryContainer: Color(0xff483a70),
-      onPrimaryContainer: Color(0xffffffff),
-      secondary: Color(0xff241f34),
-      onSecondary: Color(0xffffffff),
-      secondaryContainer: Color(0xff453f56),
-      onSecondaryContainer: Color(0xffffffff),
-      tertiary: Color(0xff3f0f2d),
-      onTertiary: Color(0xffffffff),
-      tertiaryContainer: Color(0xff66304f),
-      onTertiaryContainer: Color(0xffffffff),
-      error: Color(0xff4e0002),
-      onError: Color(0xffffffff),
-      errorContainer: Color(0xff8c0009),
-      onErrorContainer: Color(0xffffffff),
-      surface: Color(0xfffdf8fd),
-      onSurface: Color(0xff000000),
-      onSurfaceVariant: Color(0xff25232b),
-      outline: Color(0xff45414b),
-      outlineVariant: Color(0xff45414b),
-      shadow: Color(0xff000000),
-      scrim: Color(0xff000000),
-      inverseSurface: Color(0xff313034),
-      inversePrimary: Color(0xfff1e8ff),
-      primaryFixed: Color(0xff483a70),
-      onPrimaryFixed: Color(0xffffffff),
-      primaryFixedDim: Color(0xff312358),
-      onPrimaryFixedVariant: Color(0xffffffff),
-      secondaryFixed: Color(0xff453f56),
-      onSecondaryFixed: Color(0xffffffff),
-      secondaryFixedDim: Color(0xff2f293f),
-      onSecondaryFixedVariant: Color(0xffffffff),
-      tertiaryFixed: Color(0xff66304f),
-      onTertiaryFixed: Color(0xffffffff),
-      tertiaryFixedDim: Color(0xff4c1a38),
-      onTertiaryFixedVariant: Color(0xffffffff),
-      surfaceDim: Color(0xffddd8de),
-      surfaceBright: Color(0xfffdf8fd),
-      surfaceContainerLowest: Color(0xffffffff),
-      surfaceContainerLow: Color(0xfff7f2f7),
-      surfaceContainer: Color(0xfff1ecf2),
-      surfaceContainerHigh: Color(0xffece6ec),
-      surfaceContainerHighest: Color(0xffe6e1e6),
-    );
-  }
-
-  ThemeData lightHighContrast() {
-    return theme(lightHighContrastScheme());
-  }
-
   static ColorScheme darkScheme() {
     return const ColorScheme(
       brightness: Brightness.dark,
@@ -242,116 +132,6 @@ class BorneoTheme {
     return theme(darkScheme());
   }
 
-  static ColorScheme darkMediumContrastScheme() {
-    return const ColorScheme(
-      brightness: Brightness.dark,
-      primary: Color(0xffd2c2ff),
-      surfaceTint: Color(0xffcebdfd),
-      onPrimary: Color(0xff1a0a41),
-      primaryContainer: Color(0xff9788c4),
-      onPrimaryContainer: Color(0xff000000),
-      secondary: Color(0xffd0c6e3),
-      onSecondary: Color(0xff181327),
-      secondaryContainer: Color(0xff958da7),
-      onSecondaryContainer: Color(0xff000000),
-      tertiary: Color(0xffffb5da),
-      onTertiary: Color(0xff300321),
-      tertiaryContainer: Color(0xffbf7c9f),
-      onTertiaryContainer: Color(0xff000000),
-      error: Color(0xffffbab1),
-      onError: Color(0xff370001),
-      errorContainer: Color(0xffff5449),
-      onErrorContainer: Color(0xff000000),
-      surface: Color(0xff141317),
-      onSurface: Color(0xfffff9ff),
-      onSurfaceVariant: Color(0xffcec8d4),
-      outline: Color(0xffa6a1ac),
-      outlineVariant: Color(0xff86818c),
-      shadow: Color(0xff000000),
-      scrim: Color(0xff000000),
-      inverseSurface: Color(0xffe6e1e6),
-      inversePrimary: Color(0xff4d3f76),
-      primaryFixed: Color(0xffe8ddff),
-      onPrimaryFixed: Color(0xff15043c),
-      primaryFixedDim: Color(0xffcebdfd),
-      onPrimaryFixedVariant: Color(0xff3b2d63),
-      secondaryFixed: Color(0xffe8defb),
-      onSecondaryFixed: Color(0xff130e22),
-      secondaryFixedDim: Color(0xffcbc2de),
-      onSecondaryFixedVariant: Color(0xff393349),
-      tertiaryFixed: Color(0xffffd8e9),
-      onTertiaryFixed: Color(0xff2a001b),
-      tertiaryFixedDim: Color(0xfffab1d6),
-      onTertiaryFixedVariant: Color(0xff582442),
-      surfaceDim: Color(0xff141317),
-      surfaceBright: Color(0xff3a383d),
-      surfaceContainerLowest: Color(0xff0f0e11),
-      surfaceContainerLow: Color(0xff1c1b1f),
-      surfaceContainer: Color(0xff201f23),
-      surfaceContainerHigh: Color(0xff2b292d),
-      surfaceContainerHighest: Color(0xff363438),
-    );
-  }
-
-  ThemeData darkMediumContrast() {
-    return theme(darkMediumContrastScheme());
-  }
-
-  static ColorScheme darkHighContrastScheme() {
-    return const ColorScheme(
-      brightness: Brightness.dark,
-      primary: Color(0xfffff9ff),
-      surfaceTint: Color(0xffcebdfd),
-      onPrimary: Color(0xff000000),
-      primaryContainer: Color(0xffd2c2ff),
-      onPrimaryContainer: Color(0xff000000),
-      secondary: Color(0xfffff9ff),
-      onSecondary: Color(0xff000000),
-      secondaryContainer: Color(0xffd0c6e3),
-      onSecondaryContainer: Color(0xff000000),
-      tertiary: Color(0xfffff9f9),
-      onTertiary: Color(0xff000000),
-      tertiaryContainer: Color(0xffffb5da),
-      onTertiaryContainer: Color(0xff000000),
-      error: Color(0xfffff9f9),
-      onError: Color(0xff000000),
-      errorContainer: Color(0xffffbab1),
-      onErrorContainer: Color(0xff000000),
-      surface: Color(0xff141317),
-      onSurface: Color(0xffffffff),
-      onSurfaceVariant: Color(0xfffff9ff),
-      outline: Color(0xffcec8d4),
-      outlineVariant: Color(0xffcec8d4),
-      shadow: Color(0xff000000),
-      scrim: Color(0xff000000),
-      inverseSurface: Color(0xffe6e1e6),
-      inversePrimary: Color(0xff2e2056),
-      primaryFixed: Color(0xffece2ff),
-      onPrimaryFixed: Color(0xff000000),
-      primaryFixedDim: Color(0xffd2c2ff),
-      onPrimaryFixedVariant: Color(0xff1a0a41),
-      secondaryFixed: Color(0xffece2ff),
-      onSecondaryFixed: Color(0xff000000),
-      secondaryFixedDim: Color(0xffd0c6e3),
-      onSecondaryFixedVariant: Color(0xff181327),
-      tertiaryFixed: Color(0xffffdeec),
-      onTertiaryFixed: Color(0xff000000),
-      tertiaryFixedDim: Color(0xffffb5da),
-      onTertiaryFixedVariant: Color(0xff300321),
-      surfaceDim: Color(0xff141317),
-      surfaceBright: Color(0xff3a383d),
-      surfaceContainerLowest: Color(0xff0f0e11),
-      surfaceContainerLow: Color(0xff1c1b1f),
-      surfaceContainer: Color(0xff201f23),
-      surfaceContainerHigh: Color(0xff2b292d),
-      surfaceContainerHighest: Color(0xff363438),
-    );
-  }
-
-  ThemeData darkHighContrast() {
-    return theme(darkHighContrastScheme());
-  }
-
   ThemeData theme(ColorScheme colorScheme) => ThemeData(
     useMaterial3: true,
     brightness: colorScheme.brightness,

client/lib/features/devices/view_models/device_discovery_view_model.dart

@@ -1,10 +1,8 @@
 import 'dart:async';
 import 'package:flutter/services.dart';
 import 'package:borneo_app/features/devices/models/device_entity.dart';
-import 'package:borneo_app/features/devices/models/device_group_entity.dart';
 import 'package:borneo_app/features/devices/models/discoverable_device.dart';
 import 'package:borneo_app/core/services/devices/device_module_registry.dart';
-import 'package:borneo_app/core/services/group_manager.dart';
 import 'package:borneo_app/shared/view_models/abstract_screen_view_model.dart';
 import 'package:borneo_kernel_abstractions/models/supported_device_descriptor.dart';
 import 'package:cancellation_token/cancellation_token.dart';
@@ -16,11 +14,14 @@ import '../models/events.dart';
 import 'package:borneo_app/core/services/devices/device_manager.dart';
 import 'package:borneo_app/core/services/devices/ble_provisioner.dart';
 
+const int kDiscoveryTimeoutSeconds = 10;
+
 class DeviceDiscoveryViewModel extends AbstractScreenViewModel {
   bool _disposed = false;
   late CancellationToken _scanCancelToken = CancellationToken();
+  Timer? _countdownTimer;
+  int _remainingSeconds = kDiscoveryTimeoutSeconds;
   final Logger _logger;
-  final IGroupManager _groupManager;
   final IDeviceManager _deviceManager;
   final IBleProvisioner _bleProvisioner;
   final IDeviceModuleRegistry deviceMdoules;
@@ -45,17 +46,14 @@ class DeviceDiscoveryViewModel extends AbstractScreenViewModel {
   DeviceEntity? _lastestAddedDevice;
   DeviceEntity? get lastestAddedDevice => _lastestAddedDevice;
 
-  late final List<DeviceGroupEntity> _availableGroups = [];
-  List<DeviceGroupEntity> get availableGroups => _availableGroups;
-
   bool get isDiscovering => _isRefreshing;
+  int get remainingSeconds => _remainingSeconds;
 
   // Platform check
   bool get isMobile => defaultTargetPlatform == TargetPlatform.android || defaultTargetPlatform == TargetPlatform.iOS;
 
   DeviceDiscoveryViewModel(
     this._logger,
-    this._groupManager,
     this._deviceManager,
     this._bleProvisioner,
     this.deviceMdoules, {
@@ -77,7 +75,6 @@ class DeviceDiscoveryViewModel extends AbstractScreenViewModel {
   @override
   Future<void> onInitialize() async {
     try {
-      _availableGroups.addAll(await _groupManager.fetchAllGroupsInCurrentScene());
       // 延迟到下一帧，确保 UI 完全初始化
       await Future.delayed(Duration.zero);
       await startDiscovery();
@@ -87,6 +84,8 @@ class DeviceDiscoveryViewModel extends AbstractScreenViewModel {
   @override
   void dispose() {
     if (!_disposed) {
+      _countdownTimer?.cancel();
+      _countdownTimer = null;
       _deviceAddedEventSub.cancel();
       _newDeviceFoundEventSub.cancel();
       _discoverableDevices.dispose();
@@ -100,6 +99,9 @@ class DeviceDiscoveryViewModel extends AbstractScreenViewModel {
   }
 
   Future<void> _stopRefresh() async {
+    _countdownTimer?.cancel();
+    _countdownTimer = null;
+    _remainingSeconds = kDiscoveryTimeoutSeconds;
     _isRefreshing = false;
     _scanCancelToken.cancel();
     try {
@@ -138,6 +140,21 @@ class DeviceDiscoveryViewModel extends AbstractScreenViewModel {
     _updateDiscoverableList();
 
     _isRefreshing = true;
+    _remainingSeconds = kDiscoveryTimeoutSeconds;
+    _countdownTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      if (_disposed) {
+        timer.cancel();
+        return;
+      }
+      _remainingSeconds--;
+      if (_remainingSeconds <= 0) {
+        timer.cancel();
+        _countdownTimer = null;
+        stopDiscovery();
+      } else {
+        notifyListeners();
+      }
+    });
     if (!_disposed) {
       notifyListeners(); // Update UI to show loading
     }
@@ -231,8 +248,8 @@ class DeviceDiscoveryViewModel extends AbstractScreenViewModel {
     }
   }
 
-  Future<void> addNewDevice(SupportedDeviceDescriptor deviceInfo, DeviceGroupEntity? group) async {
-    await _deviceManager.addNewDevice(deviceInfo, groupID: group?.id);
+  Future<void> addNewDevice(SupportedDeviceDescriptor deviceInfo) async {
+    await _deviceManager.addNewDevice(deviceInfo, groupID: null);
   }
 
   Future<void> _onNewDeviceEntityAdded(NewDeviceEntityAddedEvent event) async {