Merge branch 'flutter' of https://github.com/revanced/revanced-manager into flutter

build: Bump version to v0.0.21.
refactor: removed dropdown for branch.
2025-05-18 06:56:16 +08:00 · 2022-09-23 14:58:19 +05:30 · 2022-09-23 14:58:07 +05:30 · 2022-09-23 14:57:05 +05:30 · 2022-09-23 14:53:21 +05:30 · 2022-09-23 13:35:47 +05:30
23 changed files with 447 additions and 283 deletions
--- a/.github/ISSUE_TEMPLATE/bug-issue.yml
+++ b/.github/ISSUE_TEMPLATE/bug-issue.yml
@ -20,14 +20,6 @@ body:
        - Other
    validations:
      required: true
-  - type: dropdown
-    attributes:
-      label: Manager Branch
-      options:
-        - Flutter
-        - Compose
-    validations:
-      required: true
  - type: textarea
    attributes:
      label: Bug description
@ -112,3 +104,17 @@ body:
      description: Add additional context here.
    validations:
      required: false
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you haven't done these steps.
+      options:
+        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: I filled out all of the requested information in this issue properly.
+          required: true
+        - label: The issue is related solely to the ReVanced Manager
+          required: true
--- a/.github/ISSUE_TEMPLATE/feature-issue.yml
+++ b/.github/ISSUE_TEMPLATE/feature-issue.yml
@ -12,14 +12,6 @@ body:
        - Other
    validations:
      required: true
-  - type: dropdown
-    attributes:
-      label: Manager Branch
-      options:
-        - Flutter
-        - Compose
-    validations:
-      required: true
  - type: textarea
    attributes:
      label: Issue
@ -43,4 +35,18 @@ body:
      label: Additional context
      description: Add additional context here.
    validations:
-      required: false
+      required: false
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you haven't done these steps.
+      options:
+        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: I filled out all of the requested information in this issue properly.
+          required: true
+        - label: The issue is related solely to the ReVanced Manager 
+          required: true
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -71,7 +71,7 @@ dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

    // ReVanced
-    implementation "app.revanced:revanced-patcher:4.4.2"
+    implementation "app.revanced:revanced-patcher:5.0.1"

    // Signing & aligning
    implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
--- a/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt
+++ b/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt
@ -74,7 +74,6 @@ class MainActivity : FlutterActivity() {
                        result.notImplemented()
                    }
                }
-
                else -> result.notImplemented()
            }
        }
@ -101,161 +100,174 @@ class MainActivity : FlutterActivity() {
        val integrations = File(integrationsPath)
        val keyStoreFile = File(keyStoreFilePath)

-        val patches = DexPatchBundle(
-            patchBundleFilePath,
-            DexClassLoader(
-                patchBundleFilePath,
-                cacheDirPath,
-                null,
-                javaClass.classLoader
-            )
-        ).loadPatches().filter { patch -> selectedPatches.any { it == patch.patchName } }
-
        Thread {
-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf(
-                        "progress" to 0.1,
-                        "header" to "",
-                        "log" to "Copying original apk"
-                    )
-                )
-            }
-            originalFile.copyTo(inputFile, true)
-
-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf(
-                        "progress" to 0.2,
-                        "header" to "Unpacking apk...",
-                        "log" to "Unpacking input apk"
-                    )
-                )
-            }
-            val patcher =
-                Patcher(
-                    PatcherOptions(
-                        inputFile,
+            try {   
+                val patches = DexPatchBundle(
+                    patchBundleFilePath,
+                    DexClassLoader(
+                        patchBundleFilePath,
                        cacheDirPath,
-                        resourcePatching,
-                        Aapt.binary(applicationContext).absolutePath,
-                        cacheDirPath,
-                        logger = ManagerLogger()
+                        null,
+                        javaClass.classLoader
                    )
-                )
-
-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf("progress" to 0.3, "header" to "", "log" to "")
-                )
-            }
-            if (mergeIntegrations) {
+                ).loadPatches().filter { patch -> selectedPatches.any { it == patch.patchName } }
+                
                handler.post {
                    installerChannel.invokeMethod(
                        "update",
                        mapOf(
-                            "progress" to 0.4,
-                            "header" to "Merging integrations...",
-                            "log" to "Merging integrations"
+                            "progress" to 0.1,
+                            "header" to "",
+                            "log" to "Copying original apk"
                        )
                    )
                }
-                patcher.addFiles(listOf(integrations)) {}
-            }
+                originalFile.copyTo(inputFile, true)

