build: Bump bump version to v0.0.13

android/app/build.gradle

@@ -44,7 +44,7 @@ android {
 
     defaultConfig {
         applicationId "app.revanced.manager.flutter"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -71,7 +71,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // ReVanced
-    implementation "app.revanced:revanced-patcher:4.4.0"
+    implementation "app.revanced:revanced-patcher:4.4.2"
 
     // Signing & aligning
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")

android/app/src/main/AndroidManifest.xml

@@ -1,21 +1,23 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="app.revanced.manager.flutter">
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
    <application
         android:label="ReVanced Manager"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:largeHeap="true">
+        android:largeHeap="true"
+        android:extractNativeLibs="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"

android/app/src/main/res/values-night-v31/styles.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_launcher_round</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

android/app/src/main/res/values-v31/styles.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_launcher_round</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
+

assets/i18n/en.json

@@ -25,7 +25,7 @@
         "downloadingMessage": "Downloading update!",
         "installingMessage": "Installing update... Hang on!",
         "errorDownloadMessage": "Unable to download update!",
-        "errorInstallMessage": "Unable to download update!",
+        "errorInstallMessage": "Unable to install update!",
         "noConnection": "No internet connection"
     },
     "applicationItem": {
@@ -50,7 +50,10 @@
         "widgetTitle": "Select application",
         "widgetTitleSelected": "Selected application",
         "widgetSubtitle": "No application selected.",
-        "noAppsLabel": "No applications found."
+        "noAppsLabel": "No applications found.",
+        "currentVersion": "Current",
+        "recommendedVersion": "Recommended",
+        "anyVersion": "any"
     },
     "patchSelectorCard": {
         "widgetTitle": "Select patches",
@@ -75,7 +78,7 @@
     "patchItem": {
         "unsupportedWarningButton": "Unsupported version",
         "unsupportedDialogTitle": "Warning",
-        "unsupportedDialogText": "Selecting this patch may or may not result in patching errors.\n\nApp version: {packageVersion}\nCurrent supported versions:\n{supportedVersions}"
+        "unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nCurrent supported versions:\n{supportedVersions}"
     },
     "installerView": {
         "widgetTitle": "Installer",
@@ -121,8 +124,11 @@
         "openButton": "Open",
         "uninstallButton": "Uninstall",
         "patchButton": "Patch",
+        "unpatchButton": "Unpatch",
         "uninstallDialogTitle": "Uninstall",
         "uninstallDialogText": "Are you sure you want to uninstall this app?",
+        "unpatchDialogTitle": "Unpatch",
+        "unpatchDialogText": "Are you sure you want to unpatch this app?",
         "rootDialogTitle": "Error",
         "rootDialogText": "App was installed with root mode enabled but currently root mode is disabled.\nPlease enable root mode first.",
         "packageNameLabel": "Package Name",

lib/services/manager_api.dart

@@ -165,46 +165,114 @@ class ManagerAPI {
     return packageInfo.version;
   }
 
-  Future<void> reAssessSavedApps() async {
-    List<PatchedApplication> patchedApps = getPatchedApps();
+  Future<List<PatchedApplication>> getAppsToRemove(
+    List<PatchedApplication> patchedApps,
+  ) async {
     List<PatchedApplication> toRemove = [];
     for (PatchedApplication app in patchedApps) {
       bool isRemove = await isAppUninstalled(app);
       if (isRemove) {
         toRemove.add(app);
-      } else {
-        app.hasUpdates = await hasAppUpdates(app.packageName, app.patchDate);
-        app.changelog = await getAppChangelog(app.packageName, app.patchDate);
-        if (!app.hasUpdates) {
-          String? currentInstalledVersion =
-              (await DeviceApps.getApp(app.packageName))?.versionName;
-          if (currentInstalledVersion != null) {
-            String currentSavedVersion = app.version;
-            int currentInstalledVersionInt = int.parse(
-                currentInstalledVersion.replaceAll(RegExp('[^0-9]'), ''));
-            int currentSavedVersionInt =
-                int.parse(currentSavedVersion.replaceAll(RegExp('[^0-9]'), ''));
-            if (currentInstalledVersionInt > currentSavedVersionInt) {
-              app.hasUpdates = true;
-            }
+      }
+    }
+    return toRemove;
+  }
+
+  Future<List<PatchedApplication>> getUnsavedApps(
+    List<PatchedApplication> patchedApps,
+  ) async {
+    List<PatchedApplication> unsavedApps = [];
+    bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+    if (hasRootPermissions) {
+      List<String> installedApps = await _rootAPI.getInstalledApps();
+      for (String packageName in installedApps) {
+        if (!patchedApps.any((app) => app.packageName == packageName)) {
+          ApplicationWithIcon? application =
+              await DeviceApps.getApp(packageName, true)
+                  as ApplicationWithIcon?;
+          if (application != null) {
+            unsavedApps.add(
+              PatchedApplication(
+                name: application.appName,
+                packageName: application.packageName,
+                version: application.versionName!,
+                apkFilePath: application.apkFilePath,
+                icon: application.icon,
+                patchDate: DateTime.now(),
+                isRooted: true,
+              ),
+            );
           }
         }
       }
     }
+    List<Application> userApps = await DeviceApps.getInstalledApplications(
+      includeSystemApps: false,
+      includeAppIcons: false,
+    );
+    for (Application app in userApps) {
+      if (app.packageName.startsWith('app.revanced') &&
+          !app.packageName.startsWith('app.revanced.manager.') &&
+          !patchedApps.any((uapp) => uapp.packageName == app.packageName)) {
+        ApplicationWithIcon? application =
+            await DeviceApps.getApp(app.packageName, true)
+                as ApplicationWithIcon?;
+        if (application != null) {
+          unsavedApps.add(
+            PatchedApplication(
+              name: application.appName,
+              packageName: application.packageName,
+              version: application.versionName!,
+              apkFilePath: application.apkFilePath,
+              icon: application.icon,
+              patchDate: DateTime.now(),
+              isRooted: false,
+            ),
+          );
+        }
+      }
+    }
+    return unsavedApps;
+  }
+
+  Future<void> reAssessSavedApps() async {
+    List<PatchedApplication> patchedApps = getPatchedApps();
+    List<PatchedApplication> unsavedApps = await getUnsavedApps(patchedApps);
+    patchedApps.addAll(unsavedApps);
+    List<PatchedApplication> toRemove = await getAppsToRemove(patchedApps);
     patchedApps.removeWhere((a) => toRemove.contains(a));
+    for (PatchedApplication app in patchedApps) {
+      app.hasUpdates = await hasAppUpdates(app.packageName, app.patchDate);
+      app.changelog = await getAppChangelog(app.packageName, app.patchDate);
+      if (!app.hasUpdates) {
+        String? currentInstalledVersion =
+            (await DeviceApps.getApp(app.packageName))?.versionName;
+        if (currentInstalledVersion != null) {
+          String currentSavedVersion = app.version;
+          int currentInstalledVersionInt = int.parse(
+              currentInstalledVersion.replaceAll(RegExp('[^0-9]'), ''));
+          int currentSavedVersionInt =
+              int.parse(currentSavedVersion.replaceAll(RegExp('[^0-9]'), ''));
+          if (currentInstalledVersionInt > currentSavedVersionInt) {
+            app.hasUpdates = true;
+          }
+        }
+      }
+    }
     await setPatchedApps(patchedApps);
   }
 
   Future<bool> isAppUninstalled(PatchedApplication app) async {
     bool existsRoot = false;
+    bool existsNonRoot = await DeviceApps.isAppInstalled(app.packageName);
     if (app.isRooted) {
       bool hasRootPermissions = await _rootAPI.hasRootPermissions();
       if (hasRootPermissions) {
         existsRoot = await _rootAPI.isAppInstalled(app.packageName);
       }
+      return !existsRoot || !existsNonRoot;
     }
-    bool existsNonRoot = await DeviceApps.isAppInstalled(app.packageName);
-    return !existsRoot && !existsNonRoot;
+    return !existsNonRoot;
   }
 
   Future<bool> hasAppUpdates(String packageName, DateTime patchDate) async {

lib/services/patcher_api.dart

@@ -220,4 +220,32 @@ class PatcherAPI {
     log.writeAsStringSync(logs);
     ShareExtend.share(log.path, 'file');
   }
+
+  String getRecommendedVersion(String packageName) {
+    Map<String, int> versions = {};
+    for (Patch patch in _patches) {
+      Package? package = patch.compatiblePackages.firstWhereOrNull(
+        (pack) => pack.name == packageName,
+      );
+      if (package != null) {
+        for (String version in package.versions) {
+          versions.update(
+            version,
+            (value) => versions[version]! + 1,
+            ifAbsent: () => 1,
+          );
+        }
+      }
+    }
+    if (versions.isNotEmpty) {
+      var entries = versions.entries.toList()
+        ..sort((a, b) => a.value.compareTo(b.value));
+      versions
+        ..clear()
+        ..addEntries(entries);
+      versions.removeWhere((key, value) => value != versions.values.last);
+      return (versions.keys.toList()..sort()).last;
+    }
+    return '';
+  }
 }

lib/services/root_api.dart

@@ -6,8 +6,12 @@ class RootAPI {
   final String _serviceDDirPath = '/data/adb/service.d';
 
   Future<bool> hasRootPermissions() async {
-    bool? isRooted = await Root.isRooted();
-    return isRooted != null && isRooted;
+    try {
+      bool? isRooted = await Root.isRooted();
+      return isRooted != null && isRooted;
+    } on Exception {
+      return false;
+    }
   }
 
   Future<void> setPermissions(
@@ -55,15 +59,8 @@ class RootAPI {
       );
       if (res != null) {
         List<String> apps = res.split('\n');
-        List<String> toRemove = [];
-        for (String packageName in apps) {
-          bool isInstalled = await isAppInstalled(packageName);
-          if (!isInstalled) {
-            toRemove.add(packageName);
-          }
-        }
-        apps.removeWhere((a) => toRemove.contains(a));
-        return apps;
+        apps.removeWhere((pack) => pack.isEmpty);
+        return apps.map((pack) => pack.trim()).toList();
       }
     } on Exception {
       return List.empty();

lib/theme.dart

@@ -4,6 +4,7 @@ import 'package:google_fonts/google_fonts.dart';
 var lightCustomColorScheme = ColorScheme.fromSeed(
   seedColor: Colors.blue,
   brightness: Brightness.light,
+  primary: const Color(0xff1B73E8),
 );
 
 var lightCustomTheme = ThemeData(
@@ -23,8 +24,8 @@ var lightCustomTheme = ThemeData(
 var darkCustomColorScheme = ColorScheme.fromSeed(
   seedColor: Colors.blue,
   brightness: Brightness.dark,
-  primary: const Color(0xff7792BA),
-  surface: const Color(0xff0A0D11),
+  primary: const Color(0xffA5CAFF),
+  surface: const Color(0xff1B1A1D),
 );
 
 var darkCustomTheme = ThemeData(
@@ -38,8 +39,8 @@ var darkCustomTheme = ThemeData(
       ),
     ),
   ),
-  canvasColor: const Color(0xff0A0D11),
-  scaffoldBackgroundColor: const Color(0xff0A0D11),
-  toggleableActiveColor: const Color(0xff7792BA),
+  canvasColor: const Color(0xff1B1A1D),
+  scaffoldBackgroundColor: const Color(0xff1B1A1D),
+  toggleableActiveColor: const Color(0xffA5CAFF),
   textTheme: GoogleFonts.robotoTextTheme(ThemeData.dark().textTheme),
 );

lib/ui/views/home/home_viewmodel.dart

@@ -74,7 +74,10 @@ class HomeViewModel extends BaseViewModel {
   }
 
   void _getPatchedApps() {
-    patchedInstalledApps = _managerAPI.getPatchedApps().toList();
+    patchedInstalledApps = _managerAPI
+        .getPatchedApps()
+        .where((app) => app.hasUpdates == false)
+        .toList();
     patchedUpdatableApps = _managerAPI
         .getPatchedApps()
         .where((app) => app.hasUpdates == true)

lib/ui/views/installer/installer_view.dart

@@ -31,7 +31,7 @@ class InstallerView extends StatelessWidget {
                 ),
                 actions: <Widget>[
                   Visibility(
-                    visible: !model.isPatching && model.hasErrors,
+                    visible: !model.isPatching && !model.hasErrors,
                     child: CustomPopupMenu(
                       onSelected: (value) => model.onMenuSelection(value),
                       children: {

lib/ui/views/installer/installer_viewmodel.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_background/flutter_background.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
+//import 'package:permission_handler/permission_handler.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
@@ -29,29 +30,31 @@ class InstallerViewModel extends BaseViewModel {
   bool hasErrors = false;
 
   Future<void> initialize(BuildContext context) async {
-    try {
-      await FlutterBackground.initialize(
-        androidConfig: FlutterBackgroundAndroidConfig(
-          notificationTitle: FlutterI18n.translate(
-            context,
-            'installerView.notificationTitle',
+    if (true /*await Permission.ignoreBatteryOptimizations.isGranted*/) {
+      try {
+        await FlutterBackground.initialize(
+          androidConfig: FlutterBackgroundAndroidConfig(
+            notificationTitle: FlutterI18n.translate(
+              context,
+              'installerView.notificationTitle',
+            ),
+            notificationText: FlutterI18n.translate(
+              context,
+              'installerView.notificationText',
+            ),
+            notificationImportance: AndroidNotificationImportance.Default,
+            notificationIcon: const AndroidResource(
+              name: 'ic_notification',
+              defType: 'drawable',
+            ),
           ),
-          notificationText: FlutterI18n.translate(
-            context,
-            'installerView.notificationText',
-          ),
-          notificationImportance: AndroidNotificationImportance.Default,
-          notificationIcon: const AndroidResource(
-            name: 'ic_notification',
-            defType: 'drawable',
-          ),
-        ),
-      );
-      await FlutterBackground.enableBackgroundExecution();
-      await Wakelock.enable();
-    } on Exception {
-      // ignore
+        );
+        await FlutterBackground.enableBackgroundExecution();
+      } on Exception {
+        // ignore
+      }
     }
+    await Wakelock.enable();
     await handlePlatformChannelMethods();
     await runPatcher();
   }
@@ -119,12 +122,14 @@ class InstallerViewModel extends BaseViewModel {
       hasErrors = true;
       update(-1.0, 'Aborting...', 'No app or patches selected! Aborting');
     }
-    try {
-      await FlutterBackground.disableBackgroundExecution();
-      await Wakelock.disable();
-    } on Exception {
-      // ignore
+    if (true /*await Permission.ignoreBatteryOptimizations.isGranted*/) {
+      try {
+        await FlutterBackground.disableBackgroundExecution();
+      } on Exception {
+        // ignore
+      }
     }
+    await Wakelock.disable();
     isPatching = false;
   }
 

lib/ui/views/navigation/navigation_view.dart

@@ -42,6 +42,7 @@ class NavigationView extends StatelessWidget {
                 context,
                 'navigationView.dashboardTab',
               ),
+              tooltip: '',
             ),
             NavigationDestination(
               icon: model.isIndexSelected(1)
@@ -51,6 +52,7 @@ class NavigationView extends StatelessWidget {
                 context,
                 'navigationView.patcherTab',
               ),
+              tooltip: '',
             ),
             NavigationDestination(
               icon: model.isIndexSelected(2)
@@ -60,6 +62,7 @@ class NavigationView extends StatelessWidget {
                 context,
                 'navigationView.settingsTab',
               ),
+              tooltip: '',
             ),
           ],
         ),

lib/ui/views/navigation/navigation_viewmodel.dart

@@ -3,7 +3,7 @@ import 'package:dynamic_themes/dynamic_themes.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:injectable/injectable.dart';
-import 'package:permission_handler/permission_handler.dart';
+//import 'package:permission_handler/permission_handler.dart';
 import 'package:revanced_manager/services/root_api.dart';
 import 'package:revanced_manager/ui/views/home/home_view.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_view.dart';
@@ -31,9 +31,12 @@ class NavigationViewModel extends IndexTrackingViewModel {
                 : Brightness.light,
       ),
     );
+    //if (prefs.getBool('permissionsRequested') == null) {
+    //await prefs.setBool('permissionsRequested', true);
     RootAPI().hasRootPermissions();
-    Permission.requestInstallPackages.request();
-    Permission.ignoreBatteryOptimizations.request();
+    //Permission.requestInstallPackages.request();
+    //Permission.ignoreBatteryOptimizations.request();
+    //}
   }
 
   Widget getViewForIndex(int index) {

lib/ui/views/patcher/patcher_viewmodel.dart

@@ -79,4 +79,32 @@ class PatcherViewModel extends BaseViewModel {
       );
     }
   }
+
+  String getAppSelectionString() {
+    String text = '${selectedApp!.name} (${selectedApp!.packageName})';
+    if (text.length > 32) {
+      text = '${text.substring(0, 32)}...)';
+    }
+    return text;
+  }
+
+  String getRecommendedVersionString(BuildContext context) {
+    String recommendedVersion =
+        _patcherAPI.getRecommendedVersion(selectedApp!.packageName);
+    if (recommendedVersion.isEmpty) {
+      recommendedVersion = FlutterI18n.translate(
+        context,
+        'appSelectorCard.anyVersion',
+      );
+    } else {
+      recommendedVersion = 'v$recommendedVersion';
+    }
+    return '${FlutterI18n.translate(
+      context,
+      'appSelectorCard.currentVersion',
+    )}: v${selectedApp!.version}\n${FlutterI18n.translate(
+      context,
+      'appSelectorCard.recommendedVersion',
+    )}: $recommendedVersion';
+  }
 }

lib/ui/widgets/appInfoView/app_info_view.dart

@@ -64,8 +64,9 @@ class AppInfoView extends StatelessWidget {
                     CustomCard(
                       child: IntrinsicHeight(
                         child: Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                          mainAxisAlignment: MainAxisAlignment.center,
                           children: <Widget>[
+                            !app.isRooted ? const Spacer() : Container(),
                             InkWell(
                               onTap: () => model.openApp(app),
                               child: Column(
@@ -92,12 +93,17 @@ class AppInfoView extends StatelessWidget {
                                 ],
                               ),
                             ),
+                            const Spacer(),
                             VerticalDivider(
                               color: Theme.of(context).canvasColor,
                             ),
+                            const Spacer(),
                             InkWell(
-                              onTap: () =>
-                                  model.showUninstallAlertDialog(context, app),
+                              onTap: () => model.showUninstallAlertDialog(
+                                context,
+                                app,
+                                false,
+                              ),
                               child: Column(
                                 mainAxisAlignment: MainAxisAlignment.center,
                                 children: <Widget>[
@@ -122,9 +128,11 @@ class AppInfoView extends StatelessWidget {
                                 ],
                               ),
                             ),
+                            const Spacer(),
                             VerticalDivider(
                               color: Theme.of(context).canvasColor,
                             ),
+                            const Spacer(),
                             InkWell(
                               onTap: () {
                                 model.navigateToPatcher(app);
@@ -154,6 +162,49 @@ class AppInfoView extends StatelessWidget {
                                 ],
                               ),
                             ),
+                            app.isRooted ? const Spacer() : Container(),
+                            app.isRooted
+                                ? VerticalDivider(
+                                    color: Theme.of(context).canvasColor,
+                                  )
+                                : Container(),
+                            app.isRooted ? const Spacer() : Container(),
+                            app.isRooted
+                                ? InkWell(
+                                    onTap: () => model.showUninstallAlertDialog(
+                                      context,
+                                      app,
+                                      true,
+                                    ),
+                                    child: Column(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.center,
+                                      children: <Widget>[
+                                        Icon(
+                                          Icons
+                                              .settings_backup_restore_outlined,
+                                          color: Theme.of(context)
+                                              .colorScheme
+                                              .primary,
+                                        ),
+                                        const SizedBox(height: 10),
+                                        I18nText(
+                                          'appInfoView.unpatchButton',
+                                          child: Text(
+                                            '',
+                                            style: TextStyle(
+                                              color: Theme.of(context)
+                                                  .colorScheme
+                                                  .primary,
+                                              fontWeight: FontWeight.bold,
+                                            ),
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  )
+                                : Container(),
+                            !app.isRooted ? const Spacer() : Container(),
                           ],
                         ),
                       ),

lib/ui/widgets/appInfoView/app_info_viewmodel.dart

@@ -19,16 +19,20 @@ class AppInfoViewModel extends BaseViewModel {
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
   final RootAPI _rootAPI = RootAPI();
 
-  Future<void> uninstallApp(PatchedApplication app) async {
+  Future<void> uninstallApp(PatchedApplication app, bool onlyUnpatch) async {
     if (app.isRooted) {
       bool hasRootPermissions = await _rootAPI.hasRootPermissions();
       if (hasRootPermissions) {
         _rootAPI.deleteApp(app.packageName, app.apkFilePath);
         _managerAPI.deletePatchedApp(app);
+        if (!onlyUnpatch) {
+          DeviceApps.uninstallApp(app.packageName);
+        }
       }
     } else {
-      DeviceApps.uninstallApp(app.packageName);
-      _managerAPI.deletePatchedApp(app);
+      DeviceApps.uninstallApp(app.packageName).then(
+        (value) => _managerAPI.deletePatchedApp(app),
+      );
     }
   }
 
@@ -43,32 +47,39 @@ class AppInfoViewModel extends BaseViewModel {
   Future<void> showUninstallAlertDialog(
     BuildContext context,
     PatchedApplication app,
+    bool onlyUnpatch,
   ) async {
-    if (app.isRooted) {
-      bool hasRootPermissions = await _rootAPI.hasRootPermissions();
-      if (!hasRootPermissions) {
-        return showDialog(
-          context: context,
-          builder: (context) => AlertDialog(
-            title: I18nText('appInfoView.rootDialogTitle'),
-            backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-            content: I18nText('appInfoView.rootDialogText'),
-            actions: <Widget>[
-              CustomMaterialButton(
-                label: I18nText('okButton'),
-                onPressed: () => Navigator.of(context).pop(),
-              )
-            ],
-          ),
-        );
-      }
+    bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+    if (app.isRooted && !hasRootPermissions) {
+      return showDialog(
+        context: context,
+        builder: (context) => AlertDialog(
+          title: I18nText('appInfoView.rootDialogTitle'),
+          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+          content: I18nText('appInfoView.rootDialogText'),
+          actions: <Widget>[
+            CustomMaterialButton(
+              label: I18nText('okButton'),
+              onPressed: () => Navigator.of(context).pop(),
+            )
+          ],
+        ),
+      );
     } else {
       return showDialog(
         context: context,
         builder: (context) => AlertDialog(
-          title: I18nText('appInfoView.uninstallDialogTitle'),
+          title: I18nText(
+            onlyUnpatch
+                ? 'appInfoView.unpatchDialogTitle'
+                : 'appInfoView.uninstallDialogTitle',
+          ),
           backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-          content: I18nText('appInfoView.uninstallDialogText'),
+          content: I18nText(
+            onlyUnpatch
+                ? 'appInfoView.unpatchDialogText'
+                : 'appInfoView.uninstallDialogText',
+          ),
           actions: <Widget>[
             CustomMaterialButton(
               isFilled: false,
@@ -78,7 +89,7 @@ class AppInfoViewModel extends BaseViewModel {
             CustomMaterialButton(
               label: I18nText('okButton'),
               onPressed: () {
-                uninstallApp(app);
+                uninstallApp(app, onlyUnpatch);
                 locator<HomeViewModel>().initialize(context);
                 Navigator.of(context).pop();
                 Navigator.of(context).pop();

lib/ui/widgets/homeView/latest_commit_card.dart

@@ -71,7 +71,7 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
             future: locator<HomeViewModel>().hasManagerUpdates(),
             initialData: false,
             builder: (context, snapshot) => Opacity(
-              opacity: snapshot.hasData && snapshot.data! ? 1.0 : 0.5,
+              opacity: snapshot.hasData && snapshot.data! ? 1.0 : 0.25,
               child: CustomMaterialButton(
                 isExpanded: false,
                 label: I18nText('latestCommitCard.updateButton'),

lib/ui/widgets/patcherView/app_selector_card.dart

@@ -39,7 +39,7 @@ class AppSelectorCard extends StatelessWidget {
                 : Row(
                     children: <Widget>[
                       SizedBox(
-                        height: 16.0,
+                        height: 18.0,
                         child: ClipOval(
                           child: Image.memory(
                             locator<PatcherViewModel>().selectedApp == null
@@ -49,8 +49,23 @@ class AppSelectorCard extends StatelessWidget {
                           ),
                         ),
                       ),
-                      const SizedBox(width: 4),
-                      Text(_getAppSelection()),
+                      const SizedBox(width: 6),
+                      Text(locator<PatcherViewModel>().getAppSelectionString()),
+                    ],
+                  ),
+            locator<PatcherViewModel>().selectedApp == null
+                ? Container()
+                : Column(
+                    children: [
+                      const SizedBox(height: 10),
+                      Padding(
+                        padding: const EdgeInsets.only(left: 20),
+                        child: Text(
+                          locator<PatcherViewModel>()
+                              .getRecommendedVersionString(context),
+                          style: const TextStyle(fontStyle: FontStyle.italic),
+                        ),
+                      ),
                     ],
                   ),
           ],
@@ -58,10 +73,4 @@ class AppSelectorCard extends StatelessWidget {
       ),
     );
   }
-
-  String _getAppSelection() {
-    String name = locator<PatcherViewModel>().selectedApp!.name;
-    String version = locator<PatcherViewModel>().selectedApp!.version;
-    return '$name (v$version)';
-  }
 }

lib/ui/widgets/settingsView/about_widget.dart

@@ -61,6 +61,13 @@ class _AboutWidgetState extends State<AboutWidget> {
                           fontWeight: FontWeight.w300,
                         ),
                       ),
+                      Text(
+                        'Build: ${snapshot.data!['flavor']}',
+                        style: const TextStyle(
+                          fontSize: 13,
+                          fontWeight: FontWeight.w300,
+                        ),
+                      ),
                       Text(
                         'Model: ${snapshot.data!['model']}',
                         style: const TextStyle(

lib/ui/widgets/shared/application_item.dart

@@ -64,34 +64,43 @@ class _ApplicationItemState extends State<ApplicationItem>
         child: Row(
           children: <Widget>[
             SizedBox(
-              width: 60,
-              child: Image.memory(widget.icon, height: 39, width: 39),
+              width: 40,
+              child: Image.memory(widget.icon, height: 40, width: 40),
             ),
             const SizedBox(width: 4),
-            Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: <Widget>[
-                Text(
-                  widget.name,
-                  style: const TextStyle(
-                    fontSize: 16,
-                    fontWeight: FontWeight.w500,
+            Padding(
+              padding: const EdgeInsets.only(left: 15.0),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  Text(
+                    widget.name.length > 9
+                        ? '${widget.name.substring(0, 9)}...'
+                        : widget.name,
+                    style: const TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.w500,
+                    ),
                   ),
-                ),
-                Text(format(widget.patchDate)),
-              ],
+                  Text(format(widget.patchDate)),
+                ],
+              ),
             ),
             const Spacer(),
-            RotationTransition(
-              turns: Tween(begin: 0.0, end: 0.50).animate(_animationController),
-              child: IconButton(
-                onPressed: () {
-                  expController.toggle();
-                  _animationController.isCompleted
-                      ? _animationController.reverse()
-                      : _animationController.forward();
-                },
-                icon: const Icon(Icons.arrow_drop_down),
+            Padding(
+              padding: const EdgeInsets.only(right: 5.0),
+              child: RotationTransition(
+                turns:
+                    Tween(begin: 0.0, end: 0.50).animate(_animationController),
+                child: IconButton(
+                  onPressed: () {
+                    expController.toggle();
+                    _animationController.isCompleted
+                        ? _animationController.reverse()
+                        : _animationController.forward();
+                  },
+                  icon: const Icon(Icons.arrow_drop_down),
+                ),
               ),
             ),
             Column(
@@ -111,7 +120,7 @@ class _ApplicationItemState extends State<ApplicationItem>
       ),
       collapsed: const Text(''),
       expanded: Padding(
-        padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
+        padding: const EdgeInsets.symmetric(vertical: 16.0, horizontal: 16.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[

lib/ui/widgets/shared/custom_card.dart

@@ -16,7 +16,7 @@ class CustomCard extends StatelessWidget {
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(16),
         color: isFilled
-            ? Theme.of(context).colorScheme.secondaryContainer
+            ? Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.40)
             : Colors.transparent,
         border: isFilled
             ? null

lib/ui/widgets/shared/custom_chip.dart

@@ -22,7 +22,7 @@ class DashboardChip extends StatelessWidget {
             color: isSelected
                 ? Theme.of(context).colorScheme.primary
                 : Theme.of(context).colorScheme.secondary,
-            fontWeight: FontWeight.bold,
+            fontWeight: FontWeight.w500,
           ),
       backgroundColor: Colors.transparent,
       selectedColor: Theme.of(context).colorScheme.secondaryContainer,

lib/utils/about_info.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 
@@ -7,6 +8,7 @@ class AboutInfo {
     final info = await DeviceInfoPlugin().androidInfo;
     return {
       'version': packageInfo.version,
+      'flavor': kReleaseMode ? 'release' : 'debug',
       'model': info.model,
       'androidVersion': info.version.release,
       'arch': info.supportedAbis.first

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 0.0.7+7
+version: 0.0.13+13
 
 environment:
   sdk: ">=2.17.5 <3.0.0"
@@ -52,7 +52,7 @@ dependencies:
       ref: feature/nullSafe
   package_info_plus: ^1.4.3+1
   path_provider: ^2.0.11
-  permission_handler: ^10.0.0
+  #permission_handler: ^10.0.0
   pull_to_refresh: ^2.0.0
   root: ^2.0.2
   share_extend: ^2.0.0
@@ -75,13 +75,6 @@ dev_dependencies:
   injectable_generator: ^1.5.4
   json_serializable: ^6.3.1
 
-flutter_icons:
-  android: true
-  ios: false
-  image_path: "assets/images/ic_launcher_round.png"
-  adaptive_icon_background: "#1B1B1B"
-  adaptive_icon_foreground: "assets/images/ic_launcher.png"
-
 flutter:
   uses-material-design: true
   assets: