fix: bug "Smooth Simple Button" in "SmoothAlertDialogue". issue #993 (#…

…994) * feat: 🎸 create 'smooth action button' component Specifc button to use in the 'smooth alert dialog'. Created because the 'smooth simple button' creates a render box problem if multiple of them are in a horizontal group. * refactor: 💡 change the action buttons type requirement change from 'smooth simple button' to 'smooth action button' * docs: ✏️ change the action buttons type requirement in the doc * refactor: 💡 change the buttons in the smooth alert dialogues change the buttons to the new type of button requirement * refactor: 💡 remove unused imports * Rename smoot_action_button.dart to smooth_action_button.dart * Update packages/smooth_app/lib/pages/user_preferences_profile.dart * Update packages/smooth_app/lib/pages/product/common/product_dialog_helper.dart * Update packages/smooth_app/lib/pages/product/common/product_list_dialog_helper.dart * Update packages/smooth_app/lib/pages/user_management/sign_up_page.dart * Update packages/smooth_app/lib/pages/user_preferences_settings.dart * Update packages/smooth_app/lib/views/bottom_sheet_views/user_contribution_view.dart * Update packages/smooth_ui_library/lib/dialogs/smooth_alert_dialog.dart * Update packages/smooth_app/lib/widgets/loading_dialog.dart * Update packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart Co-authored-by: Moises Alonso <moises.alonso@codeminer42.com> Co-authored-by: Pierre Slamich <pierre.slamich@gmail.com>
openfoodfacts · Jan 22, 2022 · 8cbca14 · 8cbca14
1 parent d1194ad
commit 8cbca14
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 43 deletions.
diff --git a/packages/smooth_app/lib/pages/product/common/product_dialog_helper.dart b/packages/smooth_app/lib/pages/product/common/product_dialog_helper.dart
@@ -6,7 +6,7 @@ import 'package:smooth_app/database/barcode_product_query.dart';
 import 'package:smooth_app/database/dao_product.dart';
 import 'package:smooth_app/database/local_database.dart';
 import 'package:smooth_app/widgets/loading_dialog.dart';
-import 'package:smooth_ui_library/buttons/smooth_simple_button.dart';
+import 'package:smooth_ui_library/buttons/smooth_action_button.dart';
 import 'package:smooth_ui_library/dialogs/smooth_alert_dialog.dart';
 
 /// Dialog helper for product barcode search
@@ -53,12 +53,12 @@ class ProductDialogHelper {
                   ? AppLocalizations.of(context)!.could_not_refresh
                   : '${AppLocalizations.of(context)!.no_product_found}: $barcode',
             ),
