Merge pull request #17 from GeorgeEnglezos/feature/code-cleanup

code cleanup / scripts in drawer

Author: GeorgeEnglezos

.github/workflows/build.yml

@@ -4,8 +4,6 @@ on:
   push:
     tags:
       - 'v*'
-  pull_request:
-    branches: [ main ]
   schedule:
     # 21:00 UTC = 23:00 Europe/Athens — runs on days 1, 5, 9, 13, 17, 21, 25, 29 (every ~4 days)
     - cron: '0 21 1,5,9,13,17,21,25,29 * *'

Docs/CODEBASE_REFERENCE.md

@@ -1,7 +1,7 @@
 # API Reference
 
 Developer documentation for the Scrcpy GUI Flutter codebase.  
-App version: **1.7.0** · Dart SDK: **^3.9.2**
+App version: **1.7.1** · Dart SDK: **^3.9.2**
 
 ---
 

ScrcpyGui/lib/main.dart

@@ -18,7 +18,7 @@ import 'pages/home_page.dart';
 import 'pages/logs_page.dart';
 import 'services/app_icon_controller.dart';
 import 'services/log_service.dart';
-import 'services/command_builder_service.dart';
+import 'services/command_notifier.dart';
 import 'services/device_manager_service.dart';
 import 'services/settings_service.dart';
 import 'theme/app_colors.dart';
