3 files changed, 25 insertions, 21 deletions
diff --git a/lib/services/local_shift_provider_service.dart b/lib/services/local_shift_provider_service.dart
index 4894820..a7dfa5b 100644
--- a/lib/services/local_shift_provider_service.dart
+++ b/lib/services/local_shift_provider_service.dart
@@ -20,6 +20,21 @@ class LocalShiftProviderService extends IProgramProviderService {
     return directory.path;
   }
 
+  Future<List<String>> getStoredFileList() async {
+    List<String> result = [];
+    Directory dir = await _localDir;
+    var list = dir.listSync();
+    for (var item in list) {
+      if (!item.path.endsWith('.json') || !item.path.contains('shifts')) {
+        continue;
+      }
+
+      result.add(item.path);
+    }
+
+    return result;
+  }
+
   Future<File> _localFile(String postfix) async {
     final path = await _localPath;
     String fullPath = '$path/shifts_' + postfix + '.json';
@@ -100,16 +115,10 @@ class LocalShiftProviderService extends IProgramProviderService {
 
   @override
   Future<List<Shift>> getPastShifts() async {
-    await Future.delayed(Duration(seconds: 1));
     List<Shift> shifts = [];
-    Directory dir = await _localDir;
-    var list = dir.listSync();
+    var list = await getStoredFileList();
     for (var item in list) {
-      if (!item.path.endsWith('.json') || !item.path.contains('shifts')) {
-        continue;
-      }
-
-      final file = File(item.path);
+      final file = File(item);
       final contents = await file.readAsString();
       final Iterable iterable = await jsonDecode(contents);
       List<Shift> data =
@@ -124,7 +133,6 @@ class LocalShiftProviderService extends IProgramProviderService {
 
   @override
   Future<List<Shift>> getShiftsForWeek(DateTime firstDayOfWeek) async {
-    await Future.delayed(Duration(seconds: 1));
     var items = await readShiftsFromFile(
         DateUtilities.DateUtils.firstDayOfWeek(firstDayOfWeek));
     List<Shift> result = [];
diff --git a/lib/services/mock_shift_provider_service.dart b/lib/services/mock_shift_provider_service.dart
index e6c88e0..605ba19 100644
--- a/lib/services/mock_shift_provider_service.dart
+++ b/lib/services/mock_shift_provider_service.dart
@@ -13,41 +13,37 @@ class MockShiftProviderService extends IProgramProviderService {
       Shift(
           end: DateTime(2022, 8, 8, 20, 30),
           start: DateTime(2022, 8, 8, 16, 30),
-          type: ShiftType.Avondrit,
+          type: 'Avondrit',
           payRate: 13.75),
     );
 
     shifts.add(Shift(
         end: DateTime(2022, 8, 6, 20, 30),
         start: DateTime(2022, 8, 6, 16, 30),
-        type: ShiftType.Avondrit,
+        type: 'Avondrit',
         payRate: 13.75));
 
     shifts.add(Shift(
         end: DateTime(2022, 8, 5, 20, 30),
         start: DateTime(2022, 8, 5, 16, 30),
-        type: ShiftType.Avondrit,
+        type: 'Avondrit',
         payRate: 13.75));
 
     shifts.add(Shift(
-        start: DateTime(2022, 8, 4, 16, 30),
-        type: ShiftType.Avondrit,
-        payRate: 13.75));
+        start: DateTime(2022, 8, 4, 16, 30), type: 'Avondrit', payRate: 13.75));
 
     shifts.add(Shift(
         end: DateTime(2022, 8, 1, 17, 30),
         start: DateTime(2022, 8, 1, 9, 30),
-        type: ShiftType.Dagrit,
+        type: 'Dagrit',
         payRate: 13.75));
 
     shifts.add(Shift(
-        start: DateTime(2022, 8, 22, 9, 30),
-        type: ShiftType.Dagrit,
-        payRate: 13.75));
+        start: DateTime(2022, 8, 22, 9, 30), type: 'Dagrit', payRate: 13.75));
 
     shifts.add(Shift(
         start: DateTime.now().subtract(Duration(hours: 2)),
-        type: ShiftType.Dagrit,
+        type: 'Dagrit',
         payRate: 13.75));
 
     savedShifts = shifts;
diff --git a/lib/services/settings_service.dart b/lib/services/settings_service.dart
index 027ecc2..350d7bd 100644
--- a/lib/services/settings_service.dart
+++ b/lib/services/settings_service.dart
@@ -44,7 +44,7 @@ class SettingsService {
     if (!exists) {
       print('created settings.json');
       await file.create();
-      await writeSettingsToFile(DefaultSettings());
+      await file.writeAsString(jsonEncode(DefaultSettings()));
     }
 
     return File('$path/settings.json');