feat: dialogs correctly follows Material 3 specifications (#1560)

Signed-off-by: validcube <pun.butrach@gmail.com>

lib/ui/widgets/appInfoView/app_info_viewmodel.dart

@@ -12,7 +12,6 @@ import 'package:revanced_manager/services/toast.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/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
 
 class AppInfoViewModel extends BaseViewModel {
@@ -67,12 +66,11 @@ class AppInfoViewModel extends BaseViewModel {
         context: context,
         builder: (context) => AlertDialog(
           title: I18nText('appInfoView.rootDialogTitle'),
-          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
           content: I18nText('appInfoView.rootDialogText'),
           actions: <Widget>[
-            CustomMaterialButton(
-              label: I18nText('okButton'),
+            FilledButton(
               onPressed: () => Navigator.of(context).pop(),
+              child: I18nText('okButton'),
             ),
           ],
         ),
@@ -85,23 +83,21 @@ class AppInfoViewModel extends BaseViewModel {
             title: I18nText(
               'appInfoView.unpatchButton',
             ),
-            backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
             content: I18nText(
               'appInfoView.unpatchDialogText',
             ),
             actions: <Widget>[
-              CustomMaterialButton(
-                isFilled: false,
-                label: I18nText('noButton'),
+              TextButton(
                 onPressed: () => Navigator.of(context).pop(),
+                child: I18nText('noButton'),
               ),
-              CustomMaterialButton(
-                label: I18nText('yesButton'),
+              FilledButton(
                 onPressed: () {
                   uninstallApp(context, app, onlyUnpatch);
                   Navigator.of(context).pop();
                   Navigator.of(context).pop();
                 },
+                child: I18nText('yesButton'),
               ),
             ],
           ),
@@ -131,14 +127,13 @@ class AppInfoViewModel extends BaseViewModel {
       context: context,
       builder: (context) => AlertDialog(
         title: I18nText('appInfoView.appliedPatchesLabel'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: SingleChildScrollView(
           child: Text(getAppliedPatchesString(app.appliedPatches)),
         ),
         actions: <Widget>[
-          CustomMaterialButton(
-            label: I18nText('okButton'),
+          FilledButton(
             onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('okButton'),
           ),
         ],
       ),

lib/ui/widgets/homeView/latest_commit_card.dart

@@ -3,7 +3,6 @@ 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/shared/custom_card.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 
 class LatestCommitCard extends StatefulWidget {
   const LatestCommitCard({
@@ -58,14 +57,14 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
                 initialData: false,
                 builder: (context, snapshot) => Opacity(
                   opacity: snapshot.hasData && snapshot.data! ? 1.0 : 0.25,
-                  child: CustomMaterialButton(
-                    label: I18nText('updateButton'),
+                  child: FilledButton(
                     onPressed: snapshot.hasData && snapshot.data!
                         ? () => widget.model.showUpdateConfirmationDialog(
                               widget.parentContext,
                               false,
                             )
                         : () => {},
+                    child: I18nText('updateButton'),
                   ),
                 ),
               ),
@@ -113,14 +112,14 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
                 initialData: false,
                 builder: (context, snapshot) => Opacity(
                   opacity: snapshot.hasData && snapshot.data! ? 1.0 : 0.25,
-                  child: CustomMaterialButton(
-                    label: I18nText('updateButton'),
+                  child: FilledButton(
                     onPressed: snapshot.hasData && snapshot.data!
                         ? () => widget.model.showUpdateConfirmationDialog(
                               widget.parentContext,
                               true,
                             )
                         : () => {},
+                    child: I18nText('updateButton'),
                   ),
                 ),
               ),

lib/ui/widgets/homeView/update_confirmation_dialog.dart

@@ -3,7 +3,6 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_markdown/flutter_markdown.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/shared/custom_material_button.dart';
 
 class UpdateConfirmationDialog extends StatelessWidget {
   const UpdateConfirmationDialog({super.key, required this.isPatches});
@@ -86,15 +85,14 @@ class UpdateConfirmationDialog extends StatelessWidget {
                             ],
                           ),
                         ),
-                        CustomMaterialButton(
-                          isExpanded: true,
-                          label: I18nText('updateButton'),
+                        FilledButton(
                           onPressed: () {
                             Navigator.of(context).pop();
                             isPatches
                                 ? model.updatePatches(context)
                                 : model.updateManager(context);
                           },
+                          child: I18nText('updateButton'),
                         ),
                       ],
                     ),

lib/ui/widgets/patchesSelectorView/patch_item.dart

@@ -5,7 +5,6 @@ import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 
 // ignore: must_be_immutable
 class PatchItem extends StatefulWidget {
@@ -216,7 +215,6 @@ class _PatchItemState extends State<PatchItem> {
       context: context,
       builder: (context) => AlertDialog(
         title: I18nText('warning'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: I18nText(
           'patchItem.unsupportedDialogText',
           translationParams: {
@@ -226,9 +224,9 @@ class _PatchItemState extends State<PatchItem> {
           },
         ),
         actions: <Widget>[
-          CustomMaterialButton(
-            label: I18nText('okButton'),
+          FilledButton(
             onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('okButton'),
           ),
         ],
       ),
@@ -240,14 +238,13 @@ class _PatchItemState extends State<PatchItem> {
       context: context,
       builder: (context) => AlertDialog(
         title: I18nText('notice'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: I18nText(
           'patchItem.unsupportedRequiredOption',
         ),
         actions: <Widget>[
-          CustomMaterialButton(
-            label: I18nText('okButton'),
+          FilledButton(
             onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('okButton'),
           ),
         ],
       ),

lib/ui/widgets/settingsView/settings_export_section.dart

@@ -3,7 +3,6 @@ import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_manage_keystore_password.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 
 final _settingsViewModel = SettingsViewModel();
 
@@ -151,20 +150,18 @@ class SExportSection extends StatelessWidget {
       context: context,
       builder: (context) => AlertDialog(
         title: I18nText(dialogTitle),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: I18nText(dialogText),
         actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
+          TextButton(
             onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('noButton'),
           ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
+          FilledButton(
             onPressed: () => {
               Navigator.of(context).pop(),
               dialogAction(),
             },
+            child: I18nText('yesButton'),
           ),
         ],
       ),
@@ -176,20 +173,18 @@ class SExportSection extends StatelessWidget {
       context: context,
       builder: (context) => AlertDialog(
         title: I18nText('settingsView.regenerateKeystoreDialogTitle'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
         content: I18nText('settingsView.regenerateKeystoreDialogText'),
         actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
+          TextButton(
             onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('noButton'),
           ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
+          FilledButton(
             onPressed: () => {
               Navigator.of(context).pop(),
               _settingsViewModel.deleteKeystore(),
             },
+            child: I18nText('yesButton'),
           ),
         ],
       ),

lib/ui/widgets/shared/application_item.dart

@@ -3,7 +3,6 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:timeago/timeago.dart';
 
 class ApplicationItem extends StatefulWidget {
@@ -24,7 +23,6 @@ class ApplicationItem extends StatefulWidget {
 }
 
 class _ApplicationItemState extends State<ApplicationItem> {
-
   @override
   void initState() {
     super.initState();
@@ -81,9 +79,9 @@ class _ApplicationItemState extends State<ApplicationItem> {
                   mainAxisAlignment: MainAxisAlignment.center,
                   crossAxisAlignment: CrossAxisAlignment.end,
                   children: <Widget>[
-                    CustomMaterialButton(
-                      label: I18nText('applicationItem.infoButton'),
+                    FilledButton(
                       onPressed: widget.onPressed,
+                      child: I18nText('applicationItem.infoButton'),
                     ),
                   ],
                 ),

lib/ui/widgets/shared/custom_material_button.dart

@@ -1,126 +0,0 @@
-import 'package:flutter/material.dart';
-
-class CustomMaterialButton extends StatelessWidget {
-  const CustomMaterialButton({
-    super.key,
-    required this.label,
-    this.isFilled = true,
-    this.isExpanded = false,
-    required this.onPressed,
-  });
-  final Widget label;
-  final bool isFilled;
-  final bool isExpanded;
-  final Function()? onPressed;
-
-  @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(
-                    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,
-    );
-  }
-}
-
-// ignore: must_be_immutable
-class TimerButton extends StatefulWidget {
-  TimerButton({
-    super.key,
-    required this.seconds,
-    required this.isRunning,
-    required this.onTimerEnd,
-    this.label = const Text(''),
-    this.isFilled = true,
-  });
-  Widget label;
-  bool isFilled;
-  int seconds;
-  final bool isRunning;
-  final Function()? onTimerEnd;
-
-  @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(
-                    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: const TextStyle(
-          fontSize: 16,
-          fontWeight: FontWeight.w600,
-        ),
-      ),
-    );
-  }
-}