changed (hopefully) everything to new List with TextEditingControllers

time

forgot to save sth ig

lib/interfaces/i_db.dart

@@ -7,15 +7,15 @@ abstract interface class IDb {
 
   onCreateDatabases(Database excursionDB, int version);
 
-  Future<int> addMainEntry(Map<String, dynamic> excursion);
+  Future<int> addMainEntry(Map<String, String> excursion);
 
-  Future<void> updateMainEntry(Map<String, dynamic> excursion);
+  Future<void> updateMainEntry(Map<String, String> excursion);
 
   Future<void> updateSent(int id);
 
-  Future<void> addTemplate(Map<String, dynamic> templates);
+  Future<void> addTemplate(Map<String, String> templates);
 
-  Future<void> updateTemplate(Map<String, dynamic> template);
+  Future<void> updateTemplate(Map<String, String> template);
 
   Future<List<Map<String, dynamic>>> getAllMainEntries();
 

lib/methods/excursion_db_helper.dart

@@ -31,6 +31,7 @@ class ExcursionDBHelper implements IDb{
   }
 
   // The function that helps
+  // TODO Change to right cols
   @override
   onCreateDatabases(Database excursionDB, int version) async {
     await excursionDB.execute(
@@ -41,7 +42,7 @@ class ExcursionDBHelper implements IDb{
 
 // Function to add a finished entry and return its ID
   @override
-  Future<int> addMainEntry(Map<String, dynamic> excursion) async {
+  Future<int> addMainEntry(Map<String, String> excursion) async {
     var excursionDBClient = await dB;
     final existingID = await excursionDBClient.query(
       'excursion',
@@ -64,7 +65,7 @@ class ExcursionDBHelper implements IDb{
   }
 
   @override
-  Future<void> updateMainEntry(Map<String, dynamic> excursion) async {
+  Future<void> updateMainEntry(Map<String, String> excursion) async {
     var excursionDBClient = await dB;
 
     await excursionDBClient
@@ -82,7 +83,7 @@ class ExcursionDBHelper implements IDb{
 
   // same thing as before but with templatews
   @override
-  Future<void> addTemplate(Map<String, dynamic> templates) async {
+  Future<void> addTemplate(Map<String, String> templates) async {
     var excursionDBClient = await dB;
 
     final existingCID = await excursionDBClient.query(
@@ -103,7 +104,7 @@ class ExcursionDBHelper implements IDb{
 
   // Updates a existing template
   @override
-  Future<void> updateTemplate(Map<String, dynamic> template) async {
+  Future<void> updateTemplate(Map<String, String> template) async {
     var excursionDBClient = await dB;
 
     await excursionDBClient.update(

lib/methods/place_db_helper.dart

@@ -41,7 +41,7 @@ class PlaceDBHelper implements IDb{
 
 // Function to add a finished entry and return its ID
   @override
-  Future<int> addMainEntry(Map<String, dynamic> place) async {
+  Future<int> addMainEntry(Map<String, String> place) async {
     var placeDBClient = await dB;
     final existingID = await placeDBClient.query(
       'place',
@@ -64,7 +64,7 @@ class PlaceDBHelper implements IDb{
   }
 
   @override
-  Future<void> updateMainEntry(Map<String, dynamic> place) async {
+  Future<void> updateMainEntry(Map<String, String> place) async {
     var placeDBClient = await dB;
 
     await placeDBClient
@@ -82,7 +82,7 @@ class PlaceDBHelper implements IDb{
 
   // same thing as before but with templatews
   @override
-  Future<void> addTemplate(Map<String, dynamic> templates) async {
+  Future<void> addTemplate(Map<String, String> templates) async {
     var placeDBClient = await dB;
 
     final existingCID = await placeDBClient.query(
@@ -103,7 +103,7 @@ class PlaceDBHelper implements IDb{
 
   // Updates a existing template
   @override
-  Future<void> updateTemplate(Map<String, dynamic> template) async {
+  Future<void> updateTemplate(Map<String, String> template) async {
     var placeDBClient = await dB;
 
     await placeDBClient.update(

lib/screens/addCam/cam_widgets.dart

@@ -85,8 +85,7 @@ class KarteState extends State<Karte> {
                         widget.onPositionChange(updatedPosition!);
                       });
                     }
-                    // ignore: use_build_context_synchronously
-                    Navigator.pop(context);
+                    if (context.mounted) Navigator.pop(context);
                   },
                   child: const Icon(Icons.save),
                 ),

lib/screens/helper/dialog_helper.dart

@@ -10,7 +10,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 class DialogHelper {
   // 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,
-      List<String> emptyField, Map<String, dynamic> saveData) async {
+      List<String> emptyField, Map<String, String> saveData) async {
     return showDialog(
         context: context,
         barrierDismissible: false,
@@ -39,7 +39,7 @@ class DialogHelper {
   }
 
   static Future<dynamic> showServerErrorDialog(
-      BuildContext context, Map<String, dynamic> saveData, bool isTemplate) {
+      BuildContext context, Map<String, String> saveData, bool isTemplate) {
     bool isLoading = false;
 
     return showDialog(
@@ -89,7 +89,7 @@ class DialogHelper {
   }
 
   static Future<void> showSaveOptionsDialog(BuildContext context,
-      Map<String, dynamic> saveData, bool isTemplate) async {
+      Map<String, String> saveData, bool isTemplate) async {
     bool isLoading = false;
 
     return showDialog(
@@ -155,7 +155,7 @@ class DialogHelper {
                           SaveFileMethod.saveFile(
                               saveData,
                               AppLocalizations.of(context)!.savefilefailed,
-                              saveData["CID"]);
+                              saveData["CID"]!);
                           setState(() => isLoading = false);
 
                     } catch (e) {

lib/screens/sharedMethods/http_request.dart

@@ -6,7 +6,7 @@ import 'package:dio/dio.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class HttpRequest {
-  static Future<int> httpRequest({Map<String, dynamic>? saveDataMap, String? saveDataString}) async {
+  static Future<int> httpRequest({Map<String, String>? saveDataMap, String? saveDataString}) async {
     // print(jsonEncode(place));
 
     final dio = Dio();

lib/screens/sharedMethods/save_file.dart

@@ -5,7 +5,7 @@ import 'package:file_picker/file_picker.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class SaveFileMethod {
-  static Future<void> saveFile(Map<String, dynamic> place, String fileNameLocalization, String placeID) async {
+  static Future<void> saveFile(Map<String, String> place, String fileNameLocalization, String placeID) async {
     String? selectedDirectory = await FilePicker.platform.getDirectoryPath();
     SharedPreferences prefs = await SharedPreferences.getInstance();
     String jsonPlace = jsonEncode(place);

lib/screens/sharedMethods/save_main_entry.dart

@@ -2,7 +2,7 @@ import 'package:fforte/methods/place_db_helper.dart';
 
 class SaveMainEntryMethod {
   static void saveEntry(
-      {required Map<String, dynamic> entryData,
+      {required Map<String, String> entryData,
       required bool isTemplate,
       bool sent = false}) async {
     var placeDB = PlaceDBHelper();
@@ -15,7 +15,7 @@ class SaveMainEntryMethod {
     }
 
     if (isTemplate) {
-      await placeDB.deleteTemplateById(entryData["CID"]);
+      await placeDB.deleteTemplateById(entryData["CID"]!);
     }
   }
 }

lib/screens/sharedMethods/save_template.dart

@@ -3,7 +3,7 @@ import 'package:fforte/interfaces/i_db.dart';
 import 'package:fforte/methods/excursion_db_helper.dart';
 import 'package:fforte/methods/place_db_helper.dart';
 
-void saveTemplate(Map<String, dynamic> templateData, DatabasesEnum dbType,
+void saveTemplate(Map<String, String> templateData, DatabasesEnum dbType,
     bool update) async {
   IDb dbHelper;
   if (dbType == DatabasesEnum.place) {

time.txt

@@ -76,3 +76,4 @@
 4. mai 45min
 5. mai 2h 15min
 6. mai 2h 15min
+7. mai 2h 45min