chore: merge dev branch to main branch (#1011)

ReVanced Manager v1.4.1

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -29,7 +29,7 @@ body:
   - type: textarea
     attributes:
       label: Steps to reproduce
-      description: Add the steps to reproduce this bug including your environment.
+      description: Add the steps to reproduce this bug, including your environment.
       placeholder: Step 1. Download some files. Step 2. ...
     validations:
       required: true
@@ -74,20 +74,20 @@ body:
   - type: textarea
     attributes:
       label: Device logs (exported using Manager settings).
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so there is no need for backticks.
       render: shell
     validations:
       required: true
   - type: textarea
     attributes:
-      label: Installer logs (exported using Installer menu option) [unneeded if issue is not during patching].
+      label: Installer logs (exported using Installer menu option) [unneeded if the issue is not during patching].
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so there is no need for backticks.
       render: shell
     validations:
       required: false
   - type: textarea
     attributes:
-      label: Screenshots or videos
+      label: Screenshots or video
       description: Add screenshots or videos that show the bug here.
       placeholder: Drag and drop the screenshots/videos into this box.
     validations:
@@ -105,16 +105,16 @@ body:
     validations:
       required: false
   - type: checkboxes
-    id: acknowledgements
+    id: acknowledgments
     attributes:
-      label: Acknowledgements
+      label: Acknowledgments
       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.
+        - label: I have searched the existing issues; this is 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.
+        - label: I properly filled out all of the requested information in this issue.
           required: true
-        - label: The issue is related solely to the ReVanced Manager and not related to patching errors or patches
+        - label: The issue is solely related to ReVanced Manager and not caused by patches.
           required: true

.github/workflows/pull-request-build.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'zulu'
           cache: 'gradle'
       - name: Setup Flutter

.github/workflows/release-build.yml

@@ -12,10 +12,10 @@ jobs:
       - uses: actions/checkout@v3
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-      - name: Set up JDK 12
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: "12"
+          java-version: "11"
           distribution: "zulu"
       - uses: subosito/flutter-action@v2
         with:

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'zulu'
           cache: 'gradle'
       - name: Setup Node.js

android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -71,7 +71,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // ReVanced
-    implementation "app.revanced:revanced-patcher:11.0.1"
+    implementation "app.revanced:revanced-patcher:11.0.4"
 
     // Signing & aligning
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionSha256Sum=a01b6587e15fe7ed120a0ee299c25982a1eee045abd6a9dd5e216b2f628ef9ac
-distributionSha256Sum=6147605a23b4eff6c334927a86ff3508cb5d6722cd624c97ded4c2e8640f1f87
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

assets/i18n/en_US.json

@@ -17,23 +17,33 @@
     "homeView": {
         "refreshSuccess": "Refreshed successfully",
         "widgetTitle": "Dashboard",
+
         "updatesSubtitle": "Updates",
         "patchedSubtitle": "Patched applications",
+
         "updatesAvailable": "Updates available",
         "noUpdates": "No updates available",
+
         "WIP": "Work in progress...",
+
         "noInstallations": "No patched applications installed",
         "installed": "Installed",
         "installUpdate": "Continue to install the update?",
+
         "updateDialogTitle": "Update Manager",
         "updateChangelogTitle": "Changelog",
+
         "notificationTitle": "Update downloaded",
         "notificationText": "Tap to install the update",
+
         "downloadingMessage": "Downloading update...",
         "downloadedMessage": "Update downloaded!",
+
         "installingMessage": "Installing update...",
+
         "errorDownloadMessage": "Unable to download update",
         "errorInstallMessage": "Unable to install update",
+
         "noConnection": "No internet connection",
         "updatesDisabled": "Updating a patched app is currently disabled. Repatch the app again."
     },
@@ -52,15 +62,19 @@
     "patcherView": {
         "widgetTitle": "Patcher",
         "patchButton": "Patch",
+
         "patchDialogText": "You have selected a resource patch and a split APK installation has been detected, so patching errors may occur.\nAre you sure you want to proceed?",
-        "armv7WarningDialogText": "Patching on ARMv7 devices is not yet supported and might fail. Proceed anyways?"
+        "armv7WarningDialogText": "Patching on ARMv7 devices is not yet supported and might fail. Proceed anyways?",
+        "splitApkWarningDialogText": "Patching a split APK is not yet supported and might fail. Proceed anyways?"
     },
     "appSelectorCard": {
         "widgetTitle": "Select an application",
         "widgetTitleSelected": "Selected application",
         "widgetSubtitle": "No application selected",
+
         "noAppsLabel": "No applications found",
         "notInstalled":"App not installed",
+
         "currentVersion": "Current",
         "suggestedVersion": "Suggested",
         "allVersions": "All versions"
@@ -68,6 +82,7 @@
     "patchSelectorCard": {
         "widgetTitle": "Select patches",
         "widgetTitleSelected": "Selected patches",
+
         "widgetSubtitle": "Select an application first",
         "widgetEmptySubtitle": "No patches selected"
     },
@@ -78,24 +93,33 @@
     "appSelectorView": {
         "viewTitle": "Select an application",
         "searchBarHint": "Search applications",
-        "selectFromStorageButton": "Select from storage",
+
         "storageButton": "Storage",
+        "selectFromStorageButton": "Select from storage",
+        
         "errorMessage": "Unable to use selected application",
+
         "downloadToast": "Download function is not available yet",
+
         "featureNotAvailable": "Feature not implemented",
         "featureNotAvailableText": "This application is a split APK and cannot be selected. Unfortunately, this feature is only available for rooted users at the moment. However, you can still install the application by selecting its APK files from your device's storage instead"
     },
     "patchesSelectorView": {
         "viewTitle": "Select patches",
         "searchBarHint": "Search patches",
+
         "doneButton": "Done",
+
         "default": "Default",
         "defaultTooltip": "Select all default patches",
+
         "none": "None",
         "noneTooltip": "Deselect all patches",
+
         "loadPatchesSelection": "Load patches selection",
         "noSavedPatches": "No saved patches for the selected app.\nPress Done to save current selection.",
         "noPatchesFound": "No patches found for the selected app",
+
         "selectAllPatchesWarningContent": "You are about to select all patches, that includes non-suggested patches and can cause unwanted behavior."
     },
     "patchItem": {
@@ -108,11 +132,14 @@
         "installRootButton": "Install as Root",
         "openButton": "Open",
         "shareButton": "Share file",
+        
         "notificationTitle": "ReVanced Manager is patching",
         "notificationText": "Tap to return to the installer",
+
         "shareApkMenuOption": "Share APK",
         "exportApkMenuOption": "Export APK",
         "shareLogMenuOption": "Share log",
+
         "installErrorDialogTitle": "Error",
         "installErrorDialogText1": "Root install is not possible with the current patches selection.\nRepatch your app or choose non-root install.",
         "installErrorDialogText2": "Non-root install is not possible with the current patches selection.\nRepatch your app or choose root install if you have your device rooted.",
@@ -121,74 +148,95 @@
     },
     "settingsView": {
         "widgetTitle": "Settings",
+
         "appearanceSectionTitle": "Appearance",
         "teamSectionTitle": "Team",
         "infoSectionTitle": "Info",
         "advancedSectionTitle": "Advanced",
+        "exportSectionTitle": "Import & export",
         "logsSectionTitle": "Logs",
+
         "darkThemeLabel": "Dark mode",
         "darkThemeHint": "Welcome to the dark side",
+
         "dynamicThemeLabel": "Material You",
         "dynamicThemeHint": "Enjoy an experience closer to your device",
+
         "languageLabel": "Language",
         "englishOption": "English",
+
         "sourcesLabel": "Sources",
         "sourcesLabelHint": "Configure your custom sources",
-        "hostRepositoryLabel": "Repository API",
-        "orgPatchesLabel": "Patches organization",
-        "sourcesPatchesLabel": "Patches source",
-        "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 its default value?",
-        "contributorsLabel": "Contributors",
+
-        "contributorsHint": "A list of contributors of ReVanced",
-        "logsLabel": "Logs",
-        "logsHint": "Share Manager's logs",
         "apiURLLabel": "API URL",
         "apiURLHint": "Configure your custom API URL",
         "selectApiURL": "API URL",
+        "hostRepositoryLabel": "Repository API",
+        "orgPatchesLabel": "Patches organization",
+        "sourcesPatchesLabel": "Patches source",
+        "orgIntegrationsLabel": "Integrations organization",
+        
+        "contributorsLabel": "Contributors",
+        "contributorsHint": "A list of contributors of ReVanced",
+
+        "logsLabel": "Logs",
+        "logsHint": "Share Manager's logs",
+
         "experimentalUniversalPatchesLabel": "Experimental universal patches support",
         "experimentalUniversalPatchesHint": "Display all applications to use with universal patches, loading list of apps may be slower",
         "experimentalPatchesLabel": "Experimental patches support",
         "experimentalPatchesHint": "Enable usage of unsupported patches in any app version",
         "enabledExperimentalPatches": "Experimental patches support enabled",
-        "exportSectionTitle": "Import & export",
+
         "aboutLabel": "About",
         "snackbarMessage": "Copied to clipboard",
         "restartAppForChanges": "Restart the app to apply changes",
-        "deleteKeystoreLabel": "Delete keystore",
+
-        "deleteKeystoreHint": "Delete the keystore used to sign the app",
-        "deleteKeystoreDialogText": "Are you sure you want to delete the keystore used to sign patched applications?",
-        "deletedKeystore": "Keystore deleted",
         "deleteTempDirLabel": "Delete temporary files",
         "deleteTempDirHint": "Delete unused temporary files",
         "deletedTempDir": "Temporary files deleted",
+
         "exportPatchesLabel": "Export patches selection",
         "exportPatchesHint": "Export patches selection to a JSON file",
         "exportedPatches": "Patches selection exported",
         "noExportFileFound": "No patches selection to export",
+
         "importPatchesLabel": "Import patches selection",
         "importPatchesHint": "Import patches selection from a JSON file",
         "importedPatches": "Patches selection imported",
+
         "resetStoredPatchesLabel": "Reset patches",
         "resetStoredPatchesHint": "Reset the stored patches selection",
+        "resetStoredPatchesDialogText": "Are you sure you want to reset the stored patches selection?",
         "resetStoredPatches": "Patches selection has been reset",
-        "jsonSelectorErrorMessage": "Unable to use selected JSON file",
+
         "deleteLogsLabel": "Delete logs",
         "deleteLogsHint": "Delete collected manager logs",
         "deletedLogs": "Logs deleted",
+
+        "deleteKeystoreLabel": "Delete keystore",
+        "deleteKeystoreHint": "Delete the keystore used to sign the app",
+        "deleteKeystoreDialogText": "Are you sure you want to delete the keystore used to sign patched applications?",
+        "deletedKeystore": "Keystore deleted",
+
         "exportKeystoreLabel": "Export keystore",
         "exportKeystoreHint": "Export keystore used to sign apps",
         "exportedKeystore": "Keystore exported",
         "noKeystoreExportFileFound": "No keystore to export",
+
         "importKeystoreLabel": "Import keystore",
         "importKeystoreHint": "Import keystore used to sign apps",
         "importedKeystore": "Keystore imported",
-        "keystoreSelectorErrorMessage": "Unable to use selected KEYSTORE file",
+
         "selectKeystorePassword": "Keystore Password",
-        "selectKeystorePasswordHint": "Select keystore password used to sign the apk"
+        "selectKeystorePasswordHint": "Select keystore password used to sign the apk",
+
+        "jsonSelectorErrorMessage": "Unable to use selected JSON file",
+        "keystoreSelectorErrorMessage": "Unable to use selected KEYSTORE file"
     },
     "appInfoView": {
         "widgetTitle": "App info",
@@ -196,18 +244,22 @@
         "uninstallButton": "Uninstall",
         "patchButton": "Patch",
         "unpatchButton": "Unpatch",
-        "unpatchDialogText": "Are you sure you want to unpatch this app?",
         "rootDialogTitle": "Error",
+
+        "unpatchDialogText": "Are you sure you want to unpatch this app?",
         "rootDialogText": "App was installed with superuser permissions, but currently ReVanced Manager has no permissions.\nPlease grant superuser permissions first.",
+
         "packageNameLabel": "Package name",
         "originalPackageNameLabel": "Original package name",
         "installTypeLabel": "Installation type",
         "rootTypeLabel": "Root",
         "nonRootTypeLabel": "Non-root",
         "patchedDateLabel": "Patched date",
-        "patchedDateHint": "{date} at {time}",
         "appliedPatchesLabel": "Applied patches",
+
+        "patchedDateHint": "{date} at {time}",
         "appliedPatchesHint": "{quantity} applied patches",
+        
         "updateNotImplemented": "This feature has not been implemented yet"
     },
     "contributorsView": {

docs/1_installation.md

@@ -9,6 +9,6 @@ In order to use ReVanced on your Android device, ReVanced Manager must be instal
 
 ## ⏭️ What's next
 
-The next page will guide you through patching an app.
+The next page will guide you through using ReVanced Manager.
 
 Continue: [🪛 Usage](2_usage.md)

lib/services/github_api.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 import 'dart:io';
-
 import 'package:collection/collection.dart';
 import 'package:dio/dio.dart';
 import 'package:dio_cache_interceptor/dio_cache_interceptor.dart';
@@ -8,6 +7,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:injectable/injectable.dart';
 import 'package:revanced_manager/models/patch.dart';
+import 'package:revanced_manager/services/manager_api.dart';
 
 @lazySingleton
 class GithubAPI {
@@ -72,6 +72,41 @@ class GithubAPI {
     }
   }
 
+  Future<Map<String, dynamic>?> getLatestManagerRelease(
+    String repoName,
+  ) async {
+    try {
+      final response = await _dio.get(
+        '/repos/$repoName/releases',
+      );
+      final Map<String, dynamic> releases = response.data[0];
+      int updates = 0;
+      final String currentVersion =
+          await ManagerAPI().getCurrentManagerVersion();
+      while (response.data[updates]['tag_name'] != 'v$currentVersion') {
+        updates++;
+      }
+      for (int i = 1; i < updates; i++) {
+        releases.update(
+          'body',
+          (value) =>
+              value +
+              '\n' +
+              '# ' +
+              response.data[i]['tag_name'] +
+              '\n' +
+              response.data[i]['body'],
+        );
+      }
+      return releases;
+    } on Exception catch (e) {
+      if (kDebugMode) {
+        print(e);
+      }
+      return null;
+    }
+  }
+
   Future<List<String>> getCommits(
     String packageName,
     String repoName,

lib/services/patcher_api.dart

@@ -1,12 +1,12 @@
 import 'dart:io';
 
-import 'package:app_installer/app_installer.dart';
 import 'package:collection/collection.dart';
 import 'package:cr_file_saver/file_saver.dart';
 import 'package:device_apps/device_apps.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:injectable/injectable.dart';
+import 'package:install_plugin/install_plugin.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
@@ -232,10 +232,8 @@ class PatcherAPI {
             );
           }
         } else {
-          await AppInstaller.installApk(_outFile!.path);
+          final install = await InstallPlugin.installApk(_outFile!.path);
-          return await DeviceApps.isAppInstalled(
+          return install['isSuccess'];
-            patchedApp.packageName,
-          );
         }
       } on Exception catch (e) {
         if (kDebugMode) {

lib/services/revanced_api.dart

@@ -140,7 +140,8 @@ class RevancedAPI {
     return null;
   }
 
-  StreamController<double> managerUpdateProgress = StreamController<double>.broadcast();
+  StreamController<double> managerUpdateProgress =
+      StreamController<double>.broadcast();
 
   void updateManagerDownloadProgress(int progress) {
     managerUpdateProgress.add(progress.toDouble());

lib/services/root_api.dart

@@ -73,7 +73,7 @@ class RootAPI {
   }
 
   Future<List<String>> getInstalledApps() async {
-    final List<String> apps = List.empty();
+    final List<String> apps = List.empty(growable: true);
     try {
       String? res = await Root.exec(
         cmd: 'ls "$_revancedDirPath"',

lib/ui/views/app_selector/app_selector_view.dart

@@ -88,7 +88,7 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                         ),
                       ),
                     )
-                  : model.apps.isEmpty
+                  : model.allApps.isEmpty
                       ? const AppSkeletonLoader()
                       : Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 12.0)
@@ -113,7 +113,9 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                                       ),
                                       installedVersion: app.versionName!,
                                       onTap: () => model.canSelectInstalled(
-                                          context, app.packageName),
+                                        context,
+                                        app.packageName,
+                                      ),
                                     ),
                                   )
                                   .toList(),

