From cceefdf3978929da7f34782829fb871b42e29569 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Fri, 30 Apr 2021 18:51:38 +0200
Subject: [PATCH] Use material translations for common words

---
 lib/helpers/ui.dart                               | 4 ++--
 lib/l10n/app_en.arb                               | 4 ----
 lib/widgets/nutrition/nutritional_plans_list.dart | 2 +-
 lib/widgets/workouts/day.dart                     | 2 +-
 lib/widgets/workouts/workout_plans_list.dart      | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/helpers/ui.dart b/lib/helpers/ui.dart
index fc16db87..4c4a214b 100644
--- a/lib/helpers/ui.dart
+++ b/lib/helpers/ui.dart
@@ -34,7 +34,7 @@ void showErrorDialog(dynamic exception, BuildContext context) {
       content: Text(exception.toString()),
       actions: [
         TextButton(
-          child: Text(AppLocalizations.of(context)!.dismiss),
+          child: Text(MaterialLocalizations.of(context).closeButtonLabel),
           onPressed: () {
             Navigator.of(ctx).pop();
           },
@@ -76,7 +76,7 @@ void showHttpExceptionErrorDialog(WgerHttpException exception, BuildContext cont
       ),
       actions: [
         TextButton(
-          child: Text(AppLocalizations.of(context)!.dismiss),
+          child: Text(MaterialLocalizations.of(context).closeButtonLabel),
           onPressed: () {
             Navigator.of(ctx).pop();
           },
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 5cc1e15c..6b5a99f8 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -188,8 +188,6 @@
   "@description": {},
   "save": "Save",
   "@save": {},
-  "cancel": "Cancel",
-  "@cancel": {},
   "addSet": "Add set",
   "@addSet": {
     "description": "Label for the button that adds a set (to a workout day)"
@@ -214,8 +212,6 @@
   },
   "anErrorOccurred": "An Error Occurred!",
   "@anErrorOccurred": {},
-  "dismiss": "Dismiss",
-  "@dismiss": {},
   "weight": "Weight",
   "@weight": {
     "description": "The weight of a workout log or body weight entry"
diff --git a/lib/widgets/nutrition/nutritional_plans_list.dart b/lib/widgets/nutrition/nutritional_plans_list.dart
index 88d70821..e55f2176 100644
--- a/lib/widgets/nutrition/nutritional_plans_list.dart
+++ b/lib/widgets/nutrition/nutritional_plans_list.dart
@@ -46,7 +46,7 @@ class NutritionalPlansList extends StatelessWidget {
                     ),
                     actions: [
                       TextButton(
-                        child: Text(AppLocalizations.of(context)!.cancel),
+                        child: Text(MaterialLocalizations.of(context).cancelButtonLabel),
                         onPressed: () => Navigator.of(contextDialog).pop(),
                       ),
                       TextButton(
diff --git a/lib/widgets/workouts/day.dart b/lib/widgets/workouts/day.dart
index 76ebe9dc..c7902331 100644
--- a/lib/widgets/workouts/day.dart
+++ b/lib/widgets/workouts/day.dart
@@ -61,7 +61,7 @@ class SettingWidget extends StatelessWidget {
                 content: ExerciseDetail(setting.exerciseObj),
                 actions: [
                   TextButton(
-                    child: Text(AppLocalizations.of(context)!.dismiss),
+                    child: Text(MaterialLocalizations.of(context).closeButtonLabel),
                     onPressed: () {
                       Navigator.of(context).pop();
                     },
diff --git a/lib/widgets/workouts/workout_plans_list.dart b/lib/widgets/workouts/workout_plans_list.dart
index 75fcbfc7..f6612a84 100644
--- a/lib/widgets/workouts/workout_plans_list.dart
+++ b/lib/widgets/workouts/workout_plans_list.dart
@@ -48,7 +48,7 @@ class WorkoutPlansList extends StatelessWidget {
                     ),
                     actions: [
                       TextButton(
-                        child: Text(AppLocalizations.of(context)!.cancel),
+                        child: Text(MaterialLocalizations.of(context).cancelButtonLabel),
                         onPressed: () => Navigator.of(contextDialog).pop(),
                       ),
                       TextButton(