fix: merge issues

NIAEFEUP · Feb 6, 2025 · 380b135 · 380b135
1 parent 0ec0cfb
commit 380b135
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/packages/uni_app/lib/generated/intl/messages_en.dart b/packages/uni_app/lib/generated/intl/messages_en.dart
@@ -184,8 +184,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Invalid credentials"),
         "keep_login": MessageLookupByLibrary.simpleMessage("Remember me"),
         "language": MessageLookupByLibrary.simpleMessage("Language"),
-        "last_refresh_time": m0,
-        "last_timestamp": m1,
+        "last_refresh_time": m1,
+        "last_timestamp": m2,
         "leave_feedback":
             MessageLookupByLibrary.simpleMessage("Leave feedback"),
         "lectures": MessageLookupByLibrary.simpleMessage("Lectures"),

diff --git a/packages/uni_app/lib/generated/intl/messages_pt_PT.dart b/packages/uni_app/lib/generated/intl/messages_pt_PT.dart
@@ -184,8 +184,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Credenciais inválidas"),
         "keep_login": MessageLookupByLibrary.simpleMessage("Lembre-se de mim"),
         "language": MessageLookupByLibrary.simpleMessage("Idioma"),
-        "last_refresh_time": m0,
-        "last_timestamp": m1,
+        "last_refresh_time": m1,
+        "last_timestamp": m2,
         "leave_feedback": MessageLookupByLibrary.simpleMessage("Feedback"),
         "lectures": MessageLookupByLibrary.simpleMessage("Aulas"),
         "library_occupation":

diff --git a/packages/uni_app/lib/main.dart b/packages/uni_app/lib/main.dart
@@ -240,7 +240,6 @@ class ApplicationState extends State<Application> {
           title: 'uni',
           navigatorKey: Application.navigatorKey,
           theme: lightTheme,
-          darkTheme: applicationDarkTheme,
           themeMode: ThemeMode.light, // themeNotifier.getTheme(),
           locale: localeNotifier.getLocale().localeCode,
           localizationsDelegates: const [

diff --git a/packages/uni_app/lib/view/academic_path/exam_page.dart b/packages/uni_app/lib/view/academic_path/exam_page.dart
@@ -61,7 +61,6 @@ class _ExamsPageState extends State<ExamsPage> {
                         title: '1',
                         subtitle: 'Jan',
                         card: ExamCard(
-                          tooltip: '',
                           name: 'Computer Laboratory',
                           acronym: 'LCOM',
                           rooms: ['B315', 'B224', 'B207'],
@@ -82,7 +81,6 @@ class _ExamsPageState extends State<ExamsPage> {
                           isActive: _nextExam(exams) == exam,
                           card: ExamCard(
                             name: exam.subject,
-                            tooltip: '',
                             acronym: exam.subjectAcronym,
                             rooms: exam.rooms,
                             type: exam.examType,

diff --git a/packages/uni_app/lib/view/restaurant/restaurant_page_view.dart b/packages/uni_app/lib/view/restaurant/restaurant_page_view.dart
@@ -258,8 +258,13 @@ class _RestaurantPageViewState extends GeneralPageViewState<RestaurantPageView>
         getRestaurantMenuItems(dayOfWeek, restaurant, locale) ?? [];
     return menuItems.isNotEmpty
         ? RestaurantCard(
-            name: RestaurantUtils.getRestaurantName(context, locale,
-                restaurant.namePt, restaurant.namePt, restaurant.period),
+            name: RestaurantUtils.getRestaurantName(
+              context,
+              locale,
+              restaurant.namePt,
+              restaurant.namePt,
+              restaurant.period,
+            ),
             icon: RestaurantUtils.getIcon(
               restaurant.typeEn ?? restaurant.typePt,
             ),