lib/ui/views/app_selector/app_selector_viewmodel.dart

@@ -45,9 +45,7 @@ class AppSelectorViewModel extends BaseViewModel {
           .length
           .compareTo(_patcherAPI.getFilteredPatches(a.packageName).length),
     );
-    noApps = apps.isEmpty;
     getAllApps();
-
     notifyListeners();
   }
 
@@ -57,7 +55,7 @@ class AppSelectorViewModel extends BaseViewModel {
         .toSet()
         .where((name) => !apps.any((app) => app.packageName == name))
         .toList();
-
+    noApps = allApps.isEmpty;
     return allApps;
   }
 

lib/ui/views/home/home_view.dart

@@ -128,7 +128,7 @@ class HomeView extends StatelessWidget {
                         },
                         child: model.showUpdatableApps
                             ? AvailableUpdatesCard()
-                            : InstalledAppsCard(),
+                            : const InstalledAppsCard(),
                       ),
                     ],
                   ),

lib/ui/views/home/home_viewmodel.dart

@@ -1,13 +1,13 @@
 // ignore_for_file: use_build_context_synchronously
 import 'dart:async';
 import 'dart:io';
-import 'package:app_installer/app_installer.dart';
 import 'package:cross_connectivity/cross_connectivity.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:injectable/injectable.dart';
