Merge pull request #199 from ImranR98/dev

UI improvements

assets/translations/hu.json

@@ -59,7 +59,7 @@
     "byX": "{} által",
     "percentProgress": "Folyamat: {}%",
     "pleaseWait": "Kis türelmet",
-    "updateAvailable": "Frissítés elérhető",
+    "updateAvailable": "Frissítés érhető el",
     "estimateInBracketsShort": "(Becsült)",
     "notInstalled": "Nem telepített",
     "estimateInBrackets": "(Becslés)",
@@ -70,11 +70,11 @@
     "removeSelectedApps": "Távolítsa el a kiválasztott appokat",
     "updateX": "Frissítés: {}",
     "installX": "Telepítés: {}",
-    "markXTrackOnlyAsUpdated": "Jelölje meg: {}\n(Csak nyomon követhető)\nas Frissítve",
+    "markXTrackOnlyAsUpdated": "Jelölje meg: {}\n(Csak nyomon követhető)\nmint Frissített",
     "changeX": "Változás {}",
     "installUpdateApps": "Appok telepítése/frissítése",
     "installUpdateSelectedApps": "Telepítse/frissítse a kiválasztott appokat",
-    "onlyWorksWithNonEVDApps": "Csak azoknál az alkalmazásoknál működik, amelyek telepítési állapota nem észlelhető automatikusan (nem gyakori).",
+    "onlyWorksWithNonEVDApps": "Csak azoknál az alkalmazásoknál működik, amelyek telepítési állapota nem észlelhető autom. (nem gyakori).",
     "markXSelectedAppsAsUpdated": "Megjelöl {} kiválasztott alkalmazást frissítettként?",
     "no": "Nem",
     "yes": "Igen",
@@ -86,8 +86,8 @@
     "shareSelectedAppURLs": "Ossza meg a kiválasztott app URL címeit",
     "resetInstallStatus": "Telepítési állapot visszaállítása",
     "more": "További",
-    "removeOutdatedFilter": "Távolítsa el az elavult alkalmazásszűrőt",
+    "removeOutdatedFilter": "Távolítsa el az elavult app szűrőt",
-    "showOutdatedOnly": "Csak az elavult alkalmazások megjelenítése",
+    "showOutdatedOnly": "Csak az elavult appok megjelenítése",
     "filter": "Szűrő",
     "filterActive": "Szűrő *",
     "filterApps": "Appok szűrése",
@@ -126,11 +126,11 @@
     "appSortBy": "App rendezés...",
     "authorName": "Szerző/Név",
     "nameAuthor": "Név/Szerző",
-    "asAdded": "Mint hozzáadott",
+    "asAdded": "Mint Hozzáadott",
     "appSortOrder": "Appok rendezése",
     "ascending": "Emelkedő",
     "descending": "Csökkenő",
-    "bgUpdateCheckInterval": "Háttérfrissítés ellenőrzési időköz",
+    "bgUpdateCheckInterval": "Háttérfrissítés ellenőrzés időköze",
     "neverManualOnly": "Soha – csak manuális",
     "appearance": "Megjelenés",
     "showWebInAppView": "Forrás megjelenítése az Appok nézetben",
@@ -155,14 +155,14 @@
     "noNewUpdates": "Nincsenek új frissítések.",
     "xHasAnUpdate": "A(z) {} frissítést kapott.",
     "appsUpdated": "Alkalmazások frissítve",
-    "appsUpdatedNotifDescription": "Értesíti a felhasználót, hogy egy vagy több app frissítése történt a háttérben",
+    "appsUpdatedNotifDescription": "Értesíti a felhasználót, hogy egy/több app frissítése megtörtént a háttérben",
     "xWasUpdatedToY": "{} frissítve a következőre: {}.",
     "errorCheckingUpdates": "Hiba a frissítések keresésekor",
     "errorCheckingUpdatesNotifDescription": "Értesítés, amely akkor jelenik meg, ha a háttérbeli frissítések ellenőrzése sikertelen",
     "appsRemoved": "Alkalmazások eltávolítva",
     "appsRemovedNotifDescription": "Értesíti a felhasználót egy vagy több alkalmazás eltávolításáról a betöltésük során fellépő hibák miatt",
     "xWasRemovedDueToErrorY": "A(z) {} a következő hiba miatt lett eltávolítva: {}",
-    "completeAppInstallation": "Teljes alkalmazástelepítés",
+    "completeAppInstallation": "Teljes app telepítés",
     "obtainiumMustBeOpenToInstallApps": "Az Obtainiumnak megnyitva kell lennie az alkalmazások telepítéséhez",
     "completeAppInstallationNotifDescription": "Megkéri a felhasználót, hogy térjen vissza az Obtainiumhoz, hogy befejezze az alkalmazás telepítését",
     "checkingForUpdates": "Frissítések keresése",
