Switch to schema version 3 (#60)

hkamran80 · Dec 5, 2022 · 5533586 · 5533586
1 parent d83f0b5
commit 5533586
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/constants.dart b/lib/constants.dart
@@ -1,7 +1,7 @@
 const applicationName = "Schedules";
 
 Uri schedulesLink =
-    Uri.parse("https://cfg-schedules.unisontech.org/schedules/latest");
+    Uri.parse("https://cfg-schedules.unisontech.org/schedules/schema-3");
 
 Uri requestLink = Uri.parse("https://go.unisontech.org/schreq");
 Uri feedbackLink = Uri.parse("https://go.unisontech.org/sch-mobile-feedback");

diff --git a/lib/extensions/string.dart b/lib/extensions/string.dart
@@ -16,8 +16,8 @@ extension StringDateTime on String {
   }
 
   String convertTime(bool hour24) => hour24
-      ? split("-").sublist(0, 2).join(":")
-      : replaceAll("-", ":").convertTo12Hour();
+      ? split(":").sublist(0, 2).join(":")
+      : convertTo12Hour();
 }
 
 extension StringRegExp on String {

diff --git a/lib/utils/schedule.dart b/lib/utils/schedule.dart
@@ -125,10 +125,10 @@ class Schedule {
       try {
         return daySchedulePeriods.firstWhere(
           (schedulePeriod) {
-            if (int.parse(schedulePeriod.times.start.replaceAll("-", "")) <=
+            if (int.parse(schedulePeriod.times.start.replaceAll(":", "")) <=
                     currentTime &&
                 currentTime <=
-                    int.parse(schedulePeriod.times.end.replaceAll("-", ""))) {
+                    int.parse(schedulePeriod.times.end.replaceAll(":", ""))) {
               if (_periodName != schedulePeriod.name) {
                 _notificationsScheduled = false;
                 _periodName = schedulePeriod.originalName;
@@ -157,7 +157,7 @@ class Schedule {
   String get timeRemaining {
     if (currentPeriodExists) {
       DateTime now = DateTime.now();
-      List<String> endTime = currentPeriod!.times.end.split("-");
+      List<String> endTime = currentPeriod!.times.end.split(":");
 
       Duration remaining = DateTime(
         now.year,
@@ -314,7 +314,7 @@ class Schedule {
         for (var interval in intervals) {
           DateTime scheduledTime = DateFormat("y-M-d H:m:s")
               .parse(
-                "${DateTime.now().toString().split(" ")[0]} ${currentPeriod!.times.end.replaceAll("-", ":")}",
+                "${DateTime.now().toString().split(" ")[0]} ${currentPeriod!.times.end}",
               )
               .subtract(interval.duration);