comment fixes (apache#25255)

akvelon · Feb 7, 2023 · 17b8c42 · 17b8c42
1 parent bc4d930
commit 17b8c42
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 140 deletions.
diff --git a/learning/tour-of-beam/frontend/lib/components/profile/user_menu.dart b/learning/tour-of-beam/frontend/lib/components/profile/user_menu.dart
@@ -129,20 +129,17 @@ class _Buttons extends StatelessWidget {
             closeOverlayCallback();
             showDialog(
               context: context,
-              builder: (context) => Dialog(
-                backgroundColor: Colors.transparent,
-                child: BeamAlertDialog(
-                  body: 'dialogs.deleteAccountWarning'.tr(),
-                  continueLabel: 'ui.deleteMyAccount'.tr(),
-                  title: 'ui.deleteTobAccount'.tr(),
-                  onContinue: () {
-                    authNotifier.deleteAccount().then(
-                      (_) {
-                        Navigator.pop(context);
-                      },
-                    );
-                  },
-                ),
+              builder: (context) => BeamAlertDialog(
+                text: 'dialogs.deleteAccountWarning'.tr(),
+                continueLabel: 'ui.deleteMyAccount'.tr(),
+                title: 'ui.deleteTobAccount'.tr(),
+                onContinue: () {
+                  authNotifier.deleteAccount().then(
+                    (_) {
+                      Navigator.pop(context);
+                    },
+                  );
+                },
               ),
             );
           },

diff --git a/learning/tour-of-beam/frontend/lib/pages/tour/widgets/solution_button.dart b/learning/tour-of-beam/frontend/lib/pages/tour/widgets/solution_button.dart
@@ -47,16 +47,13 @@ class SolutionButton extends StatelessWidget {
           // TODO(nausharipov): resolve the conflict with save user code
           showDialog(
             context: context,
-            builder: (context) => Dialog(
-              backgroundColor: Colors.transparent,
-              child: BeamAlertDialog(
-                continueLabel: 'pages.tour.showSolution'.tr(),
-                title: 'pages.tour.solveYourself'.tr(),
-                onContinue: () {
-                  tourNotifier.toggleShowingSolution();
-                  Navigator.pop(context);
-                },
-              ),
+            builder: (context) => BeamAlertDialog(
+              continueLabel: 'pages.tour.showSolution'.tr(),
+              title: 'pages.tour.solveYourself'.tr(),
+              onContinue: () {
+                tourNotifier.toggleShowingSolution();
+                Navigator.pop(context);
+              },
             ),
           );
         },

diff --git a/playground/frontend/playground_components/assets/translations/en.yaml b/playground/frontend/playground_components/assets/translations/en.yaml
@@ -15,6 +15,9 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+dialogs:
+  cancel: Cancel
+
 errors:
   error: 'Error'
   loading: 'Error while loading.'
@@ -35,7 +38,6 @@ intents:
     reset: 'Reset Code'
 
 widgets:
-
   codeEditor:
     label: 'Code Text Area'
 

diff --git a/playground/frontend/playground_components/lib/src/widgets/dialogs/alert_dialog.dart b/playground/frontend/playground_components/lib/src/widgets/dialogs/alert_dialog.dart
@@ -16,61 +16,64 @@
  * limitations under the License.
  */
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 
 import '../../../playground_components.dart';
 
 class BeamAlertDialog extends StatelessWidget {
-  final String? body;
+  final String? text;
   final String continueLabel;
   final VoidCallback onContinue;
   final String title;
 
   const BeamAlertDialog({
-    this.body,
     required this.continueLabel,
     required this.onContinue,
     required this.title,
+    this.text,
   });
 
   @override
   Widget build(BuildContext context) {
-    return OverlayBody(
-      child: Container(
-        width: BeamSizes.popupWidth,
-        padding: const EdgeInsets.all(BeamSizes.size16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Text(
-              title,
-              style: Theme.of(context).textTheme.headlineMedium,
-            ),
-            if (body != null)
-              Padding(
-                padding: const EdgeInsets.only(top: BeamSizes.size8),
-                child: Text(body!),
+    return Dialog(
+      backgroundColor: Colors.transparent,
+      child: OverlayBody(
+        child: Container(
+          width: BeamSizes.popupWidth,
+          padding: const EdgeInsets.all(BeamSizes.size16),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Text(
+                title,
+                style: Theme.of(context).textTheme.headlineMedium,
               ),
-            const SizedBox(height: BeamSizes.size8),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                TextButton(
-                  onPressed: () {
-                    Navigator.pop(context);
-                  },
-                  // TODO(nausharipov): review: translate in PGC?
-                  child: const Text('Cancel'),
+              if (text != null)
+                Padding(
+                  padding: const EdgeInsets.only(top: BeamSizes.size8),
+                  child: Text(text!),
                 ),
-                const SizedBox(width: BeamSizes.size8),
-                TextButton(
-                  onPressed: onContinue,
-                  child: Text(continueLabel),
-                ),
-              ],
-            ),
-          ],
+              const SizedBox(height: BeamSizes.size8),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.end,
+                children: [
+                  TextButton(
+                    onPressed: () {
+                      Navigator.pop(context);
+                    },
+                    child: const Text('dialogs.cancel').tr(),
+                  ),
+                  const SizedBox(width: BeamSizes.size8),
+                  TextButton(
+                    onPressed: onContinue,
+                    child: Text(continueLabel),
+                  ),
+                ],
+              ),
+            ],
+          ),
         ),
       ),
     );

diff --git a/playground/frontend/playground_components/lib/src/widgets/popups/alert_dialog.dart b/playground/frontend/playground_components/lib/src/widgets/popups/alert_dialog.dart