small bugfi

devtools_options.yaml

@@ -0,0 +1,4 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:
+  - shared_preferences: true

lib/screens/helper/add_entries_dialog_helper.dart

@@ -9,8 +9,10 @@ import 'package:fforte/l10n/app_localizations.dart';
 
 class AddEntriesDialogHelper {
   // Function to show the dialog where the user has to choose if he want to safe his values as a template
-  static Future<void> showTemplateDialog(BuildContext context,
+  static Future<void> showTemplateDialog(
-      Map<String, String> saveData) async {
+    BuildContext context,
+    Map<String, String> saveData,
+  ) async {
     return showDialog(
       context: context,
       barrierDismissible: false,
@@ -22,21 +24,31 @@ class AddEntriesDialogHelper {
               onPressed: () {
                 Navigator.of(context).pop();
               },
-                  child: Text(AppLocalizations.of(context)!.cancel)),
+              child: Text(AppLocalizations.of(context)!.cancel),
+            ),
             TextButton(
               onPressed: () {
                 saveTemplate(saveData, DatabasesEnum.place);
                 Navigator.pushNamedAndRemoveUntil(
-                        context, '/home', (route) => false);
+                  context,
+                  '/home',
+                  (route) => false,
+                );
               },
-                  child: Text(AppLocalizations.of(context)!.template))
+              child: Text(AppLocalizations.of(context)!.template),
+            ),
           ],
         );
-        });
+      },
+    );
   }
 
   static Future<dynamic> showServerErrorDialog(
-      BuildContext context, Map<String, String> saveData, bool isTemplate, DatabasesEnum dbType) {
+    BuildContext context,
+    Map<String, String> saveData,
+    bool isTemplate,
+    DatabasesEnum dbType,
+  ) {
     bool isLoading = false;
 
     return showDialog(
@@ -46,10 +58,12 @@ class AddEntriesDialogHelper {
           builder: (BuildContext context, StateSetter setState) {
             return AlertDialog(
               title: Text(AppLocalizations.of(context)!.servererrortitle),
-                content: isLoading
+              content:
+                  isLoading
                       ? const SizedBox(
                         height: 100,
-                        child: Center(child: CircularProgressIndicator()))
+                        child: Center(child: CircularProgressIndicator()),
+                      )
                       : null,
               actions: [
                 if (!isLoading)
@@ -57,36 +71,44 @@ class AddEntriesDialogHelper {
                     onPressed: () async {
                       setState(() => isLoading = true);
                       int errorCode = await HttpRequest.httpRequest(
-                              saveDataMap: saveData);
+                        saveDataMap: saveData,
+                      );
                       setState(() => isLoading = false);
 
-                          if (errorCode != 201 && context.mounted) {
+                      if (errorCode == 201 && context.mounted) {
-                            showServerErrorDialog(
+                        Navigator.pop(context);
-                                context, saveData, isTemplate, dbType);
-                          } else {
-                            if (context.mounted) Navigator.pop(context);
                         // saveData(true);
                         SaveMainEntryMethod.saveEntry(
-                                entryData: saveData, isTemplate: isTemplate, dbType: dbType);
+                          entryData: saveData,
-                            if (context.mounted) showSuccessDialog(context);
+                          isTemplate: isTemplate,
+                          dbType: dbType,
+                        );
+                        showSuccessDialog(context);
                       }
                     },
-                        child: Text(AppLocalizations.of(context)!.sendagain)),
+                    child: Text(AppLocalizations.of(context)!.sendagain),
+                  ),
                 if (!isLoading)
                   TextButton(
                     onPressed: () {
                       Navigator.pop(context);
                     },
-                        child: Text(AppLocalizations.of(context)!.cancel))
+                    child: Text(AppLocalizations.of(context)!.cancel),
+                  ),
               ],
             );
           },
         );
-        });
+      },
+    );
   }
 