-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf(
-                        "progress" to 0.5,
-                        "header" to "Applying patches...",
-                        "log" to ""
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to 0.2,
+                            "header" to "Unpacking apk...",
+                            "log" to "Unpacking input apk"
+                        )
                    )
-                )
-            }
-            patcher.addPatches(patches)
-            patcher.applyPatches().forEach { (patch, res) ->
-                if (res.isSuccess) {
-                    val msg = "[success] $patch"
+                }
+                val patcher =
+                    Patcher(
+                        PatcherOptions(
+                            inputFile,
+                            cacheDirPath,
+                            resourcePatching,
+                            Aapt.binary(applicationContext).absolutePath,
+                            cacheDirPath,
+                            logger = ManagerLogger()
+                        )
+                    )
+
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf("progress" to 0.3, "header" to "", "log" to "")
+                    )
+                }
+                if (mergeIntegrations) {
                    handler.post {
                        installerChannel.invokeMethod(
                            "update",
                            mapOf(
-                                "progress" to 0.5,
-                                "header" to "",
-                                "log" to msg
+                                "progress" to 0.4,
+                                "header" to "Merging integrations...",
+                                "log" to "Merging integrations"
                            )
                        )
                    }
-                    return@forEach
+                    patcher.addFiles(listOf(integrations)) {}
                }
-                val msg = "[error] $patch:" + res.exceptionOrNull()!!
+
                handler.post {
                    installerChannel.invokeMethod(
                        "update",
-                        mapOf("progress" to 0.5, "header" to "", "log" to msg)
+                        mapOf(
+                            "progress" to 0.5,
+                            "header" to "Applying patches...",
+                            "log" to ""
+                        )
                    )
                }
-            }

-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf(
-                        "progress" to 0.7,
-                        "header" to "Repacking apk...",
-                        "log" to "Repacking patched apk"
-                    )
-                )
-            }
-            val res = patcher.save()
-            ZipFile(patchedFile).use { file ->
-                res.dexFiles.forEach {
-                    file.addEntryCompressData(
-                        ZipEntry.createWithName(it.name),
-                        it.stream.readBytes()
+                patcher.addPatches(patches)
+                patcher.applyPatches().forEach { (patch, res) ->
+                    if (res.isSuccess) {
+                        val msg = "[success] $patch"
+                        handler.post {
+                            installerChannel.invokeMethod(
+                                "update",
+                                mapOf(
+                                    "progress" to 0.5,
+                                    "header" to "",
+                                    "log" to msg
+                                )
+                            )
+                        }
+                        return@forEach
+                    }
+                    val msg = "[error] $patch:" + res.exceptionOrNull()!!
+                    handler.post {
+                        installerChannel.invokeMethod(
+                            "update",
+                            mapOf("progress" to 0.5, "header" to "", "log" to msg)
+                        )
+                    }
+                }
+
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to 0.7,
+                            "header" to "Repacking apk...",
+                            "log" to "Repacking patched apk"
+                        )
                    )
                }
-                res.resourceFile?.let {
+                val res = patcher.save()
+                ZipFile(patchedFile).use { file ->
+                    res.dexFiles.forEach {
+                        file.addEntryCompressData(
+                            ZipEntry.createWithName(it.name),
+                            it.stream.readBytes()
+                        )
+                    }
+                    res.resourceFile?.let {
+                        file.copyEntriesFromFileAligned(
+                            ZipFile(it),
+                            ZipAligner::getEntryAlignment
+                        )
+                    }
                    file.copyEntriesFromFileAligned(
-                        ZipFile(it),
+                        ZipFile(inputFile),
                        ZipAligner::getEntryAlignment
                    )
                }
-                file.copyEntriesFromFileAligned(
-                    ZipFile(inputFile),
-                    ZipAligner::getEntryAlignment
-                )
-            }
-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf(
-                        "progress" to 0.9,
-                        "header" to "Signing apk...",
-                        "log" to ""
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to 0.9,
+                            "header" to "Signing apk...",
+                            "log" to ""
+                        )
                    )
-                )
-            }
-            Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
+                }
+                Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)

-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf(
-                        "progress" to 1.0,
-                        "header" to "Finished!",
-                        "log" to "Finished!"
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to 1.0,
+                            "header" to "Finished!",
+                            "log" to "Finished!"
+                        )
                    )
-                )
+                }
+            } catch (ex: Throwable) {
+                val stack = ex.stackTraceToString()
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to -100.0,
+                            "header" to "Aborting...",
+                            "log" to "An error occurred! Aborting\nError:\n$stack"
+                        )
+                    )
+                }
            }
-
            handler.post { result.success(null) }
