feat(#636): adapt dialog wrapper

hpi-dhc · Dec 20, 2023 · 783f663 · 783f663
1 parent 6a7743e
commit 783f663
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 43 deletions.
diff --git a/app/lib/common/utilities/drug_utils.dart b/app/lib/common/utilities/drug_utils.dart
@@ -33,9 +33,9 @@ Future<void> updateCachedDrugs() async {
       // ignore: use_build_context_synchronously
       await showAdaptiveDialog(
         context: context,
-        builder: (context) => AdaptiveDialogWrapper(
+        builder: (context) => DialogWrapper(
           title: context.l10n.update_warning_title,
-          content: Text(context.l10n.update_warning_body),
+          content: DialogContentText(context.l10n.update_warning_body),
           actions: [
             DialogAction(
               onPressed: () => Navigator.pop(context),

diff --git a/app/lib/common/widgets/adaptive_dialog.dart → app/lib/common/widgets/dialog_action.dart b/app/lib/common/widgets/adaptive_dialog.dart → app/lib/common/widgets/dialog_action.dart
@@ -2,35 +2,6 @@ import 'package:flutter/cupertino.dart';
 
 import '../module.dart';
 
-class AdaptiveDialogWrapper extends StatelessWidget {
-  const AdaptiveDialogWrapper({
-    super.key,
-    required this.title,
-    required this.content,
-    required this.actions,
-  });
-
-  final String title;
-  final Widget? content;
-  final List<DialogAction> actions;
-
-  @override
-  Widget build(BuildContext context) {
-    final materialContent = getPlatform() == SupportedPlatform.ios
-      ? Card(
-          color: Colors.transparent,
-          elevation: 0,
-          child: content,
-        )
-      : content;
-    return AlertDialog.adaptive(
-      title: Text(title),
-      content: materialContent,
-      actions: actions,
-    );
-  }
-}
-
 class DialogAction extends StatelessWidget {
   const DialogAction({
     super.key,
@@ -63,4 +34,4 @@ class DialogAction extends StatelessWidget {
         );
     }
   }
-}
+}
diff --git a/app/lib/common/widgets/dialog_content_text.dart b/app/lib/common/widgets/dialog_content_text.dart
@@ -0,0 +1,14 @@
+import '../module.dart';
+
+class DialogContentText extends StatelessWidget {
+  const DialogContentText(this.text, {
+    super.key,
+  });
+
+  final String text;
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(text, style: PharMeTheme.textTheme.bodyLarge);
+  }
+}
diff --git a/app/lib/common/widgets/dialog_wrapper.dart b/app/lib/common/widgets/dialog_wrapper.dart
@@ -0,0 +1,30 @@
+import '../module.dart';
+
+class DialogWrapper extends StatelessWidget {
+  const DialogWrapper({
+    super.key,
+    required this.title,
+    required this.content,
+    required this.actions,
+  });
+
+  final String title;
+  final Widget? content;
+  final List<DialogAction> actions;
+
+  @override
+  Widget build(BuildContext context) {
+    final materialContent = getPlatform() == SupportedPlatform.ios
+      ? Card(
+          color: Colors.transparent,
+          elevation: 0,
+          child: content,
+        )
+      : content;
+    return AlertDialog.adaptive(
+      title: Text(title),
+      content: materialContent,
+      actions: actions,
+    );
+  }
+}
diff --git a/app/lib/common/widgets/full_width_button.dart b/app/lib/common/widgets/full_width_button.dart
@@ -19,13 +19,10 @@ class FullWidthButton extends StatelessWidget {
       child: ElevatedButton(
         onPressed: enabled ? action : null,
         style: ButtonStyle(
-          shape: MaterialStateProperty.all<RoundedRectangleBorder>(
-            RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(32),
-            ),
-          ),
+          backgroundColor:
+            MaterialStateProperty.all<Color>(PharMeTheme.primaryColor),
         ),
-        child: Text(text),
+        child: Text(text, style: PharMeTheme.textTheme.bodyLarge),
       ),
     );
   }

diff --git a/app/lib/common/widgets/module.dart b/app/lib/common/widgets/module.dart
@@ -1,6 +1,8 @@
-export 'adaptive_dialog.dart';
 export 'checkbox_list_tile_wrapper.dart';
 export 'context_menu.dart';
+export 'dialog_action.dart';
+export 'dialog_content_text.dart';
+export 'dialog_wrapper.dart';
 export 'drug_list/builder.dart';
 export 'drug_list/cubit.dart';
 export 'headings.dart';

diff --git a/app/lib/drug/widgets/annotation_cards/drug.dart b/app/lib/drug/widgets/annotation_cards/drug.dart
@@ -51,9 +51,11 @@ class DrugAnnotationCard extends StatelessWidget {
                 if (isInhibitor(drug.name)) {
                   showAdaptiveDialog(
                     context: context,
-                    builder: (context) => AdaptiveDialogWrapper(
+                    builder: (context) => DialogWrapper(
                       title: context.l10n.drugs_page_active_warn_header,
-                      content: Text(context.l10n.drugs_page_active_warn),
+                      content: DialogContentText(
+                        context.l10n.drugs_page_active_warn,
+                      ),
                       actions: [
                         DialogAction(
                           onPressed: () => Navigator.pop(context, 'Cancel'),

diff --git a/app/lib/more/pages/more.dart b/app/lib/more/pages/more.dart
@@ -75,12 +75,12 @@ class DeleteDataDialog extends HookWidget {
   Widget build(BuildContext context) {
     final agreedToDeletion = useState(false);
 
-    return AdaptiveDialogWrapper(
+    return DialogWrapper(
       title: context.l10n.settings_page_delete_data,
       content: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          Text(context.l10n.settings_page_delete_data_text),
+          DialogContentText(context.l10n.settings_page_delete_data_text),
           SizedBox(height: PharMeTheme.mediumSpace),
           CheckboxListTileWrapper(
             isChecked: agreedToDeletion.value,