Fix exporting documents as png or svg

LinwoodDev · Dec 12, 2023 · 8d5ea0a · 8d5ea0a
1 parent d2aad28
commit 8d5ea0a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/app/lib/dialogs/export/image.dart b/app/lib/dialogs/export/image.dart
@@ -145,15 +145,16 @@ class _ImageExportDialogState extends State<ImageExportDialog> {
                             child: Text(AppLocalizations.of(context).export),
                             onPressed: () async {
                               final state = context.read<DocumentBloc>().state;
-                              Navigator.of(context).pop();
                               if (state is! DocumentLoadSuccess) {
                                 return;
                               }
                               final data = await generateImage();
                               if (data == null) {
                                 return;
                               }
-                              exportImage(context, data.buffer.asUint8List());
+                              await exportImage(
+                                  context, data.buffer.asUint8List());
+                              if (mounted) Navigator.of(context).pop();
                             },
                           ),
                         ],

diff --git a/app/lib/dialogs/export/svg.dart b/app/lib/dialogs/export/svg.dart
@@ -105,7 +105,7 @@ class _SvgExportDialogState extends State<SvgExportDialog> {
     );
     if (!mounted) return;
 
-    exportSvg(
+    return exportSvg(
       context,
       data.toXmlString(),
     );
@@ -162,8 +162,8 @@ class _SvgExportDialogState extends State<SvgExportDialog> {
                           ElevatedButton(
                             child: Text(AppLocalizations.of(context).export),
                             onPressed: () async {
-                              Navigator.of(context).pop();
-                              _exportSvg();
+                              await _exportSvg();
+                              if (mounted) Navigator.of(context).pop();
                             },
                           ),
                         ],

diff --git a/fastlane/metadata/android/en-US/changelogs/83.txt b/fastlane/metadata/android/en-US/changelogs/83.txt
@@ -1,4 +1,5 @@
 * Improve performance when saving ([#547](https://github.com/LinwoodDev/Butterfly/issues/547))
 * 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
 
 View all changes in the blog: https://linwood.dev/butterfly/2.0.0-rc.2