-        }
-            .start()
+        }.start()
    }

    inner class ManagerLogger : Logger {
--- a/assets/i18n/en.json
+++ b/assets/i18n/en.json
@ -14,18 +14,18 @@
        "widgetTitle": "Dashboard",
        "updatesSubtitle": "Updates",
        "patchedSubtitle": "Patched Applications",
-        "updatesAvailable": "Updates Available",
+        "updatesAvailable": "Updates available",
        "noUpdates": "No updates available",
        "noInstallations": "No patched applications installed",
        "installed": "Installed",
-        "updateDialogTitle": "Update",
-        "updateDialogText": "Are you sure you want to download and update Manager?",
-        "notificationTitle": "ReVanced Manager was updated!",
+        "updateDialogTitle": "Update Manager",
+        "updateDialogText": "Are you sure you want to download and update ReVanced Manager?",
+        "notificationTitle": "ReVanced Manager was updated",
        "notificationText": "Tap to open the app",
-        "downloadingMessage": "Downloading update!",
-        "installingMessage": "Installing update... Hang on!",
-        "errorDownloadMessage": "Unable to download update!",
-        "errorInstallMessage": "Unable to install update!",
+        "downloadingMessage": "Downloading update...",
+        "installingMessage": "Installing update...",
+        "errorDownloadMessage": "Unable to download update",
+        "errorInstallMessage": "Unable to install update",
        "noConnection": "No internet connection"
    },
    "applicationItem": {
@ -34,7 +34,7 @@
        "changelogLabel": "Changelog"
    },
    "latestCommitCard": {
-        "loadingLabel": "Loading",
+        "loadingLabel": "Loading...",
        "timeagoLabel": "{time} ago",
        "patcherLabel": "Patcher: ",
        "managerLabel": "Manager: ",
@ -44,12 +44,12 @@
        "widgetTitle": "Patcher",
        "patchButton": "Patch",
        "patchDialogTitle": "Warning",
-        "patchDialogText": "You have selected a resource patch and a split APK installation was detected so patching errors can occur.\nAre you sure you want to proceed with patching a split base APK?"
+        "patchDialogText": "You have selected a resource patch and a split APK installation was detected so patching errors may occur.\nAre you sure you want to proceed with patching a split base APK?"
    },
    "appSelectorCard": {
        "widgetTitle": "Select application",
        "widgetTitleSelected": "Selected application",
-        "widgetSubtitle": "No application selected.",
+        "widgetSubtitle": "No application selected",
        "noAppsLabel": "No applications found.",
        "currentVersion": "Current",
        "recommendedVersion": "Recommended",
@ -58,11 +58,11 @@
    "patchSelectorCard": {
        "widgetTitle": "Select patches",
        "widgetTitleSelected": "Selected patches",
-        "widgetSubtitle": "Select an application first.",
-        "widgetEmptySubtitle": "No patches selected."
+        "widgetSubtitle": "Select an application first",
+        "widgetEmptySubtitle": "No patches selected"
    },
    "socialMediaCard": {
-        "widgetTitle": "Social Media",
+        "widgetTitle": "Socials",
        "widgetSubtitle": "We are online!"
    },
    "appSelectorView": {
@ -75,7 +75,9 @@
        "viewTitle": "Select patches",
        "searchBarHint": "Search patches",
        "doneButton": "Done",
-        "noPatchesFound": "No patches found for the selected app."
+        "noPatchesFound": "No patches found for the selected app",
+        "selectAllPatchesWarningTitle": "Warning",
+        "selectAllPatchesWarningContent": "You are about to select all patches, that includes unrecommended patches and can cause unwanted behavior."
    },
    "patchItem": {
        "unsupportedWarningButton": "Unsupported version",
@ -113,13 +115,13 @@
        "frenchOption": "French",
        "sourcesLabel": "Sources",
        "sourcesLabelHint": "Configure your custom sources",
-        "orgPatchesLabel" : "Patches Org",
+        "orgPatchesLabel" : "Patches Organization",
        "sourcesPatchesLabel" : "Patches Source",
-        "orgIntegrationsLabel": "Integrations Org",
+        "orgIntegrationsLabel": "Integrations Organization",
        "sourcesIntegrationsLabel": "Integrations Source",
        "sourcesResetDialogTitle": "Reset",
        "sourcesResetDialogText": "Are you sure you want to reset custom sources to their default values?",
-        "apiURLResetDialogText": "Are you sure you want to reset API URL to their default values?",
+        "apiURLResetDialogText": "Are you sure you want to reset API URL to its default value?",
        "contributorsLabel": "Contributors",
        "contributorsHint": "A list of contributors of ReVanced",
        "logsLabel": "Logs",
--- a/crowdin.yml
+++ b/crowdin.yml
@ -0,0 +1,3 @@
+files:
+  - source: /assets/i18n/en.json
+    translation: /assets/i18n/%two_letters_code%.json
--- a/lib/services/patcher_api.dart
+++ b/lib/services/patcher_api.dart
@ -70,10 +70,14 @@ class PatcherAPI {
  }

  Future<List<Patch>> getFilteredPatches(String packageName) async {
+    String newPackageName = packageName.replaceFirst(
+      'app.revanced.',
+      'com.google.',
+    );
    return _patches
        .where((patch) =>
            !patch.name.contains('settings') &&
-            patch.compatiblePackages.any((pack) => pack.name == packageName))
+            patch.compatiblePackages.any((pack) => pack.name == newPackageName))
        .toList();
  }

@ -85,19 +89,25 @@ class PatcherAPI {

  Future<bool> needsIntegrations(List<Patch> selectedPatches) async {
    return selectedPatches.any(
-      (patch) => patch.dependencies.contains('integrations'),
+      (patch) => patch.dependencies.any(
+        (dep) => dep.contains('integrations'),
+      ),
    );
  }

  Future<bool> needsResourcePatching(List<Patch> selectedPatches) async {
    return selectedPatches.any(
-      (patch) => patch.dependencies.any((dep) => dep.contains('resource-')),
+      (patch) => patch.dependencies.any(
+        (dep) => dep.contains('resource-'),
+      ),
    );
  }

  Future<bool> needsSettingsPatch(List<Patch> selectedPatches) async {
    return selectedPatches.any(
-      (patch) => patch.dependencies.contains('settings'),
+      (patch) => patch.dependencies.any(
+        (dep) => dep.contains('settings'),
+      ),
    );
  }

--- a/lib/services/root_api.dart
+++ b/lib/services/root_api.dart
@ -7,8 +7,12 @@ class RootAPI {

  Future<bool> hasRootPermissions() async {
    try {
-      bool? isRooted = await Root.isRooted();
-      return isRooted != null && isRooted;
+      bool? isRooted = await Root.isRootAvailable();
+      if (isRooted != null && isRooted) {
+        isRooted = await Root.isRooted();
+        return isRooted != null && isRooted;
+      }
+      return false;
    } on Exception {
      return false;
    }
--- a/lib/ui/views/home/home_viewmodel.dart
+++ b/lib/ui/views/home/home_viewmodel.dart
@ -15,7 +15,7 @@ import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
 import 'package:timezone/timezone.dart' as tz;
--- a/lib/ui/views/installer/installer_view.dart
+++ b/lib/ui/views/installer/installer_view.dart
@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:revanced_manager/ui/views/installer/installer_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/ui/widgets/installerView/gradient_progress_indicator.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_popup_menu.dart';
--- a/lib/ui/views/installer/installer_viewmodel.dart
+++ b/lib/ui/views/installer/installer_viewmodel.dart
@ -11,7 +11,7 @@ import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 import 'package:wakelock/wakelock.dart';

@ -78,14 +78,20 @@ class InstallerViewModel extends BaseViewModel {
  }

  void update(double value, String header, String log) {
-    if (value > 0) {
+    if (value >= 0.0) {
      progress = value;
    }
-    isPatching = progress == 1.0 ? false : true;
-    if (progress == 0.0) {
+    if (value == 0.0) {
      logs = '';
+      isPatching = true;
      isInstalled = false;
      hasErrors = false;
+    } else if (value == 1.0) {
+      isPatching = false;
+      hasErrors = false;
+    } else if (value == -100.0) {
+      isPatching = false;
+      hasErrors = true;
    }
    if (header.isNotEmpty) {
      headerLogs = header;
@ -95,6 +101,9 @@ class InstallerViewModel extends BaseViewModel {
        logs += '\n';
      }
      logs += log;
+      if (logs[logs.length - 1] == '\n') {
+        logs = logs.substring(0, logs.length - 1);
+      }
      Future.delayed(const Duration(milliseconds: 500)).then((value) {
        scrollController.animateTo(
          scrollController.position.maxScrollExtent,
@ -117,12 +126,14 @@ class InstallerViewModel extends BaseViewModel {
          _patches,
        );
      } catch (e) {
-        hasErrors = true;
-        update(-1.0, 'Aborting...', 'An error occurred! Aborting\nError: $e');
+        update(
+          -100.0,
+          'Aborting...',
+          'An error occurred! Aborting\nError:\n$e',
+        );
      }
    } else {
-      hasErrors = true;
-      update(-1.0, 'Aborting...', 'No app or patches selected! Aborting');
+      update(-100.0, 'Aborting...', 'No app or patches selected! Aborting');
    }
    if (FlutterBackground.isBackgroundExecutionEnabled) {
      try {
@ -132,7 +143,6 @@ class InstallerViewModel extends BaseViewModel {
      }
    }
    await Wakelock.disable();
-    isPatching = false;
  }

  void installResult(BuildContext context, bool installAsRoot) async {
@ -178,6 +188,7 @@ class InstallerViewModel extends BaseViewModel {
        _app.patchDate = DateTime.now();
        _app.appliedPatches = _patches.map((p) => p.name).toList();
        if (hasMicroG) {
+          _app.name += ' ReVanced';
          _app.packageName = _app.packageName.replaceFirst(
            'com.google.',
            'app.revanced.',
--- a/lib/ui/views/patcher/patcher_viewmodel.dart
+++ b/lib/ui/views/patcher/patcher_viewmodel.dart
@ -7,7 +7,7 @@ import 'package:revanced_manager/app/app.router.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';

--- a/lib/ui/views/patches_selector/patches_selector_view.dart
+++ b/lib/ui/views/patches_selector/patches_selector_view.dart
@ -73,7 +73,12 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                        _query = searchQuery;
                      });
                    },
-                    onSelectAll: (value) => model.selectAllPatches(value),
+                    onSelectAll: (value) {
+                      if (value) {
+                        model.selectAllPatcherWarning(context);
+                      }
+                      model.selectAllPatches(value);
+                    },
                  ),
                ),
              ),
--- a/lib/ui/views/patches_selector/patches_selector_viewmodel.dart
+++ b/lib/ui/views/patches_selector/patches_selector_viewmodel.dart
@ -1,10 +1,13 @@
 import 'package:collection/collection.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
+import 'package:flutter/material.dart';

 class PatchesSelectorViewModel extends BaseViewModel {
  final PatcherAPI _patcherAPI = locator<PatcherAPI>();
@ -35,6 +38,23 @@ class PatchesSelectorViewModel extends BaseViewModel {
    notifyListeners();
  }

+  Future<void> selectAllPatcherWarning(BuildContext context) {
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText('patchesSelectorView.selectAllPatchesWarningTitle'),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: I18nText('patchesSelectorView.selectAllPatchesWarningContent'),
+        actions: <Widget>[
+          CustomMaterialButton(
+            label: I18nText('okButton'),
+            onPressed: () => Navigator.of(context).pop(),
+          )
+        ],
+      ),
+    );
+  }
+
  void selectAllPatches(bool isSelected) {
    selectedPatches.clear();
    if (isSelected) {
--- a/lib/ui/views/settings/settings_viewmodel.dart
+++ b/lib/ui/views/settings/settings_viewmodel.dart
@ -10,7 +10,7 @@ import 'package:path_provider/path_provider.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/app/app.router.dart';
 import 'package:revanced_manager/services/manager_api.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
 import 'package:share_extend/share_extend.dart';
 import 'package:stacked/stacked.dart';
--- a/lib/ui/widgets/appInfoView/app_info_view.dart
+++ b/lib/ui/widgets/appInfoView/app_info_view.dart
@ -104,52 +104,50 @@ class AppInfoView extends StatelessWidget {
                                  ),
                                ),
                              ),
-                              if (app.isRooted)
-                                VerticalDivider(
-                                  color: Theme.of(context).canvasColor,
-                                  indent: 12.0,
-                                  endIndent: 12.0,
-                                  width: 1.0,
-                                ),
-                              if (app.isRooted)
-                                Expanded(
-                                  child: Material(
-                                    type: MaterialType.transparency,
-                                    child: InkWell(
-                                      borderRadius: BorderRadius.circular(16.0),
-                                      onTap: () => model.showUninstallDialog(
-                                        context,
-                                        app,
-                                        false,
-                                      ),
-                                      child: Column(
-                                        mainAxisAlignment:
-                                            MainAxisAlignment.center,
-                                        children: <Widget>[
-                                          Icon(
-                                            Icons.delete_outline,
-                                            color: Theme.of(context)
-                                                .colorScheme
-                                                .primary,
-                                          ),
-                                          const SizedBox(height: 10),
-                                          I18nText(
-                                            'appInfoView.uninstallButton',
-                                            child: Text(
-                                              '',
-                                              style: TextStyle(
-                                                color: Theme.of(context)
-                                                    .colorScheme
-                                                    .primary,
-                                                fontWeight: FontWeight.bold,
-                                              ),
+                              VerticalDivider(
+                                color: Theme.of(context).canvasColor,
+                                indent: 12.0,
+                                endIndent: 12.0,
+                                width: 1.0,
+                              ),
+                              Expanded(
+                                child: Material(
+                                  type: MaterialType.transparency,
+                                  child: InkWell(
+                                    borderRadius: BorderRadius.circular(16.0),
+                                    onTap: () => model.showUninstallDialog(
+                                      context,
+                                      app,
+                                      false,
+                                    ),
+                                    child: Column(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.center,
+                                      children: <Widget>[
+                                        Icon(
+                                          Icons.delete_outline,
+                                          color: Theme.of(context)
+                                              .colorScheme
+                                              .primary,
+                                        ),
+                                        const SizedBox(height: 10),
+                                        I18nText(
+                                          'appInfoView.uninstallButton',
+                                          child: Text(
+                                            '',
+                                            style: TextStyle(
+                                              color: Theme.of(context)
+                                                  .colorScheme
+                                                  .primary,
+                                              fontWeight: FontWeight.bold,
                                            ),
                                          ),
-                                        ],
-                                      ),
+                                        ),
+                                      ],
                                    ),
                                  ),
                                ),
+                              ),
                              VerticalDivider(
                                color: Theme.of(context).canvasColor,
                                indent: 12.0,
--- a/lib/ui/widgets/appInfoView/app_info_viewmodel.dart
+++ b/lib/ui/widgets/appInfoView/app_info_viewmodel.dart
@ -11,7 +11,7 @@ import 'package:revanced_manager/services/root_api.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/utils/string.dart';
 import 'package:stacked/stacked.dart';

@ -20,20 +20,26 @@ class AppInfoViewModel extends BaseViewModel {
  final PatcherAPI _patcherAPI = locator<PatcherAPI>();
  final RootAPI _rootAPI = RootAPI();

-  Future<void> uninstallApp(PatchedApplication app, bool onlyUnpatch) async {
+  Future<void> uninstallApp(
+    BuildContext context,
+    PatchedApplication app,
+    bool onlyUnpatch,
+  ) async {
+    bool isUninstalled = true;
    if (app.isRooted) {
      bool hasRootPermissions = await _rootAPI.hasRootPermissions();
      if (hasRootPermissions) {
-        _rootAPI.deleteApp(app.packageName, app.apkFilePath);
-        _managerAPI.deletePatchedApp(app);
+        await _rootAPI.deleteApp(app.packageName, app.apkFilePath);
        if (!onlyUnpatch) {
-          DeviceApps.uninstallApp(app.packageName);
+          await DeviceApps.uninstallApp(app.packageName);
        }
      }
    } else {
-      DeviceApps.uninstallApp(app.packageName).then(
-        (value) => _managerAPI.deletePatchedApp(app),
-      );
+      isUninstalled = await DeviceApps.uninstallApp(app.packageName);
+    }
+    if (isUninstalled) {
+      await _managerAPI.deletePatchedApp(app);
+      locator<HomeViewModel>().initialize(context);
    }
  }

@ -87,8 +93,7 @@ class AppInfoViewModel extends BaseViewModel {
              CustomMaterialButton(
                label: I18nText('yesButton'),
                onPressed: () {
-                  uninstallApp(app, onlyUnpatch);
-                  locator<HomeViewModel>().initialize(context);
+                  uninstallApp(context, app, onlyUnpatch);
                  Navigator.of(context).pop();
                  Navigator.of(context).pop();
                },
@ -97,8 +102,7 @@ class AppInfoViewModel extends BaseViewModel {
          ),
        );
      } else {
-        uninstallApp(app, onlyUnpatch);
-        locator<HomeViewModel>().initialize(context);
+        uninstallApp(context, app, onlyUnpatch);
        Navigator.of(context).pop();
      }
    }
--- a/lib/ui/widgets/homeView/latest_commit_card.dart
+++ b/lib/ui/widgets/homeView/latest_commit_card.dart
@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';

 class LatestCommitCard extends StatefulWidget {
--- a/lib/ui/widgets/installerView/custom_material_button.dart
+++ b/lib/ui/widgets/installerView/custom_material_button.dart
@ -1,49 +0,0 @@
-import 'package:flutter/material.dart';
-
-class CustomMaterialButton extends StatelessWidget {
-  final Widget label;
-  final bool isFilled;
-  final bool isExpanded;
-  final Function()? onPressed;
-
-  const CustomMaterialButton({
-    Key? key,
-    required this.label,
-    this.isFilled = true,
-    this.isExpanded = false,
-    required this.onPressed,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return TextButton(
-      style: ButtonStyle(
-        padding: MaterialStateProperty.all(
-          isExpanded
-              ? const EdgeInsets.symmetric(horizontal: 24, vertical: 12)
-              : const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
-        ),
-        shape: MaterialStateProperty.all(
-          StadiumBorder(
-            side: isFilled
-                ? BorderSide.none
-                : BorderSide(
-                    width: 1,
-                    color: Theme.of(context).colorScheme.primary,
-                  ),
-          ),
-        ),
-        backgroundColor: MaterialStateProperty.all(
-          isFilled ? Theme.of(context).colorScheme.primary : Colors.transparent,
-        ),
-        foregroundColor: MaterialStateProperty.all(
-          isFilled
-              ? Theme.of(context).colorScheme.surface
-              : Theme.of(context).colorScheme.primary,
-        ),
-      ),
-      onPressed: onPressed,
-      child: label,
-    );
-  }
-}
--- a/lib/ui/widgets/patchesSelectorView/patch_item.dart
+++ b/lib/ui/widgets/patchesSelectorView/patch_item.dart
@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';

 // ignore: must_be_immutable
@ -147,7 +147,7 @@ class _PatchItemState extends State<PatchItem> {
          translationParams: {
            'packageVersion': widget.packageVersion,
            'supportedVersions':
-                '\u2022 ${widget.supportedPackageVersions.join('\n\u2022 ')}',
+                '\u2022 ${widget.supportedPackageVersions.reversed.join('\n\u2022 ')}',
          },
        ),
        actions: <Widget>[
--- a/lib/ui/widgets/shared/application_item.dart
+++ b/lib/ui/widgets/shared/application_item.dart
@ -1,7 +1,7 @@
 import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:expandable/expandable.dart';
 import 'package:timeago/timeago.dart';
--- a/lib/ui/widgets/shared/custom_material_button.dart
+++ b/lib/ui/widgets/shared/custom_material_button.dart
@ -0,0 +1,129 @@
+import 'package:flutter/material.dart';
+
+class CustomMaterialButton extends StatelessWidget {
+  final Widget label;
+  final bool isFilled;
+  final bool isExpanded;
+  final Function()? onPressed;
+
+  const CustomMaterialButton({
+    Key? key,
+    required this.label,
+    this.isFilled = true,
+    this.isExpanded = false,
+    required this.onPressed,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return TextButton(
+      style: ButtonStyle(
+        padding: MaterialStateProperty.all(
+          isExpanded
+              ? const EdgeInsets.symmetric(horizontal: 24, vertical: 12)
+              : const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+        ),
+        shape: MaterialStateProperty.all(
+          StadiumBorder(
+            side: isFilled
+                ? BorderSide.none
+                : BorderSide(
+                    width: 1,
+                    color: Theme.of(context).colorScheme.primary,
+                  ),
+          ),
+        ),
+        backgroundColor: MaterialStateProperty.all(
+          isFilled ? Theme.of(context).colorScheme.primary : Colors.transparent,
+        ),
+        foregroundColor: MaterialStateProperty.all(
+          isFilled
+              ? Theme.of(context).colorScheme.surface
+              : Theme.of(context).colorScheme.primary,
+        ),
+      ),
+      onPressed: onPressed,
+      child: label,
+    );
+  }
+}
+
+class TimerButton extends StatefulWidget {
+  Widget label;
+  bool isFilled;
+  int seconds;
+  final bool isRunning;
+  final Function()? onTimerEnd;
+
+  TimerButton({
+    Key? key,
+    required this.seconds,
+    required this.isRunning,
+    required this.onTimerEnd,
+    this.label = const Text(''),
+    this.isFilled = true,
+  }) : super(key: key);
+
+  @override
+  State<TimerButton> createState() => _TimerButtonState();
+}
+
+class _TimerButtonState extends State<TimerButton> {
+  void timer(int seconds) {
+    Future.delayed(const Duration(seconds: 1), () {
+      if (seconds > 0) {
+        setState(() {
+          seconds--;
+        });
+        timer(seconds);
+      } else {
+        widget.onTimerEnd!();
+      }
+    });
+  }
+
+  @override
+  void initState() {
+    //decrement seconds
+    if (widget.isRunning) {
+      timer(widget.seconds);
+    }
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext build) {
+    return TextButton(
+      style: ButtonStyle(
+        shape: MaterialStateProperty.all(
+          StadiumBorder(
+            side: widget.isFilled
+                ? BorderSide.none
+                : BorderSide(
+                    width: 1,
+                    color: Theme.of(context).colorScheme.primary,
+                  ),
+          ),
+        ),
+        backgroundColor: MaterialStateProperty.all(
+          widget.isFilled
+              ? Theme.of(context).colorScheme.primary
+              : Colors.transparent,
+        ),
+        foregroundColor: MaterialStateProperty.all(
+          widget.isFilled
+              ? Theme.of(context).colorScheme.surface
+              : Theme.of(context).colorScheme.primary,
+        ),
+      ),
+      onPressed: widget.isRunning ? null : widget.onTimerEnd,
+      child: Text(
+        widget.isRunning ? '${widget.seconds}' : 'Install',
+        style: TextStyle(
+          fontSize: 16,
+          fontWeight: FontWeight.w600,
+        ),
+      ),
+    );
+  }
+}
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager

 publish_to: 'none'

-version: 0.0.16+16
+version: 0.0.21+21

 environment:
  sdk: ">=2.17.5 <3.0.0"
@ -54,7 +54,10 @@ dependencies:
  path_provider: ^2.0.11
  permission_handler: ^10.0.0
  pull_to_refresh: ^2.0.0
-  root: ^2.0.2
+  root:
+    git:
+      url: https://github.com/gokul1630/root
+      ref: main
  share_extend: ^2.0.0
  shared_preferences: ^2.0.15
  skeletons: ^0.0.3
Author	SHA1	Message	Date
Aunali321	f00f910973	Merge branch 'flutter' of https://github.com/revanced/revanced-manager into flutter	2022-09-23 14:58:19 +05:30
Aunali321	2bc486dcec	build: Bump version to v0.0.21.	2022-09-23 14:58:07 +05:30
Aunali321	148981da18	refactor: removed dropdown for branch.	2022-09-23 14:57:05 +05:30
Aunali321	d8df377427	feat: warning dialog when selecting all patches.	2022-09-23 14:53:21 +05:30
Aunali321	efe1306aac	fix: reverse versions list to have recents first.	2022-09-23 13:35:47 +05:30
Aunali321	ead308740f	refactor: move custom button to shared dir.	2022-09-23 13:00:30 +05:30
oSumAtrIX	fa0f250e27	build: bump patcher dependency version to v5.0.1	2022-09-23 07:45:44 +02:00
oSumAtrIX	185d883b65	feat: acknowledgements section for template `feature-issue`	2022-09-23 07:33:30 +02:00
oSumAtrIX	9d8b2e1a35	feat: acknowledgements section for template `feature-issue`	2022-09-23 07:32:44 +02:00
Alberto Ponces	a6a7ff5040	build: Bump version to v0.0.19	2022-09-23 00:39:44 +01:00
Alberto Ponces	1028ec8e2a	fix: Prevent Manager from crashing when a patcher exception occurs and print its stack trace on installer's log	2022-09-23 00:38:42 +01:00
Alberto Ponces	f9242c1958	build: Bump version to v0.0.18	2022-09-22 14:04:59 +01:00
Alberto Ponces	f9865166b0	fix: TikTok integrations and settings patches should be merged if needed	2022-09-22 14:02:07 +01:00
Alberto Ponces	f0f934f6a1	fix: Prevent printing of denied root permission exceptions for unrooted users	2022-09-22 14:01:05 +01:00
Alberto Ponces	3d25655851	fix: Uninstall button should always be shown	2022-09-22 09:46:28 +01:00
oSumAtrIX	733190e76c	build: bump version to v0.0.17+17	2022-09-21 05:19:26 +02:00
oSumAtrIX	ab312dec43	build: bump patcher dependency version to v5.0.0	2022-09-21 04:16:19 +02:00
oSumAtrIX	70159b8cd8	Update Crowdin configuration file	2022-09-20 19:17:29 +02:00
oSumAtrIX	97060913a2	Update Crowdin configuration file	2022-09-20 19:07:41 +02:00
oSumAtrIX	4a0c5f9935	Update Crowdin configuration file	2022-09-20 12:06:23 +02:00
Alberto Ponces	f643a31455	Merge branch 'flutter' of github.com:revanced/revanced-manager into flutter	2022-09-20 10:05:06 +01:00
Alberto Ponces	03b87a50ea	fix: Use a proper app name when MicroG is applied	2022-09-20 10:04:51 +01:00
Alberto Ponces	4631982d42	fix: Use original packageName to get compatible patches	2022-09-20 10:04:02 +01:00
Palm	4c4b694db9	chore: update English language capitalizations and format (#228 ) * chore: update English language capitalizations and format * chore: revert capitalization changes as requested	2022-09-20 12:27:20 +05:30