Reviewed changes: code and code style ammended to comply with best practices

switch statements tightened, appropriate text widget for adative action, use defaultTargetPlatform instead of context, comments fixed

Author: u7088495

lib/widgets/dialog.dart

@@ -1,8 +1,9 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/zulip_localizations.dart';
+import 'package:flutter/foundation.dart';
 
-Widget _dialogActionText(String text) {
+Widget _materialDialogActionText(String text) {
   return Text(
     text,
 
@@ -16,29 +17,19 @@ Widget _dialogActionText(String text) {
   );
 }
 
-/// Sets the dialog action to be platform appropriate
-/// by displaying a [CupertinoDialogAction] for IOS platforms
-/// and a regular [TextButton] otherwise.
-Widget _adaptiveAction(
-      {required BuildContext context,
-      required VoidCallback onPressed,
-      required Widget child}) {
-    final ThemeData theme = Theme.of(context);
-    switch (theme.platform) {
-      case TargetPlatform.android:
-        return TextButton(onPressed: onPressed, child: child);
-      case TargetPlatform.fuchsia:
-      return TextButton(onPressed: onPressed, child: child);
-      case TargetPlatform.linux:
-        return TextButton(onPressed: onPressed, child: child);
-      case TargetPlatform.windows:
-        return TextButton(onPressed: onPressed, child: child);
-      case TargetPlatform.iOS:
-        return CupertinoDialogAction(onPressed: onPressed, child: child);
-      case TargetPlatform.macOS:
-        return CupertinoDialogAction(onPressed: onPressed, child: child);
-    }
+/// A platform-appropriate action for [AlertDialog.adaptive]'s [actions] param.
+Widget _adaptiveAction({required VoidCallback onPressed, required String text}) {
+  switch (defaultTargetPlatform) {
+    case TargetPlatform.android:
+    case TargetPlatform.fuchsia:
+    case TargetPlatform.linux:
+    case TargetPlatform.windows:
+      return TextButton(onPressed: onPressed, child: _materialDialogActionText(text));
+    case TargetPlatform.iOS:
+    case TargetPlatform.macOS:
+      return CupertinoDialogAction(onPressed: onPressed, child: Text(text));
   }
+}
 
 /// Tracks the status of a dialog, in being still open or already closed.
 ///
@@ -72,9 +63,8 @@ DialogStatus showErrorDialog({
       content: message != null ? SingleChildScrollView(child: Text(message)) : null,
       actions: [
         _adaptiveAction(
-          context: context,
           onPressed: () => Navigator.pop(context),
-          child: _dialogActionText(zulipLocalizations.errorDialogContinue)),
+          text: zulipLocalizations.errorDialogContinue),
       ]));
   return DialogStatus(future);
 }
@@ -94,12 +84,10 @@ void showSuggestedActionDialog({
       content: SingleChildScrollView(child: Text(message)),
       actions: [
         _adaptiveAction(
-          context: context,
           onPressed: () => Navigator.pop(context),
-          child: _dialogActionText(zulipLocalizations.dialogCancel)),
+          text: zulipLocalizations.dialogCancel),
         _adaptiveAction(
-          context: context,
           onPressed: onActionButtonPress,
-          child: _dialogActionText(actionButtonText ?? zulipLocalizations.dialogContinue)),
+          text: actionButtonText ?? zulipLocalizations.dialogContinue),
       ]));
 }

pubspec.lock

@@ -315,7 +315,7 @@ packages:
     dependency: transitive
     description:
       name: file
-      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
       url: "https://pub.dev"
     source: hosted
     version: "7.0.1"

test/widgets/dialog_checks.dart

@@ -9,40 +9,39 @@ import 'package:flutter_test/flutter_test.dart';
 /// and, optionally, matching an expected message. Fails if none is found.
 ///
 /// On success, returns the widget's "OK" button
-/// (which is a [CupertinoDialogAction] for OS platforms).
 /// 
 /// Dismiss the dialog by calling `tester.tap(find.byWidget(okButton))`.
 Widget checkErrorDialog(WidgetTester tester, {
   required String expectedTitle,
   String? expectedMessage,
 }) {
-  if (defaultTargetPlatform == TargetPlatform.iOS 
-    || defaultTargetPlatform == TargetPlatform.macOS) {
-        
-    final dialog = tester.widget<CupertinoAlertDialog>(find.byType(CupertinoAlertDialog));
-
-    tester.widget(find.descendant(matchRoot: true,
-    of: find.byWidget(dialog.title!), matching: find.text(expectedTitle)));
-
-    if (expectedMessage != null) {
-      tester.widget(find.descendant(matchRoot: true,
-        of: find.byWidget(dialog.content!), matching: find.text(expectedMessage)));
+  switch (defaultTargetPlatform) {
+    case TargetPlatform.android:
+    case TargetPlatform.fuchsia:
+    case TargetPlatform.linux:
+    case TargetPlatform.windows: {
+      final dialog = tester.widget<Dialog>(find.byType(Dialog));
+      tester.widget(find.widgetWithText(Dialog, expectedTitle));
+      if (expectedMessage != null) {
+        tester.widget(find.widgetWithText(Dialog, expectedMessage));
+      }
+      return tester.widget(
+        find.descendant(of: find.byWidget(dialog),
+          matching: find.widgetWithText(TextButton, 'OK')));
     }
-
-    return tester.widget(
-      find.descendant(of: find.byWidget(dialog),
+    case TargetPlatform.iOS:
+    case TargetPlatform.macOS: {
+      final dialog = tester.widget<CupertinoAlertDialog>(
+        find.byType(CupertinoAlertDialog));
+      tester.widget(find.descendant(matchRoot: true,
+        of: find.byWidget(dialog.title!), matching: find.text(expectedTitle)));
+      if (expectedMessage != null) {
+        tester.widget(find.descendant(matchRoot: true,
+          of: find.byWidget(dialog.content!), matching: find.text(expectedMessage)));
+      }
+      return tester.widget(find.descendant(of: find.byWidget(dialog),
         matching: find.widgetWithText(CupertinoDialogAction, 'OK')));
-
-  } 
-  else {
-    final dialog = tester.widget<Dialog>(find.byType(Dialog));
-    tester.widget(find.widgetWithText(Dialog, expectedTitle));
-    if (expectedMessage != null) {
-      tester.widget(find.widgetWithText(Dialog, expectedMessage));
     }
-    return tester.widget(
-      find.descendant(of: find.byWidget(dialog),
-        matching: find.widgetWithText(TextButton, 'OK')));
   }
 
 }