Refactor/service cards

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,20 +37,20 @@ 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,22 +20,26 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'en';
 
-  static m0(type) =>
+  static String m0(time) => "Closes at ${time}";
+
+  static String m1(type) =>
       "${Intl.select(type, {'all_dishes': 'All dishes', 'meat_dishes': 'Meat dishes', 'fish_dishes': 'Fish dishes', 'vegetarian_dishes': 'Vegetarian dishes', 'soups': 'Soups', 'salads': 'Salads', 'diet_dishes': 'Diet dishes', 'dishes_of_the_day': 'Dishes of the Day', 'closed': 'Closed', 'other': 'Other'})}";
 
-  static m1(time) => "last refresh at ${time}";
+  static String m2(time) => "last refresh at ${time}";
 
-  static m2(time) =>
+  static String m3(time) =>
       "${Intl.plural(time, zero: 'Refreshed ${time} minutes ago', one: 'Refreshed ${time} minute ago', other: 'Refreshed ${time} minutes ago')}";
 
-  static m3(title) =>
+  static String m4(title) =>
       "${Intl.select(title, {'horario': 'Schedule', 'exames': 'Exams', 'area': 'Personal Area', 'cadeiras': 'Course Units', 'locais': 'Places', 'restaurantes': 'Restaurants', 'calendario': 'Calendar', 'biblioteca': 'Library', 'percurso_academico': 'Academic Path', 'mapa': 'Map', 'faculdade': 'Faculty', 'bug_report': 'Leave Feedback', 'conta_corrente': 'Current Account', 'other': 'Other'})}";
 
-  static m4(period) =>
+  static String m5(time) => "Opens at ${time}";
+
+  static String m6(period) =>
       "${Intl.select(period, {'lunch': 'Lunch', 'dinner': 'Dinner', 'other': 'Other'})}";
 
   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",
@@ -114,6 +119,8 @@ class MessageLookup extends MessageLookupByLibrary {
       "Class Registration",
     ),
     "close": MessageLookupByLibrary.simpleMessage("Close"),
