Merge branch 'flutter' of https://github.com/revanced/revanced-manager into flutter

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -20,14 +20,6 @@ body:
         - Other
     validations:
       required: true
-  - type: dropdown
-    attributes:
-      label: Manager Branch
-      options:
-        - Flutter
-        - Compose
-    validations:
-      required: true
   - type: textarea
     attributes:
       label: Bug description
@@ -112,3 +104,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/feature-issue.yml

@@ -12,14 +12,6 @@ body:
         - Other
     validations:
       required: true
-  - type: dropdown
-    attributes:
-      label: Manager Branch
-      options:
-        - Flutter
-        - Compose
-    validations:
-      required: true
   - type: textarea
     attributes:
       label: Issue
@@ -43,4 +35,18 @@ body:
       label: Additional context
       description: Add additional context here.
     validations:
-      required: false
+      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

android/app/build.gradle

@@ -71,7 +71,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // ReVanced
-    implementation "app.revanced:revanced-patcher:5.0.0"
+    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 {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf(
-                        "progress" to 0.1,
-                        "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,
+            try {   
+                val patches = DexPatchBundle(
+                    patchBundleFilePath,
+                    DexClassLoader(
+                        patchBundleFilePath,
                         cacheDirPath,
-                        resourcePatching,
-                        Aapt.binary(applicationContext).absolutePath,
-                        cacheDirPath,
-                        logger = ManagerLogger()
+                        null,
+                        javaClass.classLoader
                     )
-                )
-
-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf("progress" to 0.3, "header" to "", "log" to "")
-                )
-            }
-            if (mergeIntegrations) {
+                ).loadPatches().filter { patch -> selectedPatches.any { it == patch.patchName } }
+                
                 handler.post {
                     installerChannel.invokeMethod(
                         "update",
                         mapOf(
-                            "progress" to 0.4,
-                            "header" to "Merging integrations...",
-                            "log" to "Merging integrations"
+                            "progress" to 0.1,
+                            "header" to "",
+                            "log" to "Copying original apk"
                         )
                     )
                 }
-                patcher.addFiles(listOf(integrations)) {}
-            }
+                originalFile.copyTo(inputFile, true)
 
-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf(
-                        "progress" to 0.5,
-                        "header" to "Applying patches...",
-                        "log" to ""
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to 0.2,
+                            "header" to "Unpacking apk...",
+                            "log" to "Unpacking input apk"
+                        )
                     )
