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

Signed-off-by: validcube <pun.butrach@gmail.com>
2026-01-11 13:46:17 +00:00 · 2023-12-22 20:34:03 +07:00
parent c06d15de5f
commit f8d086a743
21 changed files with 135 additions and 333 deletions
--- a/lib/ui/views/settings/settingsFragment/settings_manage_api_url.dart
+++ b/lib/ui/views/settings/settingsFragment/settings_manage_api_url.dart
@@ -7,7 +7,6 @@ import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';

 class SManageApiUrl extends BaseViewModel {
@@ -33,7 +32,6 @@ class SManageApiUrl extends BaseViewModel {
            ),
          ],
        ),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
        content: SingleChildScrollView(
          child: Column(
            children: <Widget>[
@@ -51,16 +49,14 @@ class SManageApiUrl extends BaseViewModel {
          ),
        ),
        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('cancelButton'),
+          TextButton(
            onPressed: () {
              _apiUrlController.clear();
              Navigator.of(context).pop();
            },
+            child: I18nText('cancelButton'),
          ),
-          CustomMaterialButton(
-            label: I18nText('okButton'),
+          FilledButton(
            onPressed: () {
              String apiUrl = _apiUrlController.text;
              if (!apiUrl.startsWith('https')) {
@@ -70,6 +66,7 @@ class SManageApiUrl extends BaseViewModel {
              _toast.showBottom('settingsView.restartAppForChanges');
              Navigator.of(context).pop();
            },
+            child: I18nText('okButton'),
          ),
        ],
      ),
@@ -81,16 +78,13 @@ class SManageApiUrl extends BaseViewModel {
      context: context,
      builder: (context) => AlertDialog(
        title: I18nText('settingsView.sourcesResetDialogTitle'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
        content: I18nText('settingsView.apiURLResetDialogText'),
        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
+          TextButton(
            onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('noButton'),
          ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
+          FilledButton(
            onPressed: () {
              _managerAPI.setApiUrl('');
              _toast.showBottom('settingsView.restartAppForChanges');
@@ -98,6 +92,7 @@ class SManageApiUrl extends BaseViewModel {
                ..pop()
                ..pop();
            },
+            child: I18nText('yesButton'),
          ),
        ],
      ),
--- a/lib/ui/views/settings/settingsFragment/settings_manage_keystore_password.dart
+++ b/lib/ui/views/settings/settingsFragment/settings_manage_keystore_password.dart
@@ -6,7 +6,6 @@ import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';

 class SManageKeystorePassword extends BaseViewModel {
@@ -33,7 +32,6 @@ class SManageKeystorePassword extends BaseViewModel {
            ),
          ],
        ),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
        content: SingleChildScrollView(
          child: Column(
            children: <Widget>[
@@ -47,21 +45,20 @@ class SManageKeystorePassword extends BaseViewModel {
          ),
        ),
        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('cancelButton'),
+          TextButton(
            onPressed: () {
              _keystorePasswordController.clear();
              Navigator.of(context).pop();
            },
+            child: I18nText('cancelButton'),
          ),
-          CustomMaterialButton(
-            label: I18nText('okButton'),
+          FilledButton(
            onPressed: () {
              final String passwd = _keystorePasswordController.text;
              _managerAPI.setKeystorePassword(passwd);
              Navigator.of(context).pop();
            },
+            child: I18nText('okButton'),
          ),
        ],
      ),
--- a/lib/ui/views/settings/settingsFragment/settings_manage_sources.dart
+++ b/lib/ui/views/settings/settingsFragment/settings_manage_sources.dart
@@ -7,7 +7,6 @@ import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_tile_dialog.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';

 class SManageSources extends BaseViewModel {
@@ -43,7 +42,6 @@ class SManageSources extends BaseViewModel {
            ),
          ],
        ),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
        content: SingleChildScrollView(
          child: Column(
            children: <Widget>[
@@ -107,9 +105,7 @@ class SManageSources extends BaseViewModel {
          ),
        ),
        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('cancelButton'),
+          TextButton(
            onPressed: () {
              _orgPatSourceController.clear();
              _patSourceController.clear();
@@ -117,9 +113,9 @@ class SManageSources extends BaseViewModel {
              _intSourceController.clear();
              Navigator.of(context).pop();
            },
+            child: I18nText('cancelButton'),
          ),
-          CustomMaterialButton(
-            label: I18nText('okButton'),
+          FilledButton(
            onPressed: () {
              _managerAPI.setRepoUrl(_hostSourceController.text.trim());
              _managerAPI.setPatchesRepo(
@@ -133,6 +129,7 @@ class SManageSources extends BaseViewModel {
              _toast.showBottom('settingsView.restartAppForChanges');
              Navigator.of(context).pop();
            },
+            child: I18nText('okButton'),
          ),
        ],
      ),
@@ -144,16 +141,13 @@ class SManageSources extends BaseViewModel {
      context: context,
      builder: (context) => AlertDialog(
        title: I18nText('settingsView.sourcesResetDialogTitle'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
        content: I18nText('settingsView.sourcesResetDialogText'),
        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('noButton'),
+          TextButton(
            onPressed: () => Navigator.of(context).pop(),
+            child: I18nText('noButton'),
          ),
-          CustomMaterialButton(
-            label: I18nText('yesButton'),
+          FilledButton(
            onPressed: () {
              _managerAPI.setRepoUrl('');
              _managerAPI.setPatchesRepo('');
@@ -165,6 +159,7 @@ class SManageSources extends BaseViewModel {
                ..pop()
                ..pop();
            },
+            child: I18nText('yesButton'),
          ),
        ],
      ),
--- a/lib/ui/views/settings/settingsFragment/settings_update_language.dart
+++ b/lib/ui/views/settings/settingsFragment/settings_update_language.dart
@@ -51,7 +51,6 @@ class SUpdateLanguage extends BaseViewModel {
      context: parentContext,
      builder: (context) => SimpleDialog(
        title: I18nText('settingsView.languageLabel'),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
        children: [
          SizedBox(
            height: 500,
--- a/lib/ui/views/settings/settingsFragment/settings_update_theme.dart
+++ b/lib/ui/views/settings/settingsFragment/settings_update_theme.dart
@@ -7,7 +7,6 @@ import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
-import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';

 class SUpdateThemeUI extends StatefulWidget {
  const SUpdateThemeUI({super.key});
@@ -36,9 +35,9 @@ class _SUpdateThemeUIState extends State<SUpdateThemeUI> {
              ),
            ),
          ),
-          trailing: CustomMaterialButton(
-            label: getThemeModeName(),
+          trailing: FilledButton(
            onPressed: () => {showThemeDialog(context)},
+            child: getThemeModeName(),
          ),
          onTap: () => {showThemeDialog(context)},
        ),
@@ -122,7 +121,6 @@ class _SUpdateThemeUIState extends State<SUpdateThemeUI> {
        title: I18nText('settingsView.themeModeLabel'),
        icon: const Icon(Icons.palette),
        contentPadding: const EdgeInsets.symmetric(vertical: 16),
-        backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
        content: SingleChildScrollView(
          child: ValueListenableBuilder(
            valueListenable: newTheme,
@@ -164,19 +162,18 @@ class _SUpdateThemeUIState extends State<SUpdateThemeUI> {
          ),
        ),
        actions: <Widget>[
-          CustomMaterialButton(
-            isFilled: false,
-            label: I18nText('cancelButton'),
+          TextButton(
            onPressed: () {
              Navigator.of(context).pop();
            },
+            child: I18nText('cancelButton'),
          ),
-          CustomMaterialButton(
-            label: I18nText('okButton'),
+          FilledButton(
            onPressed: () {
              setThemeMode(context, newTheme.value);
              Navigator.of(context).pop();
            },
+            child: I18nText('okButton'),
          ),
        ],
      ),