+import 'package:install_plugin/install_plugin.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/app/app.router.dart';
@@ -51,7 +51,7 @@ class HomeViewModel extends BaseViewModel {
           _toast.showBottom('homeView.installingMessage');
           final File? managerApk = await _managerAPI.downloadManager();
           if (managerApk != null) {
-            await AppInstaller.installApk(managerApk.path);
+            await InstallPlugin.installApk(managerApk.path);
           } else {
             _toast.showBottom('homeView.errorDownloadMessage');
           }
@@ -72,7 +72,7 @@ class HomeViewModel extends BaseViewModel {
       _toast.showBottom('homeView.installingMessage');
       final File? managerApk = await _managerAPI.downloadManager();
       if (managerApk != null) {
-        await AppInstaller.installApk(managerApk.path);
+        await InstallPlugin.installApk(managerApk.path);
       } else {
         _toast.showBottom('homeView.errorDownloadMessage');
       }
@@ -112,13 +112,15 @@ class HomeViewModel extends BaseViewModel {
 
   Future<bool> hasManagerUpdates() async {
     String currentVersion = await _managerAPI.getCurrentManagerVersion();
-    _latestManagerVersion = await _managerAPI.getLatestManagerVersion();
 
     // add v to current version
     if (!currentVersion.startsWith('v')) {
       currentVersion = 'v$currentVersion';
     }
 
+    _latestManagerVersion =
+        await _managerAPI.getLatestManagerVersion() ?? currentVersion;
+
     if (_latestManagerVersion != currentVersion) {
       return true;
     }
@@ -270,8 +272,9 @@ class HomeViewModel extends BaseViewModel {
                                 child: CustomMaterialButton(
                                   label: I18nText('updateButton'),
                                   onPressed: () async {
-                                    await AppInstaller.installApk(
+                                    await InstallPlugin.installApk(
-                                        downloadedApk!.path,);
+                                      downloadedApk!.path,
+                                    );
                                   },
                                 ),
                               ),
@@ -315,7 +318,7 @@ class HomeViewModel extends BaseViewModel {
         //       UILocalNotificationDateInterpretation.absoluteTime,
         // );
         _toast.showBottom('homeView.installingMessage');
-        await AppInstaller.installApk(managerApk.path);
+        await InstallPlugin.installApk(managerApk.path);
       } else {
         _toast.showBottom('homeView.errorDownloadMessage');
       }
@@ -345,7 +348,7 @@ class HomeViewModel extends BaseViewModel {
   }
 
   Future<Map<String, dynamic>?> getLatestManagerRelease() {
-    return _githubAPI.getLatestRelease(_managerAPI.defaultManagerRepo);
+    return _githubAPI.getLatestManagerRelease(_managerAPI.defaultManagerRepo);
   }
 
   Future<String?> getLatestPatcherReleaseTime() {

lib/ui/views/installer/installer_viewmodel.dart

@@ -166,7 +166,7 @@ class InstallerViewModel extends BaseViewModel {
     try {
       _app.isRooted = installAsRoot;
       final bool hasMicroG =
-          _patches.any((p) => p.name.endsWith('microg-support'));
+          _patches.any((p) => p.name.endsWith('MicroG support'));
       final bool rootMicroG = installAsRoot && hasMicroG;
       final bool rootFromStorage = installAsRoot && _app.isFromStorage;
       final bool ytWithoutRootMicroG =

lib/ui/views/navigation/navigation_view.dart

@@ -13,7 +13,16 @@ class NavigationView extends StatelessWidget {
     return ViewModelBuilder<NavigationViewModel>.reactive(
       onViewModelReady: (model) => model.initialize(context),
       viewModelBuilder: () => locator<NavigationViewModel>(),
-      builder: (context, model, child) => Scaffold(
+      builder: (context, model, child) => WillPopScope(
+        onWillPop: () async {
+          if (model.currentIndex == 0) {
+            return true;
+          } else {
+            model.setIndex(0);
+            return false;
+          }
+        },
+        child: Scaffold(
           body: PageTransitionSwitcher(
             duration: const Duration(milliseconds: 400),
             transitionBuilder: (
@@ -42,6 +51,7 @@ class NavigationView extends StatelessWidget {
                   context,
                   'navigationView.dashboardTab',
                 ),
+                tooltip: '',
               ),
               NavigationDestination(
                 icon: model.isIndexSelected(1)
@@ -51,6 +61,7 @@ class NavigationView extends StatelessWidget {
                   context,
                   'navigationView.patcherTab',
                 ),
+                tooltip: '',
               ),
               NavigationDestination(
                 icon: model.isIndexSelected(2)
@@ -60,10 +71,12 @@ class NavigationView extends StatelessWidget {
                   context,
                   'navigationView.settingsTab',
                 ),
+                tooltip: '',
               ),
             ],
           ),
         ),
+      ),
     );
   }
 }

lib/ui/views/patcher/patcher_viewmodel.dart

@@ -64,7 +64,7 @@ class PatcherViewModel extends BaseViewModel {
           builder: (context) => AlertDialog(
             title: I18nText('warning'),
             backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-            content: I18nText('patcherView.armv7WarningDialogText'),
+            content: I18nText('patcherView.splitApkWarningDialogText'),
             actions: <Widget>[
               CustomMaterialButton(
                 label: I18nText('noButton'),

lib/ui/views/settings/settings_viewmodel.dart

@@ -17,8 +17,7 @@ import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
 
 class SettingsViewModel extends BaseViewModel {
-  final NavigationService _navigationService =
+  final NavigationService _navigationService = locator<NavigationService>();
-      locator<NavigationService>();
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final Toast _toast = locator<Toast>();
 
@@ -63,11 +62,8 @@ class SettingsViewModel extends BaseViewModel {
     try {
       final File outFile = File(_managerAPI.storedPatchesFile);
       if (outFile.existsSync()) {
-        final String dateTime = DateTime.now()
+        final String dateTime =
-            .toString()
+            DateTime.now().toString().replaceAll(' ', '_').split('.').first;
-            .replaceAll(' ', '_')
-            .split('.')
-            .first;
         await CRFileSaver.saveFileWithDialog(
           SaveFileDialogParams(
             sourceFilePath: outFile.path,
@@ -87,8 +83,7 @@ class SettingsViewModel extends BaseViewModel {
 
   Future<void> importPatches() async {
     try {
-      final FilePickerResult? result =
+      final FilePickerResult? result = await FilePicker.platform.pickFiles(
-          await FilePicker.platform.pickFiles(
         type: FileType.custom,
         allowedExtensions: ['json'],
       );

lib/ui/widgets/appSelectorView/app_skeleton_loader.dart

@@ -34,7 +34,8 @@ class AppSkeletonLoader extends StatelessWidget {
                       style: SkeletonLineStyle(
                         height: 20,
                         width: screenWidth * 0.4,
-                        borderRadius: const BorderRadius.all(Radius.circular(10)),
+                        borderRadius:
+                            const BorderRadius.all(Radius.circular(10)),
                       ),
                     ),
                   ),
@@ -45,7 +46,8 @@ class AppSkeletonLoader extends StatelessWidget {
                       style: SkeletonLineStyle(
                         height: 15,
                         width: screenWidth * 0.6,
-                        borderRadius: const BorderRadius.all(Radius.circular(10)),
+                        borderRadius:
+                            const BorderRadius.all(Radius.circular(10)),
                       ),
                     ),
                   ),
@@ -56,7 +58,8 @@ class AppSkeletonLoader extends StatelessWidget {
                       style: SkeletonLineStyle(
                         height: 15,
                         width: screenWidth * 0.5,
-                        borderRadius: const BorderRadius.all(Radius.circular(10)),
+                        borderRadius:
+                            const BorderRadius.all(Radius.circular(10)),
                       ),
                     ),
                   ),

lib/ui/widgets/appSelectorView/installed_app_item.dart

@@ -66,7 +66,7 @@ class _InstalledAppItemState extends State<InstalledAppItem> {
                       context,
                       'installed',
                       translationParams: {
-                        'version':'v${widget.installedVersion}'
+                        'version': 'v${widget.installedVersion}'
                       },
                     ),
                   ),
@@ -75,20 +75,27 @@ class _InstalledAppItemState extends State<InstalledAppItem> {
                       I18nText(
                         'suggested',
                         translationParams: {
-                          'version' : widget.suggestedVersion.isEmpty
+                          'version': widget.suggestedVersion.isEmpty
-                              ? FlutterI18n.translate(context, 'appSelectorCard.allVersions')
+                              ? FlutterI18n.translate(
+                                  context,
+                                  'appSelectorCard.allVersions',
+                                )
                               : 'v${widget.suggestedVersion}',
                         },
                       ),
                       const SizedBox(width: 4),
-                      Text(
+                      Flexible(
+                        child: Text(
                           widget.patchesCount == 1
                               ? '• ${widget.patchesCount} patch'
                               : '• ${widget.patchesCount} patches',
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
                           style: TextStyle(
                             color: Theme.of(context).colorScheme.secondary,
                           ),
                         ),
+                      ),
                     ],
                   ),
                 ],

lib/ui/widgets/appSelectorView/not_installed_app_item.dart

@@ -60,8 +60,7 @@ class _NotInstalledAppItem extends State<NotInstalledAppItem> {
                     child: Text(
                       '',
                       style: TextStyle(
-                        color:
+                        color: Theme.of(context).textTheme.titleLarge!.color,
-                        Theme.of(context).textTheme.titleLarge!.color,
                       ),
                     ),
                   ),
@@ -70,20 +69,27 @@ class _NotInstalledAppItem extends State<NotInstalledAppItem> {
                       I18nText(
                         'suggested',
                         translationParams: {
-                          'version' : widget.suggestedVersion.isEmpty
+                          'version': widget.suggestedVersion.isEmpty
-                              ? FlutterI18n.translate(context, 'appSelectorCard.allVersions')
+                              ? FlutterI18n.translate(
+                                  context,
+                                  'appSelectorCard.allVersions',
+                                )
                               : 'v${widget.suggestedVersion}',
                         },
                       ),
                       const SizedBox(width: 4),
-                      Text(
+                      Flexible(
+                        child: Text(
                           widget.patchesCount == 1
                               ? '• ${widget.patchesCount} patch'
                               : '• ${widget.patchesCount} patches',
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
                           style: TextStyle(
                             color: Theme.of(context).colorScheme.secondary,
                           ),
                         ),
+                      ),
                     ],
                   ),
                 ],

lib/ui/widgets/homeView/installed_apps_card.dart

@@ -1,16 +1,49 @@
+import 'package:device_apps/device_apps.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patched_application.dart';
+import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/shared/application_item.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
-class InstalledAppsCard extends StatelessWidget {
+class InstalledAppsCard extends StatefulWidget {
-  InstalledAppsCard({Key? key}) : super(key: key);
+  const InstalledAppsCard({Key? key}) : super(key: key);
 
-  final List<PatchedApplication> apps =
+  @override
-      locator<HomeViewModel>().patchedInstalledApps;
+  State<InstalledAppsCard> createState() => _InstalledAppsCardState();
+}
+
+class _InstalledAppsCardState extends State<InstalledAppsCard> {
+  List<PatchedApplication> apps = locator<HomeViewModel>().patchedInstalledApps;
+  final ManagerAPI _managerAPI = locator<ManagerAPI>();
+  List<PatchedApplication> patchedApps = [];
+
+  @override
+  void initState() {
+    super.initState();
+    _getApps();
+  }
+
+  Future _getApps() async {
+    if (apps.isNotEmpty) {
+      patchedApps = [...apps];
+      for (final element in apps) {
+        await DeviceApps.getApp(element.packageName).then((value) {
+          if (element.version != value?.versionName) {
+            patchedApps.remove(element);
+          }
+        });
+      }
+      if (apps.length != patchedApps.length) {
+        await _managerAPI.setPatchedApps(patchedApps);
+        apps.clear();
+        apps = [...patchedApps];
+      }
+      setState(() {});
+    }
+  }
 
   @override
   Widget build(BuildContext context) {

lib/ui/widgets/homeView/update_confirmation_dialog.dart

@@ -45,8 +45,7 @@ class UpdateConfirmationDialog extends StatelessWidget {
                       children: [
                         Expanded(
                           child: Column(
-                            crossAxisAlignment:
+                            crossAxisAlignment: CrossAxisAlignment.start,
-                                CrossAxisAlignment.start,
                             children: [
                               I18nText(
                                 'homeView.updateDialogTitle',
@@ -63,14 +62,12 @@ class UpdateConfirmationDialog extends StatelessWidget {
                                 children: [
                                   Icon(
                                     Icons.new_releases_outlined,
-                                    color: Theme.of(context)
+                                    color:
-                                        .colorScheme
+                                        Theme.of(context).colorScheme.secondary,
-                                        .secondary,
                                   ),
                                   const SizedBox(width: 8.0),
                                   Text(
-                                    snapshot.data!['tag_name'] ??
+                                    snapshot.data!['tag_name'] ?? 'Unknown',
-                                        'Unknown',
                                     style: TextStyle(
                                       fontSize: 20,
                                       fontWeight: FontWeight.w500,
@@ -96,8 +93,7 @@ class UpdateConfirmationDialog extends StatelessWidget {
                     ),
                   ),
                   Padding(
-                    padding:
+                    padding: const EdgeInsets.only(left: 24.0, bottom: 12.0),
-                        const EdgeInsets.only(left: 24.0, bottom: 12.0),
                     child: I18nText(
                       'homeView.updateChangelogTitle',
                       child: Text(
@@ -113,12 +109,9 @@ class UpdateConfirmationDialog extends StatelessWidget {
                     ),
                   ),
                   Container(
-                    margin:
+                    margin: const EdgeInsets.symmetric(horizontal: 24.0),
-                        const EdgeInsets.symmetric(horizontal: 24.0),
                     decoration: BoxDecoration(
-                      color: Theme.of(context)
+                      color: Theme.of(context).colorScheme.secondaryContainer,
-                          .colorScheme
-                          .secondaryContainer,
                       borderRadius: BorderRadius.circular(12.0),
                     ),
                     child: Markdown(

lib/ui/widgets/patchesSelectorView/patch_item.dart

@@ -42,7 +42,9 @@ class PatchItem extends StatefulWidget {
 class _PatchItemState extends State<PatchItem> {
   @override
   Widget build(BuildContext context) {
-    widget.isSelected = widget.isSelected && (!widget.isUnsupported || widget._managerAPI.areExperimentalPatchesEnabled());
+    widget.isSelected = widget.isSelected &&
+        (!widget.isUnsupported ||
+            widget._managerAPI.areExperimentalPatchesEnabled());
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 4.0),
       child: Opacity(
@@ -128,14 +130,16 @@ class _PatchItemState extends State<PatchItem> {
                               !widget._managerAPI
                                   .areExperimentalPatchesEnabled()) {
                             widget.isSelected = false;
-                            widget.toast
+                            widget.toast.showBottom(
-                                .showBottom('patchItem.unsupportedPatchVersion');
+                              'patchItem.unsupportedPatchVersion',
+                            );
                           } else {
                             widget.isSelected = newValue!;
                           }
                           if (widget.isUnsupported &&
                               widget.isSelected &&
-                              !selectedUnsupportedPatches.contains(widget.name)) {
+                              !selectedUnsupportedPatches
+                                  .contains(widget.name)) {
                             selectedUnsupportedPatches.add(widget.name);
                           }
                         });

lib/ui/widgets/settingsView/settings_experimental_patches.dart

@@ -34,9 +34,11 @@ class _SExperimentalPatchesState extends State<SExperimentalPatches> {
         setState(() {
           _settingsViewModel.useExperimentalPatches(value);
         });
-        if(!value) {
+        if (!value) {
           for (final patch in selectedUnsupportedPatches) {
-            PatchesSelectorViewModel().selectedPatches.removeWhere((element) => patch == element.name);
+            PatchesSelectorViewModel()
+                .selectedPatches
+                .removeWhere((element) => patch == element.name);
           }
           selectedUnsupportedPatches.clear();
         }

lib/ui/widgets/settingsView/settings_export_section.dart

@@ -3,6 +3,7 @@ import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_manage_keystore_password.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 
 final _settingsViewModel = SettingsViewModel();
 
@@ -91,9 +92,36 @@ class SExportSection extends StatelessWidget {
             ),
           ),
           subtitle: I18nText('settingsView.resetStoredPatchesHint'),
-          onTap: () => _settingsViewModel.resetSelectedPatches(),
+          onTap: () => _showResetStoredPatchesDialog(context),
         ),
       ],
     );
   }
+
+  Future<void> _showResetStoredPatchesDialog(context) {
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText('warning'),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: I18nText(
+          'settingsView.resetStoredPatchesDialogText',
+        ),
+        actions: <Widget>[
+          CustomMaterialButton(
+            isFilled: false,
+            label: I18nText('noButton'),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+          CustomMaterialButton(
+            label: I18nText('yesButton'),
+            onPressed: () => {
+              Navigator.of(context).pop(),
+              _settingsViewModel.resetSelectedPatches()
+            },
+          )
+        ],
+      ),
+    );
+  }
 }

pubspec.yaml

@@ -1,17 +1,16 @@
 name: revanced_manager
-description: The official ReVanced Manager.
+description: Patch your favourite apps, right on your device.
 homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 1.3.6+100300006
+version: 1.4.1+100400001
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   animations: ^2.0.7
-  app_installer: ^1.1.0
   collection: ^1.17.0
   cross_connectivity: ^3.0.5
   cr_file_saver:
@@ -59,8 +58,8 @@ dependencies:
   pull_to_refresh: ^2.0.0
   root:
     git:
-      url: https://github.com/gokul1630/root
+      url: https://github.com/EvadeMaster/root
-      ref: main
+      ref: 9bcf0dc06b8e2e3ccd5fbd16bc849938e817b36b
   share_extend: ^2.0.0
   shared_preferences: ^2.1.0
   skeletons: ^0.0.3
@@ -75,6 +74,7 @@ dependencies:
   flutter_dotenv: ^5.0.2
   flutter_markdown: ^0.6.14
   dio_cache_interceptor: ^3.4.0
+  install_plugin: ^2.1.0
 
 dev_dependencies:
   json_serializable: ^6.6.1