neoagent 2.3.1-beta.89 → 2.3.1-beta.91

package/flutter_app/lib/main_devices.dart

@@ -28,6 +28,7 @@ class _DevicesPanelState extends State<DevicesPanel> {
   late final TextEditingController _textEntryController;
   Timer? _surfaceFrameTimer;
   _DeviceSurface _surface = _DeviceSurface.browser;
+  _DeviceSurface? _runningSurface;
 
   @override
   void initState() {
@@ -66,6 +67,20 @@ class _DevicesPanelState extends State<DevicesPanel> {
   bool get _isBrowser => _surface == _DeviceSurface.browser;
   bool get _isDesktop => _surface == _DeviceSurface.desktop;
 
+  bool get _isCurrentSurfaceBusy =>
+      widget.controller.isRunningDeviceAction &&
+      (_runningSurface == null || _runningSurface == _surface);
+
+  Future<T> _runOnSurface<T>(Future<T> Function() action) async {
+    final surface = _surface;
+    if (mounted) setState(() => _runningSurface = surface);
+    try {
+      return await action();
+    } finally {
+      if (mounted) setState(() => _runningSurface = null);
+    }
+  }
+
   bool get _androidOnline {
     final status = widget.controller.androidRuntime;
     final devices = _jsonMapList(status['devices'], fallbackToMapValues: true);
@@ -164,18 +179,14 @@ class _DevicesPanelState extends State<DevicesPanel> {
     await widget.controller.refreshAndroidFrameRuntime();
   }
 
-  Future<void> _switchSurface(int delta) async {
-    final surfaces = _DeviceSurface.values;
-    final currentIndex = surfaces.indexOf(_surface);
-    final nextIndex = (currentIndex + delta) % surfaces.length;
-    setState(
-      () =>
-          _surface = surfaces[nextIndex < 0 ? surfaces.length - 1 : nextIndex],
-    );
+  Future<void> _selectSurface(_DeviceSurface surface) async {
+    setState(() => _surface = surface);
     await _ensurePreview();
   }
 
-  Future<void> _openPrimary() async {
+  Future<void> _openPrimary() => _runOnSurface(_openPrimaryInner);
+
+  Future<void> _openPrimaryInner() async {
     final controller = widget.controller;
     if (_isBrowser) {
       await controller.navigateBrowserRuntime(
@@ -237,7 +248,9 @@ class _DevicesPanelState extends State<DevicesPanel> {
     await controller.openAndroidAppRuntime(packageName: raw);
   }
 
-  Future<void> _sleepPrimary() async {
+  Future<void> _sleepPrimary() => _runOnSurface(_sleepPrimaryInner);
+
+  Future<void> _sleepPrimaryInner() async {
     final controller = widget.controller;
     if (_isBrowser) {
       if (controller.browserRuntime['launched'] != true) {
@@ -259,7 +272,7 @@ class _DevicesPanelState extends State<DevicesPanel> {
     await controller.stopAndroidRuntime();
   }
 
-  Future<void> _sendText() async {
+  Future<void> _sendText() => _runOnSurface(() async {
     final text = _textEntryController.text;
     if (text.trim().isEmpty) {
       return;
@@ -274,9 +287,9 @@ class _DevicesPanelState extends State<DevicesPanel> {
         'pressEnter': true,
       });
     }
-  }
+  });
 
-  Future<void> _handleTap(Offset point) async {
+  Future<void> _handleTap(Offset point) => _runOnSurface(() async {
     if (_isBrowser) {
       await widget.controller.clickBrowserPointRuntime(
         x: point.dx.round(),
@@ -302,9 +315,9 @@ class _DevicesPanelState extends State<DevicesPanel> {
       'x': point.dx.round(),
       'y': point.dy.round(),
     });
-  }
+  });
 
-  Future<void> _handleSwipe(Offset start, Offset end) async {
+  Future<void> _handleSwipe(Offset start, Offset end) => _runOnSurface(() async {
     if (_isBrowser) {
       await widget.controller.scrollBrowserRuntime(
         deltaY: (start.dy - end.dy).round(),
@@ -333,9 +346,9 @@ class _DevicesPanelState extends State<DevicesPanel> {
       'y2': end.dy.round(),
       'durationMs': 280,
     });
-  }
+  });
 
-  Future<void> _runQuickAction(String action) async {
+  Future<void> _runQuickAction(String action) => _runOnSurface(() async {
     final controller = widget.controller;
     switch (action) {
       case 'browser_refresh':
@@ -369,7 +382,7 @@ class _DevicesPanelState extends State<DevicesPanel> {
         await _ensurePreview();
         break;
     }
-  }
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -471,7 +484,7 @@ class _DevicesPanelState extends State<DevicesPanel> {
                             ),
                           );
                         }).toList(),
-                        onChanged: controller.isRunningDeviceAction
+                        onChanged: _isCurrentSurfaceBusy
                             ? null
                             : (value) {
                                 if (value == null || value.isEmpty) {
@@ -533,7 +546,7 @@ class _DevicesPanelState extends State<DevicesPanel> {
                                 ? _desktopOnline
                                 : _androidOnline || _androidStarting),
                       starting: !_isBrowser && !_isDesktop && _androidStarting,
-                      busy: controller.isRunningDeviceAction,
+                      busy: _isCurrentSurfaceBusy,
                       onSubmit: _openPrimary,
                       onSleep: _sleepPrimary,
                     ),
@@ -542,7 +555,7 @@ class _DevicesPanelState extends State<DevicesPanel> {
                       surface: _surface,
                       controller: controller,
                       screenshotPath: _activeScreenshotPath,
-                      busy: controller.isRunningDeviceAction,
+                      busy: _isCurrentSurfaceBusy,
                       wakingUp: !_isBrowser && !_isDesktop && _androidStarting,
                       enabled: _isBrowser || _isDesktop || _androidOnline,
                       connectRequired: _desktopRequiresSelection,
@@ -553,7 +566,7 @@ class _DevicesPanelState extends State<DevicesPanel> {
                     if (!_isBrowser && !_isDesktop) ...<Widget>[
                       const SizedBox(height: 12),
                       _AndroidNavDock(
-                        busy: controller.isRunningDeviceAction,
+                        busy: _isCurrentSurfaceBusy,
                         androidOnline: _androidOnline,
                         onAction: _runQuickAction,
                       ),
@@ -561,7 +574,7 @@ class _DevicesPanelState extends State<DevicesPanel> {
                         const SizedBox(height: 14),
                         AndroidApkDropZone(
                           enabled: _androidOnline,
-                          busy: controller.isRunningDeviceAction,
+                          busy: _isCurrentSurfaceBusy,
                           onInstall: ({required filename, required bytes}) {
                             return controller.installAndroidApkRuntime(
                               filename: filename,
@@ -574,7 +587,7 @@ class _DevicesPanelState extends State<DevicesPanel> {
                     const SizedBox(height: 18),
                     _DeviceTypeDock(
                       controller: _textEntryController,
-                      busy: controller.isRunningDeviceAction,
+                      busy: _isCurrentSurfaceBusy,
                       surface: _surface,
                       onSubmit: _sendText,
                     ),
@@ -583,15 +596,14 @@ class _DevicesPanelState extends State<DevicesPanel> {
                       _DeviceQuickActions(
                         surface: _surface,
                         androidOnline: _androidOnline,
-                        busy: controller.isRunningDeviceAction,
+                        busy: _isCurrentSurfaceBusy,
                         onAction: _runQuickAction,
                       ),
                     ],
                     const SizedBox(height: 14),
                     _SurfaceSwitcher(
                       surface: _surface,
-                      onPrevious: () => _switchSurface(-1),
-                      onNext: () => _switchSurface(1),
+                      onSelect: _selectSurface,
                     ),
                   ],
                 ),
@@ -1080,6 +1092,7 @@ class _AndroidNavDock extends StatelessWidget {
           final disabled =
               busy || (!androidOnline && entry.key.startsWith('android_'));
           return IconButton.filledTonal(
+            tooltip: entry.key.replaceAll('_', ' '),
             onPressed: disabled ? null : () => onAction(entry.key),
             icon: Icon(entry.value),
           );
@@ -1092,79 +1105,54 @@ class _AndroidNavDock extends StatelessWidget {
 class _SurfaceSwitcher extends StatelessWidget {
   const _SurfaceSwitcher({
     required this.surface,
-    required this.onPrevious,
-    required this.onNext,
+    required this.onSelect,
   });
 
   final _DeviceSurface surface;
-  final VoidCallback onPrevious;
-  final VoidCallback onNext;
+  final Future<void> Function(_DeviceSurface) onSelect;
 
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(
-      builder: (context, constraints) {
-        final compact = constraints.maxWidth < 520;
-        final labelColumn = Column(
-          mainAxisSize: MainAxisSize.min,
-          children: <Widget>[
-            Text(
-              surface.label,
-              textAlign: TextAlign.center,
-              style: TextStyle(fontSize: 16, fontWeight: FontWeight.w800),
-            ),
-            const SizedBox(height: 4),
-            Text(
-              surface.helper,
-              textAlign: TextAlign.center,
-              maxLines: compact ? 3 : 2,
-              overflow: TextOverflow.ellipsis,
-              style: TextStyle(color: _textSecondary),
-            ),
-          ],
-        );
-
-        if (compact) {
-          return Column(
-            mainAxisSize: MainAxisSize.min,
-            children: <Widget>[
-              Row(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: <Widget>[
-                  IconButton.filledTonal(
-                    onPressed: onPrevious,
-                    icon: Icon(Icons.arrow_back_ios_new_rounded),
-                  ),
-                  const SizedBox(width: 14),
-                  Flexible(child: labelColumn),
-                  const SizedBox(width: 14),
-                  IconButton.filledTonal(
-                    onPressed: onNext,
-                    icon: Icon(Icons.arrow_forward_ios_rounded),
-                  ),
-                ],
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: <Widget>[
+        Wrap(
+          spacing: 8,
+          runSpacing: 8,
+          alignment: WrapAlignment.center,
+          children: _DeviceSurface.values.map((s) {
+            final selected = s == surface;
+            return ChoiceChip(
+              avatar: Icon(
+                s.icon,
+                size: 16,
+                color: selected ? _textPrimary : _textSecondary,
               ),
-            ],
-          );
-        }
-
-        return Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: <Widget>[
-            IconButton.filledTonal(
-              onPressed: onPrevious,
-              icon: Icon(Icons.arrow_back_ios_new_rounded),
-            ),
-            const SizedBox(width: 14),
-            labelColumn,
-            const SizedBox(width: 14),
-            IconButton.filledTonal(
-              onPressed: onNext,
-              icon: Icon(Icons.arrow_forward_ios_rounded),
-            ),
-          ],
-        );
-      },
+              label: Text(s.label),
+              selected: selected,
+              onSelected: (_) => onSelect(s),
+              selectedColor: _accentMuted,
+              backgroundColor: _bgCard,
+              side: BorderSide(
+                color: selected
+                    ? _accent.withValues(alpha: 0.42)
+                    : _borderLight,
+              ),
+              labelStyle: TextStyle(
+                color: selected ? _textPrimary : _textSecondary,
+                fontWeight:
+                    selected ? FontWeight.w700 : FontWeight.w500,
+              ),
+            );
+          }).toList(),
+        ),
+        const SizedBox(height: 8),
+        Text(
+          surface.helper,
+          textAlign: TextAlign.center,
+          style: TextStyle(color: _textSecondary),
+        ),
+      ],
     );
   }
 }
@@ -1386,7 +1374,10 @@ class _InteractiveSurfacePreviewState
                         onPressed: widget.onWakeRequested,
                       );
                     }
-                    return GestureDetector(
+                    return Semantics(
+                      button: true,
+                      label: 'Device surface preview — tap to interact, swipe to scroll',
+                      child: GestureDetector(
                       onTapUp: widget.busy
                           ? null
                           : (details) async {
@@ -1462,6 +1453,7 @@ class _InteractiveSurfacePreviewState
                             const Center(child: CircularProgressIndicator()),
                         ],
                       ),
+                    ),
                     );
                   },
                 ),
@@ -1583,656 +1575,8 @@ class _EmptySurfaceState extends StatelessWidget {
   }
 }
 
-// ignore: unused_element
-class _RuntimeControlCard extends StatelessWidget {
-  const _RuntimeControlCard({
-    required this.title,
-    required this.subtitle,
-    required this.status,
-    required this.child,
-  });
-
-  final String title;
-  final String subtitle;
-  final Widget status;
-  final Widget child;
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      child: Padding(
-        padding: const EdgeInsets.all(20),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: <Widget>[
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: <Widget>[
-                Expanded(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: <Widget>[
-                      Text(
-                        title,
-                        style: TextStyle(
-                          fontSize: 20,
-                          fontWeight: FontWeight.w800,
-                        ),
-                      ),
-                      const SizedBox(height: 6),
-                      Text(
-                        subtitle,
-                        style: TextStyle(color: _textSecondary, height: 1.5),
-                      ),
-                    ],
-                  ),
-                ),
-                const SizedBox(width: 12),
-                status,
-              ],
-            ),
-            const SizedBox(height: 18),
-            child,
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-// ignore: unused_element
-class _BrowserControls extends StatelessWidget {
-  const _BrowserControls({
-    required this.controller,
-    required this.browserStatus,
-    required this.browserPageInfo,
-    required this.urlController,
-    required this.waitForController,
-    required this.clickSelectorController,
-    required this.clickTextController,
-    required this.fillSelectorController,
-    required this.fillValueController,
-  });
-
-  final NeoAgentController controller;
-  final Map<String, dynamic> browserStatus;
-  final Map<String, dynamic> browserPageInfo;
-  final TextEditingController urlController;
-  final TextEditingController waitForController;
-  final TextEditingController clickSelectorController;
-  final TextEditingController clickTextController;
-  final TextEditingController fillSelectorController;
-  final TextEditingController fillValueController;
-
-  @override
-  Widget build(BuildContext context) {
-    final launched = browserStatus['launched'] == true;
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: <Widget>[
-        Wrap(
-          spacing: 10,
-          runSpacing: 10,
-          children: <Widget>[
-            _MetaPill(
-              label: launched ? 'Launched' : 'Idle',
-              icon: Icons.language_outlined,
-            ),
-            _MetaPill(
-              label: 'Pages ${browserStatus['pages'] ?? 0}',
-              icon: Icons.filter_none_outlined,
-            ),
-            _MetaPill(
-              label: browserStatus['headless'] == false
-                  ? 'Visible window'
-                  : 'Headless',
-              icon: Icons.visibility_outlined,
-            ),
-          ],
-        ),
-        if ((browserPageInfo['url']?.toString().isNotEmpty ?? false) ||
-            (browserPageInfo['title']?.toString().isNotEmpty ??
-                false)) ...<Widget>[
-          const SizedBox(height: 14),
-          SelectableText(
-            '${browserPageInfo['title'] ?? 'Untitled'}\n${browserPageInfo['url'] ?? ''}',
-            style: TextStyle(color: _textSecondary, height: 1.5),
-          ),
-        ],
-        const SizedBox(height: 18),
-        _DeviceFieldRow(
-          children: <Widget>[
-            _DeviceField(
-              label: 'URL',
-              child: TextField(controller: urlController),
-            ),
-            _DeviceField(
-              label: 'Wait For Selector',
-              child: TextField(controller: waitForController),
-            ),
-          ],
-        ),
-        const SizedBox(height: 10),
-        Wrap(
-          spacing: 10,
-          runSpacing: 10,
-          children: <Widget>[
-            FilledButton.icon(
-              onPressed: controller.isRunningDeviceAction
-                  ? null
-                  : controller.launchBrowserRuntime,
-              icon: Icon(Icons.rocket_launch_outlined),
-              label: Text('Launch'),
-            ),
-            FilledButton.icon(
-              onPressed: controller.isRunningDeviceAction
-                  ? null
-                  : () => controller.navigateBrowserRuntime(
-                      url: urlController.text.trim(),
-                      waitFor: waitForController.text.trim(),
-                    ),
-              icon: Icon(Icons.open_in_browser_outlined),
-              label: Text('Navigate'),
-            ),
-            OutlinedButton.icon(
-              onPressed: controller.isRunningDeviceAction
-                  ? null
-                  : controller.screenshotBrowserRuntime,
-              icon: Icon(Icons.photo_camera_back_outlined),
-              label: Text('Screenshot'),
-            ),
-            OutlinedButton.icon(
-              onPressed: controller.isRunningDeviceAction
-                  ? null
-                  : controller.closeBrowserRuntime,
-              icon: Icon(Icons.close),
-              label: Text('Close'),
-            ),
-          ],
-        ),
-        const SizedBox(height: 18),
-        _DeviceFieldRow(
-          children: <Widget>[
-            _DeviceField(
-              label: 'Click Selector',
-              child: TextField(controller: clickSelectorController),
-            ),
-            _DeviceField(
-              label: 'Click Text',
-              child: TextField(controller: clickTextController),
-            ),
-          ],
-        ),
-        const SizedBox(height: 10),
-        Wrap(
-          spacing: 10,
-          runSpacing: 10,
-          children: <Widget>[
-            OutlinedButton(
-              onPressed: controller.isRunningDeviceAction
-                  ? null
-                  : () => controller.clickBrowserRuntime(
-                      selector: clickSelectorController.text.trim(),
-                    ),
-              child: Text('Click Selector'),
-            ),
-            OutlinedButton(
-              onPressed: controller.isRunningDeviceAction
-                  ? null
-                  : () => controller.clickBrowserRuntime(
-                      text: clickTextController.text.trim(),
-                    ),
-              child: Text('Click Text'),
-            ),
-          ],
-        ),
-        const SizedBox(height: 18),
-        _DeviceFieldRow(
-          children: <Widget>[
-            _DeviceField(
-              label: 'Type Selector',
-              child: TextField(controller: fillSelectorController),
-            ),
-            _DeviceField(
-              label: 'Value',
-              child: TextField(controller: fillValueController),
-            ),
-          ],
-        ),
-        const SizedBox(height: 10),
-        OutlinedButton.icon(
-          onPressed: controller.isRunningDeviceAction
-              ? null
-              : () => controller.fillBrowserRuntime(
-                  selector: fillSelectorController.text.trim(),
-                  value: fillValueController.text,
-                ),
-          icon: Icon(Icons.keyboard_outlined),
-          label: Text('Type Into Field'),
-        ),
-        const SizedBox(height: 18),
-        _RuntimePreview(
-          title: 'Latest Browser Screenshot',
-          screenshotPath: controller.browserScreenshotPath,
-          controller: controller,
-        ),
-        if (controller.browserLastResult?.trim().isNotEmpty ??
-            false) ...<Widget>[
-          const SizedBox(height: 14),
-          _ResultBlock(
-            label: 'Last browser result',
-            value: controller.browserLastResult!,
-          ),
-        ],
-      ],
-    );
-  }
-}
-
-// ignore: unused_element
-class _AndroidControls extends StatelessWidget {
-  const _AndroidControls({
-    required this.controller,
-    required this.androidStatus,
-    required this.androidDevices,
-    required this.packageController,
-    required this.activityController,
-    required this.intentActionController,
-    required this.intentDataController,
-    required this.tapTextController,
-    required this.tapDescriptionController,
-    required this.tapResourceIdController,
-    required this.tapXController,
-    required this.tapYController,
-    required this.typeTextController,
-    required this.typeFieldTextController,
-    required this.typeFieldDescriptionController,
-    required this.waitTextController,
-    required this.keyController,
-    required this.swipeX1Controller,
-    required this.swipeY1Controller,
-    required this.swipeX2Controller,
-    required this.swipeY2Controller,
-    required this.toInt,
-  });
 
-  final NeoAgentController controller;
-  final Map<String, dynamic> androidStatus;
-  final List<Map<String, dynamic>> androidDevices;
-  final TextEditingController packageController;
-  final TextEditingController activityController;
-  final TextEditingController intentActionController;
-  final TextEditingController intentDataController;
-  final TextEditingController tapTextController;
-  final TextEditingController tapDescriptionController;
-  final TextEditingController tapResourceIdController;
-  final TextEditingController tapXController;
-  final TextEditingController tapYController;
-  final TextEditingController typeTextController;
-  final TextEditingController typeFieldTextController;
-  final TextEditingController typeFieldDescriptionController;
-  final TextEditingController waitTextController;
-  final TextEditingController keyController;
-  final TextEditingController swipeX1Controller;
-  final TextEditingController swipeY1Controller;
-  final TextEditingController swipeX2Controller;
-  final TextEditingController swipeY2Controller;
-  final int? Function(String text) toInt;
 
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: <Widget>[
-        Wrap(
-          spacing: 10,
-          runSpacing: 10,
-          children: <Widget>[
-            _MetaPill(
-              label: androidStatus['bootstrapped'] == true
-                  ? 'SDK Ready'
-                  : 'Bootstrap Needed',
-              icon: Icons.adb_outlined,
-            ),
-            _MetaPill(
-              label: androidStatus['serial']?.toString().isNotEmpty == true
-                  ? androidStatus['serial'].toString()
-                  : 'No active serial',
-              icon: Icons.phone_android_outlined,
-            ),
-            _MetaPill(
-              label: '${androidDevices.length} device(s)',
-              icon: Icons.devices_other_outlined,
-            ),
-          ],
-        ),
-        const SizedBox(height: 18),
-        Wrap(
-          spacing: 10,
-          runSpacing: 10,
-          children: <Widget>[
-            FilledButton.icon(
-              onPressed: controller.isRunningDeviceAction
-                  ? null
-                  : controller.startAndroidRuntime,
-              icon: Icon(Icons.play_arrow_outlined),
-              label: Text('Start Emulator'),
-            ),
-            OutlinedButton.icon(
-              onPressed: controller.isRunningDeviceAction
-                  ? null
-                  : controller.stopAndroidRuntime,
-              icon: Icon(Icons.stop_circle_outlined),
-              label: Text('Stop'),
-            ),
-            OutlinedButton.icon(
-              onPressed: controller.isRunningDeviceAction
-                  ? null
-                  : controller.screenshotAndroidRuntime,
-              icon: Icon(Icons.photo_camera_outlined),
-              label: Text('Screenshot'),
-            ),
-            OutlinedButton.icon(
-              onPressed: controller.isRunningDeviceAction
-                  ? null
-                  : controller.dumpAndroidUiRuntime,
-              icon: Icon(Icons.data_object_outlined),
-              label: Text('Dump UI'),
-            ),
-            OutlinedButton.icon(
-              onPressed: controller.isRunningDeviceAction
-                  ? null
-                  : controller.refreshAndroidApps,
-              icon: Icon(Icons.apps_outlined),
-              label: Text('Load Apps'),
-            ),
-          ],
-        ),
-        const SizedBox(height: 18),
-        _DeviceFieldRow(
-          children: <Widget>[
-            _DeviceField(
-              label: 'Package',
-              child: TextField(controller: packageController),
-            ),
-            _DeviceField(
-              label: 'Activity',
-              child: TextField(controller: activityController),
-            ),
-          ],
-        ),
-        const SizedBox(height: 10),
-        Wrap(
-          spacing: 10,
-          runSpacing: 10,
-          children: <Widget>[
-            OutlinedButton.icon(
-              onPressed: controller.isRunningDeviceAction
-                  ? null
-                  : () => controller.openAndroidAppRuntime(
-                      packageName: packageController.text.trim(),
-                      activity: activityController.text.trim(),
-                    ),
-              icon: Icon(Icons.apps),
-              label: Text('Open App'),
-            ),
-            if (controller.androidInstalledApps.isNotEmpty)
-              SizedBox(width: 1, height: 1, child: Container()),
-          ],
-        ),
-        if (controller.androidInstalledApps.isNotEmpty) ...<Widget>[
-          const SizedBox(height: 8),
-          Wrap(
-            spacing: 8,
-            runSpacing: 8,
-            children: controller.androidInstalledApps.take(10).map((appId) {
-              return ActionChip(
-                label: Text(appId),
-                onPressed: () => packageController.text = appId,
-              );
-            }).toList(),
-          ),
-        ],
-        const SizedBox(height: 18),
-        _DeviceFieldRow(
-          children: <Widget>[
-            _DeviceField(
-              label: 'Intent Action',
-              child: TextField(controller: intentActionController),
-            ),
-            _DeviceField(
-              label: 'Intent Data',
-              child: TextField(controller: intentDataController),
-            ),
-          ],
-        ),
-        const SizedBox(height: 10),
-        OutlinedButton.icon(
-          onPressed: controller.isRunningDeviceAction
-              ? null
-              : () => controller.openAndroidIntentRuntime(
-                  action: intentActionController.text.trim(),
-                  dataUri: intentDataController.text.trim(),
-                  packageName: packageController.text.trim(),
-                ),
-          icon: Icon(Icons.route_outlined),
-          label: Text('Open Intent'),
-        ),
-        const SizedBox(height: 18),
-        _DeviceFieldRow(
-          children: <Widget>[
-            _DeviceField(
-              label: 'Wait For Text',
-              child: TextField(controller: waitTextController),
-            ),
-            _DeviceField(
-              label: 'Key',
-              child: TextField(controller: keyController),
-            ),
-          ],
-        ),
-        const SizedBox(height: 10),
-        Wrap(
-          spacing: 10,
-          runSpacing: 10,
-          children: <Widget>[
-            OutlinedButton(
-              onPressed: controller.isRunningDeviceAction
-                  ? null
-                  : () => controller.waitForAndroidRuntime(<String, dynamic>{
-                      'text': waitTextController.text.trim(),
-                      'timeoutMs': 20000,
-                      'intervalMs': 1200,
-                    }),
-              child: Text('Wait For UI'),
-            ),
-            OutlinedButton(
-              onPressed: controller.isRunningDeviceAction
-                  ? null
-                  : () => controller.pressAndroidKeyRuntime(
-                      keyController.text.trim(),
-                    ),
-              child: Text('Press Key'),
-            ),
-          ],
-        ),
-        const SizedBox(height: 18),
-        _DeviceFieldRow(
-          children: <Widget>[
-            _DeviceField(
-              label: 'Tap Text',
-              child: TextField(controller: tapTextController),
-            ),
-            _DeviceField(
-              label: 'Tap Description',
-              child: TextField(controller: tapDescriptionController),
-            ),
-          ],
-        ),
-        const SizedBox(height: 10),
-        _DeviceFieldRow(
-          children: <Widget>[
-            _DeviceField(
-              label: 'Tap Resource Id',
-              child: TextField(controller: tapResourceIdController),
-            ),
-            _DeviceField(
-              label: 'Tap X / Y',
-              child: Row(
-                children: <Widget>[
-                  Expanded(child: TextField(controller: tapXController)),
-                  const SizedBox(width: 8),
-                  Expanded(child: TextField(controller: tapYController)),
-                ],
-              ),
-            ),
-          ],
-        ),
-        const SizedBox(height: 10),
-        OutlinedButton.icon(
-          onPressed: controller.isRunningDeviceAction
-              ? null
-              : () => controller.tapAndroidRuntime(<String, dynamic>{
-                  if (tapTextController.text.trim().isNotEmpty)
-                    'text': tapTextController.text.trim(),
-                  if (tapDescriptionController.text.trim().isNotEmpty)
-                    'description': tapDescriptionController.text.trim(),
-                  if (tapResourceIdController.text.trim().isNotEmpty)
-                    'resourceId': tapResourceIdController.text.trim(),
-                  if (toInt(tapXController.text) != null)
-                    'x': toInt(tapXController.text),
-                  if (toInt(tapYController.text) != null)
-                    'y': toInt(tapYController.text),
-                }),
-          icon: Icon(Icons.touch_app_outlined),
-          label: Text('Tap'),
-        ),
-        const SizedBox(height: 18),
-        _DeviceFieldRow(
-          children: <Widget>[
-            _DeviceField(
-              label: 'Type Text',
-              child: TextField(controller: typeTextController),
-            ),
-            _DeviceField(
-              label: 'Focus Field Text / Description',
-              child: Row(
-                children: <Widget>[
-                  Expanded(
-                    child: TextField(controller: typeFieldTextController),
-                  ),
-                  const SizedBox(width: 8),
-                  Expanded(
-                    child: TextField(
-                      controller: typeFieldDescriptionController,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ],
-        ),
-        const SizedBox(height: 10),
-        OutlinedButton.icon(
-          onPressed: controller.isRunningDeviceAction
-              ? null
-              : () => controller.typeAndroidRuntime(<String, dynamic>{
-                  'text': typeTextController.text,
-                  if (typeFieldTextController.text.trim().isNotEmpty)
-                    'textSelector': typeFieldTextController.text.trim(),
-                  if (typeFieldDescriptionController.text.trim().isNotEmpty)
-                    'description': typeFieldDescriptionController.text.trim(),
-                  'pressEnter': true,
-                }),
-          icon: Icon(Icons.keyboard_outlined),
-          label: Text('Type'),
-        ),
-        const SizedBox(height: 18),
-        _DeviceFieldRow(
-          children: <Widget>[
-            _DeviceField(
-              label: 'Swipe X1 / Y1',
-              child: Row(
-                children: <Widget>[
-                  Expanded(child: TextField(controller: swipeX1Controller)),
-                  const SizedBox(width: 8),
-                  Expanded(child: TextField(controller: swipeY1Controller)),
-                ],
-              ),
-            ),
-            _DeviceField(
-              label: 'Swipe X2 / Y2',
-              child: Row(
-                children: <Widget>[
-                  Expanded(child: TextField(controller: swipeX2Controller)),
-                  const SizedBox(width: 8),
-                  Expanded(child: TextField(controller: swipeY2Controller)),
-                ],
-              ),
-            ),
-          ],
-        ),
-        const SizedBox(height: 10),
-        OutlinedButton.icon(
-          onPressed: controller.isRunningDeviceAction
-              ? null
-              : () => controller.swipeAndroidRuntime(<String, dynamic>{
-                  'x1': toInt(swipeX1Controller.text),
-                  'y1': toInt(swipeY1Controller.text),
-                  'x2': toInt(swipeX2Controller.text),
-                  'y2': toInt(swipeY2Controller.text),
-                }),
-          icon: Icon(Icons.swipe_outlined),
-          label: Text('Swipe'),
-        ),
-        const SizedBox(height: 18),
-        _RuntimePreview(
-          title: 'Latest Android Screenshot',
-          screenshotPath: controller.androidScreenshotPath,
-          controller: controller,
-        ),
-        if (controller.androidUiPreview.isNotEmpty) ...<Widget>[
-          const SizedBox(height: 14),
-          Text(
-            'Latest UI dump preview',
-            style: TextStyle(fontWeight: FontWeight.w700),
-          ),
-          const SizedBox(height: 10),
-          ...controller.androidUiPreview.take(6).map((node) {
-            final title = node['text']?.toString().trim().isNotEmpty == true
-                ? node['text'].toString()
-                : node['description']?.toString().trim().isNotEmpty == true
-                ? node['description'].toString()
-                : node['resourceId']?.toString().trim().isNotEmpty == true
-                ? node['resourceId'].toString()
-                : node['className']?.toString() ?? 'node';
-            return Container(
-              margin: const EdgeInsets.only(bottom: 8),
-              padding: const EdgeInsets.all(12),
-              decoration: BoxDecoration(
-                color: _bgSecondary,
-                borderRadius: BorderRadius.circular(10),
-                border: Border.all(color: _border),
-              ),
-              child: Text(
-                '$title\n${node['packageName'] ?? ''}',
-                style: TextStyle(color: _textSecondary, height: 1.5),
-              ),
-            );
-          }),
-        ],
-        if (controller.androidLastResult?.trim().isNotEmpty ??
-            false) ...<Widget>[
-          const SizedBox(height: 14),
-          _ResultBlock(
-            label: 'Last Android result',
-            value: controller.androidLastResult!,
-          ),
-        ],
-      ],
-    );
-  }
-}
 
 class _DeviceFieldRow extends StatelessWidget {
   const _DeviceFieldRow({required this.children});