-            actions: <SmoothSimpleButton>[
-              SmoothSimpleButton(
+            actions: <SmoothActionButton>[
+              SmoothActionButton(
                 text: AppLocalizations.of(context)!.close,
                 onPressed: () => Navigator.pop(context),
               ),
-              SmoothSimpleButton(
+              SmoothActionButton(
                 text: AppLocalizations.of(context)!.contribute,
 
                 onPressed: () => Navigator.pop(
@@ -79,8 +79,8 @@ class ProductDialogHelper {
         builder: (BuildContext context) => SmoothAlertDialog(
           close: false,
           body: getErrorMessage(message),
-          actions: <SmoothSimpleButton>[
-            SmoothSimpleButton(
+          actions: <SmoothActionButton>[
+            SmoothActionButton(
               text: AppLocalizations.of(context)!.close,
               onPressed: () => Navigator.pop(context),
             ),

diff --git a/packages/smooth_app/lib/pages/product/common/product_list_dialog_helper.dart b/packages/smooth_app/lib/pages/product/common/product_list_dialog_helper.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:smooth_app/data_models/product_list.dart';
 import 'package:smooth_app/database/dao_product_list.dart';
-import 'package:smooth_ui_library/buttons/smooth_simple_button.dart';
+import 'package:smooth_ui_library/buttons/smooth_action_button.dart';
 import 'package:smooth_ui_library/dialogs/smooth_alert_dialog.dart';
 
 class ProductListDialogHelper {
@@ -28,12 +28,12 @@ class ProductListDialogHelper {
         builder: (BuildContext context) => SmoothAlertDialog(
           close: false,
           body: Text(AppLocalizations.of(context)!.really_clear),
-          actions: <SmoothSimpleButton>[
-            SmoothSimpleButton(
+          actions: <SmoothActionButton>[
+            SmoothActionButton(
               text: AppLocalizations.of(context)!.no,
               onPressed: () => Navigator.pop(context, false),
             ),
-            SmoothSimpleButton(
+            SmoothActionButton(
               text: AppLocalizations.of(context)!.yes,
               onPressed: () async {
                 await daoProductList.clear(productList);

diff --git a/packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart b/packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart
@@ -10,7 +10,7 @@ import 'package:openfoodfacts/openfoodfacts.dart';
 import 'package:openfoodfacts/utils/UnitHelper.dart';
 import 'package:smooth_app/database/product_query.dart';
 import 'package:smooth_app/widgets/loading_dialog.dart';
-import 'package:smooth_ui_library/buttons/smooth_simple_button.dart';
+import 'package:smooth_ui_library/buttons/smooth_action_button.dart';
 import 'package:smooth_ui_library/dialogs/smooth_alert_dialog.dart';
 import 'package:smooth_ui_library/util/ui_helpers.dart';
 
@@ -501,8 +501,8 @@ class _NutritionPageLoadedState extends State<NutritionPageLoaded> {
             leading: const Icon(Icons.error),
             title: Text(status.error!),
           ),
-          actions: <SmoothSimpleButton>[
-            SmoothSimpleButton(
+          actions: <SmoothActionButton>[
+            SmoothActionButton(
               text: AppLocalizations.of(context)!.okay,
               onPressed: () => Navigator.of(context).pop(),
             ),
@@ -515,8 +515,8 @@ class _NutritionPageLoadedState extends State<NutritionPageLoaded> {
       context: context,
       builder: (BuildContext context) => SmoothAlertDialog(
         body: Text(AppLocalizations.of(context)!.nutrition_page_update_done),
-        actions: <SmoothSimpleButton>[
-          SmoothSimpleButton(
+        actions: <SmoothActionButton>[
+          SmoothActionButton(
               text: AppLocalizations.of(context)!.okay,
               onPressed: () => Navigator.of(context).pop()),
         ],

diff --git a/packages/smooth_app/lib/pages/user_management/sign_up_page.dart b/packages/smooth_app/lib/pages/user_management/sign_up_page.dart
@@ -4,7 +4,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:openfoodfacts/openfoodfacts.dart';
 import 'package:smooth_app/helpers/user_management_helper.dart';
 import 'package:smooth_app/widgets/loading_dialog.dart';
-import 'package:smooth_ui_library/buttons/smooth_simple_button.dart';
+import 'package:smooth_ui_library/buttons/smooth_action_button.dart';
 import 'package:smooth_ui_library/dialogs/smooth_alert_dialog.dart';
 import 'package:smooth_ui_library/widgets/smooth_text_form_field.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -300,8 +300,8 @@ class _SignUpPageState extends State<SignUpPage> {
             leading: const Icon(Icons.error),
             title: Text(status.error!),
           ),
-          actions: <SmoothSimpleButton>[
-            SmoothSimpleButton(
+          actions: <SmoothActionButton>[
+            SmoothActionButton(
               text: AppLocalizations.of(context)!.okay,
               onPressed: () => Navigator.of(context).pop(),
             ),
@@ -315,8 +315,8 @@ class _SignUpPageState extends State<SignUpPage> {
       context: context,
       builder: (BuildContext context) => SmoothAlertDialog(
         body: Text(AppLocalizations.of(context)!.sign_up_page_action_ok),
-        actions: <SmoothSimpleButton>[
-          SmoothSimpleButton(
+        actions: <SmoothActionButton>[
+          SmoothActionButton(
               text: AppLocalizations.of(context)!.okay,
               onPressed: () => Navigator.of(context).pop()),
         ],

diff --git a/packages/smooth_app/lib/pages/user_preferences_profile.dart b/packages/smooth_app/lib/pages/user_preferences_profile.dart
@@ -7,7 +7,7 @@ import 'package:smooth_app/helpers/user_management_helper.dart';
 import 'package:smooth_app/pages/abstract_user_preferences.dart';
 import 'package:smooth_app/pages/onboarding/country_selector.dart';
 import 'package:smooth_app/pages/user_management/login_page.dart';
-import 'package:smooth_ui_library/buttons/smooth_simple_button.dart';
+import 'package:smooth_ui_library/buttons/smooth_action_button.dart';
 import 'package:smooth_ui_library/dialogs/smooth_alert_dialog.dart';
 
 /// Collapsed/expanded display of profile for the preferences page.
@@ -165,16 +165,16 @@ class UserPreferencesProfile extends AbstractUserPreferences {
           body: Text(
             localizations.sign_out_confirmation,
           ),
-          actions: <SmoothSimpleButton>[
-            SmoothSimpleButton(
+          actions: <SmoothActionButton>[
+            SmoothActionButton(
               text: localizations.yes,
               onPressed: () async {
                 UserManagementHelper.logout();
                 Navigator.pop(context);
                 setState(() {});
               },
             ),
-            SmoothSimpleButton(
+            SmoothActionButton(
               text: localizations.no,
               onPressed: () {
                 Navigator.pop(context);

diff --git a/packages/smooth_app/lib/pages/user_preferences_settings.dart b/packages/smooth_app/lib/pages/user_preferences_settings.dart
@@ -8,8 +8,8 @@ import 'package:smooth_app/pages/abstract_user_preferences.dart';
 import 'package:smooth_app/themes/smooth_theme.dart';
 import 'package:smooth_app/themes/theme_provider.dart';
 import 'package:smooth_app/views/bottom_sheet_views/user_contribution_view.dart';
+import 'package:smooth_ui_library/buttons/smooth_action_button.dart';
 import 'package:smooth_ui_library/buttons/smooth_main_button.dart';
-import 'package:smooth_ui_library/buttons/smooth_simple_button.dart';
 import 'package:smooth_ui_library/dialogs/smooth_alert_dialog.dart';
 import 'package:smooth_ui_library/widgets/smooth_list_tile.dart';
 import 'package:smooth_ui_library/widgets/smooth_toggle.dart';
@@ -192,8 +192,8 @@ class UserPreferencesSettings extends AbstractUserPreferences {
                     )
                   ],
                 ),
-                actions: <SmoothSimpleButton>[
-                  SmoothSimpleButton(
+                actions: <SmoothActionButton>[
+                  SmoothActionButton(
                     onPressed: () async {
                       showLicensePage(
                         context: context,
@@ -208,7 +208,7 @@ class UserPreferencesSettings extends AbstractUserPreferences {
                     text: appLocalizations.licenses,
                     minWidth: 100,
                   ),
-                  SmoothSimpleButton(
+                  SmoothActionButton(
                     onPressed: () =>
                         Navigator.of(context, rootNavigator: true).pop(),
                     text: appLocalizations.okay,

diff --git a/packages/smooth_app/lib/views/bottom_sheet_views/user_contribution_view.dart b/packages/smooth_app/lib/views/bottom_sheet_views/user_contribution_view.dart
@@ -5,7 +5,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:http/http.dart' as http;
 import 'package:smooth_app/data_models/github_contributors_model.dart';
 import 'package:smooth_app/helpers/launch_url_helper.dart';
-import 'package:smooth_ui_library/buttons/smooth_simple_button.dart';
+import 'package:smooth_ui_library/buttons/smooth_action_button.dart';
 import 'package:smooth_ui_library/dialogs/smooth_alert_dialog.dart';
 import 'package:smooth_ui_library/widgets/smooth_list_tile.dart';
 
@@ -113,8 +113,8 @@ class UserContributionView extends StatelessWidget {
               ),
             ],
           ),
-          actions: <SmoothSimpleButton>[
-            SmoothSimpleButton(
+          actions: <SmoothActionButton>[
+            SmoothActionButton(
               onPressed: () {
                 Navigator.of(context, rootNavigator: true).pop('dialog');
               },
@@ -174,8 +174,8 @@ class UserContributionView extends StatelessWidget {
               )
             ],
           ),
-          actions: <SmoothSimpleButton>[
-            SmoothSimpleButton(
+          actions: <SmoothActionButton>[
+            SmoothActionButton(
               onPressed: () => Navigator.pop(context),
               text: AppLocalizations.of(context)!.okay,
               minWidth: 100,
@@ -202,8 +202,8 @@ class UserContributionView extends StatelessWidget {
               ),
             ],
           ),
-          actions: <SmoothSimpleButton>[
-            SmoothSimpleButton(
+          actions: <SmoothActionButton>[
+            SmoothActionButton(
               onPressed: () => LaunchUrlHelper.launchURL(
                   'https://translate.openfoodfacts.org/', false),
               text:
@@ -272,8 +272,8 @@ class UserContributionView extends StatelessWidget {
               return const CircularProgressIndicator();
             },
           ),
-          actions: <SmoothSimpleButton>[
-            SmoothSimpleButton(
+          actions: <SmoothActionButton>[
+            SmoothActionButton(
               onPressed: () => LaunchUrlHelper.launchURL(
                   'https://github.com/openfoodfacts/smooth-app', false),
               text: AppLocalizations.of(context)!.contribute,

diff --git a/packages/smooth_app/lib/widgets/loading_dialog.dart b/packages/smooth_app/lib/widgets/loading_dialog.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:smooth_ui_library/buttons/smooth_simple_button.dart';
+import 'package:smooth_ui_library/buttons/smooth_action_button.dart';
 import 'package:smooth_ui_library/dialogs/smooth_alert_dialog.dart';
 
 /// Dialog with a stop button, while a future is running.
@@ -62,8 +62,8 @@ class LoadingDialog<T> {
           leading: const CircularProgressIndicator(),
           title: Text(title),
         ),
-        actions: <SmoothSimpleButton>[
-          SmoothSimpleButton(
+        actions: <SmoothActionButton>[
+          SmoothActionButton(
             text: AppLocalizations.of(context)!.stop,
             onPressed: () => _popDialog(context, null),
           ),

diff --git a/packages/smooth_ui_library/lib/buttons/smooth_action_button.dart b/packages/smooth_ui_library/lib/buttons/smooth_action_button.dart
@@ -0,0 +1,37 @@
+import 'package:flutter/material.dart';
+
+class SmoothActionButton extends StatelessWidget {
+  const SmoothActionButton({
+    required this.text,
+    required this.onPressed,
+    this.minWidth = 15,
+    this.height = 20,
+  });
+
+  final String text;
+  final VoidCallback onPressed;
+  final double minWidth;
+  final double height;
+
+  @override
+  Widget build(BuildContext context) {
+    final ThemeData themeData = Theme.of(context);
+    return MaterialButton(
+      color: themeData.colorScheme.primary,
+      child: Padding(
+        padding: const EdgeInsets.all(10),
+        child: Text(
+          text,
+          style: themeData.textTheme.bodyText2!
+              .copyWith(color: themeData.colorScheme.onPrimary),
+        ),
+      ),
+      height: height,
+      minWidth: minWidth,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.all(Radius.circular(15.0)),
+      ),
+      onPressed: () => onPressed(),
+    );
+  }
+}
diff --git a/packages/smooth_ui_library/lib/dialogs/smooth_alert_dialog.dart b/packages/smooth_ui_library/lib/dialogs/smooth_alert_dialog.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:smooth_ui_library/buttons/smooth_simple_button.dart';
+import 'package:smooth_ui_library/buttons/smooth_action_button.dart';
 
 ///
 ///	Open by calling
@@ -25,7 +25,7 @@ class SmoothAlertDialog extends StatelessWidget {
   final bool close;
   final double? height;
   final Widget body;
-  final List<SmoothSimpleButton>? actions;
+  final List<SmoothActionButton>? actions;
 
   @override
   Widget build(BuildContext context) {
@@ -118,6 +118,6 @@ class SmoothAlertDialog extends StatelessWidget {
 ///   final String title;
 ///   final bool close;
 ///   final Widget body;
-///   final List<SmoothSimpleButton> actions;
+///   final List<SmoothActionButton> actions;
 ///   final double height;
 ///