@@ -198,7 +198,7 @@
     "downloadingX": "{} letöltés",
     "downloadNotifDescription": "Értesíti a felhasználót az app letöltésének előrehaladásáról",
     "noAPKFound": "Nem található APK",
-    "noVersionDetection": "Nincs verzióérzékelés",
+    "noVersionDetection": "Nincs verzió érzékelés",
     "categorize": "Kategorizálás",
     "categories": "Kategóriák",
     "category": "Kategória",

lib/components/generated_form.dart

@@ -91,6 +91,7 @@ class GeneratedFormTagInput extends GeneratedFormItem {
   late bool singleSelect;
   late WrapAlignment alignment;
   late String emptyMessage;
+  late bool showLabelWhenNotEmpty;
   GeneratedFormTagInput(String key,
       {String label = 'Input',
       List<Widget> belowWidgets = const [],
@@ -100,7 +101,8 @@ class GeneratedFormTagInput extends GeneratedFormItem {
       this.deleteConfirmationMessage,
       this.singleSelect = false,
       this.alignment = WrapAlignment.start,
-      this.emptyMessage = 'Input'})
+      this.emptyMessage = 'Input',
+      this.showLabelWhenNotEmpty = true})
       : super(key,
             label: label,
             belowWidgets: belowWidgets,
@@ -140,11 +142,11 @@ class _GeneratedFormState extends State<GeneratedForm> {
     for (int r = 0; r < widget.items.length; r++) {
       for (int i = 0; i < widget.items[r].length; i++) {
         if (formInputs[r][i] is TextFormField) {
-          valid = valid &&
+          var fieldState =
-              ((formInputs[r][i].key as GlobalKey<FormFieldState>)
+              (formInputs[r][i].key as GlobalKey<FormFieldState>).currentState;
-                      .currentState
+          if (fieldState != null) {
-                      ?.isValid ??
+            valid = valid && fieldState.isValid;
-                  false);
+          }
         }
       }
     }
@@ -152,7 +154,7 @@ class _GeneratedFormState extends State<GeneratedForm> {
   }
 
   // Generates a random light color
-// Courtesy of ChatGPT 😭 (with a bugfix 🥳)
+  // Courtesy of ChatGPT 😭 (with a bugfix 🥳)
   Color generateRandomLightColor() {
     // Create a random number generator
     final Random random = Random();
@@ -259,157 +261,185 @@ class _GeneratedFormState extends State<GeneratedForm> {
             ],
           );
         } else if (widget.items[r][e] is GeneratedFormTagInput) {
-          formInputs[r][e] = Wrap(
+          formInputs[r][e] =
-            alignment: (widget.items[r][e] as GeneratedFormTagInput).alignment,
+              Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [
-            crossAxisAlignment: WrapCrossAlignment.center,
+            if ((values[widget.items[r][e].key]
-            children: [
+                            as Map<String, MapEntry<int, bool>>?)
-              (values[widget.items[r][e].key]
+                        ?.isNotEmpty ==
-                              as Map<String, MapEntry<int, bool>>?)
+                    true &&
-                          ?.isEmpty ==
+                (widget.items[r][e] as GeneratedFormTagInput)
-                      true
+                    .showLabelWhenNotEmpty)
-                  ? Text(
+              Column(
-                      (widget.items[r][e] as GeneratedFormTagInput)
+                crossAxisAlignment:
-                          .emptyMessage,
+                    (widget.items[r][e] as GeneratedFormTagInput).alignment ==
-                      style: const TextStyle(fontWeight: FontWeight.bold),
+                            WrapAlignment.center
-                    )
+                        ? CrossAxisAlignment.center
-                  : const SizedBox.shrink(),
+                        : CrossAxisAlignment.stretch,
-              ...(values[widget.items[r][e].key]
+                children: [
-                          as Map<String, MapEntry<int, bool>>?)
+                  Text(widget.items[r][e].label),
-                      ?.entries
+                  const SizedBox(
-                      .map((e2) {
+                    height: 8,
-                    return Padding(
+                  ),
-                        padding: const EdgeInsets.symmetric(horizontal: 4),
+                ],
-                        child: ChoiceChip(
+              ),
-                          label: Text(e2.key),
+            Wrap(
-                          backgroundColor: Color(e2.value.key).withAlpha(50),
+              alignment:
-                          selectedColor: Color(e2.value.key),
+                  (widget.items[r][e] as GeneratedFormTagInput).alignment,
-                          visualDensity: VisualDensity.compact,
+              crossAxisAlignment: WrapCrossAlignment.center,
-                          selected: e2.value.value,
+              children: [
-                          onSelected: (value) {
+                (values[widget.items[r][e].key]
-                            setState(() {
+                                as Map<String, MapEntry<int, bool>>?)
-                              (values[widget.items[r][e].key] as Map<String,
+                            ?.isEmpty ==
-                                      MapEntry<int, bool>>)[e2.key] =
+                        true
-                                  MapEntry(
+                    ? Text(
-                                      (values[widget.items[r][e].key] as Map<
+                        (widget.items[r][e] as GeneratedFormTagInput)
-                                              String,
+                            .emptyMessage,
-                                              MapEntry<int, bool>>)[e2.key]!
+                      )
-                                          .key,
+                    : const SizedBox.shrink(),
-                                      value);
+                ...(values[widget.items[r][e].key]
-                              if ((widget.items[r][e] as GeneratedFormTagInput)
+                            as Map<String, MapEntry<int, bool>>?)
-                                      .singleSelect &&
+                        ?.entries
-                                  value == true) {
+                        .map((e2) {
-                                for (var key in (values[widget.items[r][e].key]
+                      return Padding(
-                                        as Map<String, MapEntry<int, bool>>)
+                          padding: const EdgeInsets.symmetric(horizontal: 4),
-                                    .keys) {
+                          child: ChoiceChip(
-                                  if (key != e2.key) {
+                            label: Text(e2.key),
-                                    (values[widget.items[r][e].key] as Map<
+                            backgroundColor: Color(e2.value.key).withAlpha(50),
-                                        String,
+                            selectedColor: Color(e2.value.key),
-                                        MapEntry<int,
+                            visualDensity: VisualDensity.compact,
-                                            bool>>)[key] = MapEntry(
+                            selected: e2.value.value,
+                            onSelected: (value) {
+                              setState(() {
+                                (values[widget.items[r][e].key] as Map<String,
+                                        MapEntry<int, bool>>)[e2.key] =
+                                    MapEntry(
                                         (values[widget.items[r][e].key] as Map<
                                                 String,
-                                                MapEntry<int, bool>>)[key]!
+                                                MapEntry<int, bool>>)[e2.key]!
                                             .key,
-                                        false);
+                                        value);
+                                if ((widget.items[r][e]
+                                            as GeneratedFormTagInput)
+                                        .singleSelect &&
+                                    value == true) {
+                                  for (var key in (values[
+                                              widget.items[r][e].key]
+                                          as Map<String, MapEntry<int, bool>>)
+                                      .keys) {
+                                    if (key != e2.key) {
+                                      (values[widget.items[r][e].key] as Map<
+                                              String,
+                                              MapEntry<int, bool>>)[key] =
+                                          MapEntry(
+                                              (values[widget.items[r][e].key]
+                                                      as Map<
+                                                          String,
+                                                          MapEntry<int,
+                                                              bool>>)[key]!
+                                                  .key,
+                                              false);
+                                    }
                                   }
                                 }
-                              }
+                                someValueChanged();
-                              someValueChanged();
+                              });
-                            });
+                            },
+                          ));
+                    }) ??
+                    [const SizedBox.shrink()],
+                (values[widget.items[r][e].key]
+                                as Map<String, MapEntry<int, bool>>?)
+                            ?.values
+                            .where((e) => e.value)
+                            .isNotEmpty ==
+                        true
+                    ? Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 4),
+                        child: IconButton(
+                          onPressed: () {
+                            fn() {
+                              setState(() {
+                                var temp = values[widget.items[r][e].key]
+                                    as Map<String, MapEntry<int, bool>>;
+                                temp.removeWhere((key, value) => value.value);
+                                values[widget.items[r][e].key] = temp;
+                                someValueChanged();
+                              });
+                            }
+
+                            if ((widget.items[r][e] as GeneratedFormTagInput)
+                                    .deleteConfirmationMessage !=
+                                null) {
+                              var message =
+                                  (widget.items[r][e] as GeneratedFormTagInput)
+                                      .deleteConfirmationMessage!;
+                              showDialog<Map<String, dynamic>?>(
+                                  context: context,
+                                  builder: (BuildContext ctx) {
+                                    return GeneratedFormModal(
+                                        title: message.key,
+                                        message: message.value,
+                                        items: const []);
+                                  }).then((value) {
+                                if (value != null) {
+                                  fn();
+                                }
+                              });
+                            } else {
+                              fn();
+                            }
                           },
-                        ));
+                          icon: const Icon(Icons.remove),
-                  }) ??
+                          visualDensity: VisualDensity.compact,
-                  [const SizedBox.shrink()],
+                          tooltip: tr('remove'),
-              (values[widget.items[r][e].key]
+                        ))
-                              as Map<String, MapEntry<int, bool>>?)
+                    : const SizedBox.shrink(),
-                          ?.values
+                Padding(
-                          .where((e) => e.value)
+                    padding: const EdgeInsets.symmetric(horizontal: 4),
-                          .isNotEmpty ==
+                    child: IconButton(
-                      true
+                      onPressed: () {
-                  ? Padding(
+                        showDialog<Map<String, dynamic>?>(
-                      padding: const EdgeInsets.symmetric(horizontal: 4),
+                            context: context,
-                      child: IconButton(
+                            builder: (BuildContext ctx) {
-                        onPressed: () {
+                              return GeneratedFormModal(
-                          fn() {
+                                  title: widget.items[r][e].label,
+                                  items: [
+                                    [
+                                      GeneratedFormTextField('label',
+                                          label: tr('label'))
+                                    ]
+                                  ]);
+                            }).then((value) {
+                          String? label = value?['label'];
+                          if (label != null) {
                             setState(() {
                               var temp = values[widget.items[r][e].key]
-                                  as Map<String, MapEntry<int, bool>>;
+                                  as Map<String, MapEntry<int, bool>>?;
-                              temp.removeWhere((key, value) => value.value);
+                              temp ??= {};
-                              values[widget.items[r][e].key] = temp;
+                              if (temp[label] == null) {
-                              someValueChanged();
+                                var singleSelect = (widget.items[r][e]
-                            });
+                                        as GeneratedFormTagInput)
-                          }
+                                    .singleSelect;
-
+                                var someSelected = temp.entries
-                          if ((widget.items[r][e] as GeneratedFormTagInput)
+                                    .where((element) => element.value.value)
-                                  .deleteConfirmationMessage !=
+                                    .isNotEmpty;
-                              null) {
+                                temp[label] = MapEntry(
-                            var message =
+                                    generateRandomLightColor().value,
-                                (widget.items[r][e] as GeneratedFormTagInput)
+                                    !(someSelected && singleSelect));
-                                    .deleteConfirmationMessage!;
+                                values[widget.items[r][e].key] = temp;
-                            showDialog<Map<String, dynamic>?>(
+                                someValueChanged();
-                                context: context,
-                                builder: (BuildContext ctx) {
-                                  return GeneratedFormModal(
-                                      title: message.key,
-                                      message: message.value,
-                                      items: const []);
-                                }).then((value) {
-                              if (value != null) {
-                                fn();
                               }
                             });
-                          } else {
-                            fn();
                           }
-                        },
+                        });
-                        icon: const Icon(Icons.remove),
+                      },
-                        visualDensity: VisualDensity.compact,
+                      icon: const Icon(Icons.add),
-                        tooltip: tr('remove'),
+                      visualDensity: VisualDensity.compact,
-                      ))
+                      tooltip: tr('add'),
-                  : const SizedBox.shrink(),
+                    )),
-              Padding(
+              ],
-                  padding: const EdgeInsets.symmetric(horizontal: 4),
+            )
-                  child: IconButton(
+          ]);
-                    onPressed: () {
-                      showDialog<Map<String, dynamic>?>(
-                          context: context,
-                          builder: (BuildContext ctx) {
-                            return GeneratedFormModal(
-                                title: widget.items[r][e].label,
-                                items: [
-                                  [
-                                    GeneratedFormTextField('label',
-                                        label: tr('label'))
-                                  ]
-                                ]);
-                          }).then((value) {
-                        String? label = value?['label'];
-                        if (label != null) {
-                          setState(() {
-                            var temp = values[widget.items[r][e].key]
-                                as Map<String, MapEntry<int, bool>>?;
-                            temp ??= {};
-                            var singleSelect =
-                                (widget.items[r][e] as GeneratedFormTagInput)
-                                    .singleSelect;
-                            var someSelected = temp.entries
-                                .where((element) => element.value.value)
-                                .isNotEmpty;
-                            temp[label] = MapEntry(
-                                generateRandomLightColor().value,
-                                !(someSelected && singleSelect));
-                            values[widget.items[r][e].key] = temp;
-                            someValueChanged();
-                          });
-                        }
-                      });
-                    },
-                    icon: const Icon(Icons.add),
-                    visualDensity: VisualDensity.compact,
-                    tooltip: tr('add'),
-                  )),
-            ],
-          );
         }
       }
     }

