feat: replace FilledButton with TextButton in DeviceErrorDialog and wrap ScreenTopRoundedContainer in SafeArea

Author: oldrev

client/lib/features/devices/views/device_error_dialog.dart

@@ -14,7 +14,7 @@ class DeviceErrorDialog extends StatelessWidget {
         style: Theme.of(context).textTheme.titleMedium?.copyWith(color: Theme.of(context).colorScheme.error),
       ),
       content: Text(errorMessage),
-      actions: [FilledButton(onPressed: () => Navigator.of(context).pop(), child: Text(context.translate('OK')))],
+      actions: [TextButton(onPressed: () => Navigator.of(context).pop(), child: Text(context.translate('OK')))],
     );
   }
 }

client/lib/features/devices/views/device_group_selection_sheet.dart

@@ -21,14 +21,15 @@ class DeviceGroupSelectionSheet extends StatelessWidget {
   Widget build(BuildContext context) {
     final String? effectiveExcludeGroupId = excludeGroupId;
     final filteredGroups = availableGroups.where((g) => g.id != effectiveExcludeGroupId).toList();
+    final theme = Theme.of(context);
 
     final tiles =
         <Widget>[
               if (effectiveExcludeGroupId != '')
                 ListTile(
                   dense: true,
                   tileColor: Colors.transparent,
-                  title: Text(context.translate('No group')),
+                  title: Text(context.translate('No group'), style: theme.textTheme.bodyLarge),
                   onTap: () {
                     Navigator.pop(context);
                     onTapGroup(null);
@@ -40,7 +41,7 @@ class DeviceGroupSelectionSheet extends StatelessWidget {
                 return ListTile(
                   dense: true,
                   tileColor: Colors.transparent,
-                  title: Text(g.name),
+                  title: Text(g.name, style: theme.textTheme.bodyLarge),
                   onTap: () {
                     Navigator.pop(context);
                     onTapGroup(g);
@@ -49,36 +50,39 @@ class DeviceGroupSelectionSheet extends StatelessWidget {
               }),
             )
             .toList();
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.stretch,
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        Container(
-          padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
-          child: Text(title, textAlign: TextAlign.center),
-        ),
-        if (subtitle != null)
+    return SafeArea(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        mainAxisSize: MainAxisSize.min,
+        children: [
           Container(
-            padding: EdgeInsets.fromLTRB(16, 8, 16, 0),
-            child: Text(
-              subtitle!,
-              textAlign: TextAlign.start,
-              style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Theme.of(context).hintColor),
-            ),
+            padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
+            child: Text(title, style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w600)),
           ),
-        const SizedBox(height: 8),
-        Flexible(
-          child: ListView.separated(
-            padding: const EdgeInsets.all(0),
-            shrinkWrap: true,
-            physics: const ClampingScrollPhysics(),
-            itemBuilder: (BuildContext context, int index) => tiles[index],
-            separatorBuilder: (BuildContext context, int index) => const Divider(indent: 16, height: 1, thickness: 1),
-            itemCount: tiles.length,
+          if (subtitle != null)
+            Container(
+              padding: EdgeInsets.fromLTRB(16, 8, 16, 0),
+              child: Text(
+                subtitle!,
+                textAlign: TextAlign.start,
+                style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Theme.of(context).hintColor),
+              ),
+            ),
+          const SizedBox(height: 8),
+          Flexible(
+            child: ListView.separated(
+              padding: const EdgeInsets.all(0),
+              shrinkWrap: true,
+              physics: const ClampingScrollPhysics(),
+              itemBuilder: (BuildContext context, int index) => tiles[index],
+              separatorBuilder: (BuildContext context, int index) => const Divider(indent: 16, height: 1, thickness: 1),
+              itemCount: tiles.length,
+            ),
           ),
-        ),
-        const SizedBox(height: 16),
-      ],
+          const Divider(indent: 16, height: 1, thickness: 1),
+          const SizedBox(height: 16),
+        ],
+      ),
     );
   }
 }

client/lib/features/devices/views/group_edit_screen.dart

@@ -140,11 +140,7 @@ class _GroupEditBodyState extends ConsumerState<_GroupEditBody> {
     if (widget.args.isCreation) return const [];
 
     return [
-      IconButton(
-        key: const Key('btn_delete_group'),
-        onPressed: () => _onDeletePressed(context),
-        icon: const Icon(Icons.delete_outline),
-      ),
+      TextButton(key: const Key('btn_delete_group'), onPressed: () => _onDeletePressed(context), child: Text('Delete')),
     ];
   }
 

client/lib/features/scenes/views/scene_edit_screen.dart

@@ -248,10 +248,10 @@ class _SceneEditBodyState extends ConsumerState<_SceneEditBody> {
     if (!deletionAvailable) return const [];
     final isBusy = ref.watch(sceneEditProvider.select((s) => s.isBusy));
     return [
-      IconButton(
+      TextButton(
         key: const Key('btn_delete_scene'),
         onPressed: isBusy ? null : () => _onDeletePressed(context),
-        icon: const Icon(Icons.delete_outline),
+        child: Text('Delete'),
       ),
     ];
   }

client/lib/shared/widgets/generic_bottom_sheet_picker.dart

@@ -104,6 +104,7 @@ class GenericBottomSheetPicker<T> extends StatelessWidget {
             ),
           ),
 
+          const Divider(height: 1, thickness: 1),
           // items
           Flexible(
             child: Container(
@@ -121,7 +122,7 @@ class GenericBottomSheetPicker<T> extends StatelessWidget {
                 padding: EdgeInsets.zero,
                 itemCount: entries.length,
                 separatorBuilder: (context, index) =>
-                    Divider(height: 1, indent: 20, endIndent: 20, color: Theme.of(context).colorScheme.surfaceDim),
+                    Divider(height: 1, indent: 16, endIndent: 16, color: Theme.of(context).colorScheme.surfaceDim),
                 itemBuilder: (context, index) {
                   final entry = entries[index];
                   final isSelected = entry.value == effective;
@@ -134,7 +135,7 @@ class GenericBottomSheetPicker<T> extends StatelessWidget {
                       ),
                     ),
                     trailing: isSelected ? Icon(Icons.check, color: colorScheme.primary, size: 20) : null,
-                    contentPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 0),
+                    contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 0),
                     onTap: () => onValueSelected(entry.value),
                     dense: true,
                   );

client/lib/shared/widgets/screen_top_rounded_container.dart

@@ -27,11 +27,13 @@ class ScreenTopRoundedContainer extends StatelessWidget {
     final info = Provider.of<PlatformDeviceInfo?>(context, listen: false);
     final r = info?.screenCornerRadius ?? ScreenRadius.value(0.0);
 
-    return ClipRRect(
-      borderRadius: BorderRadius.only(topLeft: Radius.circular(r.topLeft), topRight: Radius.circular(r.topRight)),
-      child: Container(
-        decoration: BoxDecoration(color: bg, boxShadow: shadows),
-        child: Padding(padding: padding ?? EdgeInsets.zero, child: child),
+    return SafeArea(
+      child: ClipRRect(
+        borderRadius: BorderRadius.only(topLeft: Radius.circular(r.topLeft), topRight: Radius.circular(r.topRight)),
+        child: Container(
+          decoration: BoxDecoration(color: bg, boxShadow: shadows),
+          child: Padding(padding: padding ?? EdgeInsets.zero, child: child),
+        ),
       ),
     );
   }