-  static Future<void> showSaveOptionsDialog(BuildContext context,
+  static Future<void> showSaveOptionsDialog(
-      Map<String, String> saveData, bool isTemplate, DatabasesEnum dbType) async {
+    BuildContext context,
+    Map<String, String> saveData,
+    bool isTemplate,
+    DatabasesEnum dbType,
+  ) async {
     bool isLoading = false;
 
     return showDialog(
@@ -97,51 +119,66 @@ class AddEntriesDialogHelper {
         return StatefulBuilder(
           builder: (context, setState) {
             return AlertDialog(
-                title: isLoading
+              title:
+                  isLoading
                       ? Text(AppLocalizations.of(context)!.loading)
                       : Text(AppLocalizations.of(context)!.savemethod),
-                content: isLoading
+              content:
+                  isLoading
                       ? const SizedBox(
                         height: 100,
-                        child: Center(child: CircularProgressIndicator()))
+                        child: Center(child: CircularProgressIndicator()),
+                      )
                       : null,
               actions: [
                 if (!isLoading)
                   TextButton(
                     onPressed: () async {
                       setState(() => isLoading = true);
-                          saveTemplate(
+                      saveTemplate(saveData, DatabasesEnum.place);
-                              saveData, DatabasesEnum.place);
                       Navigator.pushNamedAndRemoveUntil(
-                              context, '/home', (route) => false);
+                        context,
+                        '/home',
+                        (route) => false,
+                      );
                     },
-                        child: Text(AppLocalizations.of(context)!.template)),
+                    child: Text(AppLocalizations.of(context)!.template),
+                  ),
                 if (!isLoading)
                   TextButton(
                     onPressed: () async {
                       setState(() => isLoading = true);
                       int errorCode = await HttpRequest.httpRequest(
-                              saveDataMap: saveData);
+                        saveDataMap: saveData,
+                      );
                       setState(() => isLoading = false);
 
                       if (errorCode != 201 || !context.mounted) {
                         SaveMainEntryMethod.saveEntry(
-                                entryData: saveData, isTemplate: isTemplate, dbType: dbType);
+                          entryData: saveData,
+                          isTemplate: isTemplate,
+                          dbType: dbType,
+                        );
                         if (context.mounted) {
                           AddEntriesDialogHelper.showServerErrorDialog(
-                                  context, saveData, isTemplate, dbType);
+                            context,
+                            saveData,
+                            isTemplate,
+                            dbType,
+                          );
                         }
                       } else {
                         SaveMainEntryMethod.saveEntry(
                           entryData: saveData,
                           isTemplate: isTemplate,
                           dbType: dbType,
-                                sent: true);
+                          sent: true,
+                        );
                         showSuccessDialog(context);
                       }
                     },
-                        child:
+                    child: Text(AppLocalizations.of(context)!.sendtoserver),
-                            Text(AppLocalizations.of(context)!.sendtoserver)),
+                  ),
                 if (!isLoading)
                   TextButton(
                     onPressed: () async {
@@ -149,39 +186,54 @@ class AddEntriesDialogHelper {
 
                       try {
                         SaveMainEntryMethod.saveEntry(
-                              entryData: saveData, isTemplate: isTemplate, dbType: dbType);
+                          entryData: saveData,
+                          isTemplate: isTemplate,
+                          dbType: dbType,
+                        );
                         SaveFileMethod.saveFile(
                           saveData,
                           AppLocalizations.of(context)!.savefilefailed,
-                              saveData["CID"]!);
+                          saveData["CID"]!,
+                        );
                         setState(() => isLoading = false);
-
                       } catch (e) {
-                      SnackBarHelper.showSnackBarMessage(context, AppLocalizations.of(context)!.savefilefailed);
+                        SnackBarHelper.showSnackBarMessage(
+                          context,
+                          AppLocalizations.of(context)!.savefilefailed,
+                        );
                       }
-
                     },
-                        child: Text(AppLocalizations.of(context)!.saveasfile)),
+                    child: Text(AppLocalizations.of(context)!.saveasfile),
+                  ),
                 if (!isLoading)
                   TextButton(
                     onPressed: () {
                       SaveMainEntryMethod.saveEntry(
-                              entryData: saveData, isTemplate: isTemplate, dbType: dbType);
+                        entryData: saveData,
+                        isTemplate: isTemplate,
+                        dbType: dbType,
+                      );
                       Navigator.pushNamedAndRemoveUntil(
-                              context, '/home', (route) => false);
+                        context,
+                        '/home',
+                        (route) => false,
+                      );
                     },
-                        child: Text(AppLocalizations.of(context)!.justsave)),
+                    child: Text(AppLocalizations.of(context)!.justsave),
+                  ),
                 if (!isLoading)
                   TextButton(
                     onPressed: () {
                       Navigator.pop(context);
                     },
-                        child: Text(AppLocalizations.of(context)!.cancel)),
+                    child: Text(AppLocalizations.of(context)!.cancel),
+                  ),
               ],
             );
           },
         );
-        });
+      },
+    );
   }
 
   static Future<void> showSuccessDialog(BuildContext context) async {
@@ -194,11 +246,16 @@ class AddEntriesDialogHelper {
             TextButton(
               onPressed: () {
                 Navigator.pushNamedAndRemoveUntil(
-                        context, '/home', (route) => false);
+                  context,
+                  '/home',
+                  (route) => false,
+                );
               },
-                  child: Text(AppLocalizations.of(context)!.continueB))
+              child: Text(AppLocalizations.of(context)!.continueB),
+            ),
           ],
         );
-        });
+      },
+    );
   }
 }