fix: improve app and patches loaders

lib/ui/views/app_selector/app_selector_view.dart

@@ -36,18 +36,29 @@ class _AppSelectorViewState extends State<AppSelectorView> {
           child: Padding(
             padding:
                 const EdgeInsets.symmetric(vertical: 4.0, horizontal: 12.0),
-            child: model.apps.isNotEmpty
+            child: model.noApps
-                ? Column(
+                ? Center(
+                    child: I18nText('appSelectorCard.noAppsLabel'),
+                  )
+                : model.apps.isEmpty
+                    ? Center(
+                        child: CircularProgressIndicator(
+                          color: Theme.of(context).colorScheme.secondary,
+                        ),
+                      )
+                    : Column(
                         children: [
                           SearchBar(
                             showSelectIcon: false,
-                        fillColor:
+                            fillColor: isDark
-                            isDark ? const Color(0xff1B222B) : Colors.grey[200],
+                                ? const Color(0xff1B222B)
+                                : Colors.grey[200],
                             hintText: FlutterI18n.translate(
                               context,
                               'appSelectorView.searchBarHint',
                             ),
-                        hintTextColor: Theme.of(context).colorScheme.tertiary,
+                            hintTextColor:
+                                Theme.of(context).colorScheme.tertiary,
                             onQueryChanged: (searchQuery) {
                               setState(() {
                                 _query = searchQuery;
@@ -55,73 +66,29 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                             },
                           ),
                           const SizedBox(height: 12),
-                      _query.isEmpty || _query.length < 2
+                          Expanded(
-                          ? _getAllResults(model)
+                            child: ListView(
-                          : _getFilteredResults(model)
+                              children: model
+                                  .getFilteredApps(_query)
+                                  .map((app) => InkWell(
+                                        onTap: () {
+                                          model.selectApp(app);
+                                          Navigator.of(context).pop();
+                                        },
+                                        child: InstalledAppItem(
+                                          name: app.appName,
+                                          pkgName: app.packageName,
+                                          icon: app.icon,
+                                        ),
+                                      ))
+                                  .toList(),
+                            ),
+                          ),
                         ],
-                  )
-                : _query.isEmpty || _query.length < 2
-                    ? Center(
-                        child: CircularProgressIndicator(
-                          color: Theme.of(context).colorScheme.secondary,
-                        ),
-                      )
-                    : Center(
-                        child: I18nText('appSelectorCard.noAppsLabel'),
                       ),
           ),
         ),
       ),
     );
   }
-
-  Widget _getAllResults(AppSelectorViewModel model) {
-    return Expanded(
-      child: ListView.builder(
-        itemCount: model.apps.length,
-        itemBuilder: (context, index) {
-          model.apps.sort((a, b) => a.appName.compareTo(b.appName));
-          return InkWell(
-            onTap: () {
-              model.selectApp(model.apps[index]);
-              Navigator.of(context).pop();
-            },
-            child: InstalledAppItem(
-              name: model.apps[index].appName,
-              pkgName: model.apps[index].packageName,
-              icon: model.apps[index].icon,
-            ),
-          );
-        },
-      ),
-    );
-  }
-
-  Widget _getFilteredResults(AppSelectorViewModel model) {
-    return Expanded(
-      child: ListView.builder(
-        itemCount: model.apps.length,
-        itemBuilder: (context, index) {
-          model.apps.sort((a, b) => a.appName.compareTo(b.appName));
-          if (model.apps[index].appName.toLowerCase().contains(
-                _query.toLowerCase(),
-              )) {
-            return InkWell(
-              onTap: () {
-                model.selectApp(model.apps[index]);
-                Navigator.of(context).pop();
-              },
-              child: InstalledAppItem(
-                name: model.apps[index].appName,
-                pkgName: model.apps[index].packageName,
-                icon: model.apps[index].icon,
-              ),
-            );
-          } else {
-            return const SizedBox();
-          }
-        },
-      ),
-    );
-  }
 }

lib/ui/views/app_selector/app_selector_viewmodel.dart