+    "closed": MessageLookupByLibrary.simpleMessage("Closed"),
+    "closes_at": m0,
     "coffee_machine": MessageLookupByLibrary.simpleMessage("Coffee Machine"),
     "collect_usage_stats": MessageLookupByLibrary.simpleMessage(
       "Collect usage statistics",
@@ -155,7 +162,7 @@ class MessageLookup extends MessageLookupByLibrary {
       "Email where you want to be contacted",
     ),
     "dinner": MessageLookupByLibrary.simpleMessage("Dinner"),
-    "dish_type": m0,
+    "dish_type": m1,
     "dish_types": MessageLookupByLibrary.simpleMessage("Dish Types"),
     "dona_bia": MessageLookupByLibrary.simpleMessage(
       "D. Beatriz\'s stationery store",
@@ -274,8 +281,8 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "keep_login": MessageLookupByLibrary.simpleMessage("Remember me"),
     "language": MessageLookupByLibrary.simpleMessage("Language"),
-    "last_refresh_time": m1,
-    "last_timestamp": m2,
+    "last_refresh_time": m2,
+    "last_timestamp": m3,
     "leave_feedback": MessageLookupByLibrary.simpleMessage("Leave feedback"),
     "lectures": MessageLookupByLibrary.simpleMessage("Lectures"),
     "library": MessageLookupByLibrary.simpleMessage("Library"),
@@ -311,7 +318,7 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "nationalities": MessageLookupByLibrary.simpleMessage("Nationalities"),
     "nationality": MessageLookupByLibrary.simpleMessage("Nationality"),
-    "nav_title": m3,
+    "nav_title": m4,
     "news": MessageLookupByLibrary.simpleMessage("News"),
     "nextclasses": MessageLookupByLibrary.simpleMessage(
       "Here are your classes for ",
@@ -462,9 +469,11 @@ class MessageLookup extends MessageLookupByLibrary {
       "Type of occurrence",
     ),
     "of_month": MessageLookupByLibrary.simpleMessage("of"),
+    "open": MessageLookupByLibrary.simpleMessage("Open"),
     "open_error": MessageLookupByLibrary.simpleMessage(
       "Error opening the file",
     ),
+    "opens_at": m5,
     "other_links": MessageLookupByLibrary.simpleMessage("Other links"),
     "overview": MessageLookupByLibrary.simpleMessage("Overview"),
     "parking": MessageLookupByLibrary.simpleMessage("Parking"),
@@ -517,7 +526,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "restaurant_main_page": MessageLookupByLibrary.simpleMessage(
       "Do you want to see your favorite restaurants in the main page?",
     ),
-    "restaurant_period": m4,
+    "restaurant_period": m6,
     "restaurants": MessageLookupByLibrary.simpleMessage("Restaurants"),
     "restaurants_intro_message": MessageLookupByLibrary.simpleMessage(
       "Discover campus dining options and menus",

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,22 +20,26 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'pt_PT';
 
-  static m0(type) =>
+  static String m0(time) => "Fecha às ${time}";
+
+  static String m1(type) =>
       "${Intl.select(type, {'all_dishes': 'Todos os pratos', 'meat_dishes': 'Pratos de Carne', 'fish_dishes': 'Pratos de Peixe', 'vegetarian_dishes': 'Pratos Vegetarianos', 'soups': 'Sopas', 'salads': 'Saladas', 'diet_dishes': 'Pratos de Dieta', 'dishes_of_the_day': 'Pratos do Dia', 'closed': 'Encerrado', 'other': 'Outros'})}";
 
-  static m1(time) => "última atualização às ${time}";
+  static String m2(time) => "última atualização às ${time}";
 
-  static m2(time) =>
+  static String m3(time) =>
       "${Intl.plural(time, zero: 'Atualizado há ${time} minutos', one: 'Atualizado há ${time} minuto', other: 'Atualizado há ${time} minutos')}";
 
-  static m3(title) =>
+  static String m4(title) =>
       "${Intl.select(title, {'horario': 'Horário', 'exames': 'Exames', 'area': 'Área Pessoal', 'cadeiras': 'Cadeiras', 'locais': 'Locais', 'restaurantes': 'Restaurantes', 'calendario': 'Calendário', 'biblioteca': 'Biblioteca', 'percurso_academico': 'Percurso Académico', 'mapa': 'Mapa', 'faculdade': 'Faculdade', 'bug_report': 'Feedback', 'conta_corrente': 'Conta Corrente', 'other': 'Outros'})}";
 
-  static m4(period) =>
+  static String m5(time) => "Abre às ${time}";
+
+  static String m6(period) =>
       "${Intl.select(period, {'lunch': 'Almoço', 'dinner': 'Jantar', 'other': 'Other'})}";
 
   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",
@@ -122,6 +127,8 @@ class MessageLookup extends MessageLookupByLibrary {
       "Inscrição de Turmas",
     ),
     "close": MessageLookupByLibrary.simpleMessage("Fechar"),
+    "closed": MessageLookupByLibrary.simpleMessage("Fechado"),
+    "closes_at": m0,
     "coffee_machine": MessageLookupByLibrary.simpleMessage("Máquina de café"),
     "collect_usage_stats": MessageLookupByLibrary.simpleMessage(
       "Partilhar estatísticas de uso",
@@ -163,7 +170,7 @@ class MessageLookup extends MessageLookupByLibrary {
       "Email em que desejas ser contactado",
     ),
     "dinner": MessageLookupByLibrary.simpleMessage("Jantar"),
-    "dish_type": m0,
+    "dish_type": m1,
     "dish_types": MessageLookupByLibrary.simpleMessage("Tipos de Prato"),
     "dona_bia": MessageLookupByLibrary.simpleMessage("Papelaria D. Beatriz"),
     "dona_bia_building": MessageLookupByLibrary.simpleMessage(
@@ -286,8 +293,8 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "keep_login": MessageLookupByLibrary.simpleMessage("Lembre-se de mim"),
     "language": MessageLookupByLibrary.simpleMessage("Idioma"),
-    "last_refresh_time": m1,
-    "last_timestamp": m2,
+    "last_refresh_time": m2,
+    "last_timestamp": m3,
     "leave_feedback": MessageLookupByLibrary.simpleMessage("Feedback"),
     "lectures": MessageLookupByLibrary.simpleMessage("Aulas"),
     "library": MessageLookupByLibrary.simpleMessage("Biblioteca"),
@@ -323,7 +330,7 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "nationalities": MessageLookupByLibrary.simpleMessage("Nacionalidades"),
     "nationality": MessageLookupByLibrary.simpleMessage("Nacionalidade"),
-    "nav_title": m3,
+    "nav_title": m4,
     "news": MessageLookupByLibrary.simpleMessage("Notícias"),
     "nextclasses": MessageLookupByLibrary.simpleMessage(
       "Aqui estão as tuas aulas para ",
@@ -478,9 +485,11 @@ class MessageLookup extends MessageLookupByLibrary {
       "Tipo de ocorrência",
     ),
     "of_month": MessageLookupByLibrary.simpleMessage("de"),
+    "open": MessageLookupByLibrary.simpleMessage("Aberto"),
     "open_error": MessageLookupByLibrary.simpleMessage(
       "Erro ao abrir o ficheiro",
     ),
+    "opens_at": m5,
     "other_links": MessageLookupByLibrary.simpleMessage("Outros links"),
     "overview": MessageLookupByLibrary.simpleMessage("Visão Geral"),
     "parking": MessageLookupByLibrary.simpleMessage("Parque automóvel"),
@@ -533,7 +542,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "restaurant_main_page": MessageLookupByLibrary.simpleMessage(
       "Queres ver os teus restaurantes favoritos na página principal?",
     ),
-    "restaurant_period": m4,
+    "restaurant_period": m6,
     "restaurants": MessageLookupByLibrary.simpleMessage("Restaurantes"),
     "restaurants_intro_message": MessageLookupByLibrary.simpleMessage(
       "Descobre as opções de restauração do campus e os menus",

packages/uni_app/lib/l10n/intl_en.arb

@@ -603,5 +603,21 @@
   "welcome_title": "Welcome to university!",
   "@welcome_title": {},
   "welcome_message": "The UNI team welcomes you and wishes you the best of luck on your course!",
-  "@welcome_message": {}
+  "@welcome_message": {},
+  "open": "Open",
+  "@open": {},
+  "closed": "Closed",
+  "@closed": {},
+  "closes_at": "Closes at {time}",
+  "@closes_at": {
+    "placeholders": {
+      "time": {}
+    }
+  },
+  "opens_at": "Opens at {time}",
+  "@opens_at": {
+    "placeholders": {
+      "time": {}
+    }
+  }
 }

packages/uni_app/lib/l10n/intl_pt_PT.arb

@@ -605,5 +605,21 @@
   "welcome_title": "Bem-vindo à universidade!",
   "@welcome_title": {},
   "welcome_message": "A equipa da UNI dá-te as boas-vindas e deseja-te muita sorte no curso!",
-  "@welcome_message": {}
+  "@welcome_message": {},
+  "open": "Aberto",
+  "@open": {},
+  "closed": "Fechado",
+  "@closed": {},
+  "closes_at": "Fecha às {time}",
+  "@closes_at": {
+    "placeholders": {
+      "time": {}
+    }
+  },
+  "opens_at": "Abre às {time}",
+  "@opens_at": {
+    "placeholders": {
+      "time": {}
+    }
+  }
 }