build: bump patcher dependency version to v5.0.1

* chore: update English language capitalizations and format

* chore: revert capitalization changes as requested

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -20,10 +20,12 @@ body:
         - Other
     validations:
       required: true
-  - type: textarea
+  - type: dropdown
     attributes:
-      label: Branch
+      label: Manager Branch
-      description: Which github branch did you use (Flutter or Compose)?
+      options:
+        - Flutter
+        - Compose
     validations:
       required: true
   - type: textarea
@@ -41,11 +43,56 @@ body:
       required: true
   - type: textarea
     attributes:
-      label: Relevant log output
+      label: Android version
+      description: Android version used.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Manager version
+      description: Manager version used.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Target package name
+      description: App you tried to patch.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Target package version.
+      description: Version of the app you tried to patch.
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Installation type
+      options:
+        - Non-root
+        - Root
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Patches selected.
+      description: Patches you selected for the app.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Device logs (exported using Manager settings).
       description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
       render: shell
     validations:
       required: true
+  - type: textarea
+    attributes:
+      label: Installer logs (exported using Installer menu option) [unneeded if issue is not during patching].
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: false
   - type: textarea
     attributes:
       label: Screenshots or videos
@@ -65,3 +112,17 @@ body:
       description: Add additional context here.
     validations:
       required: false
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you haven't done these steps.
+      options:
+        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: I filled out all of the requested information in this issue properly.
+          required: true
+        - label: The issue is related solely to the ReVanced Manager
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature-issue.yml

@@ -12,10 +12,12 @@ body:
         - Other
     validations:
       required: true
-  - type: textarea
+  - type: dropdown
     attributes:
-      label: Branch
+      label: Manager Branch
-      description: Which github branch did you use (Flutter or Compose)?
+      options:
+        - Flutter
+        - Compose
     validations:
       required: true
   - type: textarea
@@ -42,3 +44,17 @@ body:
       description: Add additional context here.
     validations:
       required: false
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you haven't done these steps.
+      options:
+        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: I filled out all of the requested information in this issue properly.
+          required: true
+        - label: The issue is related solely to the ReVanced Manager 
+          required: true

README.md

@@ -16,4 +16,5 @@ If you wish to discuss the Manager, a thread has been made under the [#chat](htt
 
 ## Prerequisites
 1. Android 8 or higher.
-2. For YouTube and YouTube Music - Vanced MicroG(Only for non-root).
+2. Does not work on armv7
+3. For YouTube and YouTube Music - Vanced MicroG(Only for non-root).

android/app/build.gradle

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

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

@@ -74,7 +74,6 @@ class MainActivity : FlutterActivity() {
                         result.notImplemented()
                     }
                 }
-
                 else -> result.notImplemented()
             }
         }
@@ -101,161 +100,174 @@ class MainActivity : FlutterActivity() {
         val integrations = File(integrationsPath)
         val keyStoreFile = File(keyStoreFilePath)
 
-        val patches = DexPatchBundle(
-            patchBundleFilePath,
-            DexClassLoader(
-                patchBundleFilePath,
-                cacheDirPath,
-                null,
-                javaClass.classLoader
-            )
-        ).loadPatches().filter { patch -> selectedPatches.any { it == patch.patchName } }
-
         Thread {
-            handler.post {
+            try {   
-                installerChannel.invokeMethod(
+                val patches = DexPatchBundle(
-                    "update",
+                    patchBundleFilePath,
-                    mapOf(
+                    DexClassLoader(
-                        "progress" to 0.1,
+                        patchBundleFilePath,
-                        "header" to "",
-                        "log" to "Copying original apk"
-                    )
-                )
-            }
-            originalFile.copyTo(inputFile, true)
-
-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf(
-                        "progress" to 0.2,
-                        "header" to "Unpacking apk...",
-                        "log" to "Unpacking input apk"
-                    )
-                )
-            }
-            val patcher =
-                Patcher(
-                    PatcherOptions(
-                        inputFile,
                         cacheDirPath,
-                        resourcePatching,
+                        null,
-                        Aapt.binary(applicationContext).absolutePath,
+                        javaClass.classLoader
-                        cacheDirPath,
-                        logger = ManagerLogger()
                     )
-                )
+                ).loadPatches().filter { patch -> selectedPatches.any { it == patch.patchName } }
                 
-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf("progress" to 0.3, "header" to "", "log" to "")
-                )
-            }
-            if (mergeIntegrations) {
                 handler.post {
                     installerChannel.invokeMethod(
                         "update",
                         mapOf(
-                            "progress" to 0.4,
+                            "progress" to 0.1,
-                            "header" to "Merging integrations...",
+                            "header" to "",
-                            "log" to "Merging integrations"
+                            "log" to "Copying original apk"
                         )
                     )
                 }
-                patcher.addFiles(listOf(integrations)) {}
+                originalFile.copyTo(inputFile, true)
-            }
 
-            handler.post {
+                handler.post {
-                installerChannel.invokeMethod(
+                    installerChannel.invokeMethod(
-                    "update",
+                        "update",
-                    mapOf(
+                        mapOf(
-                        "progress" to 0.5,
+                            "progress" to 0.2,
-                        "header" to "Applying patches...",
+                            "header" to "Unpacking apk...",
-                        "log" to ""
+                            "log" to "Unpacking input apk"
+                        )
                     )
-                )
+                }
-            }
+                val patcher =
-            patcher.addPatches(patches)
+                    Patcher(
-            patcher.applyPatches().forEach { (patch, res) ->
+                        PatcherOptions(
-                if (res.isSuccess) {
+                            inputFile,
-                    val msg = "[success] $patch"
+                            cacheDirPath,
+                            resourcePatching,
+                            Aapt.binary(applicationContext).absolutePath,
+                            cacheDirPath,
+                            logger = ManagerLogger()
+                        )
+                    )
+
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf("progress" to 0.3, "header" to "", "log" to "")
+                    )
+                }
+                if (mergeIntegrations) {
                     handler.post {
                         installerChannel.invokeMethod(
                             "update",
                             mapOf(
-                                "progress" to 0.5,
+                                "progress" to 0.4,
-                                "header" to "",
+                                "header" to "Merging integrations...",
-                                "log" to msg
+                                "log" to "Merging integrations"
                             )
                         )
                     }
-                    return@forEach
+                    patcher.addFiles(listOf(integrations)) {}
                 }
-                val msg = "[error] $patch:" + res.exceptionOrNull()!!
+
                 handler.post {
                     installerChannel.invokeMethod(
                         "update",
-                        mapOf("progress" to 0.5, "header" to "", "log" to msg)
+                        mapOf(
+                            "progress" to 0.5,
+                            "header" to "Applying patches...",
+                            "log" to ""
+                        )
                     )
                 }
-            }
 
-            handler.post {
+                patcher.addPatches(patches)
-                installerChannel.invokeMethod(
+                patcher.applyPatches().forEach { (patch, res) ->
-                    "update",
+                    if (res.isSuccess) {
-                    mapOf(
+                        val msg = "[success] $patch"
-                        "progress" to 0.7,
+                        handler.post {
-                        "header" to "Repacking apk...",
+                            installerChannel.invokeMethod(
-                        "log" to "Repacking patched apk"
+                                "update",
-                    )
+                                mapOf(
-                )
+                                    "progress" to 0.5,
-            }
+                                    "header" to "",
-            val res = patcher.save()
+                                    "log" to msg
-            ZipFile(patchedFile).use { file ->
+                                )
-                res.dexFiles.forEach {
+                            )
-                    file.addEntryCompressData(
+                        }
-                        ZipEntry.createWithName(it.name),
+                        return@forEach
-                        it.stream.readBytes()
+                    }
+                    val msg = "[error] $patch:" + res.exceptionOrNull()!!
+                    handler.post {
+                        installerChannel.invokeMethod(
+                            "update",
+                            mapOf("progress" to 0.5, "header" to "", "log" to msg)
+                        )
+                    }
+                }
+
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to 0.7,
+                            "header" to "Repacking apk...",
+                            "log" to "Repacking patched apk"
+                        )
                     )
                 }
-                res.resourceFile?.let {
+                val res = patcher.save()
+                ZipFile(patchedFile).use { file ->
+                    res.dexFiles.forEach {
+                        file.addEntryCompressData(
+                            ZipEntry.createWithName(it.name),
+                            it.stream.readBytes()
+                        )
+                    }
+                    res.resourceFile?.let {
+                        file.copyEntriesFromFileAligned(
+                            ZipFile(it),
+                            ZipAligner::getEntryAlignment
+                        )
+                    }
                     file.copyEntriesFromFileAligned(
-                        ZipFile(it),
+                        ZipFile(inputFile),
                         ZipAligner::getEntryAlignment
                     )
                 }
-                file.copyEntriesFromFileAligned(
+                handler.post {
-                    ZipFile(inputFile),
+                    installerChannel.invokeMethod(
-                    ZipAligner::getEntryAlignment
+                        "update",
-                )
+                        mapOf(
-            }
+                            "progress" to 0.9,
-            handler.post {
+                            "header" to "Signing apk...",
-                installerChannel.invokeMethod(
+                            "log" to ""
-                    "update",
+                        )
-                    mapOf(
-                        "progress" to 0.9,
-                        "header" to "Signing apk...",
-                        "log" to ""
                     )
-                )
+                }
-            }
+                Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
-            Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
 
-            handler.post {
+                handler.post {
-                installerChannel.invokeMethod(
+                    installerChannel.invokeMethod(
-                    "update",
+                        "update",
-                    mapOf(
+                        mapOf(
-                        "progress" to 1.0,
+                            "progress" to 1.0,
-                        "header" to "Finished!",
+                            "header" to "Finished!",
-                        "log" to "Finished!"
+                            "log" to "Finished!"
+                        )
                     )
-                )
+                }
+            } catch (ex: Throwable) {
+                val stack = ex.stackTraceToString()
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to -100.0,
+                            "header" to "Aborting...",
+                            "log" to "An error occurred! Aborting\nError:\n$stack"
+                        )
+                    )
+                }
             }
-
             handler.post { result.success(null) }
