diff --git a/.vscode/launch.json b/.vscode/launch.json
index 90c289b0..c2ed9e15 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -24,14 +24,14 @@
"SERVER_URL=https://app.pal-plugin.tech/api"
]
},
- // {
- // "name": "Dart: Run all Tests",
- // "type": "dart",
- // "request": "launch",
- // "program": "./test/",
- // "presentation": {
- // "clear": true,
- // }
- // },
+ {
+ "name": "Run all Tests",
+ "type": "dart",
+ "request": "launch",
+ "program": "./test/",
+ "presentation": {
+ "clear": true,
+ }
+ },
]
}
\ No newline at end of file
diff --git a/README.md b/README.md
index 719390f6..fa7358fc 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ class MyApp extends StatelessWidget {
appToken: 'REPLACE_WITH_YOUR_APP_TOKEN',
// --------------------
// YOUR APP IS HERE
- child: MaterialApp(
+ childApp: MaterialApp(
navigatorKey: _navigatorKey,
navigatorObservers: [PalNavigatorObserver.instance()],
home: YourApp(),
diff --git a/example/.vscode/launch.json b/example/.vscode/launch.json
new file mode 100644
index 00000000..035204ca
--- /dev/null
+++ b/example/.vscode/launch.json
@@ -0,0 +1,13 @@
+{
+ // Utilisez IntelliSense pour en savoir plus sur les attributs possibles.
+ // Pointez pour afficher la description des attributs existants.
+ // Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": "example",
+ "request": "launch",
+ "type": "dart"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/example/android/app/src/main/kotlin/io/apparence/example/MainActivity.kt b/example/android/app/src/main/kotlin/io/apparence/example/MainActivity.kt
new file mode 100644
index 00000000..8e8edfab
--- /dev/null
+++ b/example/android/app/src/main/kotlin/io/apparence/example/MainActivity.kt
@@ -0,0 +1,6 @@
+package io.apparence.example
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}
diff --git a/example/android/app/src/main/res/drawable-v21/launch_background.xml b/example/android/app/src/main/res/drawable-v21/launch_background.xml
new file mode 100644
index 00000000..f74085f3
--- /dev/null
+++ b/example/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+
+
+
+ (context, S);
+ static S? of(BuildContext context) => Localizations.of(context, S);
@override
TextDirection get textDirection => TextDirection.ltr;
@@ -27,7 +27,7 @@ class $en extends S {
const $en();
}
-class GeneratedLocalizationsDelegate extends LocalizationsDelegate {
+class GeneratedLocalizationsDelegate extends LocalizationsDelegate {
const GeneratedLocalizationsDelegate();
List get supportedLocales {
@@ -36,8 +36,8 @@ class GeneratedLocalizationsDelegate extends LocalizationsDelegate {
];
}
- LocaleListResolutionCallback listResolution({Locale fallback, bool withCountry = true}) {
- return (List locales, Iterable supported) {
+ LocaleListResolutionCallback listResolution({Locale? fallback, bool withCountry = true}) {
+ return (List? locales, Iterable supported) {
if (locales == null || locales.isEmpty) {
return fallback ?? supported.first;
} else {
@@ -46,26 +46,26 @@ class GeneratedLocalizationsDelegate extends LocalizationsDelegate {
};
}
- LocaleResolutionCallback resolution({Locale fallback, bool withCountry = true}) {
- return (Locale locale, Iterable supported) {
+ LocaleResolutionCallback resolution({Locale? fallback, bool withCountry = true}) {
+ return (Locale? locale, Iterable supported) {
return _resolve(locale, fallback, supported, withCountry);
};
}
@override
- Future load(Locale locale) {
+ Future load(Locale locale) {
final String lang = getLang(locale);
if (lang != null) {
switch (lang) {
case "en":
S.current = const $en();
- return SynchronousFuture(S.current);
+ return SynchronousFuture(S.current);
default:
// NO-OP.
}
}
S.current = const S();
- return SynchronousFuture(S.current);
+ return SynchronousFuture(S.current);
}
@override
@@ -77,7 +77,7 @@ class GeneratedLocalizationsDelegate extends LocalizationsDelegate {
///
/// Internal method to resolve a locale from a list of locales.
///
- Locale _resolve(Locale locale, Locale fallback, Iterable supported, bool withCountry) {
+ Locale _resolve(Locale? locale, Locale? fallback, Iterable supported, bool withCountry) {
if (locale == null || !_isSupported(locale, withCountry)) {
return fallback ?? supported.first;
}
@@ -110,7 +110,7 @@ class GeneratedLocalizationsDelegate extends LocalizationsDelegate {
}
// If no country requirement is requested, check if this locale has no country.
- if (true != withCountry && (supportedLocale.countryCode == null || supportedLocale.countryCode.isEmpty)) {
+ if (true != withCountry && (supportedLocale.countryCode == null || supportedLocale.countryCode!.isEmpty)) {
return true;
}
}
@@ -119,8 +119,5 @@ class GeneratedLocalizationsDelegate extends LocalizationsDelegate {
}
}
-String getLang(Locale l) => l == null
- ? null
- : l.countryCode != null && l.countryCode.isEmpty
- ? l.languageCode
- : l.toString();
+String getLang(Locale? l) => l?.countryCode != null && l!.countryCode!.isEmpty
+ ? l.languageCode : l.toString();
diff --git a/lib/src/database/adapter/app_icon_entity.dart b/lib/src/database/adapter/app_icon_entity.dart
index e9445f5a..9aba1dd3 100644
--- a/lib/src/database/adapter/app_icon_entity.dart
+++ b/lib/src/database/adapter/app_icon_entity.dart
@@ -3,9 +3,9 @@ import 'generic_adapter.dart';
class AppIconEntityAdapter extends GenericEntityAdapter {
@override
- AppIconEntity parseMap(Map map) {
+ AppIconEntity parseMap(Map? map) {
return AppIconEntity(
- id: map['id'],
+ id: map!['id'],
url: map['url'],
);
}
diff --git a/lib/src/database/adapter/generic_adapter.dart b/lib/src/database/adapter/generic_adapter.dart
index fedc0bec..5356dc02 100644
--- a/lib/src/database/adapter/generic_adapter.dart
+++ b/lib/src/database/adapter/generic_adapter.dart
@@ -11,7 +11,7 @@ abstract class GenericEntityAdapter {
String toJson(T model) => json.encode(model);
T parse(String value) {
- Map map = json.decode(value);
+ Map? map = json.decode(value);
try {
return parseMap(map);
} catch (e) {
@@ -46,11 +46,11 @@ abstract class GenericEntityAdapter {
result.entities = this.parseArray(json.encode(page['content']));
return result;
} catch (err) {
- throw "Error while parsing data " + err;
+ throw "Error while parsing data $err";
}
}
- Map decode(String value) {
+ Map? decode(String value) {
return json.decode(value);
}
@@ -58,7 +58,7 @@ abstract class GenericEntityAdapter {
return json.encode(object);
}
- T parseMap(Map map);
+ T parseMap(Map? map);
static checkKey(Map map, String key) {
return map.containsKey(key) && map[key] != null && map[key] != '';
diff --git a/lib/src/database/adapter/helper_entity_adapter.dart b/lib/src/database/adapter/helper_entity_adapter.dart
index 8b9204ef..4ebcb66a 100644
--- a/lib/src/database/adapter/helper_entity_adapter.dart
+++ b/lib/src/database/adapter/helper_entity_adapter.dart
@@ -4,8 +4,8 @@ import 'package:pal/src/database/entity/helper/helper_type.dart';
class HelperEntityAdapter extends GenericEntityAdapter {
@override
- HelperEntity parseMap(Map map) {
- final HelperType helperType = map.containsKey('type') ? getHelperType(map['type']) : null;
+ HelperEntity parseMap(Map? map) {
+ final HelperType? helperType = map!.containsKey('type') ? getHelperType(map['type']) : null;
return HelperEntity(
id: map['id'],
name: map['name'],
@@ -27,9 +27,9 @@ class HelperEntityAdapter extends GenericEntityAdapter {
class HelperBorderEntityAdapter extends GenericEntityAdapter {
@override
- HelperBorderEntity parseMap(Map map) {
+ HelperBorderEntity parseMap(Map? map) {
return HelperBorderEntity(
- id: map['id'],
+ id: map!['id'],
key: map['key'],
color: map['color'],
style: map['style'],
@@ -40,9 +40,9 @@ class HelperBorderEntityAdapter extends GenericEntityAdapter
class HelperImageEntityAdapter extends GenericEntityAdapter {
@override
- HelperImageEntity parseMap(Map map) {
+ HelperImageEntity parseMap(Map? map) {
return HelperImageEntity(
- id: map['id'],
+ id: map!['id'],
key: map['key'],
url: map['url'],
);
@@ -51,9 +51,9 @@ class HelperImageEntityAdapter extends GenericEntityAdapter {
class HelperTextEntityAdapter extends GenericEntityAdapter {
@override
- HelperTextEntity parseMap(Map map) {
+ HelperTextEntity parseMap(Map? map) {
return HelperTextEntity(
- id: map['id'],
+ id: map!['id'],
fontColor: map['fontColor'],
fontFamily: map['fontFamily'],
fontWeight: map['fontWeight'],
@@ -66,9 +66,9 @@ class HelperTextEntityAdapter extends GenericEntityAdapter {
class HelperBoxEntityAdapter extends GenericEntityAdapter {
@override
- HelperBoxEntity parseMap(Map map) {
+ HelperBoxEntity parseMap(Map? map) {
return HelperBoxEntity(
- id: map['id'],
+ id: map!['id'],
key: map['key'],
backgroundColor: map['backgroundColor'],
);
diff --git a/lib/src/database/adapter/helper_group_entity_adapter.dart b/lib/src/database/adapter/helper_group_entity_adapter.dart
index b70754e1..67f4cbeb 100644
--- a/lib/src/database/adapter/helper_group_entity_adapter.dart
+++ b/lib/src/database/adapter/helper_group_entity_adapter.dart
@@ -8,8 +8,8 @@ import 'generic_adapter.dart';
class HelperGroupEntityAdapter extends GenericEntityAdapter {
@override
- HelperGroupEntity parseMap(Map map) {
- final HelperTriggerType helperTriggerType = map.containsKey('triggerType')
+ HelperGroupEntity parseMap(Map? map) {
+ final HelperTriggerType? helperTriggerType = map!.containsKey('triggerType')
? getHelperTriggerType(map['triggerType']) : null;
return HelperGroupEntity(
id: map['id'],
diff --git a/lib/src/database/adapter/helper_group_visit_entity_adapter.dart b/lib/src/database/adapter/helper_group_visit_entity_adapter.dart
index 14f3fcfb..aa44bb60 100644
--- a/lib/src/database/adapter/helper_group_visit_entity_adapter.dart
+++ b/lib/src/database/adapter/helper_group_visit_entity_adapter.dart
@@ -4,9 +4,9 @@ import 'generic_adapter.dart';
class HelperGroupUserVisitEntityAdapter extends GenericEntityAdapter {
@override
- HelperGroupUserVisitEntity parseMap(Map map) {
+ HelperGroupUserVisitEntity parseMap(Map? map) {
return HelperGroupUserVisitEntity(
- helperGroupId: map["helperGroupId"],
+ helperGroupId: map!["helperGroupId"],
pageId: map["pageId"],
visitDate: DateTime.parse(map['time']).toLocal() ,
visitVersion: map["version"],
diff --git a/lib/src/database/adapter/in_app_user_storage_adapter.dart b/lib/src/database/adapter/in_app_user_storage_adapter.dart
index 18a9723e..fb2fc147 100644
--- a/lib/src/database/adapter/in_app_user_storage_adapter.dart
+++ b/lib/src/database/adapter/in_app_user_storage_adapter.dart
@@ -1,11 +1,11 @@
import 'package:pal/src/database/adapter/generic_adapter.dart';
import 'package:pal/src/database/entity/in_app_user_entity.dart';
-class InAppUserEntityAdapter extends GenericEntityAdapter {
+class InAppUserEntityStorageAdapter extends GenericEntityAdapter {
@override
- InAppUserEntity parseMap(Map map) {
+ InAppUserEntity parseMap(Map? map) {
return InAppUserEntity(
- id: map["id"],
+ id: map!["id"],
inAppId: map["inAppId"],
anonymous: map["anonymous"],
disabledHelpers: map["disabledHelpers"],
diff --git a/lib/src/database/adapter/page_entity_adapter.dart b/lib/src/database/adapter/page_entity_adapter.dart
index e26e1ff7..06ddb4cd 100644
--- a/lib/src/database/adapter/page_entity_adapter.dart
+++ b/lib/src/database/adapter/page_entity_adapter.dart
@@ -3,9 +3,9 @@ import 'package:pal/src/database/entity/page_entity.dart';
class PageEntityAdapter extends GenericEntityAdapter {
@override
- PageEntity parseMap(Map map) {
+ PageEntity parseMap(Map? map) {
return PageEntity(
- id: map['id'],
+ id: map!['id'],
creationDate: map['creationDate'] != null ? DateTime.parse(map['creationDate']).toLocal() : null,
lastUpdateDate: map['lastUpdateDate'] != null ? DateTime.parse(map['lastUpdateDate']).toLocal() : null,
route: map['route'],
diff --git a/lib/src/database/adapter/project_gallery_entity_adapter.dart b/lib/src/database/adapter/project_gallery_entity_adapter.dart
index e9f766b0..54185c82 100644
--- a/lib/src/database/adapter/project_gallery_entity_adapter.dart
+++ b/lib/src/database/adapter/project_gallery_entity_adapter.dart
@@ -3,9 +3,9 @@ import 'generic_adapter.dart';
class ProjectGalleryEntityAdapter extends GenericEntityAdapter {
@override
- GraphicEntity parseMap(Map map) {
+ GraphicEntity parseMap(Map? map) {
return GraphicEntity(
- id: map['id'],
+ id: map!['id'],
url: map['url'],
uploadedDate: DateTime.parse(map['uploadedDate']).toLocal(),
);
diff --git a/lib/src/database/adapter/schema_entity_adapter.dart b/lib/src/database/adapter/schema_entity_adapter.dart
index 06403b9f..cfc36148 100644
--- a/lib/src/database/adapter/schema_entity_adapter.dart
+++ b/lib/src/database/adapter/schema_entity_adapter.dart
@@ -6,9 +6,9 @@ import 'generic_adapter.dart';
class SchemaEntityAdapter extends GenericEntityAdapter {
@override
- SchemaEntity parseMap(Map map) {
+ SchemaEntity parseMap(Map? map) {
return SchemaEntity(
- projectId: map['projectId'],
+ projectId: map!['projectId'],
groups: new HelperGroupEntityAdapter().parseDynamicArray(map['groups']),
schemaVersion: map['schemaVersion'],
);
diff --git a/lib/src/database/adapter/version_entity_adapter.dart b/lib/src/database/adapter/version_entity_adapter.dart
index ab2bdd33..e3d2f811 100644
--- a/lib/src/database/adapter/version_entity_adapter.dart
+++ b/lib/src/database/adapter/version_entity_adapter.dart
@@ -4,9 +4,9 @@ import 'generic_adapter.dart';
class VersionEntityAdapter extends GenericEntityAdapter {
@override
- VersionEntity parseMap(Map map) {
+ VersionEntity parseMap(Map? map) {
return VersionEntity(
- id: map['id'],
+ id: map!['id'],
name: map['name']
);
}
diff --git a/lib/src/database/entity/app_icon_entity.dart b/lib/src/database/entity/app_icon_entity.dart
index 466f476f..af8e090c 100644
--- a/lib/src/database/entity/app_icon_entity.dart
+++ b/lib/src/database/entity/app_icon_entity.dart
@@ -1,6 +1,6 @@
class AppIconEntity {
- String id;
- String url;
+ String? id;
+ String? url;
AppIconEntity({
this.id,
diff --git a/lib/src/database/entity/graphic_entity.dart b/lib/src/database/entity/graphic_entity.dart
index 8e93689e..8f4f760b 100644
--- a/lib/src/database/entity/graphic_entity.dart
+++ b/lib/src/database/entity/graphic_entity.dart
@@ -1,7 +1,7 @@
class GraphicEntity {
- String id;
- String url;
- DateTime uploadedDate;
+ String? id;
+ String? url;
+ DateTime? uploadedDate;
GraphicEntity({
this.id,
diff --git a/lib/src/database/entity/helper/helper_entity.dart b/lib/src/database/entity/helper/helper_entity.dart
index d8fe68e5..12b16431 100644
--- a/lib/src/database/entity/helper/helper_entity.dart
+++ b/lib/src/database/entity/helper/helper_entity.dart
@@ -8,37 +8,37 @@ part 'helper_entity.g.dart';
@HiveType(typeId: 3)
class HelperEntity with Comparable {
@HiveField(0)
- String id;
+ String? id;
@HiveField(1)
- DateTime creationDate;
+ DateTime? creationDate;
@HiveField(2)
- DateTime lastUpdateDate;
+ DateTime? lastUpdateDate;
@HiveField(3)
- String name;
+ String? name;
@HiveField(4)
- int priority;
+ int? priority;
@HiveField(5)
- HelperType type;
+ HelperType? type;
@HiveField(6)
- HelperTriggerType triggerType;
+ HelperTriggerType? triggerType;
@HiveField(11)
- List helperBorders;
+ List? helperBorders;
@HiveField(12)
- List helperImages;
+ List? helperImages;
@HiveField(13)
- List helperTexts;
+ List? helperTexts;
@HiveField(14)
- List helperBoxes;
+ List? helperBoxes;
HelperEntity(
{this.id,
@@ -63,21 +63,21 @@ class HelperEntity with Comparable {
lastUpdateDate: from.lastUpdateDate,
priority: from.priority,
helperBorders:
- from.helperBorders != null ? [...from.helperBorders] : null,
- helperImages: from.helperImages != null ? [...from.helperImages] : null,
- helperTexts: from.helperTexts != null ? [...from.helperTexts] : null,
- helperBoxes: from.helperBoxes != null ? [...from.helperBoxes] : null,
+ from.helperBorders != null ? [...from.helperBorders!] : null,
+ helperImages: from.helperImages != null ? [...from.helperImages!] : null,
+ helperTexts: from.helperTexts != null ? [...from.helperTexts!] : null,
+ helperBoxes: from.helperBoxes != null ? [...from.helperBoxes!] : null,
);
}
Map toJson() => {
'id': id,
'name': name,
- 'type': type?.toString()?.split('.')[1],
+ 'type': type?.toString().split('.')[1],
'creationDate':
- creationDate != null ? creationDate.toIso8601String() : null,
+ creationDate != null ? creationDate!.toIso8601String() : null,
'lastUpdateDate':
- lastUpdateDate != null ? lastUpdateDate.toIso8601String() : null,
+ lastUpdateDate != null ? lastUpdateDate!.toIso8601String() : null,
'priority': priority,
'helperBorders': helperBorders,
'helperImages': helperImages,
@@ -104,7 +104,7 @@ class HelperEntity with Comparable {
@override
int compareTo(HelperEntity other) {
return other != null && this != null
- ? other.priority < this.priority
+ ? other.priority! < this.priority!
? 1
: -1
: 0;
@@ -127,19 +127,19 @@ class HelperEntity with Comparable {
@HiveType(typeId: 4)
class HelperBorderEntity {
@HiveField(0)
- int id;
+ int? id;
@HiveField(1)
- String color;
+ String? color;
@HiveField(2)
- String key;
+ String? key;
@HiveField(3)
- String style;
+ String? style;
@HiveField(4)
- double width;
+ double? width;
HelperBorderEntity({this.id, this.color, this.key, this.style, this.width});
@@ -181,13 +181,13 @@ class HelperBorderEntity {
@HiveType(typeId: 5)
class HelperImageEntity {
@HiveField(0)
- int id;
+ int? id;
@HiveField(1)
- String key;
+ String? key;
@HiveField(2)
- String url;
+ String? url;
Map toJson() => {
'id': id,
@@ -195,7 +195,7 @@ class HelperImageEntity {
'url': url,
};
- HelperImageEntity({this.id, this.key, @required this.url});
+ HelperImageEntity({this.id, this.key, required this.url});
HelperImageEntity copy() => HelperImageEntity(id: id, key: key, url: url);
@@ -214,25 +214,25 @@ class HelperImageEntity {
@HiveType(typeId: 6)
class HelperTextEntity {
@HiveField(0)
- int id;
+ int? id;
@HiveField(1)
- String fontColor;
+ String? fontColor;
@HiveField(2)
- String fontFamily;
+ String? fontFamily;
@HiveField(3)
- String fontWeight;
+ String? fontWeight;
@HiveField(4)
- String key;
+ String? key;
@HiveField(5)
- String value;
+ String? value;
@HiveField(6)
- int fontSize;
+ int? fontSize;
HelperTextEntity({
this.id,
@@ -289,17 +289,17 @@ class HelperTextEntity {
@HiveType(typeId: 7)
class HelperBoxEntity {
@HiveField(0)
- int id;
+ int? id;
@HiveField(1)
- String backgroundColor;
+ String? backgroundColor;
@HiveField(2)
- String key;
+ String? key;
HelperBoxEntity({
this.id,
- @required this.backgroundColor,
+ required this.backgroundColor,
this.key,
});
diff --git a/lib/src/database/entity/helper/helper_entity.g.dart b/lib/src/database/entity/helper/helper_entity.g.dart
index 6a44894b..8610fbc9 100644
--- a/lib/src/database/entity/helper/helper_entity.g.dart
+++ b/lib/src/database/entity/helper/helper_entity.g.dart
@@ -17,17 +17,17 @@ class HelperEntityAdapter extends TypeAdapter {
for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
};
return HelperEntity(
- id: fields[0] as String,
- name: fields[3] as String,
- type: fields[5] as HelperType,
- triggerType: fields[6] as HelperTriggerType,
- creationDate: fields[1] as DateTime,
- lastUpdateDate: fields[2] as DateTime,
- priority: fields[4] as int,
- helperBorders: (fields[11] as List)?.cast(),
- helperImages: (fields[12] as List)?.cast(),
- helperTexts: (fields[13] as List)?.cast(),
- helperBoxes: (fields[14] as List)?.cast(),
+ id: fields[0] as String?,
+ name: fields[3] as String?,
+ type: fields[5] as HelperType?,
+ triggerType: fields[6] as HelperTriggerType?,
+ creationDate: fields[1] as DateTime?,
+ lastUpdateDate: fields[2] as DateTime?,
+ priority: fields[4] as int?,
+ helperBorders: (fields[11] as List?)?.cast(),
+ helperImages: (fields[12] as List?)?.cast(),
+ helperTexts: (fields[13] as List?)?.cast(),
+ helperBoxes: (fields[14] as List?)?.cast(),
);
}
@@ -81,11 +81,11 @@ class HelperBorderEntityAdapter extends TypeAdapter {
for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
};
return HelperBorderEntity(
- id: fields[0] as int,
- color: fields[1] as String,
- key: fields[2] as String,
- style: fields[3] as String,
- width: fields[4] as double,
+ id: fields[0] as int?,
+ color: fields[1] as String?,
+ key: fields[2] as String?,
+ style: fields[3] as String?,
+ width: fields[4] as double?,
);
}
@@ -127,9 +127,9 @@ class HelperImageEntityAdapter extends TypeAdapter {
for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
};
return HelperImageEntity(
- id: fields[0] as int,
- key: fields[1] as String,
- url: fields[2] as String,
+ id: fields[0] as int?,
+ key: fields[1] as String?,
+ url: fields[2] as String?,
);
}
@@ -167,13 +167,13 @@ class HelperTextEntityAdapter extends TypeAdapter {
for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
};
return HelperTextEntity(
- id: fields[0] as int,
- fontColor: fields[1] as String,
- fontFamily: fields[2] as String,
- fontWeight: fields[3] as String,
- key: fields[4] as String,
- value: fields[5] as String,
- fontSize: fields[6] as int,
+ id: fields[0] as int?,
+ fontColor: fields[1] as String?,
+ fontFamily: fields[2] as String?,
+ fontWeight: fields[3] as String?,
+ key: fields[4] as String?,
+ value: fields[5] as String?,
+ fontSize: fields[6] as int?,
);
}
@@ -219,9 +219,9 @@ class HelperBoxEntityAdapter extends TypeAdapter {
for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
};
return HelperBoxEntity(
- id: fields[0] as int,
- backgroundColor: fields[1] as String,
- key: fields[2] as String,
+ id: fields[0] as int?,
+ backgroundColor: fields[1] as String?,
+ key: fields[2] as String?,
);
}
diff --git a/lib/src/database/entity/helper/helper_group_entity.dart b/lib/src/database/entity/helper/helper_group_entity.dart
index 32af80a7..96a9bd59 100644
--- a/lib/src/database/entity/helper/helper_group_entity.dart
+++ b/lib/src/database/entity/helper/helper_group_entity.dart
@@ -12,31 +12,31 @@ part 'helper_group_entity.g.dart';
class HelperGroupEntity with Comparable {
@HiveField(0)
- String id;
+ String? id;
@HiveField(1)
- int priority;
+ int? priority;
@HiveField(2)
- List helpers;
+ List? helpers;
@HiveField(3)
- PageEntity page;
+ PageEntity? page;
@HiveField(4)
- String name;
+ String? name;
@HiveField(5)
- HelperTriggerType triggerType;
+ HelperTriggerType? triggerType;
@HiveField(6)
- DateTime creationDate;
+ DateTime? creationDate;
@HiveField(7)
- String minVersion;
+ String? minVersion;
@HiveField(8)
- String maxVersion;
+ String? maxVersion;
HelperGroupEntity({
this.id,
@@ -53,7 +53,7 @@ class HelperGroupEntity with Comparable {
@override
int compareTo(HelperGroupEntity other) {
if(other.triggerType == this.triggerType) {
- return other.priority < this.priority ? 1 : -1;
+ return other.priority! < this.priority! ? 1 : -1;
}
return other.triggerType.typePriority < this.triggerType.typePriority ? 1 : -1;
}
diff --git a/lib/src/database/entity/helper/helper_group_entity.g.dart b/lib/src/database/entity/helper/helper_group_entity.g.dart
index dc184bcc..efe9491f 100644
--- a/lib/src/database/entity/helper/helper_group_entity.g.dart
+++ b/lib/src/database/entity/helper/helper_group_entity.g.dart
@@ -17,15 +17,15 @@ class HelperGroupEntityAdapter extends TypeAdapter {
for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
};
return HelperGroupEntity(
- id: fields[0] as String,
- priority: fields[1] as int,
- helpers: (fields[2] as List)?.cast(),
- page: fields[3] as PageEntity,
- name: fields[4] as String,
- triggerType: fields[5] as HelperTriggerType,
- creationDate: fields[6] as DateTime,
- minVersion: fields[7] as String,
- maxVersion: fields[8] as String,
+ id: fields[0] as String?,
+ priority: fields[1] as int?,
+ helpers: (fields[2] as List?)?.cast(),
+ page: fields[3] as PageEntity?,
+ name: fields[4] as String?,
+ triggerType: fields[5] as HelperTriggerType?,
+ creationDate: fields[6] as DateTime?,
+ minVersion: fields[7] as String?,
+ maxVersion: fields[8] as String?,
);
}
diff --git a/lib/src/database/entity/helper/helper_trigger_type.dart b/lib/src/database/entity/helper/helper_trigger_type.dart
index b7ff39e3..6f82d38d 100644
--- a/lib/src/database/entity/helper/helper_trigger_type.dart
+++ b/lib/src/database/entity/helper/helper_trigger_type.dart
@@ -11,14 +11,14 @@ enum HelperTriggerType {
ON_NEW_UPDATE,
}
-HelperTriggerType getHelperTriggerType(final String value) =>
+HelperTriggerType getHelperTriggerType(final String? value) =>
HelperTriggerType.values
.firstWhere((element) => element.toString().split('.')[1] == value);
-String helperTriggerTypeToString(final HelperTriggerType helperTriggerType) =>
+String helperTriggerTypeToString(final HelperTriggerType? helperTriggerType) =>
helperTriggerType.toString().split('.')[1];
-extension HelperTriggerTypeExt on HelperTriggerType {
+extension HelperTriggerTypeExt on HelperTriggerType? {
String get description {
switch (this) {
case HelperTriggerType.ON_SCREEN_VISIT:
@@ -41,9 +41,9 @@ extension HelperTriggerTypeExt on HelperTriggerType {
}
// FIXME replace by extension
-String getHelperTriggerTypeDescription(
+String? getHelperTriggerTypeDescription(
final HelperTriggerType helperTriggerType) {
- String description;
+ String? description;
switch (helperTriggerType) {
case HelperTriggerType.ON_SCREEN_VISIT:
description = 'On screen visit';
diff --git a/lib/src/database/entity/helper/helper_trigger_type.g.dart b/lib/src/database/entity/helper/helper_trigger_type.g.dart
index a581f7db..6b2fad82 100644
--- a/lib/src/database/entity/helper/helper_trigger_type.g.dart
+++ b/lib/src/database/entity/helper/helper_trigger_type.g.dart
@@ -18,7 +18,7 @@ class HelperTriggerTypeAdapter extends TypeAdapter {
case 1:
return HelperTriggerType.ON_NEW_UPDATE;
default:
- return null;
+ return HelperTriggerType.ON_SCREEN_VISIT;
}
}
diff --git a/lib/src/database/entity/helper/helper_type.dart b/lib/src/database/entity/helper/helper_type.dart
index bff2c4a4..6c18b91e 100644
--- a/lib/src/database/entity/helper/helper_type.dart
+++ b/lib/src/database/entity/helper/helper_type.dart
@@ -18,7 +18,7 @@ enum HelperType {
UPDATE_HELPER,
}
-HelperType getHelperType(final String value) {
+HelperType getHelperType(final String? value) {
return HelperType.values
.firstWhere((element) => element.toString().split('.')[1] == value);
}
@@ -27,8 +27,8 @@ String helperTypeToString(final HelperType helperType) {
return helperType.toString().split('.')[1];
}
-String helperTypeToAsset(final HelperType helperType) {
- String asset;
+String? helperTypeToAsset(final HelperType? helperType) {
+ String? asset;
switch (helperType) {
case HelperType.HELPER_FULL_SCREEN:
asset = 'helper_type_fullscreen.png';
@@ -47,8 +47,8 @@ String helperTypeToAsset(final HelperType helperType) {
return asset;
}
-String getHelperTypeDescription(final HelperType helperType) {
- String description;
+String? getHelperTypeDescription(final HelperType? helperType) {
+ String? description;
switch (helperType) {
case HelperType.HELPER_FULL_SCREEN:
description = 'Fullscreen';
diff --git a/lib/src/database/entity/helper/helper_type.g.dart b/lib/src/database/entity/helper/helper_type.g.dart
index 2a726740..bad72ab6 100644
--- a/lib/src/database/entity/helper/helper_type.g.dart
+++ b/lib/src/database/entity/helper/helper_type.g.dart
@@ -22,7 +22,7 @@ class HelperTypeAdapter extends TypeAdapter {
case 3:
return HelperType.UPDATE_HELPER;
default:
- return null;
+ return HelperType.HELPER_FULL_SCREEN;
}
}
diff --git a/lib/src/database/entity/helper/schema_entity.dart b/lib/src/database/entity/helper/schema_entity.dart
index 98855773..9831ba63 100644
--- a/lib/src/database/entity/helper/schema_entity.dart
+++ b/lib/src/database/entity/helper/schema_entity.dart
@@ -8,13 +8,13 @@ part 'schema_entity.g.dart';
class SchemaEntity {
@HiveField(0)
- String projectId;
+ String? projectId;
@HiveField(1)
- List groups;
+ List? groups;
@HiveField(2)
- int schemaVersion;
+ int? schemaVersion;
SchemaEntity({this.projectId, this.groups, this.schemaVersion});
}
\ No newline at end of file
diff --git a/lib/src/database/entity/helper/schema_entity.g.dart b/lib/src/database/entity/helper/schema_entity.g.dart
index ace51c59..0089f4a1 100644
--- a/lib/src/database/entity/helper/schema_entity.g.dart
+++ b/lib/src/database/entity/helper/schema_entity.g.dart
@@ -17,9 +17,9 @@ class SchemaEntityAdapter extends TypeAdapter {
for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
};
return SchemaEntity(
- projectId: fields[0] as String,
- groups: (fields[1] as List)?.cast(),
- schemaVersion: fields[2] as int,
+ projectId: fields[0] as String?,
+ groups: (fields[1] as List?)?.cast(),
+ schemaVersion: fields[2] as int?,
);
}
diff --git a/lib/src/database/entity/in_app_user_entity.dart b/lib/src/database/entity/in_app_user_entity.dart
index 1947455c..3b2da1bb 100644
--- a/lib/src/database/entity/in_app_user_entity.dart
+++ b/lib/src/database/entity/in_app_user_entity.dart
@@ -1,8 +1,17 @@
+import 'package:hive/hive.dart';
+
+part 'in_app_user_entity.g.dart';
+
+@HiveType(typeId: 12)
class InAppUserEntity {
- String id;
- String inAppId;
- bool disabledHelpers;
- bool anonymous;
+ @HiveField(0)
+ String? id;
+ @HiveField(1)
+ String? inAppId;
+ @HiveField(2)
+ bool? disabledHelpers;
+ @HiveField(3)
+ bool? anonymous;
InAppUserEntity(
{this.id, this.inAppId, this.disabledHelpers, this.anonymous});
diff --git a/lib/src/database/entity/in_app_user_entity.g.dart b/lib/src/database/entity/in_app_user_entity.g.dart
new file mode 100644
index 00000000..9bdee99a
--- /dev/null
+++ b/lib/src/database/entity/in_app_user_entity.g.dart
@@ -0,0 +1,50 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'in_app_user_entity.dart';
+
+// **************************************************************************
+// TypeAdapterGenerator
+// **************************************************************************
+
+class InAppUserEntityAdapter extends TypeAdapter {
+ @override
+ final int typeId = 12;
+
+ @override
+ InAppUserEntity read(BinaryReader reader) {
+ final numOfFields = reader.readByte();
+ final fields = {
+ for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
+ };
+ return InAppUserEntity(
+ id: fields[0] as String?,
+ inAppId: fields[1] as String?,
+ disabledHelpers: fields[2] as bool?,
+ anonymous: fields[3] as bool?,
+ );
+ }
+
+ @override
+ void write(BinaryWriter writer, InAppUserEntity obj) {
+ writer
+ ..writeByte(4)
+ ..writeByte(0)
+ ..write(obj.id)
+ ..writeByte(1)
+ ..write(obj.inAppId)
+ ..writeByte(2)
+ ..write(obj.disabledHelpers)
+ ..writeByte(3)
+ ..write(obj.anonymous);
+ }
+
+ @override
+ int get hashCode => typeId.hashCode;
+
+ @override
+ bool operator ==(Object other) =>
+ identical(this, other) ||
+ other is InAppUserEntityAdapter &&
+ runtimeType == other.runtimeType &&
+ typeId == other.typeId;
+}
diff --git a/lib/src/database/entity/page_entity.dart b/lib/src/database/entity/page_entity.dart
index da7be535..cec72abe 100644
--- a/lib/src/database/entity/page_entity.dart
+++ b/lib/src/database/entity/page_entity.dart
@@ -6,16 +6,16 @@ part 'page_entity.g.dart';
class PageEntity {
@HiveField(0)
- String id;
+ String? id;
@HiveField(1)
- DateTime creationDate;
+ DateTime? creationDate;
@HiveField(2)
- DateTime lastUpdateDate;
+ DateTime? lastUpdateDate;
@HiveField(3)
- String route;
+ String? route;
PageEntity({
this.id,
@@ -26,8 +26,8 @@ class PageEntity {
Map toJson() => {
'id': id ?? "",
- 'creationDate': creationDate != null ? creationDate.toIso8601String() : null,
- 'lastUpdateDate': lastUpdateDate != null ? lastUpdateDate.toIso8601String() : null,
+ 'creationDate': creationDate != null ? creationDate!.toIso8601String() : null,
+ 'lastUpdateDate': lastUpdateDate != null ? lastUpdateDate!.toIso8601String() : null,
'route': route
};
}
diff --git a/lib/src/database/entity/page_entity.g.dart b/lib/src/database/entity/page_entity.g.dart
index 09ff1dfa..fd8d1615 100644
--- a/lib/src/database/entity/page_entity.g.dart
+++ b/lib/src/database/entity/page_entity.g.dart
@@ -17,10 +17,10 @@ class PageEntityAdapter extends TypeAdapter {
for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
};
return PageEntity(
- id: fields[0] as String,
- creationDate: fields[1] as DateTime,
- lastUpdateDate: fields[2] as DateTime,
- route: fields[3] as String,
+ id: fields[0] as String?,
+ creationDate: fields[1] as DateTime?,
+ lastUpdateDate: fields[2] as DateTime?,
+ route: fields[3] as String?,
);
}
diff --git a/lib/src/database/entity/page_user_visit_entity.dart b/lib/src/database/entity/page_user_visit_entity.dart
index 092b5b71..95d6a10f 100644
--- a/lib/src/database/entity/page_user_visit_entity.dart
+++ b/lib/src/database/entity/page_user_visit_entity.dart
@@ -7,20 +7,20 @@ part 'page_user_visit_entity.g.dart';
class HelperGroupUserVisitEntity {
@HiveField(0)
- String pageId;
+ String? pageId;
@HiveField(1)
- String helperGroupId;
+ String? helperGroupId;
@HiveField(2)
- DateTime visitDate;
+ DateTime? visitDate;
@HiveField(3)
- String visitVersion;
+ String? visitVersion;
HelperGroupUserVisitEntity({
- @required this.pageId,
- @required this.helperGroupId,
- @required this.visitDate,
- @required this.visitVersion});
+ required this.pageId,
+ required this.helperGroupId,
+ required this.visitDate,
+ required this.visitVersion});
}
\ No newline at end of file
diff --git a/lib/src/database/entity/page_user_visit_entity.g.dart b/lib/src/database/entity/page_user_visit_entity.g.dart
index e0508961..baf0148d 100644
--- a/lib/src/database/entity/page_user_visit_entity.g.dart
+++ b/lib/src/database/entity/page_user_visit_entity.g.dart
@@ -18,10 +18,10 @@ class HelperGroupUserVisitEntityAdapter
for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
};
return HelperGroupUserVisitEntity(
- pageId: fields[0] as String,
- helperGroupId: fields[1] as String,
- visitDate: fields[2] as DateTime,
- visitVersion: fields[3] as String,
+ pageId: fields[0] as String?,
+ helperGroupId: fields[1] as String?,
+ visitDate: fields[2] as DateTime?,
+ visitVersion: fields[3] as String?,
);
}
diff --git a/lib/src/database/entity/pageable.dart b/lib/src/database/entity/pageable.dart
index 6ca8adc5..e21c6770 100644
--- a/lib/src/database/entity/pageable.dart
+++ b/lib/src/database/entity/pageable.dart
@@ -1,13 +1,13 @@
class Pageable {
- int pageNumber;
- int offset;
- int pageSize;
- int totalPages;
- int totalElements;
- int numberOfElements;
- bool last;
- bool first;
- List entities;
+ int? pageNumber;
+ int? offset;
+ int? pageSize;
+ int? totalPages;
+ int? totalElements;
+ int? numberOfElements;
+ bool? last;
+ bool? first;
+ List? entities;
Pageable({
this.pageNumber,
diff --git a/lib/src/database/entity/version_entity.dart b/lib/src/database/entity/version_entity.dart
index e8ed2c00..d9f01ecc 100644
--- a/lib/src/database/entity/version_entity.dart
+++ b/lib/src/database/entity/version_entity.dart
@@ -1,7 +1,7 @@
/// User Application version
class VersionEntity {
- int id;
- String name;
+ int? id;
+ String? name;
VersionEntity({this.id, this.name});
diff --git a/lib/src/database/hive_client.dart b/lib/src/database/hive_client.dart
index f79eb056..d4610c39 100644
--- a/lib/src/database/hive_client.dart
+++ b/lib/src/database/hive_client.dart
@@ -2,13 +2,13 @@
import 'package:flutter/cupertino.dart';
import 'package:hive/hive.dart';
import 'package:pal/src/database/entity/helper/helper_trigger_type.dart';
+import 'package:pal/src/database/entity/in_app_user_entity.dart';
import 'entity/helper/helper_entity.dart';
import 'entity/helper/helper_group_entity.dart';
import 'entity/helper/helper_type.dart';
import 'entity/helper/schema_entity.dart';
import 'entity/page_user_visit_entity.dart';
import 'entity/page_entity.dart';
-import 'package:hive_flutter/hive_flutter.dart';
typedef Future> LocalDbOpener();
@@ -22,7 +22,6 @@ class HiveClient {
@visibleForTesting
init() async {
- await Hive.initFlutter();
initAdapters();
}
@@ -34,17 +33,18 @@ class HiveClient {
@visibleForTesting
initAdapters() {
- Hive.registerAdapter(SchemaEntityAdapter());
- Hive.registerAdapter(HelperGroupEntityAdapter());
- Hive.registerAdapter(HelperEntityAdapter());
- Hive.registerAdapter(PageEntityAdapter());
- Hive.registerAdapter(HelperGroupUserVisitEntityAdapter());
- Hive.registerAdapter(HelperTypeAdapter());
- Hive.registerAdapter(HelperTriggerTypeAdapter());
- Hive.registerAdapter(HelperTextEntityAdapter());
- Hive.registerAdapter(HelperImageEntityAdapter());
- Hive.registerAdapter(HelperBorderEntityAdapter());
- Hive.registerAdapter(HelperBoxEntityAdapter());
+ Hive.registerAdapter(SchemaEntityAdapter(), override: true);
+ Hive.registerAdapter(HelperGroupEntityAdapter(), override: true);
+ Hive.registerAdapter(HelperEntityAdapter(), override: true);
+ Hive.registerAdapter(PageEntityAdapter(), override: true);
+ Hive.registerAdapter(HelperGroupUserVisitEntityAdapter(), override: true);
+ Hive.registerAdapter(HelperTypeAdapter(), override: true);
+ Hive.registerAdapter(HelperTriggerTypeAdapter(), override: true);
+ Hive.registerAdapter(HelperTextEntityAdapter(), override: true);
+ Hive.registerAdapter(HelperImageEntityAdapter(), override: true);
+ Hive.registerAdapter(HelperBorderEntityAdapter(), override: true);
+ Hive.registerAdapter(HelperBoxEntityAdapter(), override: true);
+ Hive.registerAdapter(InAppUserEntityAdapter(), override: true);
}
LocalDbOpener get openSchemaBox =>
@@ -53,6 +53,9 @@ class HiveClient {
LocalDbOpener get openVisitsBox =>
() => Hive.openBox('visits');
+ LocalDbOpener get openInAppUserBox =>
+ () => Hive.openBox('inAppUser');
+
close() => Hive.close();
}
\ No newline at end of file
diff --git a/lib/src/database/repository/base_repository.dart b/lib/src/database/repository/base_repository.dart
index a8fa780c..dcb20c0c 100644
--- a/lib/src/database/repository/base_repository.dart
+++ b/lib/src/database/repository/base_repository.dart
@@ -3,5 +3,5 @@ import 'package:pal/src/services/http_client/base_client.dart';
class BaseHttpRepository {
final HttpClient httpClient;
- const BaseHttpRepository({this.httpClient});
+ const BaseHttpRepository({required this.httpClient});
}
diff --git a/lib/src/database/repository/client/helper_repository.dart b/lib/src/database/repository/client/helper_repository.dart
index 7814a228..a33022f5 100644
--- a/lib/src/database/repository/client/helper_repository.dart
+++ b/lib/src/database/repository/client/helper_repository.dart
@@ -11,10 +11,10 @@ class ClientHelperRepository extends BaseHttpRepository {
final EntityAdapter.HelperEntityAdapter _adapter = EntityAdapter.HelperEntityAdapter();
- ClientHelperRepository({@required HttpClient httpClient})
+ ClientHelperRepository({required HttpClient httpClient})
: super(httpClient: httpClient);
- Future> getAllHelpers({final int version}) {
+ Future> getAllHelpers({final int? version}) {
throw "not implemented yet";
}
diff --git a/lib/src/database/repository/client/page_user_visit_repository.dart b/lib/src/database/repository/client/page_user_visit_repository.dart
index 6c5226b9..bd517208 100644
--- a/lib/src/database/repository/client/page_user_visit_repository.dart
+++ b/lib/src/database/repository/client/page_user_visit_repository.dart
@@ -1,7 +1,6 @@
import 'dart:convert';
-import 'package:flutter/material.dart';
import 'package:http/http.dart';
import 'package:pal/src/database/adapter/helper_group_visit_entity_adapter.dart' as Adapter;
import 'package:pal/src/database/entity/helper/helper_entity.dart';
@@ -14,16 +13,16 @@ import '../base_repository.dart';
abstract class HelperGroupUserVisitRepository {
- Future> get(String userId, String minAppVersion);
+ Future> get(String? userId, String? minAppVersion);
Future saveAll(List visits);
Future add(HelperGroupUserVisitEntity visit, {
- bool isLast,
- bool feedback,
- String inAppUserId,
- HelperEntity helper,
- String languageCode
+ required bool isLast,
+ required bool feedback,
+ required String inAppUserId,
+ required String languageCode,
+ required HelperEntity helper
});
Future clear();
@@ -34,11 +33,11 @@ class HelperGroupUserVisitHttpRepository extends BaseHttpRepository implements H
Adapter.HelperGroupUserVisitEntityAdapter _adapter = Adapter.HelperGroupUserVisitEntityAdapter();
- HelperGroupUserVisitHttpRepository({@required HttpClient httpClient})
+ HelperGroupUserVisitHttpRepository({required HttpClient httpClient})
: super(httpClient: httpClient);
- Future> get(String userId, String minAppVersion) async {
+ Future> get(String? userId, String? minAppVersion) async {
final Response response = await this
.httpClient
.get(Uri.parse('pal-analytic/users/$userId/groups'));
@@ -58,11 +57,11 @@ class HelperGroupUserVisitHttpRepository extends BaseHttpRepository implements H
@override
Future add(HelperGroupUserVisitEntity visit,
{
- @required bool isLast,
- @required bool feedback,
- @required String inAppUserId,
- @required String languageCode,
- @required HelperEntity helper
+ required bool isLast,
+ required bool feedback,
+ required String inAppUserId,
+ required String languageCode,
+ required HelperEntity helper
}) async {
var url = Uri.parse('pal-analytic/users/$inAppUserId/groups/${visit.helperGroupId}/helpers/${helper.id}');
var body = jsonEncode({
@@ -70,7 +69,7 @@ class HelperGroupUserVisitHttpRepository extends BaseHttpRepository implements H
'isLast': isLast,
'language': languageCode
});
- return httpClient.post(url, body: body, headers: {"inAppUserId": inAppUserId});
+ await httpClient.post(url, body: body, headers: {"inAppUserId": inAppUserId});
}
}
@@ -79,10 +78,10 @@ class HelperGroupUserVisitLocalRepository implements HelperGroupUserVisitReposit
LocalDbOpener _hiveBoxOpener;
- HelperGroupUserVisitLocalRepository({@required LocalDbOpener hiveBoxOpener})
+ HelperGroupUserVisitLocalRepository({required LocalDbOpener hiveBoxOpener})
: _hiveBoxOpener = hiveBoxOpener;
- Future> get(String userId, String minAppVersion)
+ Future> get(String? userId, String? minAppVersion)
=> _hiveBoxOpener().then((res) => res.values.toList());
@override
@@ -94,11 +93,11 @@ class HelperGroupUserVisitLocalRepository implements HelperGroupUserVisitReposit
@override
Future add(HelperGroupUserVisitEntity visit, {
- bool isLast,
- bool feedback,
- String inAppUserId,
- HelperEntity helper,
- String languageCode,
+ bool? isLast,
+ bool? feedback,
+ String? inAppUserId,
+ HelperEntity? helper,
+ String? languageCode,
}) => _hiveBoxOpener().then((res) => res.add(visit));
}
\ No newline at end of file
diff --git a/lib/src/database/repository/client/schema_repository.dart b/lib/src/database/repository/client/schema_repository.dart
index e6927723..fc7f23ea 100644
--- a/lib/src/database/repository/client/schema_repository.dart
+++ b/lib/src/database/repository/client/schema_repository.dart
@@ -15,7 +15,7 @@ abstract class ClientSchemaRepository {
/// if [schemaVersion] is provided and repository contains a lower or equal version returns nothing
/// if [language] is null, returns the default language
/// if [appVersion] must be provided, current application version in user pubspec.yml
- Future get({int schemaVersion, String language, String appVersion});
+ Future get({int? schemaVersion, String? language, String? appVersion});
}
@@ -24,11 +24,11 @@ class ClientSchemaRemoteRepository extends BaseHttpRepository implements ClientS
GenericEntityAdapter _adapter = Adapter.SchemaEntityAdapter();
- ClientSchemaRemoteRepository({@required HttpClient httpClient})
+ ClientSchemaRemoteRepository({required HttpClient httpClient})
: super(httpClient: httpClient);
@override
- Future get({int schemaVersion, String language, @required String appVersion}) async {
+ Future get({int? schemaVersion, String? language, String? appVersion}) async {
final Response response = await this
.httpClient
.get(Uri.parse('pal-business/client/schema'), headers: {
@@ -46,27 +46,27 @@ class ClientSchemaRemoteRepository extends BaseHttpRepository implements ClientS
class ClientSchemaLocalRepository implements ClientSchemaRepository {
- final LocalDbOpener _hiveBoxOpener;
+ final LocalDbOpener? _hiveBoxOpener;
- ClientSchemaLocalRepository({ LocalDbOpener hiveBoxOpener})
+ ClientSchemaLocalRepository({ LocalDbOpener? hiveBoxOpener})
: this._hiveBoxOpener = hiveBoxOpener;
@override
- Future get({int schemaVersion, String language, String appVersion}) async {
- var _hiveBox = await _hiveBoxOpener();
+ Future get({int? schemaVersion, String? language, String? appVersion}) async {
+ var _hiveBox = await _hiveBoxOpener!();
if(_hiveBox.isEmpty)
return null;
return _hiveBox.values.first;
}
Future save(SchemaEntity schema) async {
- var _hiveBox = await _hiveBoxOpener();
+ var _hiveBox = await _hiveBoxOpener!();
await _hiveBox.clear();
await _hiveBox.add(schema);
}
Future clear() async {
- var _hiveBox = await _hiveBoxOpener();
+ var _hiveBox = await _hiveBoxOpener!();
await _hiveBox.clear();
}
diff --git a/lib/src/database/repository/editor/helper_editor_repository.dart b/lib/src/database/repository/editor/helper_editor_repository.dart
index ba0a7b34..9eb6e3d0 100644
--- a/lib/src/database/repository/editor/helper_editor_repository.dart
+++ b/lib/src/database/repository/editor/helper_editor_repository.dart
@@ -1,7 +1,6 @@
import 'dart:convert';
import 'dart:io';
-import 'package:flutter/material.dart';
import 'package:http/http.dart';
import 'package:pal/src/database/adapter/helper_entity_adapter.dart'
as EntityAdapter;
@@ -15,31 +14,31 @@ class EditorHelperRepository extends BaseHttpRepository {
EntityAdapter.HelperEntityAdapter();
EditorHelperRepository({
- @required HttpClient httpClient,
+ required HttpClient httpClient,
}) : super(httpClient: httpClient);
- Future createHelper(final String pageId, final String groupId,
+ Future createHelper(final String? pageId, final String? groupId,
final HelperEntity createHelper) async {
final payload = jsonEncode(createHelper);
final Response response = await this.httpClient.post(
Uri.parse('pal-business/editor/groups/$groupId/helpers'),
body: payload,
);
- if (response == null || response.body == null)
+ if (response.body.isEmpty)
throw new UnknownHttpError("NO_RESULT");
return this._adapter.parse(response.body);
}
- Future updateHelper(
- final String pageId,
+ Future updateHelper(
+ final String? pageId,
final HelperEntity updatedHelper,
) async {
final payload = jsonEncode(updatedHelper);
final Response response = await this.httpClient.put(
- Uri.parse('pal-business/editor/helpers/${updatedHelper?.id}'),
+ Uri.parse('pal-business/editor/helpers/${updatedHelper.id}'),
body: payload);
- if (response == null || response.body == null)
- throw new UnknownHttpError('NO_RESULT');
+ // if (response.body.isEmpty)
+ // throw new UnknownHttpError('NO_RESULT');
return response.body.length == 0
? null
: this._adapter.parse(response.body);
@@ -52,7 +51,7 @@ class EditorHelperRepository extends BaseHttpRepository {
return this._adapter.parsePage(response.body);
}
- Future> getGroupHelpers(String groupId) async {
+ Future> getGroupHelpers(String? groupId) async {
final Response response =
await this.httpClient.get(Uri.parse('pal-business/editor/groups/$groupId/helpers'));
return this._adapter.parseArray(response.body);
@@ -76,7 +75,7 @@ class EditorHelperRepository extends BaseHttpRepository {
);
}
- Future