From 380b135bfd99e16ba77c2ed8332f1bc2dbb4b6f5 Mon Sep 17 00:00:00 2001 From: abutuc Date: Thu, 6 Feb 2025 16:26:04 +0000 Subject: [PATCH] fix: merge issues --- packages/uni_app/lib/generated/intl/messages_en.dart | 4 ++-- packages/uni_app/lib/generated/intl/messages_pt_PT.dart | 4 ++-- packages/uni_app/lib/main.dart | 1 - packages/uni_app/lib/view/academic_path/exam_page.dart | 2 -- .../lib/view/restaurant/restaurant_page_view.dart | 9 +++++++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/uni_app/lib/generated/intl/messages_en.dart b/packages/uni_app/lib/generated/intl/messages_en.dart index ad2661869..ad211ded3 100644 --- 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 index 137c068bb..5da2551ec 100644 --- 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 index 4a1730ae7..531332542 100644 --- a/packages/uni_app/lib/main.dart +++ b/packages/uni_app/lib/main.dart @@ -240,7 +240,6 @@ class ApplicationState extends State { 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 index fb6ca99b5..221ba299d 100644 --- 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 { title: '1', subtitle: 'Jan', card: ExamCard( - tooltip: '', name: 'Computer Laboratory', acronym: 'LCOM', rooms: ['B315', 'B224', 'B207'], @@ -82,7 +81,6 @@ class _ExamsPageState extends State { 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 index 8af65d762..be83541ea 100644 --- 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 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, ),