Merge branch 'main' into flutter-upgrade-to-3-7-7

SharezoneApp · Mar 9, 2023 · 148143e · 148143e
2 parents e9bf402 + 0103066
commit 148143e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 17 deletions.
diff --git a/app/lib/calendrical_events/models/calendrical_event.dart b/app/lib/calendrical_events/models/calendrical_event.dart
@@ -47,7 +47,7 @@ class CalendricalEvent {
       eventID: id,
       groupID: data['groupID'] as String,
       authorID: data['authorID'] as String,
-      date: Date.parse(data['date']),
+      date: Date.parse(data['date'] as String),
       startTime: Time.parse(data['startTime'] as String),
       endTime: Time.parse(data['endTime'] as String),
       title: data['title'] as String,

diff --git a/app/lib/timetable/src/models/lesson.dart b/app/lib/timetable/src/models/lesson.dart
@@ -45,8 +45,8 @@ class Lesson {
       lessonID: id,
       groupID: data['groupID'] as String,
       groupType: groupTypeFromString(data['groupType'] as String),
-      startDate: Date.parse(data['startDate']),
-      endDate: Date.parse(data['endDate']),
+      startDate: Date.parse(data['startDate'] as String),
+      endDate: Date.parse(data['endDate'] as String),
       startTime: Time.parse(data['startTime'] as String),
       endTime: Time.parse(data['endTime'] as String),
       periodNumber: data['periodNumber'] as int,

diff --git a/lib/date/lib/src/date.dart b/lib/date/lib/src/date.dart
@@ -16,18 +16,13 @@ class Date {
     return Date._(dateString);
   }
 
-  factory Date.parse(dynamic dateString) {
-    if (dateString != null && dateString is String) {
-      return Date._(dateString);
-    } else {
-      return null;
-    }
+  factory Date.parse(String dateString) {
+    return Date._(dateString);
   }
 
   const Date._(this._iso8601String);
 
   factory Date.fromDateTime(DateTime dateTime) {
-    if (dateTime == null) return null;
     return Date._(dateTime.toIso8601String().substring(0, 10));
   }
 

diff --git a/lib/date/lib/src/weekday.dart b/lib/date/lib/src/weekday.dart
@@ -10,10 +10,10 @@ import 'package:sharezone_common/helper_functions.dart';
 
 enum WeekDay { monday, tuesday, wednesday, thursday, friday, saturday, sunday }
 
-WeekDay weekDayEnumFromString(String data) =>
+WeekDay? weekDayEnumFromString(String data) =>
     enumFromString(WeekDay.values, data);
 
-String weekDayEnumToString(WeekDay weekDay) => enumToString(weekDay);
+String? weekDayEnumToString(WeekDay weekDay) => enumToString(weekDay);
 
 String weekDayEnumToGermanString(WeekDay weekDay) {
   switch (weekDay) {
@@ -32,5 +32,4 @@ String weekDayEnumToGermanString(WeekDay weekDay) {
     case WeekDay.sunday:
       return 'Sonntag';
   }
-  return "";
 }
diff --git a/lib/date/lib/src/weektype.dart b/lib/date/lib/src/weektype.dart
@@ -10,10 +10,10 @@ import 'package:sharezone_common/helper_functions.dart';
 
 enum WeekType { always, a, b }
 
-WeekType weekTypeEnumFromString(String data) =>
+WeekType? weekTypeEnumFromString(String data) =>
     enumFromString(WeekType.values, data, orElse: WeekType.always);
 
-String weekTypeEnumToString(WeekType weekType) => enumToString(weekType);
+String? weekTypeEnumToString(WeekType weekType) => enumToString(weekType);
 
 String weekTypeEnumToGermanString(WeekType weekType) {
   switch (weekType) {
@@ -24,5 +24,4 @@ String weekTypeEnumToGermanString(WeekType weekType) {
     case WeekType.b:
       return 'B-Woche';
   }
-  return "";
 }
diff --git a/lib/date/pubspec.yaml b/lib/date/pubspec.yaml
@@ -12,7 +12,7 @@ version: 1.0.0
 publish_to: none
 
 environment:
-  sdk: ">=2.10.0 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
   sharezone_common: