Fix consistency of close button, related to #550

LinwoodDev · Dec 15, 2023 · e5455f5 · e5455f5
1 parent 44577e6
commit e5455f5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/app/lib/dialogs/area/dialog.dart b/app/lib/dialogs/area/dialog.dart
@@ -21,7 +21,7 @@ class AreasDialog extends StatelessWidget {
               children: [
                 Header(
                   title: Text(AppLocalizations.of(context).areas),
-                  leading: IconButton(
+                  leading: IconButton.outlined(
                     icon: const PhosphorIcon(PhosphorIconsLight.x),
                     onPressed: () => Navigator.of(context).pop(),
                     tooltip: AppLocalizations.of(context).close,

diff --git a/app/lib/dialogs/search.dart b/app/lib/dialogs/search.dart
@@ -113,7 +113,7 @@ class _SearchDialogState extends State<SearchDialog> {
                           ),
                         ),
                         const SizedBox(width: 8),
-                        IconButton(
+                        IconButton.outlined(
                           icon: const PhosphorIcon(PhosphorIconsLight.x),
                           onPressed: () => Navigator.pop(context),
                           tooltip: AppLocalizations.of(context).close,

diff --git a/app/lib/dialogs/sync.dart b/app/lib/dialogs/sync.dart
@@ -33,18 +33,18 @@ class _SyncDialogState extends State<SyncDialog> {
                 children: [
                   Header(
                     title: Text(status.getLocalizedName(context)),
-                    leading: IconButton(
-                      icon: PhosphorIcon(status.getIcon()),
-                      onPressed: () => service.sync(),
-                      tooltip: status.getLocalizedName(context),
-                    ),
                     actions: [
                       IconButton(
-                        icon: const PhosphorIcon(PhosphorIconsLight.x),
-                        onPressed: () => Navigator.pop(context),
-                        tooltip: AppLocalizations.of(context).close,
+                        icon: PhosphorIcon(status.getIcon()),
+                        onPressed: () => service.sync(),
+                        tooltip: status.getLocalizedName(context),
                       ),
                     ],
+                    leading: IconButton.outlined(
+                      icon: const PhosphorIcon(PhosphorIconsLight.x),
+                      onPressed: () => Navigator.pop(context),
+                      tooltip: AppLocalizations.of(context).close,
+                    ),
                   ),
                   const Divider(),
                   SingleChildScrollView(

diff --git a/app/lib/dialogs/template.dart b/app/lib/dialogs/template.dart
@@ -57,7 +57,7 @@ class _TemplateDialogState extends State<TemplateDialog> {
               children: [
                 Header(
                   title: Text(AppLocalizations.of(context).templates),
-                  leading: IconButton(
+                  leading: IconButton.outlined(
                     icon: const PhosphorIcon(PhosphorIconsLight.x),
                     onPressed: () => Navigator.of(context).pop(),
                     tooltip: AppLocalizations.of(context).close,

diff --git a/fastlane/metadata/android/en-US/changelogs/83.txt b/fastlane/metadata/android/en-US/changelogs/83.txt
@@ -2,6 +2,7 @@
 * Improve performance when saving ([#547](https://github.com/LinwoodDev/Butterfly/issues/547))
 * Improve mobile add dialog
 * Improve selected icons in settings
+* Improve consistency of close button ([#550](https://github.com/LinwoodDev/Butterfly/issues/550))
 * Rename default locale to system locale
 * Fix calling onScale to tools on moving on touch devices ([#546](https://github.com/LinwoodDev/Butterfly/issues/546))
 * Fix exporting documents as png or svg