chore: bump patcher dependency version to v6.0.0 (#355)

Co-authored-by: Aunali321 <aunvakil.aa@gmail.com>

android/app/build.gradle

@@ -71,7 +71,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // ReVanced
-    implementation "app.revanced:revanced-patcher:5.0.1"
+    implementation "app.revanced:revanced-patcher:6.0.0"
 
     // Signing & aligning
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")

android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt

@@ -1,5 +1,6 @@
 package app.revanced.manager.flutter
 
+import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import androidx.annotation.NonNull
@@ -12,7 +13,7 @@ import app.revanced.patcher.Patcher
 import app.revanced.patcher.PatcherOptions
 import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.logging.Logger
-import app.revanced.patcher.util.patch.impl.DexPatchBundle
+import app.revanced.patcher.util.patch.PatchBundle
 import dalvik.system.DexClassLoader
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
@@ -42,7 +43,6 @@ class MainActivity : FlutterActivity() {
                     val selectedPatches = call.argument<List<String>>("selectedPatches")
                     val cacheDirPath = call.argument<String>("cacheDirPath")
                     val mergeIntegrations = call.argument<Boolean>("mergeIntegrations")
-                    val resourcePatching = call.argument<Boolean>("resourcePatching")
                     val keyStoreFilePath = call.argument<String>("keyStoreFilePath")
                     if (patchBundleFilePath != null &&
                         originalFilePath != null &&
@@ -53,7 +53,6 @@ class MainActivity : FlutterActivity() {
                         selectedPatches != null &&
                         cacheDirPath != null &&
                         mergeIntegrations != null &&
-                        resourcePatching != null &&
                         keyStoreFilePath != null
                     ) {
                         runPatcher(
@@ -67,7 +66,6 @@ class MainActivity : FlutterActivity() {
                             selectedPatches,
                             cacheDirPath,
                             mergeIntegrations,
-                            resourcePatching,
                             keyStoreFilePath
                         )
                     } else {
@@ -90,7 +88,6 @@ class MainActivity : FlutterActivity() {
         selectedPatches: List<String>,
         cacheDirPath: String,
         mergeIntegrations: Boolean,
-        resourcePatching: Boolean,
         keyStoreFilePath: String
     ) {
         val originalFile = File(originalFilePath)
@@ -102,16 +99,20 @@ class MainActivity : FlutterActivity() {
 
         Thread {
             try {   
-                val patches = DexPatchBundle(
-                    patchBundleFilePath,
-                    DexClassLoader(
+                val patches = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CUPCAKE) {
+                    PatchBundle.Dex(
                         patchBundleFilePath,
-                        cacheDirPath,
-                        null,
-                        javaClass.classLoader
-                    )
-                ).loadPatches().filter { patch -> selectedPatches.any { it == patch.patchName } }
-                
+                        DexClassLoader(
+                            patchBundleFilePath,
+                            cacheDirPath,
+                            null,
+                            javaClass.classLoader
+                        )
+                    ).loadPatches().filter { patch -> selectedPatches.any { it == patch.patchName } }
+                } else {
+                    TODO("VERSION.SDK_INT < CUPCAKE")
+                }
+
                 handler.post {
                     installerChannel.invokeMethod(
                         "update",
@@ -139,7 +140,6 @@ class MainActivity : FlutterActivity() {
                         PatcherOptions(
                             inputFile,
                             cacheDirPath,
-                            resourcePatching,
                             Aapt.binary(applicationContext).absolutePath,
                             cacheDirPath,
                             logger = ManagerLogger()
@@ -178,7 +178,7 @@ class MainActivity : FlutterActivity() {
                 }
 
                 patcher.addPatches(patches)
-                patcher.applyPatches().forEach { (patch, res) ->
+                patcher.executePatches().forEach { (patch, res) ->
                     if (res.isSuccess) {
                         val msg = "[success] $patch"
                         handler.post {
@@ -193,7 +193,7 @@ class MainActivity : FlutterActivity() {
                         }
                         return@forEach
                     }
-                    val msg = "[error] $patch:" + res.exceptionOrNull()!!
+                    val msg = "[error] $patch:" + res.exceptionOrNull()!!.printStackTrace()
                     handler.post {
                         installerChannel.invokeMethod(
                             "update",

assets/i18n/en_US.json

@@ -80,7 +80,7 @@
         "selectAllPatchesWarningContent": "You are about to select all patches, that includes unrecommended patches and can cause unwanted behavior."
     },
     "patchItem": {
-        "unsupportedWarningButton": "Unsupported version",
+        "unsupportedWarningButton": "Warning",
         "unsupportedDialogTitle": "Warning",
         "unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nCurrent supported versions:\n{supportedVersions}"
     },
@@ -115,8 +115,8 @@
         "frenchOption": "French",
         "sourcesLabel": "Sources",
         "sourcesLabelHint": "Configure your custom sources",
-        "orgPatchesLabel" : "Patches Organization",
-        "sourcesPatchesLabel" : "Patches Source",
+        "orgPatchesLabel": "Patches Organization",
+        "sourcesPatchesLabel": "Patches Source",
         "orgIntegrationsLabel": "Integrations Organization",
         "sourcesIntegrationsLabel": "Integrations Source",
         "sourcesResetDialogTitle": "Reset",

crowdin.yml

@@ -1,3 +1,3 @@
 files:
   - source: /assets/i18n/en.json
-    translation: /assets/i18n/%two_letters_code%.json
+    translation: /assets/i18n/%locale_with_underscore%.json

lib/main.dart

@@ -35,7 +35,7 @@ class MyApp extends StatelessWidget {
       localizationsDelegates: [
         FlutterI18nDelegate(
           translationLoader: FileTranslationLoader(
-            fallbackFile: 'en',
+            fallbackFile: 'en_US',
             basePath: 'assets/i18n',
           ),
         ),

lib/services/github_api.dart

@@ -20,8 +20,8 @@ class GithubAPI {
     );
   final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
   final Options _cacheOptions = buildCacheOptions(
-    const Duration(days: 1),
-    maxStale: const Duration(days: 7),
+    const Duration(hours: 6),
+    maxStale: const Duration(days: 1),
   );
   final Map<String, String> repoAppPath = {
     'com.google.android.youtube': 'youtube',

lib/services/patcher_api.dart

@@ -142,7 +142,6 @@ class PatcherAPI {
     List<Patch> selectedPatches,
   ) async {
     bool mergeIntegrations = await needsIntegrations(selectedPatches);
-    bool resourcePatching = await needsResourcePatching(selectedPatches);
     bool includeSettings = await needsSettingsPatch(selectedPatches);
     if (includeSettings) {
       try {
@@ -186,7 +185,6 @@ class PatcherAPI {
           'selectedPatches': selectedPatches.map((p) => p.name).toList(),
           'cacheDirPath': cacheDir.path,
           'mergeIntegrations': mergeIntegrations,
-          'resourcePatching': resourcePatching,
           'keyStoreFilePath': _keyStoreFile.path,
         },
       );

lib/services/revanced_api.dart

@@ -13,8 +13,8 @@ class RevancedAPI {
   late Dio _dio = Dio();
   final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
   final Options _cacheOptions = buildCacheOptions(
-    const Duration(days: 1),
-    maxStale: const Duration(days: 7),
+    const Duration(hours: 6),
+    maxStale: const Duration(days: 1),
   );
 
   Future<void> initialize(String apiUrl) async {

lib/ui/views/navigation/navigation_viewmodel.dart

@@ -32,6 +32,7 @@ class NavigationViewModel extends IndexTrackingViewModel {
       await prefs.setBool('useDarkTheme', isDark);
       await DynamicTheme.of(context)!.setTheme(isDark ? 1 : 0);
     }
+    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
     SystemChrome.setSystemUIOverlayStyle(
       SystemUiOverlayStyle(
         systemNavigationBarColor: Colors.transparent,

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -73,9 +73,9 @@ class PatchesSelectorViewModel extends BaseViewModel {
         .where((patch) =>
             query.isEmpty ||
             query.length < 2 ||
-            patch.name.toLowerCase().contains(
-                  query.toLowerCase(),
-                ))
+            patch.name.toLowerCase().contains(query.toLowerCase()) ||
+            patch.getSimpleName().toLowerCase().contains(query.toLowerCase())
+         )
         .toList();
   }
 

lib/ui/widgets/contributorsView/contributors_card.dart

@@ -33,7 +33,7 @@ class _ContributorsCardState extends State<ContributorsCard> {
               '',
               style: TextStyle(
                 fontSize: 20,
-                fontWeight: FontWeight.w600,
+                fontWeight: FontWeight.w500,
               ),
             ),
           ),

lib/ui/widgets/homeView/latest_commit_card.dart

@@ -49,7 +49,7 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
                   ),
                 ],
               ),
-              const SizedBox(height: 8),
+              const SizedBox(height: 4),
               Row(
                 children: <Widget>[
                   I18nText('latestCommitCard.managerLabel'),

lib/ui/widgets/patcherView/app_selector_card.dart

@@ -32,7 +32,7 @@ class AppSelectorCard extends StatelessWidget {
               ),
             ),
           ),
-          const SizedBox(height: 10),
+          const SizedBox(height: 8),
           locator<PatcherViewModel>().selectedApp == null
               ? I18nText('appSelectorCard.widgetSubtitle')
               : Row(
@@ -49,21 +49,21 @@ class AppSelectorCard extends StatelessWidget {
                       ),
                     ),
                     const SizedBox(width: 6),
-                    Text(locator<PatcherViewModel>().getAppSelectionString()),
+                    Text(
+                        locator<PatcherViewModel>()
+                        .getAppSelectionString(),
+                        style: const TextStyle(fontWeight: FontWeight.w600),
+                      ),
                   ],
                 ),
           locator<PatcherViewModel>().selectedApp == null
               ? Container()
               : Column(
                   children: [
-                    const SizedBox(height: 10),
-                    Padding(
-                      padding: const EdgeInsets.only(left: 20),
-                      child: Text(
-                        locator<PatcherViewModel>()
-                            .getRecommendedVersionString(context),
-                        style: const TextStyle(fontStyle: FontStyle.italic),
-                      ),
+                    const SizedBox(height: 4),
+                    Text(
+                      locator<PatcherViewModel>()
+                          .getRecommendedVersionString(context),
                     ),
                   ],
                 ),

lib/ui/widgets/patcherView/patch_selector_card.dart

@@ -32,7 +32,7 @@ class PatchSelectorCard extends StatelessWidget {
               ),
             ),
           ),
-          const SizedBox(height: 10),
+          const SizedBox(height: 4),
           locator<PatcherViewModel>().selectedApp == null
               ? I18nText('patchSelectorCard.widgetSubtitle')
               : locator<PatcherViewModel>().selectedPatches.isEmpty
@@ -46,7 +46,7 @@ class PatchSelectorCard extends StatelessWidget {
   String _getPatchesSelection() {
     String text = '';
     for (Patch p in locator<PatcherViewModel>().selectedPatches) {
-      text += '${p.getSimpleName()} (v${p.version})\n';
+      text += '\u2022  ${p.getSimpleName()} (v${p.version})\n';
     }
     return text.substring(0, text.length - 1);
   }

lib/ui/widgets/patchesSelectorView/patch_item.dart

@@ -65,21 +65,14 @@ class _PatchItemState extends State<PatchItem> {
                               fontWeight: FontWeight.w600,
                             ),
                           ),
-                          const SizedBox(width: 4),
-                          Container(
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: 4,
-                              vertical: 2,
+                          const SizedBox(width: 6),
+                          Text(
+                            widget.version,
+                            style: TextStyle(
+                              fontSize: 16,
+                              color: Theme.of(context).colorScheme.secondary,
                             ),
-                            decoration: BoxDecoration(
-                              color: Theme.of(context)
-                                  .colorScheme
-                                  .background
-                                  .withOpacity(0.5),
-                              borderRadius: BorderRadius.circular(6),
-                            ),
-                            child: Text(widget.version),
-                          )
+                          ),
                         ],
                       ),
                       const SizedBox(height: 4),
@@ -88,7 +81,10 @@ class _PatchItemState extends State<PatchItem> {
                         softWrap: true,
                         maxLines: 3,
                         overflow: TextOverflow.visible,
-                        style: const TextStyle(fontSize: 14),
+                        style: TextStyle(
+                          fontSize: 14,
+                          color: Theme.of(context).colorScheme.onSecondaryContainer,
+                        ),
                       ),
                     ],
                   ),
@@ -119,12 +115,12 @@ class _PatchItemState extends State<PatchItem> {
                         padding: const EdgeInsets.only(top: 8),
                         child: TextButton.icon(
                           label: I18nText('patchItem.unsupportedWarningButton'),
-                          icon: const Icon(Icons.warning),
+                          icon: const Icon(Icons.warning, size: 20.0),
                           onPressed: () => _showUnsupportedWarningDialog(),
                           style: ButtonStyle(
                             shape: MaterialStateProperty.all(
                               RoundedRectangleBorder(
-                                borderRadius: BorderRadius.circular(12),
+                                borderRadius: BorderRadius.circular(8),
                                 side: BorderSide(
                                   width: 1,
                                   color:

lib/ui/widgets/shared/application_item.dart

@@ -50,93 +50,94 @@ class _ApplicationItemState extends State<ApplicationItem>
   @override
   Widget build(BuildContext context) {
     ExpandableController expController = ExpandableController();
-    return ExpandablePanel(
-      controller: expController,
-      theme: const ExpandableThemeData(
-        inkWellBorderRadius: BorderRadius.all(Radius.circular(16)),
-        tapBodyToCollapse: false,
-        tapBodyToExpand: false,
-        tapHeaderToExpand: false,
-        hasIcon: false,
-        animationDuration: Duration(milliseconds: 450),
-      ),
-      header: Padding(
-        padding: const EdgeInsets.only(bottom: 16.0),
-        child: CustomCard(
-          onTap: () {
-            expController.toggle();
-            _animationController.isCompleted
-                ? _animationController.reverse()
-                : _animationController.forward();
-          },
-          child: Row(
-            children: <Widget>[
-              SizedBox(
-                width: 40,
-                child: Image.memory(widget.icon, height: 40, width: 40),
-              ),
-              const SizedBox(width: 4),
-              Padding(
-                padding: const EdgeInsets.only(left: 15.0),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: <Widget>[
-                    Text(
-                      widget.name.length > 9
-                          ? '${widget.name.substring(0, 9)}...'
-                          : widget.name,
-                      style: const TextStyle(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w500,
-                      ),
-                    ),
-                    Text(format(widget.patchDate)),
-                  ],
-                ),
-              ),
-              const Spacer(),
-              RotationTransition(
-                turns:
-                    Tween(begin: 0.0, end: 0.50).animate(_animationController),
-                child: const Padding(
-                  padding: EdgeInsets.all(8.0),
-                  child: Icon(Icons.arrow_drop_down),
-                ),
-              ),
-              Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.end,
+    return Container(
+      margin: const EdgeInsets.only(bottom: 16.0),
+      child: CustomCard(
+        onTap: () {
+                expController.toggle();
+                _animationController.isCompleted
+                    ? _animationController.reverse()
+                    : _animationController.forward();
+        },
+        child: ExpandablePanel(
+          controller: expController,
+          theme: const ExpandableThemeData(
+            inkWellBorderRadius: BorderRadius.all(Radius.circular(16)),
+            tapBodyToCollapse: false,
+            tapBodyToExpand: false,
+            tapHeaderToExpand: false,
+            hasIcon: false,
+            animationDuration: Duration(milliseconds: 450),
+          ),
+          header: Row(
                 children: <Widget>[
-                  CustomMaterialButton(
-                    label: widget.isUpdatableApp
-                        ? I18nText('applicationItem.patchButton')
-                        : I18nText('applicationItem.infoButton'),
-                    onPressed: widget.onPressed,
+                  SizedBox(
+                    width: 40,
+                    child: Image.memory(widget.icon, height: 40, width: 40),
+                  ),
+                  const SizedBox(width: 4),
+                  Padding(
+                    padding: const EdgeInsets.only(left: 15.0),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: <Widget>[
+                        Text(
+                          widget.name.length > 12
+                              ? '${widget.name.substring(0, 12)}...'
+                              : widget.name,
+                          style: const TextStyle(
+                            fontSize: 16,
+                            fontWeight: FontWeight.w500,
+                          ),
+                        ),
+                        Text(format(widget.patchDate)),
+                      ],
+                    ),
+                  ),
+                  const Spacer(),
+                  RotationTransition(
+                    turns: Tween(begin: 0.0, end: 0.50)
+                        .animate(_animationController),
+                    child: const Padding(
+                      padding: EdgeInsets.all(8.0),
+                      child: Icon(Icons.arrow_drop_down),
+                    ),
+                  ),
+                  const SizedBox(width: 8),
+                  Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.end,
+                    children: <Widget>[
+                      CustomMaterialButton(
+                        label: widget.isUpdatableApp
+                            ? I18nText('applicationItem.patchButton')
+                            : I18nText('applicationItem.infoButton'),
+                        onPressed: widget.onPressed,
+                      ),
+                    ],
                   ),
                 ],
               ),
-            ],
+          collapsed: const SizedBox(),
+          expanded: Padding(
+            padding: const EdgeInsets.only(top: 16.0, left: 4.0, right: 4.0, bottom: 4.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                I18nText(
+                  'applicationItem.changelogLabel',
+                  child: const Text(
+                    '',
+                    style: TextStyle(fontWeight: FontWeight.w700),
+                  ),
+                ),
+                const SizedBox(height: 4),
+                Text('\u2022 ${widget.changelog.join('\n\u2022 ')}'),
+              ],
+            ),
           ),
         ),
-      ),
-      collapsed: const SizedBox(),
-      expanded: Padding(
-        padding: const EdgeInsets.all(16.0).copyWith(top: 0.0),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: <Widget>[
-            I18nText(
-              'applicationItem.changelogLabel',
-              child: const Text(
-                '',
-                style: TextStyle(fontWeight: FontWeight.w700),
-              ),
-            ),
-            const SizedBox(height: 4),
-            Text('\u2022 ${widget.changelog.join('\n\u2022 ')}'),
-          ],
-        ),
-      ),
+      )
     );
   }
 }

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 0.0.23+23
+version: 0.0.29+29
 
 environment:
   sdk: ">=2.17.5 <3.0.0"