-        }
+        }.start()
-            .start()
     }
 
     inner class ManagerLogger : Logger {

assets/i18n/en.json

@@ -14,18 +14,18 @@
         "widgetTitle": "Dashboard",
         "updatesSubtitle": "Updates",
         "patchedSubtitle": "Patched Applications",
-        "updatesAvailable": "Updates Available",
+        "updatesAvailable": "Updates available",
         "noUpdates": "No updates available",
         "noInstallations": "No patched applications installed",
         "installed": "Installed",
-        "updateDialogTitle": "Update",
+        "updateDialogTitle": "Update Manager",
-        "updateDialogText": "Are you sure you want to download and update Manager?",
+        "updateDialogText": "Are you sure you want to download and update ReVanced Manager?",
-        "notificationTitle": "ReVanced Manager was updated!",
+        "notificationTitle": "ReVanced Manager was updated",
         "notificationText": "Tap to open the app",
-        "downloadingMessage": "Downloading update!",
+        "downloadingMessage": "Downloading update...",
-        "installingMessage": "Installing update... Hang on!",
+        "installingMessage": "Installing update...",
-        "errorDownloadMessage": "Unable to download update!",
+        "errorDownloadMessage": "Unable to download update",
-        "errorInstallMessage": "Unable to install update!",
+        "errorInstallMessage": "Unable to install update",
         "noConnection": "No internet connection"
     },
     "applicationItem": {
@@ -34,7 +34,7 @@
         "changelogLabel": "Changelog"
     },
     "latestCommitCard": {
-        "loadingLabel": "Loading",
+        "loadingLabel": "Loading...",
         "timeagoLabel": "{time} ago",
         "patcherLabel": "Patcher: ",
         "managerLabel": "Manager: ",
@@ -44,12 +44,12 @@
         "widgetTitle": "Patcher",
         "patchButton": "Patch",
         "patchDialogTitle": "Warning",
-        "patchDialogText": "You have selected a resource patch and a split APK installation was detected so patching errors can occur.\nAre you sure you want to proceed with patching a split base APK?"
+        "patchDialogText": "You have selected a resource patch and a split APK installation was detected so patching errors may occur.\nAre you sure you want to proceed with patching a split base APK?"
     },
     "appSelectorCard": {
         "widgetTitle": "Select application",
         "widgetTitleSelected": "Selected application",
-        "widgetSubtitle": "No application selected.",
+        "widgetSubtitle": "No application selected",
         "noAppsLabel": "No applications found.",
         "currentVersion": "Current",
         "recommendedVersion": "Recommended",
@@ -58,22 +58,24 @@
     "patchSelectorCard": {
         "widgetTitle": "Select patches",
         "widgetTitleSelected": "Selected patches",
-        "widgetSubtitle": "Select an application first.",
+        "widgetSubtitle": "Select an application first",
-        "widgetEmptySubtitle": "No patches selected."
+        "widgetEmptySubtitle": "No patches selected"
     },
     "socialMediaCard": {
-        "widgetTitle": "Social Media",
+        "widgetTitle": "Socials",
         "widgetSubtitle": "We are online!"
     },
     "appSelectorView": {
+        "viewTitle": "Select application",
         "searchBarHint": "Search applications",
         "storageButton": "Storage",
         "errorMessage": "Unable to use selected application."
     },
     "patchesSelectorView": {
+        "viewTitle": "Select patches",
         "searchBarHint": "Search patches",
         "doneButton": "Done",
-        "noPatchesFound": "No patches found for the selected app."
+        "noPatchesFound": "No patches found for the selected app"
     },
     "patchItem": {
         "unsupportedWarningButton": "Unsupported version",
@@ -93,12 +95,12 @@
         "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."
+        "installErrorDialogText3": "Root install is not possible as the original APK was selected from storage.\nSelect an installed app or choose non-root install.",
+        "noExit": "Installer is still running..."
     },
     "settingsView": {
         "widgetTitle": "Settings",
         "appearanceSectionTitle": "Appearance",
-        "patcherSectionTitle": "Patcher",
         "teamSectionTitle": "Team",
         "infoSectionTitle": "Info",
         "advancedSectionTitle": "Advanced",
@@ -111,13 +113,13 @@
         "frenchOption": "French",
         "sourcesLabel": "Sources",
         "sourcesLabelHint": "Configure your custom sources",
-        "orgPatchesLabel" : "Patches Org",
+        "orgPatchesLabel" : "Patches Organization",
         "sourcesPatchesLabel" : "Patches Source",
-        "orgIntegrationsLabel": "Integrations Org",
+        "orgIntegrationsLabel": "Integrations Organization",
         "sourcesIntegrationsLabel": "Integrations Source",
         "sourcesResetDialogTitle": "Reset",
         "sourcesResetDialogText": "Are you sure you want to reset custom sources to their default values?",
-        "apiURLResetDialogText": "Are you sure you want to reset API URL to their default values?",
+        "apiURLResetDialogText": "Are you sure you want to reset API URL to its default value?",
         "contributorsLabel": "Contributors",
         "contributorsHint": "A list of contributors of ReVanced",
         "logsLabel": "Logs",

crowdin.yml

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

lib/app/app.dart

@@ -2,6 +2,7 @@ import 'package:revanced_manager/services/github_api.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/services/revanced_api.dart';
+import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/app_selector/app_selector_view.dart';
 import 'package:revanced_manager/ui/views/contributors/contributors_view.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
@@ -36,6 +37,7 @@ import 'package:stacked_services/stacked_services.dart';
     LazySingleton(classType: PatcherAPI),
     LazySingleton(classType: RevancedAPI),
     LazySingleton(classType: GithubAPI),
+    LazySingleton(classType: Toast),
   ],
 )
 class AppSetup {}

lib/main.dart

@@ -9,6 +9,7 @@ import 'package:revanced_manager/services/revanced_api.dart';
 import 'package:revanced_manager/ui/theme/dynamic_theme_builder.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_view.dart';
 import 'package:stacked_themes/stacked_themes.dart';