lib/components/generated_form_modal.dart

@@ -9,12 +9,14 @@ class GeneratedFormModal extends StatefulWidget {
       required this.title,
       required this.items,
       this.initValid = false,
-      this.message = ''});
+      this.message = '',
+      this.additionalWidgets = const []});
 
   final String title;
   final String message;
   final List<List<GeneratedFormItem>> items;
   final bool initValid;
+  final List<Widget> additionalWidgets;
 
   @override
   State<GeneratedFormModal> createState() => _GeneratedFormModalState();
@@ -54,7 +56,8 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> {
                   this.valid = valid;
                 });
               }
-            })
+            }),
+        if (widget.additionalWidgets.isNotEmpty) ...widget.additionalWidgets
       ]),
       actions: [
         TextButton(

lib/main.dart

@@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.9.8';
+const String currentVersion = '0.9.9';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/add_app.dart

@@ -8,6 +8,7 @@ import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
 import 'package:obtainium/pages/app.dart';
 import 'package:obtainium/pages/import_export.dart';
+import 'package:obtainium/pages/settings.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
@@ -29,6 +30,7 @@ class _AddAppPageState extends State<AddAppPage> {
   AppSource? pickedSource;
   Map<String, dynamic> additionalSettings = {};
   bool additionalSettingsValid = true;
+  String? category;
 
   @override
   Widget build(BuildContext context) {
@@ -37,25 +39,19 @@ class _AddAppPageState extends State<AddAppPage> {
 
     changeUserInput(String input, bool valid, bool isBuilding) {
       userInput = input;
-      fn() {
+      if (!isBuilding) {
-        var source = valid ? sourceProvider.getSource(userInput) : null;
-        if (pickedSource.runtimeType != source.runtimeType) {
-          pickedSource = source;
-          additionalSettings = source != null
-              ? getDefaultValuesFromFormItems(
-                  source.combinedAppSpecificSettingFormItems)
-              : {};
-          additionalSettingsValid = source != null
-              ? !sourceProvider.ifRequiredAppSpecificSettingsExist(source)
-              : true;
-        }
-      }
-
-      if (isBuilding) {
-        fn();
-      } else {
         setState(() {
-          fn();
+          var source = valid ? sourceProvider.getSource(userInput) : null;
+          if (pickedSource.runtimeType != source.runtimeType) {
+            pickedSource = source;
+            additionalSettings = source != null
+                ? getDefaultValuesFromFormItems(
+                    source.combinedAppSpecificSettingFormItems)
+                : {};
+            additionalSettingsValid = source != null
+                ? !sourceProvider.ifRequiredAppSpecificSettingsExist(source)
+                : true;
+          }
         });
       }
     }
@@ -131,6 +127,9 @@ class _AddAppPageState extends State<AddAppPage> {
           if (app.additionalSettings['trackOnly'] == true) {
             app.installedVersion = app.latestVersion;
           }
+          if (category != null) {
+            app.category = category;
+          }
           await appsProvider.saveApps([app]);
 
           return app;
@@ -238,7 +237,9 @@ class _AddAppPageState extends State<AddAppPage> {
                                     ]
                                   ],
                                   onValueChanges: (values, valid, isBuilding) {
-                                    if (values.isNotEmpty && valid) {
+                                    if (values.isNotEmpty &&
+                                        valid &&
+                                        !isBuilding) {
                                       setState(() {
                                         searchQuery =
                                             values['searchSomeSources']!.trim();
@@ -299,9 +300,7 @@ class _AddAppPageState extends State<AddAppPage> {
                                 child: Text(tr('search')))
                           ],
                         ),
-                      if (pickedSource != null &&
+                      if (pickedSource != null)
-                          (pickedSource!
-                              .combinedAppSpecificSettingFormItems.isNotEmpty))
                         Column(
                           crossAxisAlignment: CrossAxisAlignment.stretch,
                           children: [
@@ -328,6 +327,21 @@ class _AddAppPageState extends State<AddAppPage> {
                                     });
                                   }
                                 }),
+                            Column(
+                              children: [
+                                const SizedBox(
+                                  height: 16,
+                                ),
+                                CategoryEditorSelector(
+                                    alignment: WrapAlignment.start,
+                                    singleSelect: true,
+                                    onSelected: (categories) {
+                                      category = categories.isEmpty
+                                          ? null
+                                          : categories.first;
+                                    }),
+                              ],
+                            ),
                           ],
                         )
                       else

lib/pages/app.dart

@@ -1,7 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
@@ -35,7 +34,6 @@ class _AppPageState extends State<AppPage> {
       });
     }
 
-    var categories = settingsProvider.categories;
     var sourceProvider = SourceProvider();
     AppInMemory? app = appsProvider.apps[widget.appId];
     var source = app != null ? sourceProvider.getSource(app.app.url) : null;
@@ -72,11 +70,12 @@ class _AppPageState extends State<AppPage> {
                   : Container()
               : CustomScrollView(
                   slivers: [
-                    SliverFillRemaining(
+                    SliverToBoxAdapter(
                         child: Column(
                       mainAxisAlignment: MainAxisAlignment.center,
                       crossAxisAlignment: CrossAxisAlignment.stretch,
                       children: [
+                        const SizedBox(height: 150),
                         app?.installedInfo != null
                             ? Row(
                                 mainAxisAlignment: MainAxisAlignment.center,
@@ -168,7 +167,8 @@ class _AppPageState extends State<AppPage> {
                                     : null;
                                 appsProvider.saveApps([app.app]);
                               }
-                            })
+                            }),
+                        const SizedBox(height: 150)
                       ],
                     )),
                   ],

lib/pages/apps.dart

@@ -7,6 +7,7 @@ import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
 import 'package:obtainium/pages/app.dart';
+import 'package:obtainium/pages/settings.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
 import 'package:obtainium/providers/source_provider.dart';
@@ -22,7 +23,8 @@ class AppsPage extends StatefulWidget {
 }
 
 class AppsPageState extends State<AppsPage> {
-  AppsFilter? filter;
+  AppsFilter filter = AppsFilter();
+  final AppsFilter neutralFilter = AppsFilter();
   var updatesOnlyFilter =
       AppsFilter(includeUptodate: false, includeNonInstalled: false);
   Set<App> selectedApps = {};
@@ -53,8 +55,7 @@ class AppsPageState extends State<AppsPage> {
     var appsProvider = context.watch<AppsProvider>();
     var settingsProvider = context.watch<SettingsProvider>();
     var sortedApps = appsProvider.apps.values.toList();
-    var currentFilterIsUpdatesOnly =
+    var currentFilterIsUpdatesOnly = filter.isIdenticalTo(updatesOnlyFilter);
-        filter?.isIdenticalTo(updatesOnlyFilter) ?? false;
 
     selectedApps = selectedApps
         .where((element) => sortedApps.map((e) => e.app).contains(element))
@@ -70,45 +71,42 @@ class AppsPageState extends State<AppsPage> {
       });
     }
 
-    if (filter != null) {
+    sortedApps = sortedApps.where((app) {
-      sortedApps = sortedApps.where((app) {
+      if (app.app.installedVersion == app.app.latestVersion &&
-        if (app.app.installedVersion == app.app.latestVersion &&
+          !(filter.includeUptodate)) {
-            !(filter!.includeUptodate)) {
+        return false;
-          return false;
+      }
-        }
+      if (app.app.installedVersion == null && !(filter.includeNonInstalled)) {
-        if (app.app.installedVersion == null &&
+        return false;
-            !(filter!.includeNonInstalled)) {
+      }
-          return false;
+      if (filter.nameFilter.isNotEmpty || filter.authorFilter.isNotEmpty) {
-        }
+        List<String> nameTokens = filter.nameFilter
-        if (filter!.nameFilter.isNotEmpty || filter!.authorFilter.isNotEmpty) {
+            .split(' ')
-          List<String> nameTokens = filter!.nameFilter
+            .where((element) => element.trim().isNotEmpty)
-              .split(' ')
+            .toList();
-              .where((element) => element.trim().isNotEmpty)
+        List<String> authorTokens = filter.authorFilter
-              .toList();
+            .split(' ')
-          List<String> authorTokens = filter!.authorFilter
+            .where((element) => element.trim().isNotEmpty)
-              .split(' ')
+            .toList();
-              .where((element) => element.trim().isNotEmpty)
-              .toList();
 
-          for (var t in nameTokens) {
+        for (var t in nameTokens) {
-            var name = app.installedInfo?.name ?? app.app.name;
+          var name = app.installedInfo?.name ?? app.app.name;
-            if (!name.toLowerCase().contains(t.toLowerCase())) {
+          if (!name.toLowerCase().contains(t.toLowerCase())) {
-              return false;
+            return false;
-            }
-          }
-          for (var t in authorTokens) {
-            if (!app.app.author.toLowerCase().contains(t.toLowerCase())) {
-              return false;
-            }
           }
         }
-        if (filter!.categoryFilter.isNotEmpty &&
+        for (var t in authorTokens) {
-            filter!.categoryFilter != app.app.category) {
+          if (!app.app.author.toLowerCase().contains(t.toLowerCase())) {
-          return false;
+            return false;
+          }
         }
-        return true;
+      }
-      }).toList();
+      if (filter.categoryFilter.isNotEmpty &&
-    }
+          !filter.categoryFilter.contains(app.app.category)) {
+        return false;
+      }
+      return true;
+    }).toList();
 
     sortedApps.sort((a, b) {
       var nameA = a.installedInfo?.name ?? a.app.name;
@@ -230,7 +228,7 @@ class AppsPageState extends State<AppsPage> {
                   decoration: BoxDecoration(
                       border: Border.symmetric(
                           vertical: BorderSide(
-                              width: 3,
+                              width: 4,
                               color: Color(settingsProvider.categories[
                                       sortedApps[index].app.category] ??
                                   const Color.fromARGB(0, 0, 0, 0).value)))),
@@ -339,21 +337,29 @@ class AppsPageState extends State<AppsPage> {
       persistentFooterButtons: [
         Row(
           children: [
-            IconButton(
+            selectedApps.isEmpty
-                onPressed: () {
+                ? IconButton(
-                  selectedApps.isEmpty
+                    onPressed: () {
-                      ? selectThese(sortedApps.map((e) => e.app).toList())
+                      selectThese(sortedApps.map((e) => e.app).toList());
-                      : clearSelected();
+                    },
-                },
+                    icon: Icon(
-                icon: Icon(
+                      Icons.select_all_outlined,
-                  selectedApps.isEmpty
+                      color: Theme.of(context).colorScheme.primary,
-                      ? Icons.select_all_outlined
+                    ),
-                      : Icons.deselect_outlined,
+                    tooltip: tr('selectAll'))
-                  color: Theme.of(context).colorScheme.primary,
+                : TextButton.icon(
-                ),
+                    onPressed: () {
-                tooltip: selectedApps.isEmpty
+                      selectedApps.isEmpty
-                    ? tr('selectAll')
+                          ? selectThese(sortedApps.map((e) => e.app).toList())
-                    : tr('deselectN', args: [selectedApps.length.toString()])),
+                          : clearSelected();
+                    },
+                    icon: Icon(
+                      selectedApps.isEmpty
+                          ? Icons.select_all_outlined
+                          : Icons.deselect_outlined,
+                      color: Theme.of(context).colorScheme.primary,
+                    ),
+                    label: Text(selectedApps.length.toString())),
             const VerticalDivider(),
             Expanded(
                 child: Row(
@@ -663,7 +669,7 @@ class AppsPageState extends State<AppsPage> {
               onPressed: () {
                 setState(() {
                   if (currentFilterIsUpdatesOnly) {
-                    filter = null;
+                    filter = AppsFilter();
                   } else {
                     filter = updatesOnlyFilter;
                   }
@@ -683,9 +689,11 @@ class AppsPageState extends State<AppsPage> {
                 ? const SizedBox()
                 : TextButton.icon(
                     label: Text(
-                      filter == null ? tr('filter') : tr('filterActive'),
+                      filter.isIdenticalTo(neutralFilter)
+                          ? tr('filter')
+                          : tr('filterActive'),
                       style: TextStyle(
-                          fontWeight: filter == null
+                          fontWeight: filter.isIdenticalTo(neutralFilter)
                               ? FontWeight.normal
                               : FontWeight.bold),
                     ),
@@ -693,44 +701,48 @@ class AppsPageState extends State<AppsPage> {
                       showDialog<Map<String, dynamic>?>(
                           context: context,
                           builder: (BuildContext ctx) {
-                            var vals = filter == null
+                            var vals = filter.toFormValuesMap();
-                                ? AppsFilter().toValuesMap()
-                                : filter!.toValuesMap();
                             return GeneratedFormModal(
-                                title: tr('filterApps'),
+                              initValid: true,
-                                items: [
+                              title: tr('filterApps'),
-                                  [
+                              items: [
-                                    GeneratedFormTextField('appName',
+                                [
-                                        label: tr('appName'),
+                                  GeneratedFormTextField('appName',
-                                        required: false,
+                                      label: tr('appName'),
-                                        defaultValue: vals['appName']),
+                                      required: false,
-                                    GeneratedFormTextField('author',
+                                      defaultValue: vals['appName']),
-                                        label: tr('author'),
+                                  GeneratedFormTextField('author',
-                                        required: false,
+                                      label: tr('author'),
-                                        defaultValue: vals['author'])
+                                      required: false,
-                                  ],
+                                      defaultValue: vals['author'])
-                                  [
+                                ],
-                                    GeneratedFormSwitch('upToDateApps',
+                                [
-                                        label: tr('upToDateApps'),
+                                  GeneratedFormSwitch('upToDateApps',
-                                        defaultValue: vals['upToDateApps'])
+                                      label: tr('upToDateApps'),
-                                  ],
+                                      defaultValue: vals['upToDateApps'])
-                                  [
+                                ],
-                                    GeneratedFormSwitch('nonInstalledApps',
+                                [
-                                        label: tr('nonInstalledApps'),
+                                  GeneratedFormSwitch('nonInstalledApps',
-                                        defaultValue: vals['nonInstalledApps'])
+                                      label: tr('nonInstalledApps'),
-                                  ],
+                                      defaultValue: vals['nonInstalledApps'])
-                                  [
+                                ]
-                                    settingsProvider.getCategoryFormItem(
+                              ],
-                                        initCategory: vals['category'] ?? '')
+                              additionalWidgets: [
-                                  ]
+                                const SizedBox(
-                                ]);
+                                  height: 16,
+                                ),
+                                CategoryEditorSelector(
+                                  preselected: filter.categoryFilter,
+                                  onSelected: (categories) {
+                                    filter.categoryFilter = categories.toSet();
+                                  },
+                                )
+                              ],
+                            );
                           }).then((values) {
                         if (values != null) {
                           setState(() {
-                            filter = AppsFilter.fromValuesMap(values);
+                            filter.setFormValuesFromMap(values);
-                            if (AppsFilter().isIdenticalTo(filter!)) {
-                              filter = null;
-                            }
                           });
                         }
                       });
@@ -748,31 +760,29 @@ class AppsFilter {
   late String authorFilter;
   late bool includeUptodate;
   late bool includeNonInstalled;
-  late String categoryFilter;
+  late Set<String> categoryFilter;
 
   AppsFilter(
       {this.nameFilter = '',
       this.authorFilter = '',
       this.includeUptodate = true,
       this.includeNonInstalled = true,
-      this.categoryFilter = ''});
+      this.categoryFilter = const {}});
 
-  Map<String, dynamic> toValuesMap() {
+  Map<String, dynamic> toFormValuesMap() {
     return {
       'appName': nameFilter,
       'author': authorFilter,
       'upToDateApps': includeUptodate,
-      'nonInstalledApps': includeNonInstalled,
+      'nonInstalledApps': includeNonInstalled
-      'category': categoryFilter
     };
   }
 
-  AppsFilter.fromValuesMap(Map<String, dynamic> values) {
+  setFormValuesFromMap(Map<String, dynamic> values) {
     nameFilter = values['appName']!;
     authorFilter = values['author']!;
     includeUptodate = values['upToDateApps'];
     includeNonInstalled = values['nonInstalledApps'];
-    categoryFilter = values['category']!;
   }
 
   bool isIdenticalTo(AppsFilter other) =>
@@ -780,5 +790,7 @@ class AppsFilter {
       nameFilter.trim() == other.nameFilter.trim() &&
       includeUptodate == other.includeUptodate &&
       includeNonInstalled == other.includeNonInstalled &&
-      categoryFilter.trim() == other.categoryFilter.trim();
+      categoryFilter.length == other.categoryFilter.length &&
+      categoryFilter.union(other.categoryFilter).length ==
+          categoryFilter.length;
 }

lib/pages/settings.dart

@@ -185,7 +185,7 @@ class _SettingsPageState extends State<SettingsPage> {
               return [e];
             }).toList(),
             onValueChanges: (values, valid, isBuilding) {
-              if (valid) {
+              if (valid && !isBuilding) {
                 values.forEach((key, value) {
                   settingsProvider.setSettingString(key, value);
                 });
@@ -286,7 +286,9 @@ class _SettingsPageState extends State<SettingsPage> {
                                   color: Theme.of(context).colorScheme.primary),
                             ),
                             height16,
-                            const CategoryEditorSelector()
+                            const CategoryEditorSelector(
+                              showLabelWhenNotEmpty: false,
+                            )
                           ],
                         ))),
           SliverToBoxAdapter(
@@ -407,12 +409,14 @@ class CategoryEditorSelector extends StatefulWidget {
   final bool singleSelect;
   final Set<String> preselected;
   final WrapAlignment alignment;
+  final bool showLabelWhenNotEmpty;
   const CategoryEditorSelector(
       {super.key,
       this.onSelected,
       this.singleSelect = false,
       this.preselected = const {},
-      this.alignment = WrapAlignment.start});
+      this.alignment = WrapAlignment.start,
+      this.showLabelWhenNotEmpty = true});
 
   @override
   State<CategoryEditorSelector> createState() => _CategoryEditorSelectorState();
@@ -439,7 +443,8 @@ class _CategoryEditorSelectorState extends State<CategoryEditorSelector> {
                 deleteConfirmationMessage: MapEntry(
                     tr('deleteCategoriesQuestion'),
                     tr('categoryDeleteWarning')),
-                singleSelect: widget.singleSelect)
+                singleSelect: widget.singleSelect,
+                showLabelWhenNotEmpty: widget.showLabelWhenNotEmpty)
           ]
         ],
         onValueChanges: ((values, valid, isBuilding) {

pubspec.lock

@@ -739,14 +739,14 @@ packages:
       name: webview_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.0"
+    version: "4.0.1"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.1"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
@@ -760,7 +760,7 @@ packages:
       name: webview_flutter_wkwebview
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.1"
   win32:
     dependency: transitive
     description:

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.9.8+96 # When changing this, update the tag in main() accordingly
+version: 0.9.9+97 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'