feat: Add ability to set null in patch options (#1947)

Author: TheAabedKhan

assets/i18n/strings.i18n.json

@@ -118,16 +118,18 @@
   },
   "patchOptionsView": {
     "customValue": "Custom value",
+    "setToNull": "Set to null",
+    "nullValue": "This option value is currently null",
     "resetOptionsTooltip": "Reset patch options",
     "viewTitle": "Patch options",
     "saveOptions": "Save",
     "addOptions": "Add options",
-    "deselectPatch": "Deselect patch",
+    "unselectPatch": "Unselect patch",
     "tooltip": "More input options",
     "selectFilePath": "Select file path",
     "selectFolder": "Select folder",
     "selectOption": "Select option",
-    "requiredOption": "This option is required",
+    "requiredOption": "Setting this option is required",
     "unsupportedOption": "This option is not supported",
     "requiredOptionNull": "The following options have to be set:\n\n${options}"
   },

lib/services/manager_api.dart

@@ -31,7 +31,6 @@ class ManagerAPI {
   final String cliRepo = 'revanced-cli';
   late SharedPreferences _prefs;
   List<Patch> patches = [];
-  List<Option> modifiedOptions = [];
   List<Option> options = [];
   Patch? selectedPatch;
   BuildContext? ctx;

lib/ui/views/patch_options/patch_options_view.dart

@@ -37,79 +37,35 @@ class PatchOptionsView extends StatelessWidget {
                     color: Theme.of(context).textTheme.titleLarge!.color,
                   ),
                 ),
-                actions: [
-                  IconButton(
-                    onPressed: () {
-                      model.resetOptions();
-                    },
-                    icon: const Icon(
-                      Icons.history,
-                    ),
-                    tooltip: t.patchOptionsView.resetOptionsTooltip,
-                  ),
-                ],
               ),
               SliverToBoxAdapter(
                 child: Padding(
                   padding: const EdgeInsets.all(8.0),
                   child: Column(
                     children: [
-                      for (final Option option in model.visibleOptions)
+                      for (final Option option in model.modifiedOptions)
                         if (option.valueType == 'String' ||
                             option.valueType == 'Int')
                           IntAndStringPatchOption(
                             patchOption: option,
-                            removeOption: (option) {
-                              model.removeOption(option);
-                            },
-                            onChanged: (value, option) {
-                              model.modifyOptions(value, option);
-                            },
+                            model: model,
                           )
                         else if (option.valueType == 'Boolean')
                           BooleanPatchOption(
                             patchOption: option,
-                            removeOption: (option) {
-                              model.removeOption(option);
-                            },
-                            onChanged: (value, option) {
-                              model.modifyOptions(value, option);
-                            },
+                            model: model,
                           )
                         else if (option.valueType == 'StringArray' ||
                             option.valueType == 'IntArray' ||
                             option.valueType == 'LongArray')
                           IntStringLongListPatchOption(
                             patchOption: option,
-                            removeOption: (option) {
-                              model.removeOption(option);
-                            },
-                            onChanged: (value, option) {
-                              model.modifyOptions(value, option);
-                            },
+                            model: model,
                           )
                         else
                           UnsupportedPatchOption(
                             patchOption: option,
                           ),
-                      if (model.visibleOptions.length !=
-                          model.options.length) ...[
-                        const SizedBox(
-                          height: 8,
-                        ),
-                        FilledButton(
-                          onPressed: () {
-                            model.showAddOptionDialog(context);
-                          },
-                          child: Row(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              const Icon(Icons.add),
-                              Text(t.patchOptionsView.addOptions),
-                            ],
-                          ),
-                        ),
-                      ],
                       const SizedBox(
                         height: 80,
                       ),

lib/ui/views/patch_options/patch_options_viewmodel.dart

@@ -5,7 +5,6 @@ import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:stacked/stacked.dart';
 
 class PatchOptionsViewModel extends BaseViewModel {
@@ -14,7 +13,7 @@ class PatchOptionsViewModel extends BaseViewModel {
       locator<PatcherViewModel>().selectedApp!.packageName;
   List<Option> options = [];
   List<Option> savedOptions = [];
-  List<Option> visibleOptions = [];
+  List<Option> modifiedOptions = [];
 
   Future<void> initialize() async {
     options = getDefaultOptions();
@@ -28,44 +27,26 @@ class PatchOptionsViewModel extends BaseViewModel {
         savedOptions.add(savedOption);
       }
     }
-    if (savedOptions.isNotEmpty) {
-      visibleOptions = [
-        ...savedOptions,
-        ...options.where(
-          (option) =>
-              option.required &&
-              !savedOptions.any((sOption) => sOption.key == option.key),
-        ),
-      ];
-    } else {
-      visibleOptions = [
-        ...options.where((option) => option.required),
-      ];
-    }
-  }
-
-  void addOption(Option option) {
-    visibleOptions.add(option);
-    notifyListeners();
-  }
-
-  void removeOption(Option option) {
-    visibleOptions.removeWhere((vOption) => vOption.key == option.key);
-    notifyListeners();
+    modifiedOptions = [
+      ...savedOptions,
+      ...options.where(
+        (option) => !savedOptions.any((sOption) => sOption.key == option.key),
+      ),
+    ];
   }
 
   bool saveOptions(BuildContext context) {
     final List<Option> requiredNullOptions = [];
     for (final Option option in options) {
-      if (!visibleOptions.any((vOption) => vOption.key == option.key)) {
+      if (modifiedOptions.any((mOption) => mOption.key == option.key)) {
         _managerAPI.clearPatchOption(
           selectedApp,
           _managerAPI.selectedPatch!.name,
           option.key,
         );
       }
     }
-    for (final Option option in visibleOptions) {
+    for (final Option option in modifiedOptions) {
       if (option.required && option.value == null) {
         requiredNullOptions.add(option);
       } else {
@@ -98,11 +79,8 @@ class PatchOptionsViewModel extends BaseViewModel {
       required: option.required,
       key: option.key,
     );
-    visibleOptions[visibleOptions
-        .indexWhere((vOption) => vOption.key == option.key)] = modifiedOption;
-    _managerAPI.modifiedOptions
-        .removeWhere((mOption) => mOption.key == option.key);
-    _managerAPI.modifiedOptions.add(modifiedOption);
+    modifiedOptions.removeWhere((mOption) => mOption.key == option.key);
+    modifiedOptions.add(modifiedOption);
   }
 
   List<Option> getDefaultOptions() {
@@ -122,93 +100,11 @@ class PatchOptionsViewModel extends BaseViewModel {
     return defaultOptions;
   }
 
-  void resetOptions() {
-    _managerAPI.modifiedOptions.clear();
-    visibleOptions =
-        getDefaultOptions().where((option) => option.required).toList();
-    notifyListeners();
-  }
-
-  Future<void> showAddOptionDialog(BuildContext context) async {
-    await showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Text(
-              t.patchOptionsView.addOptions,
-            ),
-            Text(
-              '',
-              style: TextStyle(
-                fontSize: 16,
-                color: Theme.of(context).colorScheme.onSecondaryContainer,
-              ),
-            ),
-          ],
-        ),
-        actions: [
-          FilledButton(
-            onPressed: () {
-              Navigator.of(context).pop();
-            },
-            child: Text(t.cancelButton),
-          ),
-        ],
-        contentPadding: const EdgeInsets.all(8),
-        content: Wrap(
-          spacing: 14,
-          runSpacing: 14,
-          children: options
-              .where(
-            (option) =>
-                !visibleOptions.any((vOption) => vOption.key == option.key),
-          )
-              .map((e) {
-            return CustomCard(
-              padding: const EdgeInsets.all(4),
-              backgroundColor: Theme.of(context).colorScheme.surface,
-              onTap: () {
-                addOption(e);
-                Navigator.pop(context);
-              },
-              child: Padding(
-                padding: const EdgeInsets.all(8.0),
-                child: Row(
-                  children: [
-                    Expanded(
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Text(
-                            e.title,
-                            style: TextStyle(
-                              fontSize: 16,
-                              color: Theme.of(context).colorScheme.onSurface,
-                            ),
-                          ),
-                          const SizedBox(height: 4),
-                          Text(
-                            e.description,
-                            style: TextStyle(
-                              fontSize: 14,
-                              color: Theme.of(context).colorScheme.onSurface,
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            );
-          }).toList(),
-        ),
-      ),
-    );
-  }
+  dynamic getDefaultValue(Option patchOption) => _managerAPI.options
+      .firstWhere(
+        (option) => option.key == patchOption.key,
+      )
+      .value;
 }
 
 Future<void> showRequiredOptionNullDialog(
@@ -248,7 +144,7 @@ Future<void> showRequiredOptionNullDialog(
               PatchesSelectorViewModel().showPatchesChangeDialog(context);
             }
           },
-          child: Text(t.patchOptionsView.deselectPatch),
+          child: Text(t.patchOptionsView.unselectPatch),
         ),
         FilledButton(
           onPressed: () {

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -61,7 +61,6 @@ class PatchesSelectorViewModel extends BaseViewModel {
   void navigateToPatchOptions(List<Option> setOptions, Patch patch) {
     _managerAPI.options = setOptions;
     _managerAPI.selectedPatch = patch;
-    _managerAPI.modifiedOptions.clear();
     _navigationService.navigateToPatchOptionsView();
   }