chore: merge dev to main (#1388)

assets/i18n/en_US.json

@@ -254,7 +254,7 @@
         "resetStoredPatchesLabel": "Reset patch selection",
         "resetStoredPatchesHint": "Reset the stored patch selection",
         "resetStoredPatchesDialogTitle": "Reset patch selection?",
-        "resetStoredPatchesDialogText": "The default selection of patches will be restored..",
+        "resetStoredPatchesDialogText": "The default selection of patches will be restored.",
         "resetStoredPatches": "Patch selection has been reset",
 
         "resetStoredOptionsLabel": "Reset patch options",

lib/services/manager_api.dart

@@ -677,7 +677,7 @@ class ManagerAPI {
   Future<List<String>> getDefaultPatches() async {
     final List<Patch> patches = await getPatches();
     final List<String> defaultPatches = [];
-    if (isVersionCompatibilityCheckEnabled() == false) {
+    if (isVersionCompatibilityCheckEnabled() == true) {
       defaultPatches.addAll(
         patches
             .where(

lib/ui/views/patcher/patcher_viewmodel.dart

@@ -80,7 +80,8 @@ class PatcherViewModel extends BaseViewModel {
   }
 
   bool checkRequiredPatchOption(BuildContext context) {
-    if (getNullRequiredOptions(selectedPatches, selectedApp!.packageName).isNotEmpty) {
+    if (getNullRequiredOptions(selectedPatches, selectedApp!.packageName)
+        .isNotEmpty) {
       showRequiredOptionDialog(context);
       return false;
     }
@@ -190,7 +191,7 @@ class PatcherViewModel extends BaseViewModel {
       this.selectedPatches.clear();
       this.selectedPatches.addAll(patches.where((patch) => !patch.excluded));
     }
-    if (!_managerAPI.isVersionCompatibilityCheckEnabled()) {
+    if (_managerAPI.isVersionCompatibilityCheckEnabled()) {
       this.selectedPatches.removeWhere((patch) => !isPatchSupported(patch));
     }
     if (!_managerAPI.areUniversalPatchesEnabled()) {
@@ -199,11 +200,12 @@ class PatcherViewModel extends BaseViewModel {
           .removeWhere((patch) => patch.compatiblePackages.isEmpty);
     }
     final usedPatches = _managerAPI.getUsedPatches(selectedApp!.packageName);
-    for (final patch in usedPatches){
-      if (!patches.any((p) => p.name == patch.name)){
+    for (final patch in usedPatches) {
+      if (!patches.any((p) => p.name == patch.name)) {
         removedPatches.add('• ${patch.name}');
         for (final option in patch.options) {
-          _managerAPI.clearPatchOption(selectedApp!.packageName, patch.name, option.key);
+          _managerAPI.clearPatchOption(
+              selectedApp!.packageName, patch.name, option.key);
         }
       }
     }

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -169,7 +169,7 @@ class PatchesSelectorViewModel extends BaseViewModel {
             .where(
               (element) =>
                   !element.excluded &&
-                  (_managerAPI.isVersionCompatibilityCheckEnabled() ||
+                  (!_managerAPI.isVersionCompatibilityCheckEnabled() ||
                       isPatchSupported(element)),
             ),
       );
@@ -209,7 +209,10 @@ class PatchesSelectorViewModel extends BaseViewModel {
               query.isEmpty ||
               query.length < 2 ||
               patch.name.toLowerCase().contains(query.toLowerCase()) ||
-              patch.name.replaceAll(RegExp(r'[^\w\s]+'), '').toLowerCase().contains(query.toLowerCase()),
+              patch.name
+                  .replaceAll(RegExp(r'[^\w\s]+'), '')
+                  .toLowerCase()
+                  .contains(query.toLowerCase()),
         )
         .toList();
     if (_managerAPI.areUniversalPatchesEnabled()) {
@@ -281,7 +284,7 @@ class PatchesSelectorViewModel extends BaseViewModel {
         this.selectedPatches.addAll(
               patches.where((patch) => selectedPatches.contains(patch.name)),
             );
-        if (!_managerAPI.isVersionCompatibilityCheckEnabled()) {
+        if (_managerAPI.isVersionCompatibilityCheckEnabled()) {
           this.selectedPatches.removeWhere((patch) => !isPatchSupported(patch));
         }
       } else {

lib/ui/widgets/patchesSelectorView/patch_item.dart

@@ -48,12 +48,13 @@ class _PatchItemState extends State<PatchItem> {
   Widget build(BuildContext context) {
     widget.isSelected = widget.isSelected &&
         (!widget.isUnsupported ||
-            widget._managerAPI.isVersionCompatibilityCheckEnabled()) && !widget.hasUnsupportedPatchOption;
+            !widget._managerAPI.isVersionCompatibilityCheckEnabled()) &&
+        !widget.hasUnsupportedPatchOption;
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 4.0),
       child: Opacity(
         opacity: widget.isUnsupported &&
-                widget._managerAPI.isVersionCompatibilityCheckEnabled() == false
+                widget._managerAPI.isVersionCompatibilityCheckEnabled() == true
             ? 0.5
             : 1,
         child: CustomCard(
@@ -65,7 +66,7 @@ class _PatchItemState extends State<PatchItem> {
           ),
           onTap: () {
             if (widget.isUnsupported &&
-                !widget._managerAPI.isVersionCompatibilityCheckEnabled()) {
+                widget._managerAPI.isVersionCompatibilityCheckEnabled()) {
               widget.isSelected = false;
               widget.toast.showBottom('patchItem.unsupportedPatchVersion');
             } else if (widget.isChangeEnabled) {
@@ -79,7 +80,7 @@ class _PatchItemState extends State<PatchItem> {
               setState(() {});
             }
             if (!widget.isUnsupported ||
-                widget._managerAPI.isVersionCompatibilityCheckEnabled()) {
+                !widget._managerAPI.isVersionCompatibilityCheckEnabled()) {
               widget.onChanged(widget.isSelected);
             }
           },
@@ -98,7 +99,8 @@ class _PatchItemState extends State<PatchItem> {
                   ),
                   onChanged: (newValue) {
                     if (widget.isUnsupported &&
-                        !widget._managerAPI.isVersionCompatibilityCheckEnabled()) {
+                        widget._managerAPI
+                            .isVersionCompatibilityCheckEnabled()) {
                       widget.isSelected = false;
                       widget.toast.showBottom(
                         'patchItem.unsupportedPatchVersion',
@@ -114,7 +116,8 @@ class _PatchItemState extends State<PatchItem> {
                       setState(() {});
                     }
                     if (!widget.isUnsupported ||
-                        widget._managerAPI.isVersionCompatibilityCheckEnabled()) {
+                        !widget._managerAPI
+                            .isVersionCompatibilityCheckEnabled()) {
                       widget.onChanged(widget.isSelected);
                     }
                   },
@@ -154,7 +157,7 @@ class _PatchItemState extends State<PatchItem> {
                             runSpacing: 4,
                             children: [
                               if (widget.isUnsupported &&
-                                  widget._managerAPI
+                                  !widget._managerAPI
                                       .isVersionCompatibilityCheckEnabled())
                                 Padding(
                                   padding: const EdgeInsets.only(top: 8),

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 1.13.0+101300000
+version: 1.13.1+101300100
 
 environment:
   sdk: '>=3.0.0 <4.0.0'