chore: merge dev to main (#1399)

.releaserc

@@ -1,75 +0,0 @@
-{
-  "branches": [
-    "main",
-    {
-      "name": "dev",
-      "prerelease": true
-    }
-  ],
-  "plugins": [
-    "semantic-release-export-data",
-    "@semantic-release/commit-analyzer",
-    [
-      "@semantic-release/release-notes-generator",
-      {
-        "presetConfig": {
-          "types": [
-            {
-              "type": "build",
-              "section": "Dependency Updates"
-            },
-            {
-              "type": "chore",
-              "section": "Other Changes",
-              "hidden": false
-            },
-            {
-              "type": "perf",
-              "section": "Performance Improvements",
-              "hidden": false
-            },
-            {
-              "type": "refactor",
-              "section": "Code Improvements",
-              "hidden": false
-            }
-          ]
-        }
-      }
-    ],
-    "@semantic-release/changelog",
-    "semantic-release-flutter-plugin",
-    [
-      "@semantic-release/git",
-      {
-        "assets": [
-          "CHANGELOG.md",
-          "pubspec.yaml"
-        ]
-      }
-    ],
-    [
-      "@semantic-release/github",
-      {
-        "assets": [
-          {
-            "path": "build/app/outputs/apk/release/revanced-manager-*.apk"
-          }
-        ],
-        "successComment": false
-      }
-    ],
-    [
-      "@saithodev/semantic-release-backmerge",
-      {
-        "backmergeBranches": [
-          {
-            "from": "main",
-            "to": "dev"
-          }
-        ],
-        "clearWorkspace": true
-      }
-    ]
-  ]
-}

CHANGELOG.md

@@ -1 +0,0 @@
-

assets/i18n/en_US.json

@@ -1,6 +1,7 @@
 {
     "okButton": "OK",
     "cancelButton": "Cancel",
+    "dismissButton": "Dismiss",
     "quitButton": "Quit",
     "updateButton": "Update",
     "enabledLabel": "Enabled",
@@ -134,6 +135,7 @@
         "setRequiredOption": "Some patches require options to be set:\n\n{patches}\n\nPlease set them before continuing."
     },
     "patchOptionsView": {
+        "resetOptionsTooltip": "Reset patch options",
         "viewTitle": "Patch options",
         "saveOptions": "Save",
 
@@ -232,7 +234,7 @@
         "universalPatchesLabel": "Show universal patches",
         "universalPatchesHint": "Display all apps and universal patches (may slow down the app list)",
         "versionCompatibilityCheckLabel": "Version compatibility check",
-        "versionCompatibilityCheckHint": "Restricts patches to supported versions",
+        "versionCompatibilityCheckHint": "Restricts patches to supported app versions",
 
         "aboutLabel": "About",
         "snackbarMessage": "Copied to clipboard",

lib/ui/views/installer/installer_viewmodel.dart

@@ -139,7 +139,6 @@ class InstallerViewModel extends BaseViewModel {
   }
 
   Future<void> runPatcher() async {
-
     try {
       await _patcherAPI.runPatcher(
         _app.packageName,
@@ -159,7 +158,7 @@ class InstallerViewModel extends BaseViewModel {
 
     // Necessary to reset the state of patches so that they
     // can be reloaded again.
-   _managerAPI.patches.clear();
+    _managerAPI.patches.clear();
     await _patcherAPI.loadPatches();
 
     try {
@@ -185,26 +184,27 @@ class InstallerViewModel extends BaseViewModel {
 
     final formattedLogs = [
       '```',
-      '~ Device Info',
+      '- Device Info',
       'ReVanced Manager: ${info['version']}',
       'Build: ${info['flavor']}',
       'Model: ${info['model']}',
       'Android version: ${info['androidVersion']}',
       'Supported architectures: ${info['supportedArch'].join(", ")}',
-
+      'Root permissions: ${isRooted ? 'Yes' : 'No'}',
-      '\n~ Patch Info',
+      
+      '\n- Patch Info',
       'App: ${_app.packageName} v${_app.version}',
       'Patches version: ${_managerAPI.patchesVersion}',
-      'Patches: ${_patches.map((p) => p.name).toList().join(", ")}',
+      'Patches: ${_patches.map((p) => p.name + (p.options.isEmpty ? '' : ' [${p.options.map((o) => '${o.title}: ${o.value}').join(", ")}]')).toList().join(", ")}',
-
+      
-      '\n~ Settings',
+      '\n- Settings',
       'Allow changing patch selection: ${_managerAPI.isPatchesChangeEnabled()}',
-      'Show universal patches: ${_managerAPI.areUniversalPatchesEnabled()}',
       'Version compatibility check: ${_managerAPI.isVersionCompatibilityCheckEnabled()}',
+      'Show universal patches: ${_managerAPI.areUniversalPatchesEnabled()}',
       'Patches source: ${_managerAPI.getPatchesRepo()}',
       'Integration source: ${_managerAPI.getIntegrationsRepo()}',
-
+      
-      '\n~ Logs',
+      '\n- Logs',
       logs,
       '```',
     ];

lib/ui/views/patch_options/patch_options_view.dart

@@ -48,6 +48,10 @@ class PatchOptionsView extends StatelessWidget {
                     icon: const Icon(
                       Icons.history,
                     ),
+                    tooltip: FlutterI18n.translate(
+                      context,
+                      'patchOptionsView.resetOptionsTooltip',
+                    ),
                   ),
                 ],
               ),

lib/ui/views/patch_options/patch_options_viewmodel.dart

@@ -147,7 +147,7 @@ class PatchOptionsViewModel extends BaseViewModel {
         ),
         actions: [
           CustomMaterialButton(
-            label: I18nText('okButton'),
+            label: I18nText('cancelButton'),
             onPressed: () {
               Navigator.of(context).pop();
             },
@@ -165,7 +165,7 @@ class PatchOptionsViewModel extends BaseViewModel {
               .map((e) {
             return CustomCard(
               padding: const EdgeInsets.all(4),
-              backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+              backgroundColor: Theme.of(context).colorScheme.surface,
               onTap: () {
                 addOption(e);
                 Navigator.pop(context);
@@ -186,9 +186,9 @@ class PatchOptionsViewModel extends BaseViewModel {
                       e.description,
                       style: TextStyle(
                         fontSize: 14,
-                        color: Theme.of(context).colorScheme.onSecondaryContainer,
+                        color: Theme.of(context).colorScheme.onSurface,
                       ),
-                    )
+                    ),
                   ],
                 ),
               ),

lib/ui/widgets/settingsView/social_media_widget.dart

@@ -52,8 +52,8 @@ class SocialMediaWidget extends StatelessWidget {
               SocialMediaItem(
                 icon: FaIcon(FontAwesomeIcons.github),
                 title: Text('GitHub'),
-                subtitle: Text('github.com/revanced'),
+                subtitle: Text('github.com/ReVanced'),
-                url: 'https://github.com/revanced',
+                url: 'https://github.com/ReVanced',
               ),
               SocialMediaItem(
                 icon: FaIcon(FontAwesomeIcons.discord),
@@ -74,10 +74,10 @@ class SocialMediaWidget extends StatelessWidget {
                 url: 'https://reddit.com/r/revancedapp',
               ),
               SocialMediaItem(
-                icon: FaIcon(FontAwesomeIcons.twitter),
+                icon: FaIcon(FontAwesomeIcons.xTwitter),
-                title: Text('Twitter'),
+                title: Text('X'),
                 subtitle: Text('@revancedapp'),
-                url: 'https://twitter.com/revancedapp',
+                url: 'https://x.com/revancedapp',
               ),
               SocialMediaItem(
                 icon: FaIcon(FontAwesomeIcons.youtube),

package.json

@@ -1,10 +0,0 @@
-{
-    "devDependencies": {
-        "@saithodev/semantic-release-backmerge": "^3.1.0",
-        "@semantic-release/changelog": "^6.0.3",
-        "@semantic-release/git": "^10.0.1",
-        "semantic-release": "^21.0.1",
-        "semantic-release-export-data": "^1.0.1",
-        "semantic-release-flutter-plugin": "^1.1.2"
-    }
-}

pubspec.yaml

@@ -41,7 +41,7 @@ dependencies:
     sdk: flutter
   flutter_svg: ^2.0.4
   fluttertoast: ^8.2.1
-  font_awesome_flutter: ^10.4.0
+  font_awesome_flutter: ^10.6.0
   get_it: 7.2.0
   google_fonts: ^4.0.3
   http: ^0.13.5