build: Bump version to v0.0.14

Co-authored-by: Alberto Ponces <ponces26@gmail.com>

README.md

@@ -13,3 +13,7 @@ If you wish to discuss the Manager, a thread has been made under the [#chat](htt
 
 ## ⚠️ Disclaimer
 *Please note that even though we're releasing the Manager, it is an ALPHA version. Meaning there's a big chance that the Manager might not work at all for you.*
+
+## Prerequisites
+1. Android 8 or higher.
+2. For YouTube and YouTube Music - Vanced MicroG(Only for non-root).

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

@@ -3,8 +3,8 @@
     "cancelButton": "Cancel",
     "enabledLabel": "Enabled",
     "disabledLabel": "Disabled",
-    "yesLabel": "Yes",
+    "yesButton": "Yes",
-    "noLabel": "No",
+    "noButton": "No",
     "navigationView": {
         "dashboardTab": "Dashboard",
         "patcherTab": "Patcher",
@@ -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",
@@ -86,7 +89,11 @@
         "notificationTitle": "ReVanced Manager is patching",
         "notificationText": "Tap to return to the installer",
         "shareApkMenuOption": "Share APK",
-        "shareLogMenuOption": "Share log"
+        "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.",
+        "installErrorDialogText3": "Root install is not possible as the original APK was selected from storage.\nSelect an installed app or choose non-root install."
     },
     "settingsView": {
         "widgetTitle": "Settings",
@@ -94,6 +101,7 @@
         "patcherSectionTitle": "Patcher",
         "teamSectionTitle": "Team",
         "infoSectionTitle": "Info",
+        "advancedSectionTitle": "Advanced",
         "darkThemeLabel": "Dark Mode",
         "darkThemeHint": "Welcome to the Dark Side",
         "dynamicThemeLabel": "Material You",
@@ -109,10 +117,14 @@
         "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?",
         "contributorsLabel": "Contributors",
         "contributorsHint": "A list of contributors of ReVanced",
         "logsLabel": "Logs",
         "logsHint": "Share device debug logs",
+        "apiURLLabel": "API URL",
+        "apiURLHint": "Configure your custom API URL",
+        "selectApiURL": "Select URL",
         "aboutLabel": "About",
         "snackbarMessage": "Copied to clipboard"
     },
@@ -121,8 +133,8 @@
         "openButton": "Open",
         "uninstallButton": "Uninstall",
         "patchButton": "Patch",
-        "uninstallDialogTitle": "Uninstall",
+        "unpatchButton": "Unpatch",
-        "uninstallDialogText": "Are you sure you want to uninstall this app?",
+        "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/main.dart

@@ -15,9 +15,10 @@ Future main() async {
   await setupLocator();
   WidgetsFlutterBinding.ensureInitialized();
   await locator<ManagerAPI>().initialize();
-  await locator<PatcherAPI>().initialize();
+  String apiUrl = locator<ManagerAPI>().getApiUrl();
-  locator<RevancedAPI>().initialize();
+  await locator<RevancedAPI>().initialize(apiUrl);
   locator<GithubAPI>().initialize();
+  await locator<PatcherAPI>().initialize();
   runApp(const MyApp());
 }
 

lib/models/patched_application.dart

@@ -17,6 +17,7 @@ class PatchedApplication {
   Uint8List icon;
   DateTime patchDate;
   bool isRooted;
+  bool isFromStorage;
   bool hasUpdates;
   List<String> appliedPatches;
   List<String> changelog;
@@ -29,6 +30,7 @@ class PatchedApplication {
     required this.icon,
     required this.patchDate,
     this.isRooted = false,
+    this.isFromStorage = false,
     this.hasUpdates = false,
     this.appliedPatches = const [],
     this.changelog = const [],

lib/services/github_api.dart

@@ -9,8 +9,7 @@ import 'package:revanced_manager/models/patch.dart';
 
 @lazySingleton
 class GithubAPI {
-  final String apiUrl = 'https://api.github.com';
+  final Dio _dio = Dio(BaseOptions(baseUrl: 'https://api.github.com'));
-  final Dio _dio = Dio();
   final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
   final Options _cacheOptions = buildCacheOptions(
     const Duration(days: 1),
@@ -37,7 +36,7 @@ class GithubAPI {
   Future<Map<String, dynamic>?> _getLatestRelease(String repoName) async {
     try {
       var response = await _dio.get(
-        '$apiUrl/repos/$repoName/releases/latest',
+        '/repos/$repoName/releases/latest',
         options: _cacheOptions,
       );
       return response.data;
@@ -55,7 +54,7 @@ class GithubAPI {
         'src/main/kotlin/app/revanced/patches/${repoAppPath[packageName]}';
     try {
       var response = await _dio.get(
-        '$apiUrl/repos/$repoName/commits',
+        '/repos/$repoName/commits',
         queryParameters: {
           'path': path,
           'per_page': 3,

lib/services/manager_api.dart

@@ -19,6 +19,7 @@ class ManagerAPI {
   final String patcherRepo = 'revanced-patcher';
   final String cliRepo = 'revanced-cli';
   late SharedPreferences _prefs;
+  String defaultApiUrl = 'https://revanced-releases-api.afterst0rm.xyz';
   String defaultPatcherRepo = 'revanced/revanced-patcher';
   String defaultPatchesRepo = 'revanced/revanced-patches';
   String defaultIntegrationsRepo = 'revanced/revanced-integrations';
@@ -29,6 +30,19 @@ class ManagerAPI {
     _prefs = await SharedPreferences.getInstance();
   }
 
+  String getApiUrl() {
+    return _prefs.getString('apiUrl') ?? defaultApiUrl;
+  }
+
+  Future<void> setApiUrl(String url) async {
+    if (url.isEmpty || url == ' ') {
+      url = defaultApiUrl;
+    }
+    await _revancedAPI.initialize(url);
+    await _revancedAPI.clearAllCache();
+    await _prefs.setString('apiUrl', url);
+  }
+
   String getPatchesRepo() {
     return _prefs.getString('patchesRepo') ?? defaultPatchesRepo;
   }
@@ -110,10 +124,11 @@ class ManagerAPI {
   }
 
   Future<List<Patch>> getPatches() async {
-    if (getPatchesRepo() == defaultPatchesRepo) {
+    String repoName = getPatchesRepo();
+    if (repoName == defaultPatchesRepo) {
       return await _revancedAPI.getPatches();
     } else {
-      return await _githubAPI.getPatches(getPatchesRepo());
+      return await _githubAPI.getPatches(repoName);
     }
   }
 
@@ -165,46 +180,114 @@ class ManagerAPI {
     return packageInfo.version;
   }
 
-  Future<void> reAssessSavedApps() async {
+  Future<List<PatchedApplication>> getAppsToRemove(
-    List<PatchedApplication> patchedApps = getPatchedApps();
+    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);
+    return toRemove;
-        if (!app.hasUpdates) {
+  }
-          String? currentInstalledVersion =
+
-              (await DeviceApps.getApp(app.packageName))?.versionName;
+  Future<List<PatchedApplication>> getUnsavedApps(
-          if (currentInstalledVersion != null) {
+    List<PatchedApplication> patchedApps,
-            String currentSavedVersion = app.version;
+  ) async {
-            int currentInstalledVersionInt = int.parse(
+    List<PatchedApplication> unsavedApps = [];
-                currentInstalledVersion.replaceAll(RegExp('[^0-9]'), ''));
+    bool hasRootPermissions = await _rootAPI.hasRootPermissions();
-            int currentSavedVersionInt =
+    if (hasRootPermissions) {
-                int.parse(currentSavedVersion.replaceAll(RegExp('[^0-9]'), ''));
+      List<String> installedApps = await _rootAPI.getInstalledApps();
-            if (currentInstalledVersionInt > currentSavedVersionInt) {
+      for (String packageName in installedApps) {
-              app.hasUpdates = true;
+        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 !existsNonRoot;
-    return !existsRoot && !existsNonRoot;
   }
 
   Future<bool> hasAppUpdates(String packageName, DateTime patchDate) async {

lib/services/patcher_api.dart

@@ -199,10 +199,9 @@ class PatcherAPI {
       String prefix = appName.toLowerCase().replaceAll(' ', '-');
       String newName = '$prefix-revanced_v$version.apk';
       int lastSeparator = _outFile!.path.lastIndexOf('/');
-      File share = _outFile!.renameSync(
+      String newPath = _outFile!.path.substring(0, lastSeparator + 1) + newName;
-        _outFile!.path.substring(0, lastSeparator + 1) + newName,
+      File shareFile = _outFile!.copySync(newPath);
-      );
+      ShareExtend.share(shareFile.path, 'file');
-      ShareExtend.share(share.path, 'file');
     }
   }
 
@@ -220,4 +219,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/revanced_api.dart

@@ -9,15 +9,15 @@ import 'package:timeago/timeago.dart';
 
 @lazySingleton
 class RevancedAPI {
-  final String apiUrl = 'https://revanced-releases-api.afterst0rm.xyz';
+  late Dio _dio = Dio();
-  final Dio _dio = Dio();
   final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
   final Options _cacheOptions = buildCacheOptions(
     const Duration(days: 1),
     maxStale: const Duration(days: 7),
   );
 
-  void initialize() {
+  Future<void> initialize(String apiUrl) async {
+    _dio = Dio(BaseOptions(baseUrl: apiUrl));
     _dio.interceptors.add(_dioCacheManager.interceptor);
   }
 
@@ -28,10 +28,7 @@ class RevancedAPI {
   Future<Map<String, List<dynamic>>> getContributors() async {
     Map<String, List<dynamic>> contributors = {};
     try {
-      var response = await _dio.get(
+      var response = await _dio.get('/contributors', options: _cacheOptions);
-        '$apiUrl/contributors',
-        options: _cacheOptions,
-      );
       List<dynamic> repositories = response.data['repositories'];
       for (Map<String, dynamic> repo in repositories) {
         String name = repo['name'];
@@ -45,7 +42,7 @@ class RevancedAPI {
 
   Future<List<Patch>> getPatches() async {
     try {
-      var response = await _dio.get('$apiUrl/patches', options: _cacheOptions);
+      var response = await _dio.get('/patches', options: _cacheOptions);
       List<dynamic> patches = response.data;
       return patches.map((patch) => Patch.fromJson(patch)).toList();
     } on Exception {
@@ -58,7 +55,7 @@ class RevancedAPI {
     String repoName,
   ) async {
     try {
-      var response = await _dio.get('$apiUrl/tools', options: _cacheOptions);
+      var response = await _dio.get('/tools', options: _cacheOptions);
       List<dynamic> tools = response.data['tools'];
       return tools.firstWhereOrNull(
         (t) =>
@@ -71,10 +68,14 @@ class RevancedAPI {
   }
 
   Future<String?> getLatestReleaseVersion(
-      String extension, String repoName) async {
+    String extension,
+    String repoName,
+  ) async {
     try {
-      Map<String, dynamic>? release =
+      Map<String, dynamic>? release = await _getLatestRelease(
-          await _getLatestRelease(extension, repoName);
+        extension,
+        repoName,
+      );
       if (release != null) {
         return release['version'];
       }

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();
+    try {
-    return isRooted != null && isRooted;
+      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 = [];
+        apps.removeWhere((pack) => pack.isEmpty);
-        for (String packageName in apps) {
+        return apps.map((pack) => pack.trim()).toList();
-          bool isInstalled = await isAppInstalled(packageName);
-          if (!isInstalled) {
-            toRemove.add(packageName);
-          }
-        }
-        apps.removeWhere((a) => toRemove.contains(a));
-        return apps;
       }
     } 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),
+  primary: const Color(0xffA5CAFF),
-  surface: const Color(0xff0A0D11),
+  surface: const Color(0xff1B1A1D),
 );
 
 var darkCustomTheme = ThemeData(
@@ -38,8 +39,8 @@ var darkCustomTheme = ThemeData(
       ),
     ),
   ),
-  canvasColor: const Color(0xff0A0D11),
+  canvasColor: const Color(0xff1B1A1D),
-  scaffoldBackgroundColor: const Color(0xff0A0D11),
+  scaffoldBackgroundColor: const Color(0xff1B1A1D),
-  toggleableActiveColor: const Color(0xff7792BA),
+  toggleableActiveColor: const Color(0xffA5CAFF),
   textTheme: GoogleFonts.robotoTextTheme(ThemeData.dark().textTheme),
 );

lib/ui/views/app_selector/app_selector_viewmodel.dart

@@ -54,6 +54,7 @@ class AppSelectorViewModel extends BaseViewModel {
             apkFilePath: result.files.single.path!,
             icon: application.icon,
             patchDate: DateTime.now(),
+            isFromStorage: true,
           );
           locator<PatcherViewModel>().selectedPatches.clear();
           locator<PatcherViewModel>().notifyListeners();

lib/ui/views/home/home_view.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:animations/animations.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/homeView/available_updates_card.dart';
@@ -83,9 +84,26 @@ class HomeView extends StatelessWidget {
                         ],
                       ),
                       const SizedBox(height: 14),
-                      model.showUpdatableApps
+                      PageTransitionSwitcher(
-                          ? AvailableUpdatesCard()
+                        transitionBuilder:
-                          : InstalledAppsCard(),
+                            (child, primaryAnimation, secondaryAnimation) {
+                          return FadeThroughTransition(
+                            animation: primaryAnimation,
+                            secondaryAnimation: secondaryAnimation,
+                            fillColor: Colors.transparent,
+                            child: child,
+                          );
+                        },
+                        layoutBuilder: (entries) {
+                          return Stack(
+                            alignment: Alignment.topCenter,
+                            children: entries,
+                          );
+                        },
+                        child: model.showUpdatableApps
+                            ? AvailableUpdatesCard()
+                            : InstalledAppsCard(),
+                      ),
                     ],
                   ),
                 ),

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)
@@ -169,11 +172,11 @@ class HomeViewModel extends BaseViewModel {
         actions: <Widget>[
           CustomMaterialButton(
             isFilled: false,
-            label: I18nText('cancelButton'),
+            label: I18nText('noButton'),
             onPressed: () => Navigator.of(context).pop(),
           ),
           CustomMaterialButton(
-            label: I18nText('okButton'),
+            label: I18nText('yesButton'),
             onPressed: () {
               Navigator.of(context).pop();
               updateManager(context);

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: {
@@ -111,7 +111,10 @@ class InstallerView extends StatelessWidget {
                               label:
                                   I18nText('installerView.installRootButton'),
                               isExpanded: true,
-                              onPressed: () => model.installResult(true),
+                              onPressed: () => model.installResult(
+                                context,
+                                true,
+                              ),
                             ),
                           ),
                           Visibility(
@@ -125,7 +128,10 @@ class InstallerView extends StatelessWidget {
                             child: CustomMaterialButton(
                               label: I18nText('installerView.installButton'),
                               isExpanded: true,
-                              onPressed: () => model.installResult(false),
+                              onPressed: () => model.installResult(
+                                context,
+                                false,
+                              ),
                             ),
                           ),
                         ],

lib/ui/views/installer/installer_viewmodel.dart

@@ -3,12 +3,14 @@ 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';
 import 'package:revanced_manager/services/manager_api.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/installerView/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 import 'package:wakelock/wakelock.dart';
 
@@ -29,29 +31,30 @@ class InstallerViewModel extends BaseViewModel {
   bool hasErrors = false;
 
   Future<void> initialize(BuildContext context) async {
-    try {
+    if (await Permission.ignoreBatteryOptimizations.isGranted) {
-      await FlutterBackground.initialize(
+      try {
-        androidConfig: FlutterBackgroundAndroidConfig(
+        FlutterBackground.initialize(
-          notificationTitle: FlutterI18n.translate(
+          androidConfig: FlutterBackgroundAndroidConfig(
-            context,
+            notificationTitle: FlutterI18n.translate(
-            'installerView.notificationTitle',
+              context,
+              'installerView.notificationTitle',
+            ),
+            notificationText: FlutterI18n.translate(
+              context,
+              'installerView.notificationText',
+            ),
+            notificationImportance: AndroidNotificationImportance.Default,
+            notificationIcon: const AndroidResource(
+              name: 'ic_notification',
+              defType: 'drawable',
+            ),
           ),
-          notificationText: FlutterI18n.translate(
+        ).then((value) => FlutterBackground.enableBackgroundExecution());
-            context,
+      } on Exception {
-            'installerView.notificationText',
+        // ignore
-          ),
+      }
-          notificationImportance: AndroidNotificationImportance.Default,
-          notificationIcon: const AndroidResource(
-            name: 'ic_notification',
-            defType: 'drawable',
-          ),
-        ),
-      );
-      await FlutterBackground.enableBackgroundExecution();
-      await Wakelock.enable();
-    } on Exception {
-      // ignore
     }
+    await Wakelock.enable();
     await handlePlatformChannelMethods();
     await runPatcher();
   }
@@ -119,37 +122,67 @@ class InstallerViewModel extends BaseViewModel {
       hasErrors = true;
       update(-1.0, 'Aborting...', 'No app or patches selected! Aborting');
     }
-    try {
+    if (FlutterBackground.isBackgroundExecutionEnabled) {
-      await FlutterBackground.disableBackgroundExecution();
+      try {
-      await Wakelock.disable();
+        FlutterBackground.disableBackgroundExecution();
-    } on Exception {
+      } on Exception {
-      // ignore
+        // ignore
+      }
     }
+    await Wakelock.disable();
     isPatching = false;
   }
 
-  void installResult(bool installAsRoot) async {
+  void installResult(BuildContext context, bool installAsRoot) async {
     _app.isRooted = installAsRoot;
-    update(
+    bool hasMicroG = _patches.any((p) => p.name.endsWith('microg-support'));
-      1.0,
+    bool rootMicroG = installAsRoot && hasMicroG;
-      'Installing...',
+    bool rootFromStorage = installAsRoot && _app.isFromStorage;
-      _app.isRooted
+    bool ytWithoutRootMicroG =
-          ? 'Installing patched file using root method'
+        !installAsRoot && !hasMicroG && _app.packageName.contains('youtube');
-          : 'Installing patched file using nonroot method',
+    if (rootMicroG || rootFromStorage || ytWithoutRootMicroG) {
-    );
+      return showDialog(
-    isInstalled = await _patcherAPI.installPatchedFile(_app);
+        context: context,
-    if (isInstalled) {
+        builder: (context) => AlertDialog(
-      update(1.0, 'Installed!', 'Installed!');
+          title: I18nText('installerView.installErrorDialogTitle'),
-      _app.patchDate = DateTime.now();
+          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-      _app.appliedPatches = _patches.map((p) => p.name).toList();
+          content: I18nText(
-      bool hasMicroG = _patches.any((p) => p.name.endsWith('microg-support'));
+            rootMicroG
-      if (hasMicroG) {
+                ? 'installerView.installErrorDialogText1'
-        _app.packageName = _app.packageName.replaceFirst(
+                : rootFromStorage
-          'com.google.',
+                    ? 'installerView.installErrorDialogText3'
-          'app.revanced.',
+                    : 'installerView.installErrorDialogText2',
-        );
+          ),
+          actions: <Widget>[
+            CustomMaterialButton(
+              label: I18nText('okButton'),
+              onPressed: () => Navigator.of(context).pop(),
+            )
+          ],
+        ),
+      );
+    } else {
+      update(
+        1.0,
+        'Installing...',
+        _app.isRooted
+            ? 'Installing patched file using root method'
+            : 'Installing patched file using nonroot method',
+      );
+      isInstalled = await _patcherAPI.installPatchedFile(_app);
+      if (isInstalled) {
+        update(1.0, 'Installed!', 'Installed!');
+        _app.isFromStorage = false;
+        _app.patchDate = DateTime.now();
+        _app.appliedPatches = _patches.map((p) => p.name).toList();
+        if (hasMicroG) {
+          _app.packageName = _app.packageName.replaceFirst(
+            'com.google.',
+            'app.revanced.',
+          );
+        }
+        await _managerAPI.savePatchedApp(_app);
       }
-      await _managerAPI.savePatchedApp(_app);
     }
   }
 

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

@@ -15,25 +15,30 @@ import 'package:stacked/stacked.dart';
 class NavigationViewModel extends IndexTrackingViewModel {
   void initialize(BuildContext context) async {
     SharedPreferences prefs = await SharedPreferences.getInstance();
+    if (prefs.getBool('permissionsRequested') == null) {
+      await prefs.setBool('permissionsRequested', true);
+      RootAPI().hasRootPermissions().then(
+            (value) => Permission.requestInstallPackages.request().then(
+                  (value) => Permission.ignoreBatteryOptimizations.request(),
+                ),
+          );
+    }
     if (prefs.getBool('useDarkTheme') == null) {
       bool isDark =
           MediaQuery.of(context).platformBrightness != Brightness.light;
       await prefs.setBool('useDarkTheme', isDark);
       await DynamicTheme.of(context)!.setTheme(isDark ? 1 : 0);
     }
+    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
     SystemChrome.setSystemUIOverlayStyle(
       SystemUiOverlayStyle(
-        systemNavigationBarColor:
+        systemNavigationBarColor: Colors.transparent,
-            DynamicTheme.of(context)!.theme.colorScheme.surface,
         systemNavigationBarIconBrightness:
             DynamicTheme.of(context)!.theme.brightness == Brightness.light
                 ? Brightness.dark
                 : Brightness.light,
       ),
     );
-    RootAPI().hasRootPermissions();
-    Permission.requestInstallPackages.request();
-    Permission.ignoreBatteryOptimizations.request();
   }
 
   Widget getViewForIndex(int index) {

lib/ui/views/patcher/patcher_viewmodel.dart

@@ -64,11 +64,11 @@ class PatcherViewModel extends BaseViewModel {
           actions: <Widget>[
             CustomMaterialButton(
               isFilled: false,
-              label: I18nText('cancelButton'),
+              label: I18nText('noButton'),
               onPressed: () => Navigator.of(context).pop(),
             ),
             CustomMaterialButton(
-              label: I18nText('okButton'),
+              label: I18nText('yesButton'),
               onPressed: () {
                 Navigator.of(context).pop();
                 navigateToInstaller();
@@ -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/views/settings/settings_view.dart

@@ -145,6 +145,17 @@ class SettingsView extends StatelessWidget {
                         const AboutWidget(),
                       ],
                     ),
+                    const Divider(thickness: 1.0),
+                    SettingsSection(
+                      title: 'settingsView.advancedSectionTitle',
+                      children: <Widget>[
+                        SettingsTileDialog(
+                          title: 'settingsView.apiURLLabel',
+                          subtitle: 'settingsView.apiURLHint',
+                          onTap: () => model.showApiUrlDialog(context),
+                        ),
+                      ],
+                    ),
                   ],
                 ),
               ),

lib/ui/views/settings/settings_viewmodel.dart

@@ -27,6 +27,7 @@ class SettingsViewModel extends BaseViewModel {
   final TextEditingController _patSourceController = TextEditingController();
   final TextEditingController _orgIntSourceController = TextEditingController();
   final TextEditingController _intSourceController = TextEditingController();
+  final TextEditingController _apiUrlController = TextEditingController();
 
   void setLanguage(String language) {
     notifyListeners();
@@ -55,12 +56,6 @@ class SettingsViewModel extends BaseViewModel {
     } else {
       await DynamicTheme.of(context)!.setTheme(value ? 3 : 1);
     }
-    SystemChrome.setSystemUIOverlayStyle(
-      SystemUiOverlayStyle(
-        systemNavigationBarColor:
-            DynamicTheme.of(context)!.theme.colorScheme.surface,
-      ),
-    );
     notifyListeners();
   }
 
@@ -78,8 +73,6 @@ class SettingsViewModel extends BaseViewModel {
     }
     SystemChrome.setSystemUIOverlayStyle(
       SystemUiOverlayStyle(
-        systemNavigationBarColor:
-            DynamicTheme.of(context)!.theme.colorScheme.surface,
         systemNavigationBarIconBrightness:
             value ? Brightness.light : Brightness.dark,
       ),
@@ -208,6 +201,65 @@ class SettingsViewModel extends BaseViewModel {
     );
   }
 
+  Future<void> showApiUrlDialog(BuildContext context) async {
+    String apiUrl = _managerAPI.getApiUrl();
+    _apiUrlController.text = apiUrl.replaceAll('https://', '');
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Row(
+          children: <Widget>[
+            I18nText('settingsView.apiURLLabel'),
+            const Spacer(),
+            IconButton(
+              icon: const Icon(Icons.manage_history_outlined),
+              onPressed: () => showApiUrlResetDialog(context),
+              color: Theme.of(context).colorScheme.secondary,
+            )
+          ],
+        ),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: SingleChildScrollView(
+          child: Column(
+            children: <Widget>[
+              CustomTextField(
+                leadingIcon: Icon(
+                  Icons.api_outlined,
+                  color: Theme.of(context).colorScheme.secondary,
+                ),
+                inputController: _apiUrlController,
+                label: I18nText('settingsView.selectApiURL'),
+                hint: apiUrl.split('/')[0],
+                onChanged: (value) => notifyListeners(),
+              ),
+            ],
+          ),
+        ),
+        actions: <Widget>[
+          CustomMaterialButton(
+            isFilled: false,
+            label: I18nText('cancelButton'),
+            onPressed: () {
+              _apiUrlController.clear();
+              Navigator.of(context).pop();
+            },
+          ),
+          CustomMaterialButton(
+            label: I18nText('okButton'),
+            onPressed: () {
+              String apiUrl = _apiUrlController.text;
+              if (!apiUrl.startsWith('https')) {
+                apiUrl = 'https://$apiUrl';
+              }
+              _managerAPI.setApiUrl(apiUrl);
+              Navigator.of(context).pop();
+            },
+          )
+        ],
+      ),
+    );
+  }
+
   Future<void> showResetConfirmationDialog(BuildContext context) async {
     return showDialog(
       context: context,
@@ -218,11 +270,11 @@ class SettingsViewModel extends BaseViewModel {
         actions: <Widget>[
           CustomMaterialButton(
             isFilled: false,
-            label: I18nText('cancelButton'),
+            label: I18nText('noButton'),
             onPressed: () => Navigator.of(context).pop(),
           ),
           CustomMaterialButton(
-            label: I18nText('okButton'),
+            label: I18nText('yesButton'),
             onPressed: () {
               _managerAPI.setPatchesRepo('');
               _managerAPI.setIntegrationsRepo('');
@@ -235,6 +287,32 @@ class SettingsViewModel extends BaseViewModel {
     );
   }
 
+  Future<void> showApiUrlResetDialog(BuildContext context) async {
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText('settingsView.sourcesResetDialogTitle'),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: I18nText('settingsView.apiURLResetDialogText'),
+        actions: <Widget>[
+          CustomMaterialButton(
+            isFilled: false,
+            label: I18nText('noButton'),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+          CustomMaterialButton(
+            label: I18nText('yesButton'),
+            onPressed: () {
+              _managerAPI.setApiUrl('');
+              Navigator.of(context).pop();
+              Navigator.of(context).pop();
+            },
+          )
+        ],
+      ),
+    );
+  }
+
   Future<int> getSdkVersion() async {
     AndroidDeviceInfo info = await DeviceInfoPlugin().androidInfo;
     return info.version.sdkInt ?? -1;

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: () =>
+                              onTap: () => model.showUninstallDialog(
-                                  model.showUninstallAlertDialog(context, app),
+                                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.showUninstallDialog(
+                                      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

@@ -1,3 +1,4 @@
+// ignore_for_file: use_build_context_synchronously
 import 'package:device_apps/device_apps.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
@@ -19,16 +20,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);
+      DeviceApps.uninstallApp(app.packageName).then(
-      _managerAPI.deletePatchedApp(app);
+        (value) => _managerAPI.deletePatchedApp(app),
+      );
     }
   }
 
@@ -40,53 +45,62 @@ class AppInfoViewModel extends BaseViewModel {
     locator<NavigationViewModel>().setIndex(1);
   }
 
-  Future<void> showUninstallAlertDialog(
+  Future<void> showUninstallDialog(
     BuildContext context,
     PatchedApplication app,
+    bool onlyUnpatch,
   ) async {
-    if (app.isRooted) {
+    bool hasRootPermissions = await _rootAPI.hasRootPermissions();
-      bool hasRootPermissions = await _rootAPI.hasRootPermissions();
+    if (app.isRooted && !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(),
-              )
-            ],
-          ),
-        );
-      }
-    } else {
       return showDialog(
         context: context,
         builder: (context) => AlertDialog(
-          title: I18nText('appInfoView.uninstallDialogTitle'),
+          title: I18nText('appInfoView.rootDialogTitle'),
           backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-          content: I18nText('appInfoView.uninstallDialogText'),
+          content: I18nText('appInfoView.rootDialogText'),
           actions: <Widget>[
-            CustomMaterialButton(
-              isFilled: false,
-              label: I18nText('cancelButton'),
-              onPressed: () => Navigator.of(context).pop(),
-            ),
             CustomMaterialButton(
               label: I18nText('okButton'),
-              onPressed: () {
+              onPressed: () => Navigator.of(context).pop(),
-                uninstallApp(app);
-                locator<HomeViewModel>().initialize(context);
-                Navigator.of(context).pop();
-                Navigator.of(context).pop();
-              },
             )
           ],
         ),
       );
+    } else {
+      if (onlyUnpatch) {
+        return showDialog(
+          context: context,
+          builder: (context) => AlertDialog(
+            title: I18nText(
+              'appInfoView.unpatchButton',
+            ),
+            backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+            content: I18nText(
+              'appInfoView.unpatchDialogText',
+            ),
+            actions: <Widget>[
+              CustomMaterialButton(
+                isFilled: false,
+                label: I18nText('noButton'),
+                onPressed: () => Navigator.of(context).pop(),
+              ),
+              CustomMaterialButton(
+                label: I18nText('yesButton'),
+                onPressed: () {
+                  uninstallApp(app, onlyUnpatch);
+                  locator<HomeViewModel>().initialize(context);
+                  Navigator.of(context).pop();
+                  Navigator.of(context).pop();
+                },
+              )
+            ],
+          ),
+        );
+      } else {
+        uninstallApp(app, onlyUnpatch);
+        locator<HomeViewModel>().initialize(context);
+        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),
+                      const SizedBox(width: 6),
-                      Text(_getAppSelection()),
+                      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,
+              width: 40,
-              child: Image.memory(widget.icon, height: 39, width: 39),
+              child: Image.memory(widget.icon, height: 40, width: 40),
             ),
             const SizedBox(width: 4),
-            Column(
+            Padding(
-              crossAxisAlignment: CrossAxisAlignment.start,
+              padding: const EdgeInsets.only(left: 15.0),
-              children: <Widget>[
+              child: Column(
-                Text(
+                crossAxisAlignment: CrossAxisAlignment.start,
-                  widget.name,
+                children: <Widget>[
-                  style: const TextStyle(
+                  Text(
-                    fontSize: 16,
+                    widget.name.length > 9
-                    fontWeight: FontWeight.w500,
+                        ? '${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(
+            Padding(
-              turns: Tween(begin: 0.0, end: 0.50).animate(_animationController),
+              padding: const EdgeInsets.only(right: 5.0),
-              child: IconButton(
+              child: RotationTransition(
-                onPressed: () {
+                turns:
-                  expController.toggle();
+                    Tween(begin: 0.0, end: 0.50).animate(_animationController),
-                  _animationController.isCompleted
+                child: IconButton(
-                      ? _animationController.reverse()
+                  onPressed: () {
-                      : _animationController.forward();
+                    expController.toggle();
-                },
+                    _animationController.isCompleted
-                icon: const Icon(Icons.arrow_drop_down),
+                        ? _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.14+14
 
 environment:
   sdk: ">=2.17.5 <3.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: