Merge branch 'dev' into main

PLGuerraDesigns · Oct 13, 2023 · cb1e374 · cb1e374
2 parents 661040f + 264e2c0
commit cb1e374
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/lib/screens/split_screen.dart b/lib/screens/split_screen.dart
@@ -111,17 +111,19 @@ class SplitScreenState extends State<SplitScreen>
             });
           case 2:
             showDialog(
-                context: context,
-                builder: (BuildContext context) => DownloadDialog(
-                      onDownloadPdf: () async {
-                        Navigator.pop(context);
-                        await FileHandler().savePDF(pdfGenerator);
-                      },
-                      onDownloadJson: () async {
-                        Navigator.pop(context);
-                        await FileHandler().savePDF(pdfGenerator);
-                      },
-                    ));
+              context: context,
+              builder: (BuildContext context) => DownloadDialog(
+                onDownloadPdf: () async {
+                  await FileHandler().savePDF(pdfGenerator);
+                },
+                onDownloadJson: () {
+                  FileHandler().saveJSONData(
+                    pdfGenerator: pdfGenerator,
+                    projectVersionInfoHandler: projectInfoHandler,
+                  );
+                },
+              ),
+            );
           case 3:
             Printing.layoutPdf(
                 onLayout: (PdfPageFormat format) =>
@@ -463,17 +465,19 @@ class SplitScreenState extends State<SplitScreen>
                         tooltip: Strings.downloadPdfAndJson,
                         onPressed: () {
                           showDialog(
-                              context: context,
-                              builder: (BuildContext context) => DownloadDialog(
-                                    onDownloadPdf: () async {
-                                      Navigator.pop(context);
-                                      await FileHandler().savePDF(pdfGenerator);
-                                    },
-                                    onDownloadJson: () async {
-                                      Navigator.pop(context);
-                                      await FileHandler().savePDF(pdfGenerator);
-                                    },
-                                  ));
+                            context: context,
+                            builder: (BuildContext context) => DownloadDialog(
+                              onDownloadPdf: () async {
+                                await FileHandler().savePDF(pdfGenerator);
+                              },
+                              onDownloadJson: () {
+                                FileHandler().saveJSONData(
+                                  pdfGenerator: pdfGenerator,
+                                  projectVersionInfoHandler: projectInfoHandler,
+                                );
+                              },
+                            ),
+                          );
                         },
                       ),
                   ],

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A resume builder app made with flutter.
 
 publish_to: "none"
 
-version: 0.4.3+10
+version: 0.4.4+11
 
 environment:
   sdk: ">=3.0.6 <4.0.0"