Merge pull request #71 from limitedeternity/main

Update popup_dialog.dart
MahanRahmati · May 18, 2022 · 6e9ba19 · 6e9ba19
2 parents 1eb2c95 + 5841a10
commit 6e9ba19
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/lib/src/dialogs/popup_dialog.dart b/lib/src/dialogs/popup_dialog.dart
@@ -87,16 +87,18 @@ class _ArnaPopupDialog extends StatelessWidget {
               child: ClipRRect(
                 borderRadius: Styles.listBorderRadius,
                 child: ArnaScaffold(
-                  headerBarLeading: headerBarLeading,
+                  headerBarLeading: Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: <Widget>[
+                      ArnaTextButton(
+                        label: MaterialLocalizations.of(context).backButtonTooltip,
+                        onPressed: Navigator.of(context).pop,
+                      ),
+                      if (headerBarLeading != null) headerBarLeading!,
+                    ],
+                  ),
                   title: title,
-                  actions: <Widget>[
-                    if (actions != null) ...actions!,
-                    ArnaBorderlessButton(
-                      icon: Icons.close,
-                      onPressed: Navigator.of(context).pop,
-                      tooltipMessage: MaterialLocalizations.of(context).closeButtonTooltip,
-                    )
-                  ],
+                  actions: actions,
                   body: body,
                   isDialog: true,
                 ),
@@ -185,7 +187,7 @@ class _ArnaPopupPage extends StatelessWidget {
         children: <Widget>[
           ArnaIconButton(
             icon: Icons.arrow_back_outlined,
-            onPressed: () => Navigator.pop(context),
+            onPressed: Navigator.of(context).pop,
             tooltipMessage: MaterialLocalizations.of(context).backButtonTooltip,
             semanticLabel: MaterialLocalizations.of(context).backButtonTooltip,
           ),