Merge remote-tracking branch 'origin/firebase' into dev

# Conflicts:
#	lib/model/promemoria.dart

lib/model/base_entity.dart

@@ -1,19 +0,0 @@
-abstract class BaseEntity{
-  static String id = 'id';
-  static String title = 'Title';
-  static String creationDate = 'CreationDate';
-  static String lastEditDate = 'LastEditDate';
-  
-  static String get getId{
-    return id;
-  }
-  static String get getTitle{
-    return title;
-  }
-  static String get getCreationDate{
-    return creationDate;
-  }
-  static String get getLastEditDate{
-    return lastEditDate;
-  }
-}

lib/model/note.dart

@@ -1,13 +1,13 @@
-import 'base_entity.dart';
+
 
 const String noteTable = 'note';
 
 class Note{
-  String id;
+  String id='';
   String title;
   String creationDate;
   String lastModificationDate;
-  String arrayPromemoria;
+  String? arrayPromemoria;
   String description;
 
   Map<String, dynamic> toMap() {
@@ -30,6 +30,14 @@ class Note{
     this.description,
   );
 
+  Note.newConstructor(
+    this.title,
+    this.creationDate,
+    this.lastModificationDate,
+    this.arrayPromemoria,
+    this.description,
+  );
+
   String getId() {
     return id;
   }
@@ -62,7 +70,7 @@ class Note{
     lastModificationDate = lastModificationDate1;
   }
 
-  String getArrayPromemoria() {
+  String? getArrayPromemoria() {
     return arrayPromemoria;
   }
 
@@ -79,7 +87,7 @@ class Note{
   }
 
   static Note fromJson(Map<String, dynamic> data) => Note(
-      data['id'],
+      data['id'].toString(),
       data['title'],
       data['creationDate'],
       data['lastModificationDate'],

lib/model/promemoria.dart

@@ -6,14 +6,14 @@ const String promemoriaTable = 'promemoria';
 
 class Promemoria {
   String id = '';
-  String title = '';
-  String creationDate = '';
-  String lastModificationDate = '';
-  String expirationDate = '';
-  String arrayPromemoria = '';
-  String description = '';
-  String priority = '';
-  String color = '';
+  String title;
+  String creationDate;
+  String lastModificationDate;
+  String expirationDate;
+  String? arrayPromemoria;
+  String description;
+  String priority;
+  String color;
 
   Promemoria(
       this.id,
@@ -106,7 +106,7 @@ class Promemoria {
     expirationDate = expirationDate1;
   }
 
-  String getArrayPromemoria() {
+  String? getArrayPromemoria() {
     return arrayPromemoria;
   }
 
@@ -140,7 +140,7 @@ class Promemoria {
 
   static Promemoria fromJson(Map<String, dynamic> data) {
     Promemoria promemoria = Promemoria(
-        data['id'],
+        data['id'].toString(),
         data['title'],
         data['creationDate'],
         data['lastModificationDate'],