@@ -14,17 +14,20 @@ import 'package:stacked/stacked.dart';
 class AppSelectorViewModel extends BaseViewModel {
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
   final List<ApplicationWithIcon> apps = [];
+  bool noApps = false;
   bool _isRooted = false;
 
   Future<void> initialize() async {
     apps.addAll(await _patcherAPI.getFilteredInstalledApps());
+    apps.sort((a, b) => a.appName.compareTo(b.appName));
+    noApps = apps.isEmpty;
     SharedPreferences prefs = await SharedPreferences.getInstance();
     _isRooted = prefs.getBool('isRooted') ?? false;
     notifyListeners();
   }
 
   void selectApp(ApplicationWithIcon application) async {
-    PatchedApplication app = PatchedApplication(
+    locator<PatcherViewModel>().selectedApp = PatchedApplication(
       name: application.appName,
       packageName: application.packageName,
       version: application.versionName!,
@@ -35,7 +38,6 @@ class AppSelectorViewModel extends BaseViewModel {
       isFromStorage: false,
       appliedPatches: [],
     );
-    locator<PatcherViewModel>().selectedApp = app;
     locator<PatcherViewModel>().selectedPatches.clear();
     locator<PatcherViewModel>().notifyListeners();
   }
@@ -52,7 +54,7 @@ class AppSelectorViewModel extends BaseViewModel {
             await DeviceApps.getAppFromStorage(apkFile.path, true)
                 as ApplicationWithIcon?;
         if (application != null) {
-          PatchedApplication app = PatchedApplication(
+          locator<PatcherViewModel>().selectedApp = PatchedApplication(
             name: application.appName,
             packageName: application.packageName,
             version: application.versionName!,
@@ -63,7 +65,6 @@ class AppSelectorViewModel extends BaseViewModel {
             isFromStorage: true,
             appliedPatches: [],
           );
-          locator<PatcherViewModel>().selectedApp = app;
           locator<PatcherViewModel>().selectedPatches.clear();
           locator<PatcherViewModel>().notifyListeners();
         }
@@ -79,4 +80,13 @@ class AppSelectorViewModel extends BaseViewModel {
       );
     }
   }
+
+  List<ApplicationWithIcon> getFilteredApps(String query) {
+    return apps
+        .where((app) =>
+            query.isEmpty ||
+            query.length < 2 ||
+            app.appName.toLowerCase().contains(query.toLowerCase()))
+        .toList();
+  }
 }

lib/ui/views/patches_selector/patches_selector_view.dart

@@ -14,8 +14,7 @@ class PatchesSelectorView extends StatefulWidget {
 }
 
 class _PatchesSelectorViewState extends State<PatchesSelectorView> {
-  final List<PatchItem> _items = [];
+  String _query = '';
-  String query = '';
 
   @override
   Widget build(BuildContext context) {
@@ -27,8 +26,13 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
           child: Padding(
             padding:
                 const EdgeInsets.symmetric(vertical: 4.0, horizontal: 12.0),
-            child: model.patches.isNotEmpty
+            child: model.patches.isEmpty
-                ? Column(
+                ? Center(
+                    child: CircularProgressIndicator(
+                      color: Theme.of(context).colorScheme.secondary,
+                    ),
+                  )
+                : Column(
                     children: [
                       SearchBar(
                         showSelectIcon: true,
@@ -41,15 +45,28 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                         hintTextColor: Theme.of(context).colorScheme.tertiary,
                         onQueryChanged: (searchQuery) {
                           setState(() {
-                            query = searchQuery;
+                            _query = searchQuery;
                           });
                         },
                         onSelectAll: (value) => model.selectAllPatches(value),
                       ),
                       const SizedBox(height: 12),
-                      query.isEmpty || query.length < 2
+                      Expanded(
-                          ? _getAllResults(model)
+                        child: ListView(
-                          : _getFilteredResults(model),
+                          children: model
+                              .getFilteredPatches(_query)
+                              .map((patch) => PatchItem(
+                                    name: patch.name,
+                                    simpleName: patch.simpleName,
+                                    version: patch.version,
+                                    description: patch.description,
+                                    isSelected: model.isSelected(patch),
+                                    onChanged: (value) =>
+                                        model.selectPatch(patch, value),
+                                  ))
+                              .toList(),
+                        ),
+                      ),
                       MaterialButton(
                         textColor: Colors.white,
                         color: Theme.of(context).colorScheme.secondary,
@@ -68,65 +85,10 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                         child: I18nText('patchesSelectorView.doneButton'),
                       ),
                     ],
-                  )
-                : Center(
-                    child: CircularProgressIndicator(
-                      color: Theme.of(context).colorScheme.secondary,
                   ),
           ),
         ),
       ),
-      ),
-    );
-  }
-
-  Widget _getAllResults(PatchesSelectorViewModel model) {
-    _items.clear();
-    return Expanded(
-      child: ListView.builder(
-        itemCount: model.patches.length,
-        itemBuilder: (context, index) {
-          model.patches.sort((a, b) => a.simpleName.compareTo(b.simpleName));
-          PatchItem item = PatchItem(
-            name: model.patches[index].name,
-            simpleName: model.patches[index].simpleName,
-            version: model.patches[index].version,
-            description: model.patches[index].description,
-            isSelected: model.isSelected(index),
-            onChanged: (value) => model.selectPatch(index, value),
-          );
-          _items.add(item);
-          return item;
-        },
-      ),
-    );
-  }
-
-  Widget _getFilteredResults(PatchesSelectorViewModel model) {
-    _items.clear();
-    return Expanded(
-      child: ListView.builder(
-        itemCount: model.patches.length,
-        itemBuilder: (context, index) {
-          model.patches.sort((a, b) => a.simpleName.compareTo(b.simpleName));
-          if (model.patches[index].simpleName.toLowerCase().contains(
-                query.toLowerCase(),
-              )) {
-            PatchItem item = PatchItem(
-              name: model.patches[index].name,
-              simpleName: model.patches[index].simpleName,
-              version: model.patches[index].version,
-              description: model.patches[index].description,
-              isSelected: model.isSelected(index),
-              onChanged: (value) => model.selectPatch(index, value),
-            );
-            _items.add(item);
-            return item;
-          } else {
-            return const SizedBox();
-          }
-        },
-      ),
     );
   }
 }

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -14,6 +14,7 @@ class PatchesSelectorViewModel extends BaseViewModel {
     patches.addAll(await _patcherAPI.getFilteredPatches(
       locator<PatcherViewModel>().selectedApp,
     ));
+    patches.sort((a, b) => a.simpleName.compareTo(b.simpleName));
     for (Patch p in patches) {
       if (p.include) {
         selectedPatches.add(p);
@@ -22,14 +23,13 @@ class PatchesSelectorViewModel extends BaseViewModel {
     notifyListeners();
   }
 
-  bool isSelected(int index) {
+  bool isSelected(Patch patch) {
     return selectedPatches.any(
-      (element) => element.name == patches[index].name,
+      (element) => element.name == patch.name,
     );
   }
 
-  void selectPatch(int index, bool isSelected) {
+  void selectPatch(Patch patch, bool isSelected) {
-    Patch patch = patches.firstWhere((p) => p.name == patches[index].name);
     if (isSelected && !selectedPatches.contains(patch)) {
       selectedPatches.add(patch);
     } else {
@@ -50,4 +50,15 @@ class PatchesSelectorViewModel extends BaseViewModel {
     locator<PatcherViewModel>().selectedPatches = selectedPatches;
     locator<PatcherViewModel>().notifyListeners();
   }
+
+  List<Patch> getFilteredPatches(String query) {
+    return patches
+        .where((patch) =>
+            query.isEmpty ||
+            query.length < 2 ||
+            patch.simpleName.toLowerCase().contains(
+                  query.toLowerCase(),
+                ))
+        .toList();
+  }
 }