+import 'package:timezone/data/latest.dart' as tz;
 
 Future main() async {
   await ThemeManager.initialise();
@@ -19,6 +20,7 @@ Future main() async {
   await locator<RevancedAPI>().initialize(apiUrl);
   locator<GithubAPI>().initialize();
   await locator<PatcherAPI>().initialize();
+  tz.initializeTimeZones();
   runApp(const MyApp());
 }
 

lib/services/manager_api.dart

@@ -97,8 +97,10 @@ class ManagerAPI {
   Future<void> savePatchedApp(PatchedApplication app) async {
     List<PatchedApplication> patchedApps = getPatchedApps();
     patchedApps.removeWhere((a) => a.packageName == app.packageName);
-    ApplicationWithIcon? installed =
+    ApplicationWithIcon? installed = await DeviceApps.getApp(
-        await DeviceApps.getApp(app.packageName, true) as ApplicationWithIcon?;
+      app.packageName,
+      true,
+    ) as ApplicationWithIcon?;
     if (installed != null) {
       app.name = installed.appName;
       app.version = installed.versionName!;
@@ -202,9 +204,10 @@ class ManagerAPI {
       List<String> installedApps = await _rootAPI.getInstalledApps();
       for (String packageName in installedApps) {
         if (!patchedApps.any((app) => app.packageName == packageName)) {
-          ApplicationWithIcon? application =
+          ApplicationWithIcon? application = await DeviceApps.getApp(
-              await DeviceApps.getApp(packageName, true)
+            packageName,
-                  as ApplicationWithIcon?;
+            true,
+          ) as ApplicationWithIcon?;
           if (application != null) {
             unsavedApps.add(
               PatchedApplication(
@@ -229,9 +232,10 @@ class ManagerAPI {
       if (app.packageName.startsWith('app.revanced') &&
           !app.packageName.startsWith('app.revanced.manager.') &&
           !patchedApps.any((uapp) => uapp.packageName == app.packageName)) {
-        ApplicationWithIcon? application =
+        ApplicationWithIcon? application = await DeviceApps.getApp(
-            await DeviceApps.getApp(app.packageName, true)
+          app.packageName,
-                as ApplicationWithIcon?;
+          true,
+        ) as ApplicationWithIcon?;
         if (application != null) {
           unsavedApps.add(
             PatchedApplication(

lib/services/patcher_api.dart

@@ -53,9 +53,10 @@ class PatcherAPI {
       for (Package package in patch.compatiblePackages) {
         try {
           if (!filteredApps.any((app) => app.packageName == package.name)) {
-            ApplicationWithIcon? app =
+            ApplicationWithIcon? app = await DeviceApps.getApp(
-                await DeviceApps.getApp(package.name, true)
+              package.name,
-                    as ApplicationWithIcon?;
+              true,
+            ) as ApplicationWithIcon?;
             if (app != null) {
               filteredApps.add(app);
             }
@@ -69,10 +70,14 @@ class PatcherAPI {
   }
 
   Future<List<Patch>> getFilteredPatches(String packageName) async {
+    String newPackageName = packageName.replaceFirst(
+      'app.revanced.',
+      'com.google.',
+    );
     return _patches
         .where((patch) =>
             !patch.name.contains('settings') &&
-            patch.compatiblePackages.any((pack) => pack.name == packageName))
+            patch.compatiblePackages.any((pack) => pack.name == newPackageName))
         .toList();
   }
 
@@ -84,19 +89,25 @@ class PatcherAPI {
 
   Future<bool> needsIntegrations(List<Patch> selectedPatches) async {
     return selectedPatches.any(
-      (patch) => patch.dependencies.contains('integrations'),
+      (patch) => patch.dependencies.any(
+        (dep) => dep.contains('integrations'),
+      ),
     );
   }
 
   Future<bool> needsResourcePatching(List<Patch> selectedPatches) async {
     return selectedPatches.any(
-      (patch) => patch.dependencies.any((dep) => dep.contains('resource-')),
+      (patch) => patch.dependencies.any(
+        (dep) => dep.contains('resource-'),
+      ),
     );
   }
 
   Future<bool> needsSettingsPatch(List<Patch> selectedPatches) async {
     return selectedPatches.any(
-      (patch) => patch.dependencies.contains('settings'),
+      (patch) => patch.dependencies.any(
+        (dep) => dep.contains('settings'),
+      ),
     );
   }
 

lib/services/root_api.dart

@@ -7,8 +7,12 @@ class RootAPI {
 
   Future<bool> hasRootPermissions() async {
     try {
-      bool? isRooted = await Root.isRooted();
+      bool? isRooted = await Root.isRootAvailable();
-      return isRooted != null && isRooted;
+      if (isRooted != null && isRooted) {
+        isRooted = await Root.isRooted();
+        return isRooted != null && isRooted;
+      }
+      return false;
     } on Exception {
       return false;
     }

lib/services/toast.dart

@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/flutter_i18n.dart';
+import 'package:fluttertoast/fluttertoast.dart' as t;
+
+class Toast {
+  final t.FToast _fToast = t.FToast();
+  late BuildContext buildContext;
+
+  void initialize(BuildContext context) {
+    _fToast.init(context);
+  }
+
+  void show(String text) {
+    t.Fluttertoast.showToast(
+      msg: FlutterI18n.translate(
+        _fToast.context!,
+        text,
+      ),
+      toastLength: t.Toast.LENGTH_LONG,
+      gravity: t.ToastGravity.CENTER,
+    );
+  }
+}

lib/ui/views/app_selector/app_selector_view.dart

@@ -31,53 +31,77 @@ class _AppSelectorViewState extends State<AppSelectorView> {
             Navigator.of(context).pop();
           },
         ),
-        body: SafeArea(
+        body: CustomScrollView(
-          child: Padding(
+          slivers: [
-            padding:
+            SliverAppBar(
-                const EdgeInsets.symmetric(vertical: 4.0, horizontal: 12.0),
+              pinned: true,
-            child: Column(
+              floating: true,
-              children: <Widget>[
+              snap: false,
-                SearchBar(
+              title: I18nText(
-                  showSelectIcon: false,
+                'appSelectorView.viewTitle',
-                  hintText: FlutterI18n.translate(
+                child: Text(
-                    context,
+                  '',
-                    'appSelectorView.searchBarHint',
+                  style: TextStyle(
+                    color: Theme.of(context).textTheme.headline6!.color,
                   ),
-                  onQueryChanged: (searchQuery) {
-                    setState(() {
-                      _query = searchQuery;
-                    });
-                  },
                 ),
-                const SizedBox(height: 12),
+              ),
-                Expanded(
+              leading: IconButton(
-                  child: model.noApps
+                icon: Icon(
-                      ? Center(
+                  Icons.arrow_back,
-                          child: I18nText('appSelectorCard.noAppsLabel'),
+                  color: Theme.of(context).textTheme.headline6!.color,
-                        )
-                      : model.apps.isEmpty
-                          ? const AppSkeletonLoader()
-                          : ListView(
-                              padding: const EdgeInsets.only(bottom: 80),
-                              children: model
-                                  .getFilteredApps(_query)
-                                  .map((app) => InkWell(
-                                        onTap: () {
-                                          model.selectApp(app);
-                                          Navigator.of(context).pop();
-                                        },
-                                        child: InstalledAppItem(
-                                          name: app.appName,
-                                          pkgName: app.packageName,
-                                          icon: app.icon,
-                                        ),
-                                      ))
-                                  .toList(),
-                            ),
                 ),
-              ],
+                onPressed: () => Navigator.of(context).pop(),
+              ),
+              bottom: PreferredSize(
+                preferredSize: const Size.fromHeight(64.0),
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(
+                    vertical: 8.0,
+                    horizontal: 12.0,
+                  ),
+                  child: SearchBar(
+                    showSelectIcon: false,
+                    hintText: FlutterI18n.translate(
+                      context,
+                      'appSelectorView.searchBarHint',
+                    ),
+                    onQueryChanged: (searchQuery) {
+                      setState(() {
+                        _query = searchQuery;
+                      });
+                    },
+                  ),
+                ),
+              ),
             ),
-          ),
+            SliverToBoxAdapter(
+              child: model.noApps
+                  ? Center(
+                      child: I18nText('appSelectorCard.noAppsLabel'),
+                    )
+                  : model.apps.isEmpty
+                      ? const AppSkeletonLoader()
+                      : Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 12.0)
+                              .copyWith(bottom: 80),
+                          child: Column(
+                            children: model
+                                .getFilteredApps(_query)
+                                .map((app) => InstalledAppItem(
+                                      name: app.appName,
+                                      pkgName: app.packageName,
+                                      icon: app.icon,
+                                      onTap: () {
+                                        model.selectApp(app);
+                                        Navigator.of(context).pop();
+                                      },
+                                    ))
+                                .toList(),
+                          ),
+                        ),
+            ),
+          ],
         ),
       ),
     );

lib/ui/views/app_selector/app_selector_viewmodel.dart

@@ -2,16 +2,16 @@ import 'dart:io';
 import 'package:device_apps/device_apps.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_i18n/flutter_i18n.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
+import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:stacked/stacked.dart';
 
 class AppSelectorViewModel extends BaseViewModel {
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
+  final Toast _toast = locator<Toast>();
   final List<ApplicationWithIcon> apps = [];
   bool noApps = false;
 
@@ -43,9 +43,10 @@ class AppSelectorViewModel extends BaseViewModel {
       );
       if (result != null && result.files.single.path != null) {
         File apkFile = File(result.files.single.path!);
-        ApplicationWithIcon? application =
+        ApplicationWithIcon? application = await DeviceApps.getAppFromStorage(
-            await DeviceApps.getAppFromStorage(apkFile.path, true)
+          apkFile.path,
-                as ApplicationWithIcon?;
+          true,
+        ) as ApplicationWithIcon?;
         if (application != null) {
           locator<PatcherViewModel>().selectedApp = PatchedApplication(
             name: application.appName,
@@ -61,14 +62,7 @@ class AppSelectorViewModel extends BaseViewModel {
         }
       }
     } on Exception {
-      Fluttertoast.showToast(
+      _toast.show('appSelectorView.errorMessage');
-        msg: FlutterI18n.translate(
-          context,
-          'appSelectorView.errorMessage',
-        ),
-        toastLength: Toast.LENGTH_LONG,
-        gravity: ToastGravity.CENTER,
-      );
     }
   }
 

lib/ui/views/home/home_view.dart

@@ -28,6 +28,7 @@ class HomeView extends StatelessWidget {
           child: CustomScrollView(
             slivers: <Widget>[
               CustomSliverAppBar(
+                isMainView: true,
                 title: I18nText(
                   'homeView.widgetTitle',
                   child: Text(

lib/ui/views/home/home_viewmodel.dart

@@ -6,24 +6,26 @@ import 'package:device_apps/device_apps.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 import 'package:injectable/injectable.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/app/app.router.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/services/toast.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
+import 'package:timezone/timezone.dart' as tz;
 
 @lazySingleton
 class HomeViewModel extends BaseViewModel {
   final NavigationService _navigationService = locator<NavigationService>();
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
+  final Toast _toast = locator<Toast>();
   final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
   DateTime? _lastUpdate;
   bool showUpdatableApps = true;
@@ -38,16 +40,13 @@ class HomeViewModel extends BaseViewModel {
       onSelectNotification: (p) =>
           DeviceApps.openApp('app.revanced.manager.flutter'),
     );
+    flutterLocalNotificationsPlugin
+        .resolvePlatformSpecificImplementation<
+            AndroidFlutterLocalNotificationsPlugin>()
+        ?.requestPermission();
     bool isConnected = await Connectivity().checkConnection();
     if (!isConnected) {
-      Fluttertoast.showToast(
+      _toast.show('homeView.noConnection');
-        msg: FlutterI18n.translate(
-          context,
-          'homeView.noConnection',
-        ),
-        toastLength: Toast.LENGTH_LONG,
-        gravity: ToastGravity.CENTER,
-      );
     }
     _getPatchedApps();
     _managerAPI.reAssessSavedApps().then((_) => _getPatchedApps());
@@ -102,69 +101,48 @@ class HomeViewModel extends BaseViewModel {
     return false;
   }
 
-  void updateManager(BuildContext context) async {
+  Future<void> updateManager(BuildContext context) async {
-    Fluttertoast.showToast(
+    try {
-      msg: FlutterI18n.translate(
+      _toast.show('homeView.downloadingMessage');
-        context,
+      File? managerApk = await _managerAPI.downloadManager();
-        'homeView.downloadingMessage',
+      if (managerApk != null) {
-      ),
+        await flutterLocalNotificationsPlugin.zonedSchedule(
-      toastLength: Toast.LENGTH_LONG,
+          0,
-      gravity: ToastGravity.CENTER,
+          FlutterI18n.translate(
-    );
-    File? managerApk = await _managerAPI.downloadManager();
-    if (managerApk != null) {
-      flutterLocalNotificationsPlugin.show(
-        0,
-        FlutterI18n.translate(
-          context,
-          'homeView.notificationTitle',
-        ),
-        FlutterI18n.translate(
-          context,
-          'homeView.notificationText',
-        ),
-        const NotificationDetails(
-          android: AndroidNotificationDetails(
-            'revanced_manager_channel',
-            'ReVanced Manager Channel',
-          ),
-        ),
-      );
-      try {
-        Fluttertoast.showToast(
-          msg: FlutterI18n.translate(
             context,
-            'homeView.installingMessage',
+            'homeView.notificationTitle',
           ),
-          toastLength: Toast.LENGTH_LONG,
+          FlutterI18n.translate(
-          gravity: ToastGravity.CENTER,
+            context,
+            'homeView.notificationText',
+          ),
+          tz.TZDateTime.now(tz.local).add(const Duration(seconds: 5)),
+          const NotificationDetails(
+            android: AndroidNotificationDetails(
+              'revanced_manager_channel',
+              'ReVanced Manager Channel',
+              importance: Importance.max,
+              priority: Priority.high,
+              ticker: 'ticker',
+            ),
+          ),
+          androidAllowWhileIdle: true,
+          uiLocalNotificationDateInterpretation:
+              UILocalNotificationDateInterpretation.absoluteTime,
         );
+        _toast.show('homeView.installingMessage');
         await AppInstaller.installApk(managerApk.path);
-      } on Exception {
+      } else {
-        Fluttertoast.showToast(
+        _toast.show('homeView.errorDownloadMessage');
-          msg: FlutterI18n.translate(
-            context,
-            'homeView.errorInstallMessage',
-          ),
-          toastLength: Toast.LENGTH_LONG,
-          gravity: ToastGravity.CENTER,
-        );
       }
-    } else {
+    } on Exception {
-      Fluttertoast.showToast(
+      _toast.show('homeView.errorInstallMessage');
-        msg: FlutterI18n.translate(
-          context,
-          'homeView.errorDownloadMessage',
-        ),
-        toastLength: Toast.LENGTH_LONG,
-        gravity: ToastGravity.CENTER,
-      );
     }
   }
 
-  Future<void> showUpdateConfirmationDialog(BuildContext context) async {
+  Future<void> showUpdateConfirmationDialog(BuildContext parentContext) async {
     return showDialog(
-      context: context,
+      context: parentContext,
       builder: (context) => AlertDialog(
         title: I18nText('homeView.updateDialogTitle'),
         backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
@@ -179,7 +157,7 @@ class HomeViewModel extends BaseViewModel {
             label: I18nText('yesButton'),
             onPressed: () {
               Navigator.of(context).pop();
-              updateManager(context);
+              updateManager(parentContext);
             },
           )
         ],

lib/ui/views/installer/installer_view.dart

@@ -29,6 +29,7 @@ class InstallerView extends StatelessWidget {
                     color: Theme.of(context).textTheme.headline6!.color,
                   ),
                 ),
+                onBackButtonPressed: () => model.onWillPop(context),
                 actions: <Widget>[
                   Visibility(
                     visible: !model.isPatching && !model.hasErrors,
@@ -143,13 +144,7 @@ class InstallerView extends StatelessWidget {
             ],
           ),
         ),
-        onWillPop: () async {
+        onWillPop: () => model.onWillPop(context),
-          if (!model.isPatching) {
-            model.cleanPatcher();
-            Navigator.of(context).pop();
-          }
-          return false;
-        },
       ),
     );
   }

lib/ui/views/installer/installer_viewmodel.dart

@@ -9,6 +9,7 @@ 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/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
@@ -17,6 +18,7 @@ import 'package:wakelock/wakelock.dart';
 class InstallerViewModel extends BaseViewModel {
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
+  final Toast _toast = locator<Toast>();
   final PatchedApplication _app = locator<PatcherViewModel>().selectedApp!;
   final List<Patch> _patches = locator<PatcherViewModel>().selectedPatches;
   static const _installerChannel = MethodChannel(
@@ -76,14 +78,20 @@ class InstallerViewModel extends BaseViewModel {
   }
 
   void update(double value, String header, String log) {
-    if (value > 0) {
+    if (value >= 0.0) {
       progress = value;
     }
-    isPatching = progress == 1.0 ? false : true;
+    if (value == 0.0) {
-    if (progress == 0.0) {
       logs = '';
+      isPatching = true;
       isInstalled = false;
       hasErrors = false;
+    } else if (value == 1.0) {
+      isPatching = false;
+      hasErrors = false;
+    } else if (value == -100.0) {
+      isPatching = false;
+      hasErrors = true;
     }
     if (header.isNotEmpty) {
       headerLogs = header;
@@ -93,6 +101,9 @@ class InstallerViewModel extends BaseViewModel {
         logs += '\n';
       }
       logs += log;
+      if (logs[logs.length - 1] == '\n') {
+        logs = logs.substring(0, logs.length - 1);
+      }
       Future.delayed(const Duration(milliseconds: 500)).then((value) {
         scrollController.animateTo(
           scrollController.position.maxScrollExtent,
@@ -115,12 +126,14 @@ class InstallerViewModel extends BaseViewModel {
           _patches,
         );
       } catch (e) {
-        hasErrors = true;
+        update(
-        update(-1.0, 'Aborting...', 'An error occurred! Aborting\nError: $e');
+          -100.0,
+          'Aborting...',
+          'An error occurred! Aborting\nError:\n$e',
+        );
       }
     } else {
-      hasErrors = true;
+      update(-100.0, 'Aborting...', 'No app or patches selected! Aborting');
-      update(-1.0, 'Aborting...', 'No app or patches selected! Aborting');
     }
     if (FlutterBackground.isBackgroundExecutionEnabled) {
       try {
@@ -130,7 +143,6 @@ class InstallerViewModel extends BaseViewModel {
       }
     }
     await Wakelock.disable();
-    isPatching = false;
   }
 
   void installResult(BuildContext context, bool installAsRoot) async {
@@ -176,6 +188,7 @@ class InstallerViewModel extends BaseViewModel {
         _app.patchDate = DateTime.now();
         _app.appliedPatches = _patches.map((p) => p.name).toList();
         if (hasMicroG) {
+          _app.name += ' ReVanced';
           _app.packageName = _app.packageName.replaceFirst(
             'com.google.',
             'app.revanced.',
@@ -215,4 +228,14 @@ class InstallerViewModel extends BaseViewModel {
         break;
     }
   }
+
+  Future<bool> onWillPop(BuildContext context) async {
+    if (isPatching) {
+      _toast.show('installerView.noExit');
+      return false;
+    }
+    cleanPatcher();
+    Navigator.of(context).pop();
+    return true;
+  }
 }

lib/ui/views/navigation/navigation_viewmodel.dart

@@ -4,7 +4,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:injectable/injectable.dart';
 import 'package:permission_handler/permission_handler.dart';
+import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/root_api.dart';
+import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/home/home_view.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_view.dart';
 import 'package:revanced_manager/ui/views/settings/settings_view.dart';
@@ -14,6 +16,7 @@ import 'package:stacked/stacked.dart';
 @lazySingleton
 class NavigationViewModel extends IndexTrackingViewModel {
   void initialize(BuildContext context) async {
+    locator<Toast>().initialize(context);
     SharedPreferences prefs = await SharedPreferences.getInstance();
     if (prefs.getBool('permissionsRequested') == null) {
       await prefs.setBool('permissionsRequested', true);

lib/ui/views/patcher/patcher_view.dart

@@ -28,6 +28,7 @@ class PatcherView extends StatelessWidget {
         body: CustomScrollView(
           slivers: <Widget>[
             CustomSliverAppBar(
+              isMainView: true,
               title: I18nText(
                 'patcherView.widgetTitle',
                 child: Text(

lib/ui/views/patches_selector/patches_selector_view.dart

@@ -33,144 +33,170 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
             },
           ),
         ),
-        body: SafeArea(
+        body: CustomScrollView(
-          child: Padding(
+          slivers: [
-            padding:
+            SliverAppBar(
-                const EdgeInsets.symmetric(vertical: 4.0, horizontal: 12.0),
+              pinned: true,
-            child: Column(
+              floating: true,
-              children: <Widget>[
+              snap: false,
-                SearchBar(
+              title: I18nText(
-                  showSelectIcon: true,
+                'patchesSelectorView.viewTitle',
-                  hintText: FlutterI18n.translate(
+                child: Text(
-                    context,
+                  '',
-                    'patchesSelectorView.searchBarHint',
+                  style: TextStyle(
+                    color: Theme.of(context).textTheme.headline6!.color,
                   ),
-                  onQueryChanged: (searchQuery) {
-                    setState(() {
-                      _query = searchQuery;
-                    });
-                  },
-                  onSelectAll: (value) => model.selectAllPatches(value),
                 ),
-                const SizedBox(height: 12),
+              ),
-                Expanded(
+              leading: IconButton(
-                  child: model.patches.isEmpty
+                icon: Icon(
-                      ? Padding(
+                  Icons.arrow_back,
-                          padding: const EdgeInsets.all(8.0),
+                  color: Theme.of(context).textTheme.headline6!.color,
-                          child: Center(
+                ),
-                            child: I18nText(
+                onPressed: () => Navigator.of(context).pop(),
-                              'patchesSelectorView.noPatchesFound',
+              ),
-                              child: Text(
+              bottom: PreferredSize(
-                                '',
+                preferredSize: const Size.fromHeight(64.0),
-                                style: Theme.of(context).textTheme.bodyMedium,
+                child: Padding(
-                              ),
+                  padding: const EdgeInsets.symmetric(
-                            ),
+                    vertical: 8.0,
+                    horizontal: 12.0,
+                  ),
+                  child: SearchBar(
+                    showSelectIcon: true,
+                    hintText: FlutterI18n.translate(
+                      context,
+                      'patchesSelectorView.searchBarHint',
+                    ),
+                    onQueryChanged: (searchQuery) {
+                      setState(() {
+                        _query = searchQuery;
+                      });
+                    },
+                    onSelectAll: (value) => model.selectAllPatches(value),
+                  ),
+                ),
+              ),
+            ),
+            SliverToBoxAdapter(
+              child: model.patches.isEmpty
+                  ? Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: Center(
+                        child: I18nText(
+                          'patchesSelectorView.noPatchesFound',
+                          child: Text(
+                            '',
+                            style: Theme.of(context).textTheme.bodyMedium,
                           ),
-                        )
+                        ),
-                      : ListView(
+                      ),
-                          padding: const EdgeInsets.only(bottom: 80),
+                    )
-                          children: model
+                  : Padding(
-                              .getQueriedPatches(_query)
+                      padding: const EdgeInsets.symmetric(horizontal: 12.0)
-                              .map(
+                          .copyWith(bottom: 80),
-                                (patch) => PatchItem(
+                      child: Column(
-                                  name: patch.name,
+                        children: model
-                                  simpleName: patch.getSimpleName(),
+                            .getQueriedPatches(_query)
-                                  version: patch.version,
+                            .map(
-                                  description: patch.description,
+                              (patch) => PatchItem(
-                                  packageVersion: model.getAppVersion(),
+                                name: patch.name,
-                                  supportedPackageVersions:
+                                simpleName: patch.getSimpleName(),
-                                      model.getSupportedVersions(patch),
+                                version: patch.version,
-                                  isUnsupported: !model.isPatchSupported(patch),
+                                description: patch.description,
-                                  isSelected: model.isSelected(patch),
+                                packageVersion: model.getAppVersion(),
-                                  onChanged: (value) =>
+                                supportedPackageVersions:
-                                      model.selectPatch(patch, value),
+                                    model.getSupportedVersions(patch),
-                                ),
+                                isUnsupported: !model.isPatchSupported(patch),
-                                /* TODO: Enable this and make use of new Patch Options implementation
+                                isSelected: model.isSelected(patch),
-                                     patch.hasOptions ? ExpandablePanel(
+                                onChanged: (value) =>
-                                      controller: expController,
+                                    model.selectPatch(patch, value),
-                                      theme: const ExpandableThemeData(
+                              ),
-                                        hasIcon: false,
+                              /* TODO: Enable this and make use of new Patch Options implementation
-                                        tapBodyToExpand: true,
+                                   patch.hasOptions ? ExpandablePanel(
-                                        tapBodyToCollapse: true,
+                                    controller: expController,
-                                        tapHeaderToExpand: true,
+                                    theme: const ExpandableThemeData(
-                                      ),
+                                      hasIcon: false,
-                                      header: Column(
+                                      tapBodyToExpand: true,
-                                        children: <Widget>[
+                                      tapBodyToCollapse: true,
-                                          GestureDetector(
+                                      tapHeaderToExpand: true,
-                                            onLongPress: () =>
+                                    ),
-                                                expController.toggle(),
+                                    header: Column(
-                                            child: PatchItem(
+                                      children: <Widget>[
-                                              name: patch.name,
+                                        GestureDetector(
-                                              simpleName: patch.getSimpleName(),
+                                          onLongPress: () =>
-                                              description: patch.description,
+                                              expController.toggle(),
-                                              version: patch.version,
+                                          child: PatchItem(
-                                              packageVersion:
+                                            name: patch.name,
-                                                  model.getAppVersion(),
+                                            simpleName: patch.getSimpleName(),
-                                              supportedPackageVersions: model
+                                            description: patch.description,
-                                                  .getSupportedVersions(patch),
+                                            version: patch.version,
-                                              isUnsupported: !model
+                                            packageVersion:
-                                                  .isPatchSupported(patch),
+                                                model.getAppVersion(),
-                                              isSelected:
+                                            supportedPackageVersions: model
-                                                  model.isSelected(patch),
+                                                .getSupportedVersions(patch),
-                                              onChanged: (value) => model
+                                            isUnsupported: !model
-                                                  .selectPatch(patch, value),
+                                                .isPatchSupported(patch),
-                                              child: const Padding(
+                                            isSelected:
-                                                padding: EdgeInsets.symmetric(
+                                                model.isSelected(patch),
-                                                  vertical: 8.0,
+                                            onChanged: (value) => model
-                                                ),
+                                                .selectPatch(patch, value),
-                                                child: Text(
+                                            child: const Padding(
-                                                    'Long press for additional options.',
+                                              padding: EdgeInsets.symmetric(
-                                                ),
+                                                vertical: 8.0,
+                                              ),
+                                              child: Text(
+                                                  'Long press for additional options.',
                                               ),
                                             ),
                                           ),
-                                        ],
+                                        ),
+                                      ],
+                                    ),
+                                    expanded: Padding(
+                                      padding: const EdgeInsets.symmetric(
+                                        vertical: 10.0,
+                                        horizontal: 10,
                                       ),
-                                      expanded: Padding(
+                                      child: Container(
                                         padding: const EdgeInsets.symmetric(
-                                          vertical: 10.0,
+                                          vertical: 8,
-                                          horizontal: 10,
+                                          horizontal: 8,
                                         ),
-                                        child: Container(
+                                        decoration: BoxDecoration(
-                                          padding: const EdgeInsets.symmetric(
+                                          color: Theme.of(context)
-                                            vertical: 8,
+                                              .colorScheme
-                                            horizontal: 8,
+                                              .tertiary
-                                          ),
+                                              .withOpacity(0.1),
-                                          decoration: BoxDecoration(
+                                          borderRadius:
-                                            color: Theme.of(context)
+                                              BorderRadius.circular(12),
-                                                .colorScheme
+                                        ),
-                                                .tertiary
+                                        child: Column(
-                                                .withOpacity(0.1),
+                                          children: <Widget>[
-                                            borderRadius:
+                                            Text(
-                                                BorderRadius.circular(12),
+                                              'Patch options',
-                                          ),
+                                              style: GoogleFonts.inter(
-                                          child: Column(
+                                                fontSize: 18,
-                                            children: <Widget>[
+                                                fontWeight: FontWeight.w600,
-                                              Text(
-                                                'Patch options',
-                                                style: GoogleFonts.inter(
-                                                  fontSize: 18,
-                                                  fontWeight: FontWeight.w600,
-                                                ),
                                               ),
-                                              const OptionsTextField(
+                                            ),
-                                                  hint: 'App name'),
+                                            const OptionsTextField(
-                                              const OptionsFilePicker(
+                                                hint: 'App name'),
-                                                optionName: 'Choose a logo',
+                                            const OptionsFilePicker(
-                                              ),
+                                              optionName: 'Choose a logo',
-                                            ],
+                                            ),
-                                          ),
+                                          ],
                                         ),
                                       ),
-                                      collapsed: Container(),
+                                    ),
-                                    ) */
+                                    collapsed: Container(),
-                              )
+                                  ) */
-                              .toList(),
+                            )
-                        ),
+                            .toList(),
-                ),
+                      ),
-              ],
+                    ),
             ),
-          ),
+          ],
         ),
       ),
     );

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -17,13 +17,6 @@ class PatchesSelectorViewModel extends BaseViewModel {
       locator<PatcherViewModel>().selectedApp!.packageName,
     ));
     patches.sort((a, b) => a.name.compareTo(b.name));
-    if (selectedPatches.isEmpty) {
-      for (Patch patch in patches) {
-        if (!patch.excluded && isPatchSupported(patch)) {
-          selectedPatches.add(patch);
-        }
-      }
-    }
     notifyListeners();
   }
 

lib/ui/views/settings/settings_view.dart

@@ -13,6 +13,9 @@ import 'package:stacked/stacked.dart';
 class SettingsView extends StatelessWidget {
   const SettingsView({Key? key}) : super(key: key);
 
+  static const _settingsDivider =
+      Divider(thickness: 1.0, indent: 20.0, endIndent: 20.0);
+
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<SettingsViewModel>.reactive(
@@ -21,6 +24,7 @@ class SettingsView extends StatelessWidget {
         body: CustomScrollView(
           slivers: <Widget>[
             CustomSliverAppBar(
+              isMainView: true,
               title: I18nText(
                 'settingsView.widgetTitle',
                 child: Text(
@@ -31,133 +35,135 @@ class SettingsView extends StatelessWidget {
                 ),
               ),
             ),
-            SliverPadding(
+            SliverList(
-              padding: const EdgeInsets.all(20.0),
+              delegate: SliverChildListDelegate.fixed(
-              sliver: SliverList(
+                <Widget>[
-                delegate: SliverChildListDelegate.fixed(
+                  SettingsSection(
-                  <Widget>[
+                    title: 'settingsView.appearanceSectionTitle',
-                    SettingsSection(
+                    children: <Widget>[
-                      title: 'settingsView.appearanceSectionTitle',
+                      CustomSwitchTile(
-                      children: <Widget>[
+                        padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                        CustomSwitchTile(
+                        title: I18nText(
-                          title: I18nText(
+                          'settingsView.darkThemeLabel',
-                            'settingsView.darkThemeLabel',
+                          child: const Text(
-                            child: const Text(
+                            '',
-                              '',
+                            style: TextStyle(
-                              style: TextStyle(
+                              fontSize: 20,
-                                fontSize: 20,
+                              fontWeight: FontWeight.w500,
-                                fontWeight: FontWeight.w500,
-                              ),
                             ),
                           ),
-                          subtitle: I18nText('settingsView.darkThemeHint'),
-                          value: model.getDarkThemeStatus(),
-                          onTap: (value) => model.setUseDarkTheme(
-                            context,
-                            value,
-                          ),
                         ),
-                        FutureBuilder<int>(
+                        subtitle: I18nText('settingsView.darkThemeHint'),
-                          future: model.getSdkVersion(),
+                        value: model.getDarkThemeStatus(),
-                          builder: (context, snapshot) => Visibility(
+                        onTap: (value) => model.setUseDarkTheme(
-                            visible: snapshot.hasData &&
+                          context,
-                                snapshot.data! >= ANDROID_12_SDK_VERSION,
+                          value,
-                            child: CustomSwitchTile(
+                        ),
-                              title: I18nText(
+                      ),
-                                'settingsView.dynamicThemeLabel',
+                      FutureBuilder<int>(
-                                child: const Text(
+                        future: model.getSdkVersion(),
-                                  '',
+                        builder: (context, snapshot) => Visibility(
-                                  style: TextStyle(
+                          visible: snapshot.hasData &&
-                                    fontSize: 20,
+                              snapshot.data! >= ANDROID_12_SDK_VERSION,
-                                    fontWeight: FontWeight.w500,
+                          child: CustomSwitchTile(
-                                  ),
+                            padding:
+                                const EdgeInsets.symmetric(horizontal: 20.0),
+                            title: I18nText(
+                              'settingsView.dynamicThemeLabel',
+                              child: const Text(
+                                '',
+                                style: TextStyle(
+                                  fontSize: 20,
+                                  fontWeight: FontWeight.w500,
                                 ),
                               ),
-                              subtitle:
+                            ),
-                                  I18nText('settingsView.dynamicThemeHint'),
+                            subtitle: I18nText('settingsView.dynamicThemeHint'),
-                              value: model.getDynamicThemeStatus(),
+                            value: model.getDynamicThemeStatus(),
-                              onTap: (value) => model.setUseDynamicTheme(
+                            onTap: (value) => model.setUseDynamicTheme(
-                                context,
+                              context,
-                                value,
+                              value,
-                              ),
                             ),
                           ),
                         ),
-                      ],
+                      ),
-                    ),
+                    ],
-                    SettingsTileDialog(
+                  ),
-                      title: 'settingsView.languageLabel',
+                  SettingsTileDialog(
-                      subtitle: 'English',
+                    padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                      onTap: () => model.showLanguagesDialog(context),
+                    title: 'settingsView.languageLabel',
-                    ),
+                    subtitle: 'English',
-                    const Divider(thickness: 1.0),
+                    onTap: () => model.showLanguagesDialog(context),
-                    SettingsSection(
+                  ),
-                      title: 'settingsView.patcherSectionTitle',
+                  _settingsDivider,
-                      children: <Widget>[
+                  SettingsSection(
-                        SettingsTileDialog(
+                    title: 'settingsView.teamSectionTitle',
-                          title: 'settingsView.sourcesLabel',
+                    children: <Widget>[
-                          subtitle: 'settingsView.sourcesLabelHint',
+                      ListTile(
-                          onTap: () => model.showSourcesDialog(context),
+                        contentPadding:
-                        ),
+                            const EdgeInsets.symmetric(horizontal: 20.0),
-                      ],
+                        title: I18nText(
-                    ),
+                          'settingsView.contributorsLabel',
-                    const Divider(thickness: 1.0),
+                          child: const Text(
-                    SettingsSection(
+                            '',
-                      title: 'settingsView.teamSectionTitle',
+                            style: TextStyle(
-                      children: <Widget>[
+                              fontSize: 20,
-                        ListTile(
+                              fontWeight: FontWeight.w500,
-                          contentPadding: EdgeInsets.zero,
-                          title: I18nText(
-                            'settingsView.contributorsLabel',
-                            child: const Text(
-                              '',
-                              style: TextStyle(
-                                fontSize: 20,
-                                fontWeight: FontWeight.w500,
-                              ),
                             ),
                           ),
-                          subtitle: I18nText('settingsView.contributorsHint'),
-                          onTap: () => model.navigateToContributors(),
                         ),
-                        const SocialMediaWidget(),
+                        subtitle: I18nText('settingsView.contributorsHint'),
-                      ],
+                        onTap: () => model.navigateToContributors(),
-                    ),
+                      ),
-                    const Divider(thickness: 1.0),
+                      const SocialMediaWidget(
-                    SettingsSection(
+                        padding: EdgeInsets.symmetric(horizontal: 20.0),
-                      title: 'settingsView.infoSectionTitle',
+                      ),
-                      children: <Widget>[
+                    ],
-                        ListTile(
+                  ),
-                          contentPadding: EdgeInsets.zero,
+                  _settingsDivider,
-                          title: I18nText(
+                  SettingsSection(
-                            'settingsView.logsLabel',
+                    title: 'settingsView.advancedSectionTitle',
-                            child: const Text(
+                    children: <Widget>[
-                              '',
+                      SettingsTileDialog(
-                              style: TextStyle(
+                        padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                                fontSize: 20,
+                        title: 'settingsView.apiURLLabel',
-                                fontWeight: FontWeight.w500,
+                        subtitle: 'settingsView.apiURLHint',
-                              ),
+                        onTap: () => model.showApiUrlDialog(context),
+                      ),
+                      SettingsTileDialog(
+                        padding: const EdgeInsets.symmetric(horizontal: 20.0),
+                        title: 'settingsView.sourcesLabel',
+                        subtitle: 'settingsView.sourcesLabelHint',
+                        onTap: () => model.showSourcesDialog(context),
+                      ),
+                    ],
+                  ),
+                  _settingsDivider,
+                  SettingsSection(
+                    title: 'settingsView.infoSectionTitle',
+                    children: <Widget>[
+                      ListTile(
+                        contentPadding:
+                            const EdgeInsets.symmetric(horizontal: 20.0),
+                        title: I18nText(
+                          'settingsView.logsLabel',
+                          child: const Text(
+                            '',
+                            style: TextStyle(
+                              fontSize: 20,
+                              fontWeight: FontWeight.w500,
                             ),
                           ),
-                          subtitle: I18nText('settingsView.logsHint'),
-                          onTap: () => model.exportLogcatLogs(),
                         ),
-                        const AboutWidget(),
+                        subtitle: I18nText('settingsView.logsHint'),
-                      ],
+                        onTap: () => model.exportLogcatLogs(),
-                    ),
+                      ),
-                    const Divider(thickness: 1.0),
+                      const AboutWidget(
-                    SettingsSection(
+                        padding: EdgeInsets.symmetric(horizontal: 20.0),
-                      title: 'settingsView.advancedSectionTitle',
+                      ),
-                      children: <Widget>[
+                    ],
-                        SettingsTileDialog(
+                  ),
-                          title: 'settingsView.apiURLLabel',
+                ],
-                          subtitle: 'settingsView.apiURLHint',
-                          onTap: () => model.showApiUrlDialog(context),
-                        ),
-                      ],
-                    ),
-                  ],
-                ),
               ),
             ),
           ],

lib/ui/widgets/appInfoView/app_info_view.dart

@@ -34,7 +34,7 @@ class AppInfoView extends StatelessWidget {
               ),
             ),
             SliverPadding(
-              padding: const EdgeInsets.all(20.0),
+              padding: const EdgeInsets.symmetric(vertical: 20.0),
               sliver: SliverList(
                 delegate: SliverChildListDelegate.fixed(
                   <Widget>[
@@ -61,135 +61,34 @@ class AppInfoView extends StatelessWidget {
                       style: Theme.of(context).textTheme.subtitle1,
                     ),
                     const SizedBox(height: 20),
-                    CustomCard(
+                    Padding(
-                      child: IntrinsicHeight(
+                      padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                        child: Row(
+                      child: CustomCard(
-                          mainAxisAlignment: MainAxisAlignment.center,
+                        padding: EdgeInsets.zero,
-                          children: <Widget>[
+                        child: SizedBox(
-                            !app.isRooted ? const Spacer() : Container(),
+                          height: 94.0,
-                            InkWell(
+                          child: Row(
-                              onTap: () => model.openApp(app),
+                            mainAxisAlignment: MainAxisAlignment.center,
-                              child: Column(
+                            children: <Widget>[
-                                mainAxisAlignment: MainAxisAlignment.center,
+                              Expanded(
-                                children: <Widget>[
+                                child: Material(
-                                  Icon(
+                                  type: MaterialType.transparency,
-                                    Icons.open_in_new_outlined,
+                                  child: InkWell(
-                                    color:
+                                    borderRadius: BorderRadius.circular(16.0),
-                                        Theme.of(context).colorScheme.primary,
+                                    onTap: () => model.openApp(app),
-                                  ),
-                                  const SizedBox(height: 10),
-                                  I18nText(
-                                    'appInfoView.openButton',
-                                    child: Text(
-                                      '',
-                                      style: TextStyle(
-                                        color: Theme.of(context)
-                                            .colorScheme
-                                            .primary,
-                                        fontWeight: FontWeight.bold,
-                                      ),
-                                    ),
-                                  ),
-                                ],
-                              ),
-                            ),
-                            const Spacer(),
-                            VerticalDivider(
-                              color: Theme.of(context).canvasColor,
-                            ),
-                            const Spacer(),
-                            InkWell(
-                              onTap: () => model.showUninstallDialog(
-                                context,
-                                app,
-                                false,
-                              ),
-                              child: Column(
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: <Widget>[
-                                  Icon(
-                                    Icons.delete_outline,
-                                    color:
-                                        Theme.of(context).colorScheme.primary,
-                                  ),
-                                  const SizedBox(height: 10),
-                                  I18nText(
-                                    'appInfoView.uninstallButton',
-                                    child: Text(
-                                      '',
-                                      style: TextStyle(
-                                        color: Theme.of(context)
-                                            .colorScheme
-                                            .primary,
-                                        fontWeight: FontWeight.bold,
-                                      ),
-                                    ),
-                                  ),
-                                ],
-                              ),
-                            ),
-                            const Spacer(),
-                            VerticalDivider(
-                              color: Theme.of(context).canvasColor,
-                            ),
-                            const Spacer(),
-                            InkWell(
-                              onTap: () {
-                                model.navigateToPatcher(app);
-                                Navigator.of(context).pop();
-                              },
-                              child: Column(
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: <Widget>[
-                                  Icon(
-                                    Icons.build_outlined,
-                                    color:
-                                        Theme.of(context).colorScheme.primary,
-                                  ),
-                                  const SizedBox(height: 10),
-                                  I18nText(
-                                    'appInfoView.patchButton',
-                                    child: Text(
-                                      '',
-                                      style: TextStyle(
-                                        color: Theme.of(context)
-                                            .colorScheme
-                                            .primary,
-                                        fontWeight: FontWeight.bold,
-                                      ),
-                                    ),
-                                  ),
-                                ],
-                              ),
-                            ),
-                            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
+                                          Icons.open_in_new_outlined,
-                                              .settings_backup_restore_outlined,
                                           color: Theme.of(context)
                                               .colorScheme
                                               .primary,
                                         ),
                                         const SizedBox(height: 10),
                                         I18nText(
-                                          'appInfoView.unpatchButton',
+                                          'appInfoView.openButton',
                                           child: Text(
                                             '',
                                             style: TextStyle(
@@ -202,16 +101,152 @@ class AppInfoView extends StatelessWidget {
                                         ),
                                       ],
                                     ),
-                                  )
+                                  ),
-                                : Container(),
+                                ),
-                            !app.isRooted ? const Spacer() : Container(),
+                              ),
-                          ],
+                              VerticalDivider(
+                                color: Theme.of(context).canvasColor,
+                                indent: 12.0,
+                                endIndent: 12.0,
+                                width: 1.0,
+                              ),
+                              Expanded(
+                                child: Material(
+                                  type: MaterialType.transparency,
+                                  child: InkWell(
+                                    borderRadius: BorderRadius.circular(16.0),
+                                    onTap: () => model.showUninstallDialog(
+                                      context,
+                                      app,
+                                      false,
+                                    ),
+                                    child: Column(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.center,
+                                      children: <Widget>[
+                                        Icon(
+                                          Icons.delete_outline,
+                                          color: Theme.of(context)
+                                              .colorScheme
+                                              .primary,
+                                        ),
+                                        const SizedBox(height: 10),
+                                        I18nText(
+                                          'appInfoView.uninstallButton',
+                                          child: Text(
+                                            '',
+                                            style: TextStyle(
+                                              color: Theme.of(context)
+                                                  .colorScheme
+                                                  .primary,
+                                              fontWeight: FontWeight.bold,
+                                            ),
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+                                ),
+                              ),
+                              VerticalDivider(
+                                color: Theme.of(context).canvasColor,
+                                indent: 12.0,
+                                endIndent: 12.0,
+                                width: 1.0,
+                              ),
+                              Expanded(
+                                child: Material(
+                                  type: MaterialType.transparency,
+                                  child: InkWell(
+                                    borderRadius: BorderRadius.circular(16.0),
+                                    onTap: () {
+                                      model.navigateToPatcher(app);
+                                      Navigator.of(context).pop();
+                                    },
+                                    child: Column(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.center,
+                                      children: <Widget>[
+                                        Icon(
+                                          Icons.build_outlined,
+                                          color: Theme.of(context)
+                                              .colorScheme
+                                              .primary,
+                                        ),
+                                        const SizedBox(height: 10),
+                                        I18nText(
+                                          'appInfoView.patchButton',
+                                          child: Text(
+                                            '',
+                                            style: TextStyle(
+                                              color: Theme.of(context)
+                                                  .colorScheme
+                                                  .primary,
+                                              fontWeight: FontWeight.bold,
+                                            ),
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+                                ),
+                              ),
+                              if (app.isRooted)
+                                VerticalDivider(
+                                  color: Theme.of(context).canvasColor,
+                                  indent: 12.0,
+                                  endIndent: 12.0,
+                                  width: 1.0,
+                                ),
+                              if (app.isRooted)
+                                Expanded(
+                                  child: Material(
+                                    type: MaterialType.transparency,
+                                    child: InkWell(
+                                      borderRadius: BorderRadius.circular(16.0),
+                                      onTap: () => model.showUninstallDialog(
+                                        context,
+                                        app,
+                                        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,
+                                              ),
+                                            ),
+                                          ),
+                                        ],
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                            ],
+                          ),
                         ),
                       ),
                     ),
                     const SizedBox(height: 20),
                     ListTile(
-                      contentPadding: EdgeInsets.zero,
+                      contentPadding:
+                          const EdgeInsets.symmetric(horizontal: 20.0),
                       title: I18nText(
                         'appInfoView.packageNameLabel',
                         child: const Text(
@@ -226,7 +261,8 @@ class AppInfoView extends StatelessWidget {
                     ),
                     const SizedBox(height: 4),
                     ListTile(
-                      contentPadding: EdgeInsets.zero,
+                      contentPadding:
+                          const EdgeInsets.symmetric(horizontal: 20.0),
                       title: I18nText(
                         'appInfoView.installTypeLabel',
                         child: const Text(
@@ -243,7 +279,8 @@ class AppInfoView extends StatelessWidget {
                     ),
                     const SizedBox(height: 4),
                     ListTile(
-                      contentPadding: EdgeInsets.zero,
+                      contentPadding:
+                          const EdgeInsets.symmetric(horizontal: 20.0),
                       title: I18nText(
                         'appInfoView.patchedDateLabel',
                         child: const Text(
@@ -264,7 +301,8 @@ class AppInfoView extends StatelessWidget {
                     ),
                     const SizedBox(height: 4),
                     ListTile(
-                      contentPadding: EdgeInsets.zero,
+                      contentPadding:
+                          const EdgeInsets.symmetric(horizontal: 20.0),
                       title: I18nText(
                         'appInfoView.appliedPatchesLabel',
                         child: const Text(

lib/ui/widgets/appInfoView/app_info_viewmodel.dart

@@ -20,20 +20,26 @@ class AppInfoViewModel extends BaseViewModel {
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
   final RootAPI _rootAPI = RootAPI();
 
-  Future<void> uninstallApp(PatchedApplication app, bool onlyUnpatch) async {
+  Future<void> uninstallApp(
+    BuildContext context,
+    PatchedApplication app,
+    bool onlyUnpatch,
+  ) async {
+    bool isUninstalled = true;
     if (app.isRooted) {
       bool hasRootPermissions = await _rootAPI.hasRootPermissions();
       if (hasRootPermissions) {
-        _rootAPI.deleteApp(app.packageName, app.apkFilePath);
+        await _rootAPI.deleteApp(app.packageName, app.apkFilePath);
-        _managerAPI.deletePatchedApp(app);
         if (!onlyUnpatch) {
-          DeviceApps.uninstallApp(app.packageName);
+          await DeviceApps.uninstallApp(app.packageName);
         }
       }
     } else {
-      DeviceApps.uninstallApp(app.packageName).then(
+      isUninstalled = await DeviceApps.uninstallApp(app.packageName);
-        (value) => _managerAPI.deletePatchedApp(app),
+    }
-      );
+    if (isUninstalled) {
+      await _managerAPI.deletePatchedApp(app);
+      locator<HomeViewModel>().initialize(context);
     }
   }
 
@@ -87,8 +93,7 @@ class AppInfoViewModel extends BaseViewModel {
               CustomMaterialButton(
                 label: I18nText('yesButton'),
                 onPressed: () {
-                  uninstallApp(app, onlyUnpatch);
+                  uninstallApp(context, app, onlyUnpatch);
-                  locator<HomeViewModel>().initialize(context);
                   Navigator.of(context).pop();
                   Navigator.of(context).pop();
                 },
@@ -97,8 +102,7 @@ class AppInfoViewModel extends BaseViewModel {
           ),
         );
       } else {
-        uninstallApp(app, onlyUnpatch);
+        uninstallApp(context, app, onlyUnpatch);
-        locator<HomeViewModel>().initialize(context);
         Navigator.of(context).pop();
       }
     }

lib/ui/widgets/appSelectorView/app_skeleton_loader.dart

@@ -10,6 +10,7 @@ class AppSkeletonLoader extends StatelessWidget {
     return Skeleton(
       isLoading: true,
       skeleton: ListView.builder(
+        shrinkWrap: true,
         itemCount: 7,
         itemBuilder: (context, index) => Padding(
           padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 8.0),

lib/ui/widgets/appSelectorView/installed_app_item.dart

@@ -6,12 +6,14 @@ class InstalledAppItem extends StatefulWidget {
   final String name;
   final String pkgName;
   final Uint8List icon;
+  final Function()? onTap;
 
   const InstalledAppItem({
     Key? key,
     required this.name,
     required this.pkgName,
     required this.icon,
+    this.onTap,
   }) : super(key: key);
 
   @override
@@ -24,6 +26,7 @@ class _InstalledAppItemState extends State<InstalledAppItem> {
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 4.0),
       child: CustomCard(
+        onTap: widget.onTap,
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: <Widget>[

lib/ui/widgets/patcherView/app_selector_card.dart

@@ -15,61 +15,59 @@ class AppSelectorCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
+    return CustomCard(
       onTap: onPressed,
-      child: CustomCard(
+      child: Column(
-        child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
-          crossAxisAlignment: CrossAxisAlignment.start,
+        children: <Widget>[
-          children: <Widget>[
+          I18nText(
-            I18nText(
+            locator<PatcherViewModel>().selectedApp == null
-              locator<PatcherViewModel>().selectedApp == null
+                ? 'appSelectorCard.widgetTitle'
-                  ? 'appSelectorCard.widgetTitle'
+                : 'appSelectorCard.widgetTitleSelected',
-                  : 'appSelectorCard.widgetTitleSelected',
+            child: const Text(
-              child: const Text(
+              '',
-                '',
+              style: TextStyle(
-                style: TextStyle(
+                fontSize: 18,
-                  fontSize: 18,
+                fontWeight: FontWeight.w500,
-                  fontWeight: FontWeight.w500,
-                ),
               ),
             ),
-            const SizedBox(height: 10),
+          ),
-            locator<PatcherViewModel>().selectedApp == null
+          const SizedBox(height: 10),
-                ? I18nText('appSelectorCard.widgetSubtitle')
+          locator<PatcherViewModel>().selectedApp == null
-                : Row(
+              ? I18nText('appSelectorCard.widgetSubtitle')
-                    children: <Widget>[
+              : Row(
-                      SizedBox(
+                  children: <Widget>[
-                        height: 18.0,
+                    SizedBox(
-                        child: ClipOval(
+                      height: 18.0,
-                          child: Image.memory(
+                      child: ClipOval(
-                            locator<PatcherViewModel>().selectedApp == null
+                        child: Image.memory(
-                                ? Uint8List(0)
+                          locator<PatcherViewModel>().selectedApp == null
-                                : locator<PatcherViewModel>().selectedApp!.icon,
+                              ? Uint8List(0)
-                            fit: BoxFit.cover,
+                              : locator<PatcherViewModel>().selectedApp!.icon,
-                          ),
+                          fit: BoxFit.cover,
                         ),
                       ),
-                      const SizedBox(width: 6),
+                    ),
-                      Text(locator<PatcherViewModel>().getAppSelectionString()),
+                    const SizedBox(width: 6),
-                    ],
+                    Text(locator<PatcherViewModel>().getAppSelectionString()),
-                  ),
+                  ],
-            locator<PatcherViewModel>().selectedApp == null
+                ),
-                ? Container()
+          locator<PatcherViewModel>().selectedApp == null
-                : Column(
+              ? Container()
-                    children: [
+              : Column(
-                      const SizedBox(height: 10),
+                  children: [
-                      Padding(
+                    const SizedBox(height: 10),
-                        padding: const EdgeInsets.only(left: 20),
+                    Padding(
-                        child: Text(
+                      padding: const EdgeInsets.only(left: 20),
-                          locator<PatcherViewModel>()
+                      child: Text(
-                              .getRecommendedVersionString(context),
+                        locator<PatcherViewModel>()
-                          style: const TextStyle(fontStyle: FontStyle.italic),
+                            .getRecommendedVersionString(context),
-                        ),
+                        style: const TextStyle(fontStyle: FontStyle.italic),
                       ),
-                    ],
+                    ),
-                  ),
+                  ],
-          ],
+                ),
-        ),
+        ],
       ),
     );
   }

lib/ui/widgets/patcherView/patch_selector_card.dart

@@ -15,32 +15,30 @@ class PatchSelectorCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
+    return CustomCard(
       onTap: onPressed,
-      child: CustomCard(
+      child: Column(
-        child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
-          crossAxisAlignment: CrossAxisAlignment.start,
+        children: <Widget>[
-          children: <Widget>[
+          I18nText(
-            I18nText(
+            locator<PatcherViewModel>().selectedPatches.isEmpty
-              locator<PatcherViewModel>().selectedPatches.isEmpty
+                ? 'patchSelectorCard.widgetTitle'
-                  ? 'patchSelectorCard.widgetTitle'
+                : 'patchSelectorCard.widgetTitleSelected',
-                  : 'patchSelectorCard.widgetTitleSelected',
+            child: const Text(
-              child: const Text(
+              '',
-                '',
+              style: TextStyle(
-                style: TextStyle(
+                fontSize: 18,
-                  fontSize: 18,
+                fontWeight: FontWeight.w500,
-                  fontWeight: FontWeight.w500,
-                ),
               ),
             ),
-            const SizedBox(height: 10),
+          ),
-            locator<PatcherViewModel>().selectedApp == null
+          const SizedBox(height: 10),
-                ? I18nText('patchSelectorCard.widgetSubtitle')
+          locator<PatcherViewModel>().selectedApp == null
-                : locator<PatcherViewModel>().selectedPatches.isEmpty
+              ? I18nText('patchSelectorCard.widgetSubtitle')
-                    ? I18nText('patchSelectorCard.widgetEmptySubtitle')
+              : locator<PatcherViewModel>().selectedPatches.isEmpty
-                    : Text(_getPatchesSelection()),
+                  ? I18nText('patchSelectorCard.widgetEmptySubtitle')
-          ],
+                  : Text(_getPatchesSelection()),
-        ),
+        ],
       ),
     );
   }

lib/ui/widgets/patchesSelectorView/patch_item.dart

@@ -39,102 +39,98 @@ class _PatchItemState extends State<PatchItem> {
   Widget build(BuildContext context) {
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 4.0),
-      child: InkWell(
+      child: CustomCard(
-        borderRadius: BorderRadius.circular(16),
         onTap: () {
           setState(() => widget.isSelected = !widget.isSelected);
           widget.onChanged(widget.isSelected);
         },
-        child: CustomCard(
+        child: Column(
-          child: Column(
+          children: <Widget>[
-            children: <Widget>[
+            Row(
-              Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: <Widget>[
-                children: <Widget>[
+                Flexible(
-                  Flexible(
+                  child: Column(
-                    child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                    children: <Widget>[
-                      children: <Widget>[
+                      Row(
-                        Row(
+                        crossAxisAlignment: CrossAxisAlignment.end,
-                          crossAxisAlignment: CrossAxisAlignment.end,
+                        children: <Widget>[
-                          children: <Widget>[
+                          Text(
-                            Text(
+                            widget.simpleName,
-                              widget.simpleName,
+                            style: const TextStyle(
-                              style: const TextStyle(
+                              fontSize: 16,
-                                fontSize: 16,
+                              fontWeight: FontWeight.w600,
-                                fontWeight: FontWeight.w600,
-                              ),
                             ),
-                            const SizedBox(width: 4),
+                          ),
-                            Text(widget.version)
+                          const SizedBox(width: 4),
-                          ],
+                          Text(widget.version)
-                        ),
+                        ],
-                        const SizedBox(height: 4),
-                        Text(
-                          widget.description,
-                          softWrap: true,
-                          maxLines: 3,
-                          overflow: TextOverflow.visible,
-                          style: const TextStyle(fontSize: 14),
-                        ),
-                      ],
-                    ),
-                  ),
-                  Transform.scale(
-                    scale: 1.2,
-                    child: Checkbox(
-                      value: widget.isSelected,
-                      activeColor: Theme.of(context).colorScheme.primary,
-                      checkColor:
-                          Theme.of(context).colorScheme.secondaryContainer,
-                      side: BorderSide(
-                        width: 2.0,
-                        color: Theme.of(context).colorScheme.primary,
                       ),
-                      onChanged: (newValue) {
+                      const SizedBox(height: 4),
-                        setState(() => widget.isSelected = newValue!);
+                      Text(
-                        widget.onChanged(widget.isSelected);
+                        widget.description,
-                      },
+                        softWrap: true,
+                        maxLines: 3,
+                        overflow: TextOverflow.visible,
+                        style: const TextStyle(fontSize: 14),
+                      ),
+                    ],
+                  ),
+                ),
+                Transform.scale(
+                  scale: 1.2,
+                  child: Checkbox(
+                    value: widget.isSelected,
+                    activeColor: Theme.of(context).colorScheme.primary,
+                    checkColor:
+                        Theme.of(context).colorScheme.secondaryContainer,
+                    side: BorderSide(
+                      width: 2.0,
+                      color: Theme.of(context).colorScheme.primary,
                     ),
-                  )
+                    onChanged: (newValue) {
-                ],
+                      setState(() => widget.isSelected = newValue!);
-              ),
+                      widget.onChanged(widget.isSelected);
-              widget.isUnsupported
+                    },
-                  ? Row(
+                  ),
-                      children: <Widget>[
+                )
-                        Padding(
+              ],
-                          padding: const EdgeInsets.only(top: 8),
+            ),
-                          child: TextButton.icon(
+            widget.isUnsupported
-                            label:
+                ? Row(
-                                I18nText('patchItem.unsupportedWarningButton'),
+                    children: <Widget>[
-                            icon: const Icon(Icons.warning),
+                      Padding(
-                            onPressed: () => _showUnsupportedWarningDialog(),
+                        padding: const EdgeInsets.only(top: 8),
-                            style: ButtonStyle(
+                        child: TextButton.icon(
-                              shape: MaterialStateProperty.all(
+                          label: I18nText('patchItem.unsupportedWarningButton'),
-                                RoundedRectangleBorder(
+                          icon: const Icon(Icons.warning),
-                                  borderRadius: BorderRadius.circular(12),
+                          onPressed: () => _showUnsupportedWarningDialog(),
-                                  side: BorderSide(
+                          style: ButtonStyle(
-                                    width: 1,
+                            shape: MaterialStateProperty.all(
-                                    color:
+                              RoundedRectangleBorder(
-                                        Theme.of(context).colorScheme.secondary,
+                                borderRadius: BorderRadius.circular(12),
-                                  ),
+                                side: BorderSide(
+                                  width: 1,
+                                  color:
+                                      Theme.of(context).colorScheme.secondary,
                                 ),
                               ),
-                              backgroundColor: MaterialStateProperty.all(
+                            ),
-                                Colors.transparent,
+                            backgroundColor: MaterialStateProperty.all(
-                              ),
+                              Colors.transparent,
-                              foregroundColor: MaterialStateProperty.all(
+                            ),
-                                Theme.of(context).colorScheme.secondary,
+                            foregroundColor: MaterialStateProperty.all(
-                              ),
+                              Theme.of(context).colorScheme.secondary,
                             ),
                           ),
                         ),
-                      ],
+                      ),
-                    )
+                    ],
-                  : Container(),
+                  )
-              widget.child ?? const SizedBox(),
+                : Container(),
-            ],
+            widget.child ?? const SizedBox(),
-          ),
+          ],
         ),
       ),
     );

lib/ui/widgets/settingsView/about_widget.dart

@@ -4,7 +4,9 @@ import 'package:revanced_manager/utils/about_info.dart';
 import 'package:flutter/services.dart';
 
 class AboutWidget extends StatefulWidget {
-  const AboutWidget({Key? key}) : super(key: key);
+  const AboutWidget({Key? key, this.padding}) : super(key: key);
+
+  final EdgeInsetsGeometry? padding;
 
   @override
   State<AboutWidget> createState() => _AboutWidgetState();
@@ -13,28 +15,15 @@ class AboutWidget extends StatefulWidget {
 class _AboutWidgetState extends State<AboutWidget> {
   @override
   Widget build(BuildContext context) {
-    return Padding(
+    return FutureBuilder<Map<String, dynamic>>(
-      padding: const EdgeInsets.symmetric(vertical: 8.0),
+      future: AboutInfo.getInfo(),
-      child: Column(
+      builder: (context, snapshot) {
-        crossAxisAlignment: CrossAxisAlignment.start,
+        return Padding(
-        children: <Widget>[
+          padding: const EdgeInsets.symmetric(vertical: 8.0),
-          I18nText(
+          child: ListTile(
-            'settingsView.aboutLabel',
+            contentPadding: widget.padding ?? EdgeInsets.zero,
-            child: const Text(
+            onLongPress: snapshot.hasData
-              '',
+                ? () {
-              style: TextStyle(
-                fontSize: 20,
-                fontWeight: FontWeight.w500,
-              ),
-            ),
-          ),
-          const SizedBox(height: 4),
-          FutureBuilder<Map<String, dynamic>>(
-            future: AboutInfo.getInfo(),
-            builder: (context, snapshot) {
-              if (snapshot.hasData) {
-                return GestureDetector(
-                  onLongPress: () {
                     Clipboard.setData(
                       ClipboardData(
                         text: 'Version: ${snapshot.data!['version']}\n'
@@ -50,8 +39,20 @@ class _AboutWidgetState extends State<AboutWidget> {
                             Theme.of(context).colorScheme.secondary,
                       ),
                     );
-                  },
+                  }
-                  child: Column(
+                : null,
+            title: I18nText(
+              'settingsView.aboutLabel',
+              child: const Text(
+                '',
+                style: TextStyle(
+                  fontSize: 20,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+            subtitle: snapshot.hasData
+                ? Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: <Widget>[
                       Text(
@@ -90,15 +91,11 @@ class _AboutWidgetState extends State<AboutWidget> {
                         ),
                       ),
                     ],
-                  ),
+                  )
-                );
+                : const SizedBox(),
-              } else {
-                return Container();
-              }
-            },
           ),
-        ],
+        );
-      ),
+      },
     );
   }
 }

lib/ui/widgets/settingsView/custom_switch_tile.dart

@@ -6,6 +6,7 @@ class CustomSwitchTile extends StatelessWidget {
   final Widget subtitle;
   final bool value;
   final Function(bool) onTap;
+  final EdgeInsetsGeometry? padding;
 
   const CustomSwitchTile({
     Key? key,
@@ -13,14 +14,16 @@ class CustomSwitchTile extends StatelessWidget {
     required this.subtitle,
     required this.value,
     required this.onTap,
+    this.padding,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return ListTile(
-      contentPadding: EdgeInsets.zero,
+      contentPadding: padding ?? EdgeInsets.zero,
       title: title,
       subtitle: subtitle,
+      onTap: () => onTap(!value),
       trailing: CustomSwitch(
         value: value,
         onChanged: onTap,

lib/ui/widgets/settingsView/settings_section.dart

@@ -17,7 +17,7 @@ class SettingsSection extends StatelessWidget {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: <Widget>[
         Container(
-          padding: const EdgeInsets.only(top: 16.0, bottom: 10.0),
+          padding: const EdgeInsets.only(top: 16.0, bottom: 10.0, left: 20.0),
           child: I18nText(
             title,
             child: Text(

lib/ui/widgets/settingsView/settings_tile_dialog.dart

@@ -5,18 +5,20 @@ class SettingsTileDialog extends StatelessWidget {
   final String title;
   final String subtitle;
   final Function()? onTap;
+  final EdgeInsetsGeometry? padding;
 
   const SettingsTileDialog({
     Key? key,
     required this.title,
     required this.subtitle,
     required this.onTap,
+    this.padding,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return ListTile(
-      contentPadding: EdgeInsets.zero,
+      contentPadding: padding ?? EdgeInsets.zero,
       title: I18nText(
         title,
         child: const Text(

lib/ui/widgets/settingsView/social_media_item.dart

@@ -0,0 +1,52 @@
+
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class SocialMediaItem extends StatelessWidget {
+  final Widget? icon;
+  final Widget title;
+  final Widget? subtitle;
+  final String? url;
+
+  const SocialMediaItem({
+    Key? key,
+    this.icon,
+    required this.title,
+    this.subtitle,
+    this.url,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16.0)),
+      contentPadding: EdgeInsets.zero,
+      leading: SizedBox(
+        width: 48.0,
+        child: Center(
+          child: icon,
+        ),
+      ),
+      title: DefaultTextStyle(
+        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+              color: Theme.of(context).colorScheme.onSecondaryContainer,
+            ),
+        child: title,
+      ),
+      subtitle: subtitle != null
+          ? DefaultTextStyle(
+              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                    color: Theme.of(context).colorScheme.primary,
+                  ),
+              child: subtitle!,
+            )
+          : null,
+      onTap: () => url != null
+          ? launchUrl(
+              Uri.parse(url!),
+              mode: LaunchMode.externalApplication,
+            )
+          : null,
+    );
+  }
+}

lib/ui/widgets/settingsView/social_media_widget.dart

@@ -2,11 +2,16 @@ import 'package:expandable/expandable.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/social_media_item.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 class SocialMediaWidget extends StatelessWidget {
-  const SocialMediaWidget({Key? key}) : super(key: key);
+  final EdgeInsetsGeometry? padding;
+
+  const SocialMediaWidget({
+    Key? key,
+    this.padding,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -14,11 +19,13 @@ class SocialMediaWidget extends StatelessWidget {
       theme: ExpandableThemeData(
         hasIcon: true,
         iconColor: Theme.of(context).iconTheme.color,
-        iconPadding: const EdgeInsets.symmetric(vertical: 16.0),
+        iconPadding: const EdgeInsets.symmetric(vertical: 16.0)
+            .add(padding ?? EdgeInsets.zero)
+            .resolve(Directionality.of(context)),
         animationDuration: const Duration(milliseconds: 400),
       ),
       header: ListTile(
-        contentPadding: EdgeInsets.zero,
+        contentPadding: padding ?? EdgeInsets.zero,
         title: I18nText(
           'socialMediaCard.widgetTitle',
           child: const Text(
@@ -31,169 +38,52 @@ class SocialMediaWidget extends StatelessWidget {
         ),
         subtitle: I18nText('socialMediaCard.widgetSubtitle'),
       ),
-      expanded: CustomCard(
+      expanded: Padding(
-        child: Column(
+        padding: padding ?? EdgeInsets.zero,
-          children: <Widget>[
+        child: CustomCard(
-            ListTile(
+          child: Column(
-              contentPadding: EdgeInsets.zero,
+            children: const <Widget>[
-              leading: Padding(
+              SocialMediaItem(
-                padding: const EdgeInsets.all(8.0),
+                icon: FaIcon(FontAwesomeIcons.github),
-                child: FaIcon(
+                title: Text('GitHub'),
-                  FontAwesomeIcons.github,
+                subtitle: Text('github.com/revanced'),
-                  color: Theme.of(context).colorScheme.secondary,
+                url: 'https://github.com/revanced',
-                ),
               ),
-              title: Text(
+              SocialMediaItem(
-                'GitHub',
+                icon: FaIcon(FontAwesomeIcons.discord),
-                style: TextStyle(
+                title: Text('Discord'),
-                  color: Theme.of(context).colorScheme.secondary,
+                subtitle: Text('discord.gg/revanced'),
-                ),
+                url: 'https://discord.gg/rF2YcEjcrT',
               ),
-              subtitle: Text(
+              SocialMediaItem(
-                'github.com/revanced',
+                icon: FaIcon(FontAwesomeIcons.telegram),
-                style: TextStyle(
+                title: Text('Telegram'),
-                  color: Theme.of(context).colorScheme.secondary,
+                subtitle: Text('t.me/app_revanced'),
-                ),
+                url: 'https://t.me/app_revanced',
               ),
-              onTap: () => launchUrl(
+              SocialMediaItem(
-                Uri.parse('https://github.com/revanced'),
+                icon: FaIcon(FontAwesomeIcons.reddit),
-                mode: LaunchMode.externalApplication,
+                title: Text('Reddit'),
+                subtitle: Text('r/revancedapp'),
+                url: 'https://reddit.com/r/revancedapp',
               ),
-            ),
+              SocialMediaItem(
-            ListTile(
+                icon: FaIcon(FontAwesomeIcons.twitter),
-              contentPadding: EdgeInsets.zero,
+                title: Text('Twitter'),
-              leading: Padding(
+                subtitle: Text('@revancedapp'),
-                padding: const EdgeInsets.all(8.0).copyWith(left: 5),
+                url: 'https://twitter.com/revancedapp',
-                child: FaIcon(
-                  FontAwesomeIcons.discord,
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
               ),
-              title: Text(
+              SocialMediaItem(
-                'Discord',
+                icon: FaIcon(FontAwesomeIcons.youtube),
-                style: TextStyle(
+                title: Text('YouTube'),
-                  color: Theme.of(context).colorScheme.secondary,
+                subtitle: Text('youtube.com/revanced'),
-                ),
+                url: 'https://youtube.com/revanced',
               ),
-              subtitle: Text(
+            ],
-                'discord.gg/revanced',
+          ),
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-              ),
-              onTap: () => launchUrl(
-                Uri.parse('https://discord.gg/rF2YcEjcrT'),
-                mode: LaunchMode.externalApplication,
-              ),
-            ),
-            ListTile(
-              contentPadding: EdgeInsets.zero,
-              leading: Padding(
-                padding: const EdgeInsets.all(8.0),
-                child: FaIcon(
-                  FontAwesomeIcons.telegram,
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-              ),
-              title: Text(
-                'Telegram',
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-              ),
-              subtitle: Text(
-                't.me/app_revanced',
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-              ),
-              onTap: () => launchUrl(
-                Uri.parse('https://t.me/app_revanced'),
-                mode: LaunchMode.externalApplication,
-              ),
-            ),
-            ListTile(
-              contentPadding: EdgeInsets.zero,
-              leading: Padding(
-                padding: const EdgeInsets.all(8.0),
-                child: FaIcon(
-                  FontAwesomeIcons.reddit,
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-              ),
-              title: Text(
-                'Reddit',
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-              ),
-              subtitle: Text(
-                'r/revancedapp',
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-              ),
-              onTap: () => launchUrl(
-                Uri.parse('https://reddit.com/r/revancedapp'),
-                mode: LaunchMode.externalApplication,
-              ),
-            ),
-            ListTile(
-              contentPadding: EdgeInsets.zero,
-              leading: Padding(
-                padding: const EdgeInsets.all(8.0),
-                child: FaIcon(
-                  FontAwesomeIcons.twitter,
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-              ),
-              title: Text(
-                'Twitter',
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-              ),
-              subtitle: Text(
-                '@revancedapp',
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-              ),
-              onTap: () => launchUrl(
-                Uri.parse('https://twitter.com/revancedapp'),
-                mode: LaunchMode.externalApplication,
-              ),
-            ),
-            ListTile(
-              contentPadding: EdgeInsets.zero,
-              leading: Padding(
-                padding: const EdgeInsets.all(8.0),
-                child: FaIcon(
-                  FontAwesomeIcons.youtube,
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-              ),
-              title: Text(
-                'YouTube',
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-              ),
-              subtitle: Text(
-                'youtube.com/revanced',
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.secondary,
-                ),
-              ),
-              onTap: () => launchUrl(
-                Uri.parse('https://youtube.com/revanced'),
-                mode: LaunchMode.externalApplication,
-              ),
-            ),
-          ],
         ),
       ),
-      collapsed: Container(),
+      collapsed: const SizedBox(),
     );
   }
 }

lib/ui/widgets/shared/application_item.dart

@@ -60,67 +60,68 @@ class _ApplicationItemState extends State<ApplicationItem>
         hasIcon: false,
         animationDuration: Duration(milliseconds: 450),
       ),
-      header: CustomCard(
+      header: Padding(
-        child: Row(
+        padding: const EdgeInsets.only(bottom: 16.0),
-          children: <Widget>[
+        child: CustomCard(
-            SizedBox(
+          onTap: () {
-              width: 40,
+            expController.toggle();
-              child: Image.memory(widget.icon, height: 40, width: 40),
+            _animationController.isCompleted
-            ),
+                ? _animationController.reverse()
-            const SizedBox(width: 4),
+                : _animationController.forward();
-            Padding(
+          },
-              padding: const EdgeInsets.only(left: 15.0),
+          child: Row(
-              child: Column(
+            children: <Widget>[
-                crossAxisAlignment: CrossAxisAlignment.start,
+              SizedBox(
-                children: <Widget>[
+                width: 40,
-                  Text(
+                child: Image.memory(widget.icon, height: 40, width: 40),
-                    widget.name.length > 9
-                        ? '${widget.name.substring(0, 9)}...'
-                        : widget.name,
-                    style: const TextStyle(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w500,
-                    ),
-                  ),
-                  Text(format(widget.patchDate)),
-                ],
               ),
-            ),
+              const SizedBox(width: 4),
-            const Spacer(),
+              Padding(
-            Padding(
+                padding: const EdgeInsets.only(left: 15.0),
-              padding: const EdgeInsets.only(right: 5.0),
+                child: Column(
-              child: RotationTransition(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: <Widget>[
+                    Text(
+                      widget.name.length > 9
+                          ? '${widget.name.substring(0, 9)}...'
+                          : widget.name,
+                      style: const TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                      ),
+                    ),
+                    Text(format(widget.patchDate)),
+                  ],
+                ),
+              ),
+              const Spacer(),
+              RotationTransition(
                 turns:
                     Tween(begin: 0.0, end: 0.50).animate(_animationController),
-                child: IconButton(
+                child: const Padding(
-                  onPressed: () {
+                  padding: EdgeInsets.all(8.0),
-                    expController.toggle();
+                  child: Icon(Icons.arrow_drop_down),
-                    _animationController.isCompleted
-                        ? _animationController.reverse()
-                        : _animationController.forward();
-                  },
-                  icon: const Icon(Icons.arrow_drop_down),
                 ),
               ),
-            ),
+              Column(
-            Column(
+                mainAxisAlignment: MainAxisAlignment.center,
-              mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.end,
-              crossAxisAlignment: CrossAxisAlignment.end,
+                children: <Widget>[
-              children: <Widget>[
+                  CustomMaterialButton(
-                CustomMaterialButton(
+                    label: widget.isUpdatableApp
-                  label: widget.isUpdatableApp
+                        ? I18nText('applicationItem.patchButton')
-                      ? I18nText('applicationItem.patchButton')
+                        : I18nText('applicationItem.infoButton'),
-                      : I18nText('applicationItem.infoButton'),
+                    onPressed: widget.onPressed,
-                  onPressed: widget.onPressed,
+                  ),
-                ),
+                ],
-              ],
+              ),
-            ),
+            ],
-          ],
+          ),
         ),
       ),
-      collapsed: const Text(''),
+      collapsed: const SizedBox(),
       expanded: Padding(
-        padding: const EdgeInsets.symmetric(vertical: 16.0, horizontal: 16.0),
+        padding: const EdgeInsets.all(16.0).copyWith(top: 0.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[

lib/ui/widgets/shared/custom_card.dart

@@ -3,30 +3,33 @@ import 'package:flutter/material.dart';
 class CustomCard extends StatelessWidget {
   final bool isFilled;
   final Widget child;
+  final Function()? onTap;
+  final EdgeInsetsGeometry? padding;
 
   const CustomCard({
     Key? key,
     this.isFilled = true,
     required this.child,
+    this.onTap,
+    this.padding,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return Container(
+    return Material(
-      decoration: BoxDecoration(
+      type: isFilled ? MaterialType.card : MaterialType.transparency,
+      color: isFilled
+          ? Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.4)
+          : Colors.transparent,
+      borderRadius: BorderRadius.circular(16),
+      child: InkWell(
+        onTap: onTap,
         borderRadius: BorderRadius.circular(16),
-        color: isFilled
+        child: Padding(
-            ? Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.40)
+          padding: padding ?? const EdgeInsets.all(20.0),
-            : Colors.transparent,
+          child: child,
-        border: isFilled
+        ),
-            ? null
-            : Border.all(
-                width: 1,
-                color: Theme.of(context).colorScheme.secondary,
-              ),
       ),
-      padding: const EdgeInsets.all(20),
-      child: child,
     );
   }
 }

lib/ui/widgets/shared/custom_sliver_app_bar.dart

@@ -4,12 +4,16 @@ class CustomSliverAppBar extends StatelessWidget {
   final Widget title;
   final List<Widget>? actions;
   final PreferredSizeWidget? bottom;
+  final bool isMainView;
+  final Function()? onBackButtonPressed;
 
   const CustomSliverAppBar({
     Key? key,
     required this.title,
     this.actions,
     this.bottom,
+    this.isMainView = false,
+    this.onBackButtonPressed,
   }) : super(key: key);
 
   @override
@@ -19,16 +23,29 @@ class CustomSliverAppBar extends StatelessWidget {
       snap: false,
       floating: false,
       expandedHeight: 100.0,
-      automaticallyImplyLeading: false,
+      automaticallyImplyLeading: !isMainView,
+      flexibleSpace: FlexibleSpaceBar(
+        titlePadding: EdgeInsets.only(
+          bottom: bottom != null ? 16.0 : 14.0,
+          left: isMainView ? 20.0 : 55.0,
+        ),
+        title: title,
+      ),
+      leading: isMainView
+          ? null
+          : IconButton(
+              icon: Icon(
+                Icons.arrow_back,
+                color: Theme.of(context).textTheme.headline6!.color,
+              ),
+              onPressed:
+                  onBackButtonPressed ?? () => Navigator.of(context).pop(),
+            ),
       backgroundColor: MaterialStateColor.resolveWith(
         (states) => states.contains(MaterialState.scrolledUnder)
             ? Theme.of(context).colorScheme.surface
             : Theme.of(context).canvasColor,
       ),
-      flexibleSpace: FlexibleSpaceBar(
-        titlePadding: const EdgeInsets.only(bottom: 16.0, left: 20.0),
-        title: title,
-      ),
       actions: actions,
       bottom: bottom,
     );

lib/ui/widgets/shared/search_bar.dart

@@ -21,7 +21,7 @@ class SearchBar extends StatefulWidget {
 
 class _SearchBarState extends State<SearchBar> {
   final TextEditingController _textController = TextEditingController();
-  bool _toggleSelectAll = true;
+  bool _toggleSelectAll = false;
 
   @override
   Widget build(BuildContext context) {

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 0.0.14+14
+version: 0.0.19+19
 
 environment:
   sdk: ">=2.17.5 <3.0.0"
@@ -54,7 +54,10 @@ dependencies:
   path_provider: ^2.0.11
   permission_handler: ^10.0.0
   pull_to_refresh: ^2.0.0
-  root: ^2.0.2
+  root:
+    git:
+      url: https://github.com/gokul1630/root
+      ref: main
   share_extend: ^2.0.0
   shared_preferences: ^2.0.15
   skeletons: ^0.0.3
@@ -63,6 +66,7 @@ dependencies:
   stacked_services: ^0.9.3
   stacked_themes: ^0.3.9
   timeago: ^3.2.2
+  timezone: ^0.8.0
   url_launcher: ^6.1.5
   wakelock: ^0.6.2
 

test/widget_test.dart

@@ -1,30 +0,0 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility in the flutter_test package. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:revanced_manager/main.dart';
-
-void main() {
-  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(const MyApp());
-
-    // Verify that our counter starts at 0.
-    expect(find.text('0'), findsOneWidget);
-    expect(find.text('1'), findsNothing);
-
-    // Tap the '+' icon and trigger a frame.
-    await tester.tap(find.byIcon(Icons.add));
-    await tester.pump();
-
-    // Verify that our counter has incremented.
-    expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);
-  });
-}