feat: update dialogs and buttons to use adaptive styles and replace ElevatedButton with FilledButton

oldrev · oldrev · commit b6cb1493037a · 2026-03-05T23:01:19.000+08:00
diff --git a/client/3rd-party/flutter_esp_ble_prov/example/lib/main.dart b/client/3rd-party/flutter_esp_ble_prov/example/lib/main.dart
@@ -196,7 +196,7 @@ class _ProvisioningHomePageState extends State<ProvisioningHomePage> {
   void _showSuccessDialog() {
     showDialog(
       context: context,
-      builder: (context) => AlertDialog(
+      builder: (context) => AlertDialog.adaptive(
         title: const Row(
           children: [
             Icon(Icons.check_circle, color: Colors.green),
diff --git a/client/lib/core/services/app_notification_service_impl.dart b/client/lib/core/services/app_notification_service_impl.dart
@@ -25,7 +25,7 @@ class AppNotificationServiceImpl implements IAppNotificationService {
     showDialog<void>(
       context: context,
       barrierDismissible: false,
-      builder: (dialogContext) => AlertDialog(
+      builder: (dialogContext) => AlertDialog.adaptive(
         icon: Icon(Icons.error_outline, color: theme.colorScheme.error, size: 32),
         title: Text(title),
         content: body != null ? SingleChildScrollView(child: Text(body)) : null,
diff --git a/client/lib/devices/borneo/lyfi/views/controller_settings_screen.dart b/client/lib/devices/borneo/lyfi/views/controller_settings_screen.dart
@@ -239,7 +239,7 @@ class _ControllerSettingsScreenState extends State<ControllerSettingsScreen> {
     showDialog(
       context: context,
       builder: (BuildContext dialogContext) {
-        return AlertDialog(
+        return AlertDialog.adaptive(
           title: Text(context.translate('Confirm Submit')),
           content: Text(
             context.translate(
diff --git a/client/lib/devices/borneo/lyfi/views/dashboard/dashboard_chart.dart b/client/lib/devices/borneo/lyfi/views/dashboard/dashboard_chart.dart
@@ -19,27 +19,32 @@ class DashboardChart extends StatelessWidget {
         if (!isActuallyOnline) {
           return Container(
             constraints: const BoxConstraints(minHeight: 200),
-            child: Center(
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  Icon(Icons.wifi_off, size: 48, color: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.5)),
-                  const SizedBox(height: 8),
-                  Text(
-                    context.translate('Device Offline'),
-                    style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                      color: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.7),
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.start,
+              children: [
+                Expanded(
+                  child: FittedBox(
+                    fit: BoxFit.fill,
+                    child: Icon(
+                      Icons.wifi_off,
+                      size: null,
+                      color: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.38),
                     ),
                   ),
-                  const SizedBox(height: 8),
-                  Text(
-                    context.translate('Please check device connection'),
-                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                      color: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.5),
-                    ),
+                ),
+                Text(
+                  context.translate('Device Offline'),
+                  style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    color: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.7),
                   ),
-                ],
-              ),
+                ),
+                Text(
+                  context.translate('Please check device connection'),
+                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                    color: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.5),
+                  ),
+                ),
+              ],
             ),
           );
         } else {
diff --git a/client/lib/devices/borneo/lyfi/views/dashboard/dashboard_power_tile.dart b/client/lib/devices/borneo/lyfi/views/dashboard/dashboard_power_tile.dart
@@ -37,7 +37,7 @@ class DashboardPowerTile extends StatelessWidget {
           builder: (context, _) => DashboardToufu(
             title: context.translate("LED Power"),
             icon: Icons.power_outlined,
-            foregroundColor: fgColor,
+            foregroundColor: isOnline ? fgColor : disabledColor,
             backgroundColor: theme.colorScheme.surfaceContainerHighest,
             arcColor: arcColor,
             progressColor: progressColor,
diff --git a/client/lib/devices/borneo/lyfi/views/dashboard/dashboard_temperature_tile.dart b/client/lib/devices/borneo/lyfi/views/dashboard/dashboard_temperature_tile.dart
@@ -26,6 +26,8 @@ class DashboardTemperatureTile extends StatelessWidget {
           (vm) =>
               (vm.isOnline, vm.currentTempRaw, vm.currentTemp, vm.localeService.temperatureUnitText, vm.fanPowerRatio),
         );
+    final disabledColor = theme.colorScheme.onSurface.withValues(alpha: 0.38);
+    final Color fgColor = theme.colorScheme.onSurface;
 
     Color progressColor;
     if (currentTempRaw != null && currentTempRaw <= 45) {
@@ -41,7 +43,7 @@ class DashboardTemperatureTile extends StatelessWidget {
     return DashboardToufu(
       title: context.translate("Temperature & Fan"),
       icon: Icons.thermostat,
-      foregroundColor: theme.colorScheme.onSurface,
+      foregroundColor: isOnline ? fgColor : disabledColor,
       backgroundColor: theme.colorScheme.surfaceContainerHighest,
       arcColor: null,
       progressColor: progressColor,
diff --git a/client/lib/devices/borneo/lyfi/views/moon_screen.dart b/client/lib/devices/borneo/lyfi/views/moon_screen.dart
@@ -44,8 +44,10 @@ class MoonScreen extends StatelessWidget {
             title: Text(context.translate('Moonlight')),
             actions: [
               Consumer<MoonViewModel>(
-                builder: (context, vm, _) =>
-                    Switch(value: vm.enabled, onChanged: !vm.isBusy && vm.isOnline && vm.isOn ? vm.setEnabled : null),
+                builder: (context, vm, _) => Switch.adaptive(
+                  value: vm.enabled,
+                  onChanged: !vm.isBusy && vm.isOnline && vm.isOn ? vm.setEnabled : null,
+                ),
               ),
               Consumer<MoonViewModel>(
                 builder: (context, vm, _) => AppBarApplyButton(
diff --git a/client/lib/devices/borneo/lyfi/views/settings_screen.dart b/client/lib/devices/borneo/lyfi/views/settings_screen.dart
@@ -297,7 +297,7 @@ class SettingsScreen extends StatelessWidget {
   void _showFactoryResetDialog(BuildContext context, SettingsViewModel vm) {
     showDialog(
       context: context,
-      builder: (context) => AlertDialog(
+      builder: (context) => AlertDialog.adaptive(
         title: Text(context.translate('Restore Factory Settings')),
         content: Column(
           mainAxisSize: MainAxisSize.min,
@@ -381,17 +381,18 @@ class SettingsScreen extends StatelessWidget {
     showDialog(
       context: context,
       builder: (context) => StatefulBuilder(
-        builder: (context, setState) => AlertDialog(
-          title: Text(context.translate('Set Manual Fan Power')),
+        builder: (context, setState) => AlertDialog.adaptive(
+          title: Text(context.translate('Set Manual Fan Power'), style: Theme.of(context).textTheme.titleMedium),
           content: Column(
             mainAxisSize: MainAxisSize.min,
             children: [
               Text('${tempValue.toInt()}%'),
-              Slider(
+              Slider.adaptive(
                 value: tempValue,
                 min: 0,
                 max: 100,
                 divisions: 100,
+                label: '${tempValue.toInt()}%',
                 onChanged: (value) {
                   setState(() {
                     tempValue = value;
@@ -438,7 +439,7 @@ class SettingsScreen extends StatelessWidget {
     showDialog(
       context: context,
       builder: (context) => StatefulBuilder(
-        builder: (context, setState) => AlertDialog(
+        builder: (context, setState) => AlertDialog.adaptive(
           title: Text(context.translate('Set Device Name')),
           content: Column(
             mainAxisSize: MainAxisSize.min,
diff --git a/client/lib/devices/views/device_offline_view.dart b/client/lib/devices/views/device_offline_view.dart
@@ -28,13 +28,13 @@ class DeviceOfflineView extends StatelessWidget {
               textAlign: TextAlign.center,
             ),
             const SizedBox(height: 32),
-            ElevatedButton.icon(
+            FilledButton.icon(
               onPressed: () {
                 Navigator.pop(context);
               },
               icon: const Icon(Icons.arrow_back, size: 24),
               label: Text(context.translate('Close')),
-              style: ElevatedButton.styleFrom(
+              style: FilledButton.styleFrom(
                 backgroundColor: theme.colorScheme.primary,
                 foregroundColor: theme.colorScheme.onPrimary,
                 padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 16),
diff --git a/client/lib/devices/views/device_ota_screen.dart b/client/lib/devices/views/device_ota_screen.dart
@@ -46,7 +46,7 @@ class _DeviceOtaScreenState extends State<DeviceOtaScreen> with TickerProviderSt
     final confirmed = await showDialog<bool>(
       context: context,
       barrierDismissible: false,
-      builder: (ctx) => AlertDialog(
+      builder: (ctx) => AlertDialog.adaptive(
         title: Text(context.translate('Firmware Update')),
         content: SingleChildScrollView(
           child: Column(
@@ -438,7 +438,7 @@ class _DeviceOtaScreenState extends State<DeviceOtaScreen> with TickerProviderSt
     if (vm.isSucceeded) {
       return SizedBox(
         width: double.infinity,
-        child: ElevatedButton.icon(
+        child: FilledButton.icon(
           onPressed: () => Navigator.of(context).pop(),
           icon: const Icon(Icons.check),
           label: Text(context.translate('Done')),
@@ -449,7 +449,7 @@ class _DeviceOtaScreenState extends State<DeviceOtaScreen> with TickerProviderSt
     if (vm.hasUpdate) {
       return SizedBox(
         width: double.infinity,
-        child: ElevatedButton.icon(
+        child: FilledButton.icon(
           onPressed: () async {
             final ok = await _confirmUpgrade(context);
             if (ok && context.mounted) {
@@ -468,7 +468,7 @@ class _DeviceOtaScreenState extends State<DeviceOtaScreen> with TickerProviderSt
       children: [
         SizedBox(
           width: double.infinity,
-          child: ElevatedButton.icon(
+          child: FilledButton.icon(
             onPressed: vm.canCheck ? () => vm.checkUpdate() : null,
             icon: const Icon(Icons.refresh),
             label: Text(
diff --git a/client/lib/features/chores/views/chore_card.dart b/client/lib/features/chores/views/chore_card.dart
@@ -82,7 +82,7 @@ class _ChoreCardState extends ConsumerState<ChoreCard> {
                         ),
                       ),
                       const Spacer(),
-                      Switch(
+                      Switch.adaptive(
                         value: isActive,
                         onChanged: state.isBusy ? null : (v) => v ? notifier.executeChore() : notifier.undoChore(),
                         activeThumbColor: colorScheme.primary,
diff --git a/client/lib/features/chores/views/chore_list.dart b/client/lib/features/chores/views/chore_list.dart
@@ -68,7 +68,7 @@ class _ChoreListState extends ConsumerState<ChoreList> {
             children: [
               Text(context.translate('Error loading chores'), style: TextStyle(color: theme.colorScheme.error)),
               const SizedBox(height: 8),
-              ElevatedButton(
+              FilledButton(
                 onPressed: () => ref.read(choresProvider.notifier).refresh(),
                 child: Text(context.translate('Retry')),
               ),
diff --git a/client/lib/features/devices/views/device_card.dart b/client/lib/features/devices/views/device_card.dart
@@ -123,9 +123,9 @@ class DeviceCard extends StatelessWidget {
             },
             borderRadius: BorderRadius.circular(4),
             child: Row(
+              spacing: 4,
               children: [
-                Icon(Icons.error_outline, size: 12, color: colorScheme.error),
-                const SizedBox(width: 4),
+                Icon(Icons.error_outline, size: 24, color: colorScheme.error),
                 Text(
                   context.translate('OFF-LINE'),
                   style: Theme.of(context).textTheme.labelSmall?.copyWith(color: colorScheme.error),
diff --git a/client/lib/features/devices/views/device_error_dialog.dart b/client/lib/features/devices/views/device_error_dialog.dart
@@ -8,10 +8,13 @@ class DeviceErrorDialog extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text(context.translate('Device Error')),
+    return AlertDialog.adaptive(
+      title: Text(
+        context.translate('Device Error'),
+        style: Theme.of(context).textTheme.titleMedium?.copyWith(color: Theme.of(context).colorScheme.error),
+      ),
       content: Text(errorMessage),
-      actions: [TextButton(onPressed: () => Navigator.of(context).pop(), child: Text(context.translate('OK')))],
+      actions: [FilledButton(onPressed: () => Navigator.of(context).pop(), child: Text(context.translate('OK')))],
     );
   }
 }
diff --git a/client/lib/features/devices/views/group_edit_screen.dart b/client/lib/features/devices/views/group_edit_screen.dart
@@ -104,7 +104,7 @@ class _GroupEditBodyState extends ConsumerState<_GroupEditBody> {
       Consumer(
         builder: (context, ref, _) {
           final isBusy = ref.watch(groupEditProvider.select((s) => s.isBusy));
-          return ElevatedButton(
+          return FilledButton(
             key: const Key('btn_submit'),
             onPressed: isBusy ? null : () => _onSubmitPressed(context),
             child: isBusy
diff --git a/client/lib/features/devices/views/provisioning_progress_screen.dart b/client/lib/features/devices/views/provisioning_progress_screen.dart
@@ -118,7 +118,7 @@ class ProvisioningProgressScreen extends StatelessWidget {
                             style: TextStyle(color: Theme.of(context).colorScheme.error),
                           ),
                           const SizedBox(height: 16),
-                          ElevatedButton(
+                          FilledButton(
                             onPressed: () => Navigator.pop(context),
                             child: Text(context.translate('Close')),
                           ),
diff --git a/client/lib/features/devices/views/provisioning_screen.dart b/client/lib/features/devices/views/provisioning_screen.dart
@@ -519,7 +519,7 @@ class _DoneStepState extends State<_DoneStep> {
             ],
             SizedBox(
               width: double.infinity,
-              child: ElevatedButton.icon(
+              child: FilledButton.icon(
                 onPressed: (widget.vm.autoAdded || widget.vm.registerRemainingSeconds <= 0)
                     ? () {
                         Navigator.of(
diff --git a/client/lib/features/devices/widgets/empty_groups_widget.dart b/client/lib/features/devices/widgets/empty_groups_widget.dart
@@ -25,7 +25,7 @@ class EmptyGroupsWidget extends StatelessWidget {
               textAlign: TextAlign.center,
             ),
             const SizedBox(height: 24),
-            ElevatedButton.icon(
+            FilledButton.icon(
               onPressed: onCreateGroup,
               icon: const Icon(Icons.add),
               label: Text(context.translate('Add Devices')),
diff --git a/client/lib/features/scenes/views/scene_edit_screen.dart b/client/lib/features/scenes/views/scene_edit_screen.dart
@@ -202,7 +202,7 @@ class _SceneEditBodyState extends ConsumerState<_SceneEditBody> {
     final isBusy = ref.watch(sceneEditProvider.select((s) => s.isBusy));
     return SizedBox(
       width: double.infinity,
-      child: ElevatedButton(
+      child: FilledButton(
         key: const Key('btn_submit'),
         onPressed: isBusy ? null : () => _onSubmitPressed(context),
         child: isBusy
diff --git a/client/lib/features/scenes/views/scenes_screen.dart b/client/lib/features/scenes/views/scenes_screen.dart
@@ -41,7 +41,7 @@ class _ScenesScreenState extends ConsumerState<ScenesScreen> {
           children: [
             Text(context.translate('Error: {errMsg}', nArgs: {'errMsg': vm.error!})),
             const SizedBox(height: 16),
-            ElevatedButton(
+            FilledButton(
               onPressed: () => ref.read(scenesProvider.notifier).initialize(),
               child: Text(context.translate('Retry')),
             ),
diff --git a/client/lib/main/views/main_screen.dart b/client/lib/main/views/main_screen.dart
@@ -260,7 +260,7 @@ class _MainScreenState extends State<MainScreen> {
       builder: (context) {
         return PopScope(
           canPop: false,
-          child: AlertDialog(
+          child: AlertDialog.adaptive(
             content: Row(
               children: [CircularProgressIndicator(), SizedBox(width: 20), Text(context.translate('Loading...'))],
             ),
diff --git a/client/lib/shared/widgets/confirmation_sheet.dart b/client/lib/shared/widgets/confirmation_sheet.dart
@@ -45,7 +45,7 @@ class ConfirmationSheet extends StatelessWidget {
                   child: Text(context.translate('Cancel')),
                 ),
                 const SizedBox(width: 8),
-                ElevatedButton(
+                FilledButton(
                   onPressed: () {
                     Navigator.of(context).pop();
                     okPressed();
diff --git a/client/lib/shared/widgets/unlock_switch.dart b/client/lib/shared/widgets/unlock_switch.dart
@@ -4,7 +4,7 @@ class UnlockSwitch extends Switch {
   const UnlockSwitch({super.key, required super.value, required super.onChanged});
 
   @override
-  Widget build(BuildContext context) => Switch(
+  Widget build(BuildContext context) => Switch.adaptive(
     value: super.value,
     onChanged: super.onChanged,
     thumbIcon: WidgetStateProperty.resolveWith<Icon?>((Set<WidgetState> states) {