-                )
-            }
-            patcher.addPatches(patches)
-            patcher.applyPatches().forEach { (patch, res) ->
-                if (res.isSuccess) {
-                    val msg = "[success] $patch"
+                }
+                val patcher =
+                    Patcher(
+                        PatcherOptions(
+                            inputFile,
+                            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,
-                                "header" to "",
-                                "log" to msg
+                                "progress" to 0.4,
+                                "header" to "Merging integrations...",
+                                "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 {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf(
-                        "progress" to 0.7,
-                        "header" to "Repacking apk...",
-                        "log" to "Repacking patched apk"
-                    )
-                )
-            }
-            val res = patcher.save()
-            ZipFile(patchedFile).use { file ->
-                res.dexFiles.forEach {
-                    file.addEntryCompressData(
-                        ZipEntry.createWithName(it.name),
-                        it.stream.readBytes()
+                patcher.addPatches(patches)
+                patcher.applyPatches().forEach { (patch, res) ->
+                    if (res.isSuccess) {
+                        val msg = "[success] $patch"
+                        handler.post {
+                            installerChannel.invokeMethod(
+                                "update",
+                                mapOf(
+                                    "progress" to 0.5,
+                                    "header" to "",
+                                    "log" to msg
+                                )
+                            )
+                        }
+                        return@forEach
+                    }
+                    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(
-                    ZipFile(inputFile),
-                    ZipAligner::getEntryAlignment
-                )
-            }
-            handler.post {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf(
-                        "progress" to 0.9,
-                        "header" to "Signing apk...",
-                        "log" to ""
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "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 {
-                installerChannel.invokeMethod(
-                    "update",
-                    mapOf(
-                        "progress" to 1.0,
-                        "header" to "Finished!",
-                        "log" to "Finished!"
+                handler.post {
+                    installerChannel.invokeMethod(
+                        "update",
+                        mapOf(
+                            "progress" to 1.0,
+                            "header" 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

@@ -75,7 +75,9 @@
         "viewTitle": "Select patches",
         "searchBarHint": "Search patches",
         "doneButton": "Done",
-        "noPatchesFound": "No patches found for the selected app"
+        "noPatchesFound": "No patches found for the selected app",
+        "selectAllPatchesWarningTitle": "Warning",
+        "selectAllPatchesWarningContent": "You are about to select all patches, that includes unrecommended patches and can cause unwanted behavior."
     },
     "patchItem": {
         "unsupportedWarningButton": "Unsupported version",

lib/ui/views/home/home_viewmodel.dart

@@ -15,7 +15,7 @@ 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:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
 import 'package:timezone/timezone.dart' as tz;

lib/ui/views/installer/installer_view.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:revanced_manager/ui/views/installer/installer_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/ui/widgets/installerView/gradient_progress_indicator.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_popup_menu.dart';

lib/ui/views/installer/installer_viewmodel.dart

@@ -11,7 +11,7 @@ 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:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 import 'package:wakelock/wakelock.dart';
 
@@ -78,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 (progress == 0.0) {
+    if (value == 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;
@@ -95,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,
@@ -117,12 +126,14 @@ class InstallerViewModel extends BaseViewModel {
           _patches,
         );
       } catch (e) {
-        hasErrors = true;
-        update(-1.0, 'Aborting...', 'An error occurred! Aborting\nError: $e');
+        update(
+          -100.0,
+          'Aborting...',
+          'An error occurred! Aborting\nError:\n$e',
+        );
       }
     } else {
-      hasErrors = true;
-      update(-1.0, 'Aborting...', 'No app or patches selected! Aborting');
+      update(-100.0, 'Aborting...', 'No app or patches selected! Aborting');
     }
     if (FlutterBackground.isBackgroundExecutionEnabled) {
       try {
@@ -132,7 +143,6 @@ class InstallerViewModel extends BaseViewModel {
       }
     }
     await Wakelock.disable();
-    isPatching = false;
   }
 
   void installResult(BuildContext context, bool installAsRoot) async {

lib/ui/views/patcher/patcher_viewmodel.dart

@@ -7,7 +7,7 @@ import 'package:revanced_manager/app/app.router.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 import 'package:stacked_services/stacked_services.dart';
 

lib/ui/views/patches_selector/patches_selector_view.dart

@@ -73,7 +73,12 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
                         _query = searchQuery;
                       });
                     },
-                    onSelectAll: (value) => model.selectAllPatches(value),
+                    onSelectAll: (value) {
+                      if (value) {
+                        model.selectAllPatcherWarning(context);
+                      }
+                      model.selectAllPatches(value);
+                    },
                   ),
                 ),
               ),

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -1,10 +1,13 @@
 import 'package:collection/collection.dart';
+import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
+import 'package:flutter/material.dart';
 
 class PatchesSelectorViewModel extends BaseViewModel {
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
@@ -35,6 +38,23 @@ class PatchesSelectorViewModel extends BaseViewModel {
     notifyListeners();
   }
 
+  Future<void> selectAllPatcherWarning(BuildContext context) {
+    return showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: I18nText('patchesSelectorView.selectAllPatchesWarningTitle'),
+        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+        content: I18nText('patchesSelectorView.selectAllPatchesWarningContent'),
+        actions: <Widget>[
+          CustomMaterialButton(
+            label: I18nText('okButton'),
+            onPressed: () => Navigator.of(context).pop(),
+          )
+        ],
+      ),
+    );
+  }
+
   void selectAllPatches(bool isSelected) {
     selectedPatches.clear();
     if (isSelected) {

lib/ui/views/settings/settings_viewmodel.dart

@@ -10,7 +10,7 @@ import 'package:path_provider/path_provider.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/app/app.router.dart';
 import 'package:revanced_manager/services/manager_api.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
 import 'package:share_extend/share_extend.dart';
 import 'package:stacked/stacked.dart';

lib/ui/widgets/appInfoView/app_info_viewmodel.dart

@@ -11,7 +11,7 @@ import 'package:revanced_manager/services/root_api.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.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:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/utils/string.dart';
 import 'package:stacked/stacked.dart';
 

lib/ui/widgets/homeView/latest_commit_card.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class LatestCommitCard extends StatefulWidget {

lib/ui/widgets/installerView/custom_material_button.dart

@@ -1,49 +0,0 @@
-import 'package:flutter/material.dart';
-
-class CustomMaterialButton extends StatelessWidget {
-  final Widget label;
-  final bool isFilled;
-  final bool isExpanded;
-  final Function()? onPressed;
-
-  const CustomMaterialButton({
-    Key? key,
-    required this.label,
-    this.isFilled = true,
-    this.isExpanded = false,
-    required this.onPressed,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return TextButton(
-      style: ButtonStyle(
-        padding: MaterialStateProperty.all(
-          isExpanded
-              ? const EdgeInsets.symmetric(horizontal: 24, vertical: 12)
-              : const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
-        ),
-        shape: MaterialStateProperty.all(
-          StadiumBorder(
-            side: isFilled
-                ? BorderSide.none
-                : BorderSide(
-                    width: 1,
-                    color: Theme.of(context).colorScheme.primary,
-                  ),
-          ),
-        ),
-        backgroundColor: MaterialStateProperty.all(
-          isFilled ? Theme.of(context).colorScheme.primary : Colors.transparent,
-        ),
-        foregroundColor: MaterialStateProperty.all(
-          isFilled
-              ? Theme.of(context).colorScheme.surface
-              : Theme.of(context).colorScheme.primary,
-        ),
-      ),
-      onPressed: onPressed,
-      child: label,
-    );
-  }
-}

lib/ui/widgets/patchesSelectorView/patch_item.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 // ignore: must_be_immutable
@@ -147,7 +147,7 @@ class _PatchItemState extends State<PatchItem> {
           translationParams: {
             'packageVersion': widget.packageVersion,
             'supportedVersions':
-                '\u2022 ${widget.supportedPackageVersions.join('\n\u2022 ')}',
+                '\u2022 ${widget.supportedPackageVersions.reversed.join('\n\u2022 ')}',
           },
         ),
         actions: <Widget>[

lib/ui/widgets/shared/application_item.dart

@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
-import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:expandable/expandable.dart';
 import 'package:timeago/timeago.dart';

lib/ui/widgets/shared/custom_material_button.dart

@@ -0,0 +1,129 @@
+import 'package:flutter/material.dart';
+
+class CustomMaterialButton extends StatelessWidget {
+  final Widget label;
+  final bool isFilled;
+  final bool isExpanded;
+  final Function()? onPressed;
+
+  const CustomMaterialButton({
+    Key? key,
+    required this.label,
+    this.isFilled = true,
+    this.isExpanded = false,
+    required this.onPressed,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return TextButton(
+      style: ButtonStyle(
+        padding: MaterialStateProperty.all(
+          isExpanded
+              ? const EdgeInsets.symmetric(horizontal: 24, vertical: 12)
+              : const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+        ),
+        shape: MaterialStateProperty.all(
+          StadiumBorder(
+            side: isFilled
+                ? BorderSide.none
+                : BorderSide(
+                    width: 1,
+                    color: Theme.of(context).colorScheme.primary,
+                  ),
+          ),
+        ),
+        backgroundColor: MaterialStateProperty.all(
+          isFilled ? Theme.of(context).colorScheme.primary : Colors.transparent,
+        ),
+        foregroundColor: MaterialStateProperty.all(
+          isFilled
+              ? Theme.of(context).colorScheme.surface
+              : Theme.of(context).colorScheme.primary,
+        ),
+      ),
+      onPressed: onPressed,
+      child: label,
+    );
+  }
+}
+
+class TimerButton extends StatefulWidget {
+  Widget label;
+  bool isFilled;
+  int seconds;
+  final bool isRunning;
+  final Function()? onTimerEnd;
+
+  TimerButton({
+    Key? key,
+    required this.seconds,
+    required this.isRunning,
+    required this.onTimerEnd,
+    this.label = const Text(''),
+    this.isFilled = true,
+  }) : super(key: key);
+
+  @override
+  State<TimerButton> createState() => _TimerButtonState();
+}
+
+class _TimerButtonState extends State<TimerButton> {
+  void timer(int seconds) {
+    Future.delayed(const Duration(seconds: 1), () {
+      if (seconds > 0) {
+        setState(() {
+          seconds--;
+        });
+        timer(seconds);
+      } else {
+        widget.onTimerEnd!();
+      }
+    });
+  }
+
+  @override
+  void initState() {
+    //decrement seconds
+    if (widget.isRunning) {
+      timer(widget.seconds);
+    }
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext build) {
+    return TextButton(
+      style: ButtonStyle(
+        shape: MaterialStateProperty.all(
+          StadiumBorder(
+            side: widget.isFilled
+                ? BorderSide.none
+                : BorderSide(
+                    width: 1,
+                    color: Theme.of(context).colorScheme.primary,
+                  ),
+          ),
+        ),
+        backgroundColor: MaterialStateProperty.all(
+          widget.isFilled
+              ? Theme.of(context).colorScheme.primary
+              : Colors.transparent,
+        ),
+        foregroundColor: MaterialStateProperty.all(
+          widget.isFilled
+              ? Theme.of(context).colorScheme.surface
+              : Theme.of(context).colorScheme.primary,
+        ),
+      ),
+      onPressed: widget.isRunning ? null : widget.onTimerEnd,
+      child: Text(
+        widget.isRunning ? '${widget.seconds}' : 'Install',
+        style: TextStyle(
+          fontSize: 16,
+          fontWeight: FontWeight.w600,
+        ),
+      ),
+    );
+  }
+}

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 0.0.18+18
+version: 0.0.21+21
 
 environment:
   sdk: ">=2.17.5 <3.0.0"