Merge branch 'dev' into feat/patch-options

docs/2_1_patching.md

@@ -11,12 +11,12 @@ The following pages will guide you through using ReVanced Manager to patch apps.
 4. Tap on the **Select patches** card and select the patches you want to apply[^2]
    > **Warning**: If you see a warning you can click on it for more information.
 5. Tap on the **Done** then **Patch** button
-   > **Warning**: The patching process may take ~5 minutes. Exiting the app may increase the time it takes to patch.
+   > **Warning**: The patching process may take ~5 minutes. Exiting the app may cancel patching or increase the time it takes to patch.
 6. Tap on the **Install** button
    > **Note**: If you are rooted, you can mount the patched app on top of the original app.[^3]
-   > Optionally, you may export the patched app to storage using the options in the top right corner.
+   > Optionally, you may export the patched app to storage using the option in the bottom left corner.
 
-[^1]: Non-root users may be prompted to select an APK from storage, in which case you have to source the APK file yourself. ReVanced does not provide any APK files.
+[^1]: Non-root users may be prompted to select an APK from storage, in which case you must source the APK file yourself. ReVanced does not provide any APK files.
 [^2]: It is suggested to use the default set of patches by tapping on the **Default** button above the list of patches.
 [^3]: Mounting the patched app on top of the original app will only work if the installed app version matches the version of the app selected in step 3. above.
 

docs/3_troubleshooting.md

@@ -6,7 +6,7 @@ In case you encounter any issues while using ReVanced Manager, please refer to t
 
   Make sure ReVanced Manager is up to date by following [🔄 Updating ReVanced Manager](2_3_updating.md) and select the **Default** button when choosing patches.
 
-- 💥 App not installed as package conflicts with an existing package
+- 🚫 App not installed as package conflicts with an existing package
 
   An existing installation of the app you're trying to patch is conflicting with the patched app. Uninstall the existing app before installing the patched app.
 
@@ -16,10 +16,6 @@ In case you encounter any issues while using ReVanced Manager, please refer to t
 
   Alternatively, you can use [ReVanced CLI](https://github.com/revanced/revanced-cli) to patch the app.
 
-- 🚫 Non-root install is not possible with the current patches selection
-
-  Select the **Default** button when choosing patches.
-
 - 🚨 Patched app crashes on launch
 
   Select the **Default** button when choosing patches.

lib/ui/widgets/patcherView/patch_selector_card.dart

@@ -58,7 +58,9 @@ class PatchSelectorCard extends StatelessWidget {
 
   String _getPatchesSelection() {
     String text = '';
-    for (final Patch p in locator<PatcherViewModel>().selectedPatches) {
+    final List<Patch> selectedPatches = locator<PatcherViewModel>().selectedPatches;
+    selectedPatches.sort((a, b) => a.name.compareTo(b.name));
+    for (final Patch p in selectedPatches) {
       text += '•  ${p.getSimpleName()}\n';
     }
     return text.substring(0, text.length - 1);