redesign: Academic Path - Schedule

packages/uni_app/lib/controller/local_storage/database/app_lectures_database.dart

@@ -16,10 +16,10 @@ class AppLecturesDatabase extends AppDatabase<List<Lecture>> {
             createScript,
           ],
           onUpgrade: migrate,
-          version: 10,
+          version: 11,
         );
   static const createScript = '''
-CREATE TABLE lectures(subject TEXT, typeClass TEXT,
+CREATE TABLE lectures(acronym TEXT, subject TEXT, typeClass TEXT,
           startTime TEXT, endTime TEXT, room TEXT, teacher TEXT, classNumber TEXT, occurrId INTEGER)''';
 
   /// Returns a list containing all of the lectures stored in this database.

packages/uni_app/lib/controller/parsers/schedule/api/parser.dart

@@ -62,6 +62,7 @@ Future<List<Lecture>> parseSchedule(
     final occurrId = lecture['ocorrencia_id'] as int;
 
     final lec = Lecture.fromApi(
+      '',
       subject,
       typeClass,
       startTime,

packages/uni_app/lib/controller/parsers/schedule/new_api/models/response_lecture_unit.dart

@@ -4,11 +4,12 @@ part '../../../../../generated/controller/parsers/schedule/new_api/models/respon
 
 @JsonSerializable(explicitToJson: true)
 class ResponseLectureUnit {
-  ResponseLectureUnit(this.acronym, this.sigarraId);
+  ResponseLectureUnit(this.acronym, this.name, this.sigarraId);
   factory ResponseLectureUnit.fromJson(Map<String, dynamic> json) =>
       _$ResponseLectureUnitFromJson(json);
 
   String acronym;
+  String name;
   @JsonKey(name: 'sigarra_id')
   int sigarraId;
 

packages/uni_app/lib/controller/parsers/schedule/new_api/parser.dart

@@ -31,6 +31,7 @@ List<Lecture> getLecturesFromApiResponse(
       .map(
         (lecture) => Lecture(
           lecture.units.first.acronym,
+          lecture.units.first.name,
           lecture.typology.acronym,
           lecture.start,
           lecture.end,

packages/uni_app/lib/generated/intl/messages_all.dart

@@ -11,6 +11,7 @@
 
 import 'dart:async';
 
+import 'package:flutter/foundation.dart';
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';
 import 'package:intl/src/intl_helpers.dart';
@@ -20,8 +21,8 @@ import 'messages_pt_PT.dart' as messages_pt_pt;
 
 typedef Future<dynamic> LibraryLoader();
 Map<String, LibraryLoader> _deferredLibraries = {
-  'en': () => new Future.value(null),
-  'pt_PT': () => new Future.value(null),
+  'en': () => new SynchronousFuture(null),
+  'pt_PT': () => new SynchronousFuture(null),
 };
 
 MessageLookupByLibrary? _findExact(String localeName) {
@@ -36,18 +37,18 @@ MessageLookupByLibrary? _findExact(String localeName) {
 }
 
 /// User programs should call this before using [localeName] for messages.
-Future<bool> initializeMessages(String localeName) async {
+Future<bool> initializeMessages(String localeName) {
   var availableLocale = Intl.verifiedLocale(
       localeName, (locale) => _deferredLibraries[locale] != null,
       onFailure: (_) => null);
   if (availableLocale == null) {
-    return new Future.value(false);
+    return new SynchronousFuture(false);
   }
   var lib = _deferredLibraries[availableLocale];
-  await (lib == null ? new Future.value(false) : lib());
+  lib == null ? new SynchronousFuture(false) : lib();
   initializeInternalMessageLookup(() => new CompositeMessageLookup());
   messageLookup.addLocale(availableLocale, _findGeneratedMessagesFor);
-  return new Future.value(true);
+  return new SynchronousFuture(true);
 }
 
 bool _messagesExistFor(String locale) {

packages/uni_app/lib/generated/intl/messages_en.dart

@@ -7,7 +7,8 @@
 // ignore_for_file:unnecessary_brace_in_string_interps, unnecessary_new
 // ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
 // ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
-// ignore_for_file:unused_import, file_names
+// ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
+// ignore_for_file:unnecessary_string_interpolations, unnecessary_string_escapes
 
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';
@@ -19,12 +20,12 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'en';
 
-  static m0(time) => "last refresh at ${time}";
+  static String m0(time) => "last refresh at ${time}";
 
-  static m1(time) =>
+  static String m1(time) =>
       "${Intl.plural(time, zero: 'Refreshed ${time} minutes ago', one: 'Refreshed ${time} minute ago', other: 'Refreshed ${time} minutes ago')}";
 
-  static m2(title) => "${Intl.select(title, {
+  static String m2(title) => "${Intl.select(title, {
             'horario': 'Schedule',
             'exames': 'Exams',
             'area': 'Personal Area',
@@ -41,7 +42,7 @@ class MessageLookup extends MessageLookupByLibrary {
           })}";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
-  static _notInlinedMessages(_) => <String, Function>{
+  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
         "about": MessageLookupByLibrary.simpleMessage("About us"),
         "academic_services":
             MessageLookupByLibrary.simpleMessage("Academic services"),
@@ -161,7 +162,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "language": MessageLookupByLibrary.simpleMessage("Language"),
         "last_refresh_time": m0,
         "last_timestamp": m1,
-        "lectures": MessageLookupByLibrary.simpleMessage("Lectures"),
         "library_occupation":
             MessageLookupByLibrary.simpleMessage("Library Occupation"),
         "load_error": MessageLookupByLibrary.simpleMessage(
@@ -194,6 +194,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("You don\'t have classes on"),
         "no_classes_on_weekend":
             MessageLookupByLibrary.simpleMessage("You don\'t have classes on"),
+        "no_classes_this_week": MessageLookupByLibrary.simpleMessage(
+            "You have no classes this week"),
         "no_college": MessageLookupByLibrary.simpleMessage("no college"),
         "no_course_units": MessageLookupByLibrary.simpleMessage(
             "No course units in the selected period"),
@@ -270,6 +272,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "restaurant_main_page": MessageLookupByLibrary.simpleMessage(
             "Do you want to see your favorite restaurants in the main page?"),
         "room": MessageLookupByLibrary.simpleMessage("Room"),
+        "schedule": MessageLookupByLibrary.simpleMessage("Schedule"),
         "school_calendar":
             MessageLookupByLibrary.simpleMessage("School Calendar"),
         "search": MessageLookupByLibrary.simpleMessage("Search"),

packages/uni_app/lib/generated/intl/messages_pt_PT.dart

@@ -7,7 +7,8 @@
 // ignore_for_file:unnecessary_brace_in_string_interps, unnecessary_new
 // ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
 // ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
-// ignore_for_file:unused_import, file_names
+// ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
+// ignore_for_file:unnecessary_string_interpolations, unnecessary_string_escapes
 
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';
@@ -19,12 +20,12 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'pt_PT';
 
-  static m0(time) => "última atualização às ${time}";
+  static String m0(time) => "última atualização às ${time}";
 
-  static m1(time) =>
+  static String m1(time) =>
       "${Intl.plural(time, zero: 'Atualizado há ${time} minutos', one: 'Atualizado há ${time} minuto', other: 'Atualizado há ${time} minutos')}";
 
-  static m2(title) => "${Intl.select(title, {
+  static String m2(title) => "${Intl.select(title, {
             'horario': 'Horário',
             'exames': 'Exames',
             'area': 'Área Pessoal',
@@ -41,7 +42,7 @@ class MessageLookup extends MessageLookupByLibrary {
           })}";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
-  static _notInlinedMessages(_) => <String, Function>{
+  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
         "about": MessageLookupByLibrary.simpleMessage("Sobre nós"),
         "academic_services":
             MessageLookupByLibrary.simpleMessage("Serviços académicos"),
@@ -160,7 +161,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "language": MessageLookupByLibrary.simpleMessage("Idioma"),
         "last_refresh_time": m0,
         "last_timestamp": m1,
-        "lectures": MessageLookupByLibrary.simpleMessage("Aulas"),
         "library_occupation":
             MessageLookupByLibrary.simpleMessage("Ocupação da Biblioteca"),
         "load_error": MessageLookupByLibrary.simpleMessage(
@@ -271,6 +271,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "restaurant_main_page": MessageLookupByLibrary.simpleMessage(
             "Queres ver os teus restaurantes favoritos na página principal?"),
         "room": MessageLookupByLibrary.simpleMessage("Sala"),
+        "schedule": MessageLookupByLibrary.simpleMessage("Aulas"),
         "school_calendar":
             MessageLookupByLibrary.simpleMessage("Calendário Escolar"),
         "search": MessageLookupByLibrary.simpleMessage("Pesquisar"),

packages/uni_app/lib/l10n/intl_en.arb

@@ -188,6 +188,8 @@
   "@no_bus_stops": {},
   "no_class": "There are no classes to display",
   "@no_class": {},
+  "no_classes_this_week": "You have no classes this week",
+  "@no_classes_this_week": {},
   "no_classes": "No classes to present",
   "@no_classes": {},
   "no_classes_on": "You don't have classes on",
@@ -342,8 +344,8 @@
   "@wrong_credentials_exception": {},
   "internet_status_exception": "Check your internet connection",
   "@internet_status_exception": {},
-  "lectures": "Lectures",
-  "@lectures": {},
+  "schedule": "Schedule",
+  "@schedule": {},
   "exams": "Exams",
   "@exams": {},
   "courses": "Courses",

packages/uni_app/lib/l10n/intl_pt_PT.arb

@@ -342,8 +342,8 @@
   "@wrong_credentials_exception": {},
   "internet_status_exception": "Verifique sua conexão com a internet",
   "@internet_status_exception": {},
-  "lectures": "Aulas",
-  "@lectures": {},
+  "schedule": "Aulas",
+  "@schedule": {},
   "exams": "Exames",
   "@exams": {},
   "courses": "Cursos",

packages/uni_app/lib/model/entities/lecture.dart

@@ -9,6 +9,7 @@ part '../../generated/model/entities/lecture.g.dart';
 class Lecture {
   /// Creates an instance of the class [Lecture].
   Lecture(
+    this.acronym,
     this.subject,
     this.typeClass,
     this.startTime,
@@ -23,6 +24,7 @@ class Lecture {
       _$LectureFromJson(json);
 
   factory Lecture.fromApi(
+    String acronym,
     String subject,
     String typeClass,
     DateTime startTime,
@@ -34,6 +36,7 @@ class Lecture {
   ) {
     final endTime = startTime.add(Duration(minutes: 30 * blocks));
     final lecture = Lecture(
+      acronym,
       subject,
       typeClass,
       startTime,
@@ -46,37 +49,7 @@ class Lecture {
     return lecture;
   }
 
-  factory Lecture.fromHtml(
-    String subject,
-    String typeClass,
-    DateTime day,
-    String startTimeString,
-    int blocks,
-    String room,
-    String teacher,
-    String classNumber,
-    int occurrId,
-  ) {
-    final startTimeList = startTimeString.split(':');
-    final startTime = day.add(
-      Duration(
-        hours: int.parse(startTimeList[0]),
-        minutes: int.parse(startTimeList[1]),
-      ),
-    );
-    final endTime = startTime.add(Duration(minutes: 30 * blocks));
-    return Lecture(
-      subject,
-      typeClass,
-      startTime,
-      endTime,
-      room,
-      teacher,
-      classNumber,
-      occurrId,
-    );
-  }
-
+  String acronym;
   String subject;
   String typeClass;
   String room;
@@ -89,7 +62,7 @@ class Lecture {
 
   @override
   String toString() {
-    return '$subject $typeClass\n$startTime $endTime\n $room  '
+    return '$acronym \n$subject $typeClass\n$startTime $endTime\n $room  '
         '$teacher\n';
   }
 
@@ -100,6 +73,7 @@ class Lecture {
 
   @override
   int get hashCode => Object.hash(
+        acronym,
         subject,
         startTime,
         endTime,
@@ -113,6 +87,7 @@ class Lecture {
   @override
   bool operator ==(Object other) =>
       other is Lecture &&
+      acronym == other.acronym &&
       subject == other.subject &&
       startTime == other.startTime &&
       endTime == other.endTime &&