@@ -57,9 +57,10 @@ Future<void> main() async {
   final deviceManager = DeviceManagerService();
   await deviceManager.initialize();
 
-  // Initialize CommandBuilderService with reference to DeviceManagerService
-  final commandBuilder = CommandBuilderService();
-  commandBuilder.deviceManagerService = deviceManager;
+  // Initialize CommandNotifier — unified state for the new architecture
+  final commandNotifier = CommandNotifier();
+  commandNotifier.setDeviceManager(deviceManager);
+  commandNotifier.loadDefault();
 
   final iconController = AppIconController(
     appDrawerSettings: appDrawerSettings,
@@ -71,9 +72,7 @@ Future<void> main() async {
         ChangeNotifierProvider<DeviceManagerService>.value(
           value: deviceManager,
         ),
-        ChangeNotifierProvider<CommandBuilderService>.value(
-          value: commandBuilder,
-        ),
+        ChangeNotifierProvider<CommandNotifier>.value(value: commandNotifier),
         ChangeNotifierProvider<AppIconController>.value(value: iconController),
         ChangeNotifierProvider<LogService>.value(value: LogService.instance),
       ],
@@ -105,20 +104,50 @@ class _ScrcpyGuiAppState extends State<ScrcpyGuiApp> {
   /// Currently selected page index (0: Home, 1: Favorites, 2: Resources, 3: Settings)
   late int selectedIndex;
   late AppSettings _currentSettings;
-  final SettingsService _settingsService = SettingsService();
   UpdateService? _updateResult;
   bool _hideBanner = false;
 
   @override
   void initState() {
     super.initState();
     _currentSettings = widget.settings;
-    // Set initial tab based on bootTab setting
     selectedIndex = _getInitialTabIndex();
-    _startSettingsPolling();
+    SettingsService().appSettingsNotifier.addListener(_onSettingsChanged);
     _checkUpdateOnStartup();
   }
 
+  @override
+  void dispose() {
+    SettingsService().appSettingsNotifier.removeListener(_onSettingsChanged);
+    super.dispose();
+  }
+
+  void _onSettingsChanged() {
+    final newSettings = SettingsService.currentSettings;
+    if (newSettings == null || !mounted) return;
+
+    final tabsVisibilityChanged =
+        newSettings.showBatFilesTab != _currentSettings.showBatFilesTab ||
+        newSettings.showAppDrawerTab != _currentSettings.showAppDrawerTab ||
+        newSettings.loggingEnabled != _currentSettings.loggingEnabled;
+
+    int newIndex = selectedIndex;
+    if (tabsVisibilityChanged) {
+      final currentTabs = _visibleTabLabelsFor(_currentSettings);
+      final label = selectedIndex < currentTabs.length
+          ? currentTabs[selectedIndex]
+          : 'Home';
+      final newTabs = _visibleTabLabelsFor(newSettings);
+      final idx = newTabs.indexOf(label);
+      newIndex = idx >= 0 ? idx : 0;
+    }
+
+    setState(() {
+      _currentSettings = newSettings;
+      selectedIndex = newIndex;
+    });
+  }
+
   Future<void> _checkUpdateOnStartup() async {
     if (!_currentSettings.checkForUpdatesOnStartup) return;
 
@@ -160,36 +189,6 @@ class _ScrcpyGuiAppState extends State<ScrcpyGuiApp> {
     ];
   }
 
-  void _startSettingsPolling() {
-    // Poll for settings changes every 500ms
-    Future.delayed(const Duration(milliseconds: 500), () async {
-      if (mounted) {
-        final newSettings = await _settingsService.loadSettings();
-        final tabsVisibilityChanged =
-            newSettings.showBatFilesTab != _currentSettings.showBatFilesTab ||
-            newSettings.showAppDrawerTab != _currentSettings.showAppDrawerTab ||
-            newSettings.loggingEnabled != _currentSettings.loggingEnabled;
-
-        if (tabsVisibilityChanged) {
-          final currentTabs = _visibleTabLabelsFor(_currentSettings);
-          final currentTabLabel =
-              selectedIndex >= 0 && selectedIndex < currentTabs.length
-              ? currentTabs[selectedIndex]
-              : 'Home';
-
-          final newTabs = _visibleTabLabelsFor(newSettings);
-          final newIndex = newTabs.indexOf(currentTabLabel);
-
-          setState(() {
-            _currentSettings = newSettings;
-            selectedIndex = newIndex >= 0 ? newIndex : 0;
-          });
-        }
-        _startSettingsPolling();
-      }
-    });
-  }
-
   /// List of available pages in the application
   ///
   /// Index mapping (when Scripts tab is shown):
@@ -207,8 +206,11 @@ class _ScrcpyGuiAppState extends State<ScrcpyGuiApp> {
   List<Widget> get pages => [
     HomePage(
       panelOrder: _currentSettings.panelOrder,
-      onNavigateToSettings: () =>
-          setState(() => selectedIndex = pages.length - 1),
+      onNavigateToSettings: () {
+        final tabs = _visibleTabLabelsFor(_currentSettings);
+        final idx = tabs.indexOf('Settings');
+        if (idx >= 0) setState(() => selectedIndex = idx);
+      },
     ),
     const FavoritesPage(),
     if (_currentSettings.showAppDrawerTab) const AppDrawerPage(),
@@ -235,13 +237,14 @@ class _ScrcpyGuiAppState extends State<ScrcpyGuiApp> {
               showAppDrawerTab: _currentSettings.showAppDrawerTab,
               showLogsTab: _currentSettings.loggingEnabled,
               onItemSelected: (index) {
-                // Clear command builder when leaving Home page (index 0)
+                final notifier = Provider.of<CommandNotifier>(
+                  context,
+                  listen: false,
+                );
                 if (selectedIndex == 0 && index != 0) {
-                  final commandService = Provider.of<CommandBuilderService>(
-                    context,
-                    listen: false,
-                  );
-                  commandService.resetToDefaults();
+                  notifier.reset();
+                } else if (index == 0 && selectedIndex != 0) {
+                  notifier.loadDefault();
                 }
                 setState(() => selectedIndex = index);
               },

ScrcpyGui/lib/models/app_drawer_settings_model.dart

@@ -1,22 +1,37 @@
 import 'dart:convert';
 import '../services/icon_fetch_strategy.dart';
 
+/// A user-defined or auto-generated grouping of apps. Immutable — use
+/// [copyWith] to derive a new instance.
 class AppGroup {
-  String name;
-  List<String> items;
-  bool isAutoGenerated;
-  bool collapsed;
+  final String name;
+  final List<String> items;
+  final bool isAutoGenerated;
+  final bool collapsed;
 
   AppGroup({
     required this.name,
-    this.items = const [],
+    List<String> items = const [],
     this.isAutoGenerated = false,
     this.collapsed = false,
-  });
+  }) : items = List.unmodifiable(items);
+
+  AppGroup copyWith({
+    String? name,
+    List<String>? items,
+    bool? isAutoGenerated,
+    bool? collapsed,
+  }) =>
+      AppGroup(
+        name: name ?? this.name,
+        items: items ?? this.items,
+        isAutoGenerated: isAutoGenerated ?? this.isAutoGenerated,
+        collapsed: collapsed ?? this.collapsed,
+      );
 
   factory AppGroup.fromJson(Map<String, dynamic> json) => AppGroup(
         name: json['name'] as String,
-        items: (json['items'] as List<dynamic>?)?.cast<String>() ?? [],
+        items: (json['items'] as List<dynamic>?)?.cast<String>() ?? const [],
         isAutoGenerated: json['isAutoGenerated'] as bool? ?? false,
         collapsed: json['collapsed'] as bool? ?? false,
       );
@@ -29,15 +44,17 @@ class AppGroup {
       };
 }
 
+/// App Drawer settings. Immutable — use [copyWith] to derive a new instance.
 class AppDrawerSettings {
-  String appLaunchCommand;
-  IconFetchMethod iconFetchMethod;
-  List<String> favorites;
-  List<AppGroup> groups;
-  bool autoGroupByCategory;
-  bool showScripts;
-  bool otherCollapsed;
-  bool scriptsCollapsed;
+  final String appLaunchCommand;
+  final IconFetchMethod iconFetchMethod;
+  final List<String> favorites;
+  final List<AppGroup> groups;
+  final bool autoGroupByCategory;
+  final bool showScripts;
+  final bool otherCollapsed;
+  final bool scriptsCollapsed;
+  final bool includeSystemApps;
 
   static const String _defaultCommand =
       'scrcpy --pause-on-exit=if-error --new-display=1920x1080';
@@ -51,8 +68,32 @@ class AppDrawerSettings {
     this.showScripts = false,
     this.otherCollapsed = false,
     this.scriptsCollapsed = false,
-  })  : favorites = favorites ?? [],
-        groups = groups ?? [];
+    this.includeSystemApps = false,
+  })  : favorites = List.unmodifiable(favorites ?? const []),
+        groups = List.unmodifiable(groups ?? const []);
+
+  AppDrawerSettings copyWith({
+    String? appLaunchCommand,
+    IconFetchMethod? iconFetchMethod,
+    List<String>? favorites,
+    List<AppGroup>? groups,
+    bool? autoGroupByCategory,
+    bool? showScripts,
+    bool? otherCollapsed,
+    bool? scriptsCollapsed,
+    bool? includeSystemApps,
+  }) =>
+      AppDrawerSettings(
+        appLaunchCommand: appLaunchCommand ?? this.appLaunchCommand,
+        iconFetchMethod: iconFetchMethod ?? this.iconFetchMethod,
+        favorites: favorites ?? this.favorites,
+        groups: groups ?? this.groups,
+        autoGroupByCategory: autoGroupByCategory ?? this.autoGroupByCategory,
+        showScripts: showScripts ?? this.showScripts,
+        otherCollapsed: otherCollapsed ?? this.otherCollapsed,
+        scriptsCollapsed: scriptsCollapsed ?? this.scriptsCollapsed,
+        includeSystemApps: includeSystemApps ?? this.includeSystemApps,
+      );
 
   factory AppDrawerSettings.fromJson(Map<String, dynamic> json) =>
       AppDrawerSettings(
@@ -61,16 +102,17 @@ class AppDrawerSettings {
         iconFetchMethod:
             iconFetchMethodFromString(json['iconFetchMethod'] as String?),
         favorites:
-            (json['favorites'] as List<dynamic>?)?.cast<String>() ?? [],
+            (json['favorites'] as List<dynamic>?)?.cast<String>() ?? const [],
         groups: (json['groups'] as List<dynamic>?)
                 ?.map((e) => AppGroup.fromJson(e as Map<String, dynamic>))
                 .toList() ??
-            [],
+            const [],
         autoGroupByCategory:
             json['autoGroupByCategory'] as bool? ?? true,
         showScripts: json['showScripts'] as bool? ?? false,
         otherCollapsed: json['otherCollapsed'] as bool? ?? false,
         scriptsCollapsed: json['scriptsCollapsed'] as bool? ?? false,
+        includeSystemApps: json['includeSystemApps'] as bool? ?? false,
       );
 
   Map<String, dynamic> toJson() => {
@@ -82,6 +124,7 @@ class AppDrawerSettings {
         'showScripts': showScripts,
         'otherCollapsed': otherCollapsed,
         'scriptsCollapsed': scriptsCollapsed,
+        'includeSystemApps': includeSystemApps,
       };
 
   String toJsonString() => jsonEncode(toJson());