Skip to content

Commit 69dcba4

Browse files
LouisPhilippeHeonLouisPhilippeHeon
authored
Package updates (#1234)
1 parent 3bb6e30 commit 69dcba4

File tree

198 files changed

+6634
-6169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+6634
-6169
lines changed

‎android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if (customConfigFile.exists()) {
2828
android {
2929
namespace = "ca.etsmtl.applets.etsmobile"
3030
compileSdk = flutter.compileSdkVersion
31-
ndkVersion = flutter.ndkVersion
31+
ndkVersion = "27.0.12077973"
3232

3333
compileOptions {
3434
sourceCompatibility = JavaVersion.VERSION_17

‎ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ PODS:
1616
- Firebase/RemoteConfig (11.10.0):
1717
- Firebase/CoreOnly
1818
- FirebaseRemoteConfig (~> 11.10.0)
19-
- firebase_analytics (11.4.5):
19+
- firebase_analytics (11.4.6):
2020
- Firebase/Analytics (= 11.10.0)
2121
- firebase_core
2222
- Flutter
@@ -288,7 +288,7 @@ SPEC CHECKSUMS:
288288
connectivity_plus: 2a701ffec2c0ae28a48cf7540e279787e77c447d
289289
device_calendar: 9cb33f88a02e19652ec7b8b122ca778f751b1f7b
290290
Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2
291-
firebase_analytics: 4b8609ce8d2e0c8928472bec8d9753a8f1835eb6
291+
firebase_analytics: 943aa4699bf6afe056a96991ba8ee34776323d4c
292292
firebase_core: 3c2f323cae65c97a636a05a23b17730ef93df2cf
293293
firebase_crashlytics: 6f5f71ba7ec7b6a0412c4ed076272643c434f69f
294294
firebase_remote_config: 6dc3e79fe219c24f1393faf91463559bf3784fd4

‎lib/data/models/emergency_procedures.dart‎

Lines changed: 35 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,38 @@ import 'package:notredame/data/models/emergency_procedure.dart';
33
import 'package:notredame/l10n/app_localizations.dart';
44

55
List<EmergencyProcedure> emergencyProcedures(AppIntl intl) => [
6-
EmergencyProcedure(
7-
title: intl.security_bomb_threat_title, detail: 'assets/markdown/${intl.security_bomb_threat_detail}'),
8-
EmergencyProcedure(
9-
title: intl.security_suspicious_packages_title,
10-
detail: 'assets/markdown/${intl.security_suspicious_packages_detail}'),
11-
EmergencyProcedure(
12-
title: intl.security_evacuation_title, detail: 'assets/markdown/${intl.security_evacuation_detail}'),
13-
EmergencyProcedure(
14-
title: intl.security_gas_leak_title, detail: 'assets/markdown/${intl.security_gas_leak_detail}'),
15-
EmergencyProcedure(title: intl.security_fire_title, detail: 'assets/markdown/${intl.security_fire_detail}'),
16-
EmergencyProcedure(
17-
title: intl.security_broken_elevator_title,
18-
detail: 'assets/markdown/${intl.security_broken_elevator_detail}'),
19-
EmergencyProcedure(
20-
title: intl.security_electrical_outage_title,
21-
detail: 'assets/markdown/${intl.security_electrical_outage_detail}'),
22-
EmergencyProcedure(
23-
title: intl.security_armed_person_title, detail: 'assets/markdown/${intl.security_armed_person_detail}'),
24-
EmergencyProcedure(
25-
title: intl.security_earthquake_title, detail: 'assets/markdown/${intl.security_earthquake_detail}'),
26-
EmergencyProcedure(
27-
title: intl.security_medical_emergency_title,
28-
detail: 'assets/markdown/${intl.security_medical_emergency_detail}'),
29-
];
6+
EmergencyProcedure(
7+
title: intl.security_bomb_threat_title,
8+
detail: 'assets/markdown/${intl.security_bomb_threat_detail}',
9+
),
10+
EmergencyProcedure(
11+
title: intl.security_suspicious_packages_title,
12+
detail: 'assets/markdown/${intl.security_suspicious_packages_detail}',
13+
),
14+
EmergencyProcedure(
15+
title: intl.security_evacuation_title,
16+
detail: 'assets/markdown/${intl.security_evacuation_detail}',
17+
),
18+
EmergencyProcedure(title: intl.security_gas_leak_title, detail: 'assets/markdown/${intl.security_gas_leak_detail}'),
19+
EmergencyProcedure(title: intl.security_fire_title, detail: 'assets/markdown/${intl.security_fire_detail}'),
20+
EmergencyProcedure(
21+
title: intl.security_broken_elevator_title,
22+
detail: 'assets/markdown/${intl.security_broken_elevator_detail}',
23+
),
24+
EmergencyProcedure(
25+
title: intl.security_electrical_outage_title,
26+
detail: 'assets/markdown/${intl.security_electrical_outage_detail}',
27+
),
28+
EmergencyProcedure(
29+
title: intl.security_armed_person_title,
30+
detail: 'assets/markdown/${intl.security_armed_person_detail}',
31+
),
32+
EmergencyProcedure(
33+
title: intl.security_earthquake_title,
34+
detail: 'assets/markdown/${intl.security_earthquake_detail}',
35+
),
36+
EmergencyProcedure(
37+
title: intl.security_medical_emergency_title,
38+
detail: 'assets/markdown/${intl.security_medical_emergency_detail}',
39+
),
40+
];

‎lib/data/models/firebase_options.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ class DefaultFirebaseOptions {
4646
'you can reconfigure this by running the FlutterFire CLI again.',
4747
);
4848
default:
49-
throw UnsupportedError(
50-
'DefaultFirebaseOptions are not supported for this platform.',
51-
);
49+
throw UnsupportedError('DefaultFirebaseOptions are not supported for this platform.');
5250
}
5351
}
5452

‎lib/data/models/hello/activity_area.dart‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,30 @@ class ActivityArea {
99

1010
final DateTime updatedAt;
1111

12-
ActivityArea(
13-
{required this.id, required this.nameFr, required this.nameEn, required this.createdAt, required this.updatedAt});
12+
ActivityArea({
13+
required this.id,
14+
required this.nameFr,
15+
required this.nameEn,
16+
required this.createdAt,
17+
required this.updatedAt,
18+
});
1419

1520
/// Used to create [ActivityArea] instance from a JSON file
1621
factory ActivityArea.fromJson(Map<String, dynamic> map) => ActivityArea(
17-
id: map['id'] as String,
18-
nameFr: map['nameFr'] as String,
19-
nameEn: map['nameEn'] as String,
20-
createdAt: DateTime.parse(map['createdAt'] as String),
21-
updatedAt: DateTime.parse(map['updatedAt'] as String));
22+
id: map['id'] as String,
23+
nameFr: map['nameFr'] as String,
24+
nameEn: map['nameEn'] as String,
25+
createdAt: DateTime.parse(map['createdAt'] as String),
26+
updatedAt: DateTime.parse(map['updatedAt'] as String),
27+
);
2228

2329
Map<String, dynamic> toJson() => {
24-
'id': id,
25-
'nameFr': nameFr,
26-
'nameEn': nameEn,
27-
'createdAt': createdAt.toString(),
28-
'updatedAt': updatedAt.toString(),
29-
};
30+
'id': id,
31+
'nameFr': nameFr,
32+
'nameEn': nameEn,
33+
'createdAt': createdAt.toString(),
34+
'updatedAt': updatedAt.toString(),
35+
};
3036

3137
@override
3238
bool operator ==(Object other) =>

‎lib/data/models/hello/news.dart‎

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -36,49 +36,51 @@ class News {
3636

3737
final List<NewsTags> tags;
3838

39-
News(
40-
{required this.id,
41-
required this.title,
42-
required this.content,
43-
this.imageUrl,
44-
required this.state,
45-
required this.tags,
46-
required this.publicationDate,
47-
required this.eventStartDate,
48-
required this.eventEndDate,
49-
required this.createdAt,
50-
required this.updatedAt,
51-
required this.organizer});
39+
News({
40+
required this.id,
41+
required this.title,
42+
required this.content,
43+
this.imageUrl,
44+
required this.state,
45+
required this.tags,
46+
required this.publicationDate,
47+
required this.eventStartDate,
48+
required this.eventEndDate,
49+
required this.createdAt,
50+
required this.updatedAt,
51+
required this.organizer,
52+
});
5253

5354
/// Used to create [CourseActivity] instance from a JSON file
5455
factory News.fromJson(Map<String, dynamic> map) => News(
55-
id: map['id'] as String,
56-
title: map['title'] as String,
57-
content: map['content'] as String,
58-
imageUrl: map['imageUrl'] as String?,
59-
state: map['state'] as String,
60-
tags: (map['tags'] as List<dynamic>).map((e) => NewsTags.fromJson(e as Map<String, dynamic>)).toList(),
61-
publicationDate: DateTime.parse(map['publicationDate'] as String),
62-
eventStartDate: DateTime.parse(map['eventStartDate'] as String),
63-
eventEndDate: DateTime.parse(map['eventEndDate'] as String),
64-
createdAt: DateTime.parse(map['createdAt'] as String),
65-
updatedAt: DateTime.parse(map['updatedAt'] as String),
66-
organizer: Organizer.fromJson(map['organizer'] as Map<String, dynamic>));
56+
id: map['id'] as String,
57+
title: map['title'] as String,
58+
content: map['content'] as String,
59+
imageUrl: map['imageUrl'] as String?,
60+
state: map['state'] as String,
61+
tags: (map['tags'] as List<dynamic>).map((e) => NewsTags.fromJson(e as Map<String, dynamic>)).toList(),
62+
publicationDate: DateTime.parse(map['publicationDate'] as String),
63+
eventStartDate: DateTime.parse(map['eventStartDate'] as String),
64+
eventEndDate: DateTime.parse(map['eventEndDate'] as String),
65+
createdAt: DateTime.parse(map['createdAt'] as String),
66+
updatedAt: DateTime.parse(map['updatedAt'] as String),
67+
organizer: Organizer.fromJson(map['organizer'] as Map<String, dynamic>),
68+
);
6769

6870
Map<String, dynamic> toJson() => {
69-
'id': id,
70-
'title': title,
71-
'content': content,
72-
'imageUrl': imageUrl,
73-
'state': state,
74-
'tags': tags.map((e) => e.toJson()).toList(),
75-
'publicationDate': publicationDate.toString(),
76-
'eventStartDate': eventStartDate.toString(),
77-
'eventEndDate': eventEndDate.toString(),
78-
'createdAt': createdAt.toString(),
79-
'updatedAt': updatedAt.toString(),
80-
'organizer': organizer.toJson(),
81-
};
71+
'id': id,
72+
'title': title,
73+
'content': content,
74+
'imageUrl': imageUrl,
75+
'state': state,
76+
'tags': tags.map((e) => e.toJson()).toList(),
77+
'publicationDate': publicationDate.toString(),
78+
'eventStartDate': eventStartDate.toString(),
79+
'eventEndDate': eventEndDate.toString(),
80+
'createdAt': createdAt.toString(),
81+
'updatedAt': updatedAt.toString(),
82+
'organizer': organizer.toJson(),
83+
};
8284

8385
@override
8486
bool operator ==(Object other) =>

‎lib/data/models/hello/news_tags.dart‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,18 @@ class NewsTags {
1111

1212
/// Used to create [NewsTags] instance from a JSON file
1313
factory NewsTags.fromJson(Map<String, dynamic> map) => NewsTags(
14-
id: map['id'] as String,
15-
name: map['name'] as String,
16-
createdAt: DateTime.parse(map['createdAt'] as String),
17-
updatedAt: DateTime.parse(map['updatedAt'] as String));
14+
id: map['id'] as String,
15+
name: map['name'] as String,
16+
createdAt: DateTime.parse(map['createdAt'] as String),
17+
updatedAt: DateTime.parse(map['updatedAt'] as String),
18+
);
1819

1920
Map<String, dynamic> toJson() => {
20-
'id': id,
21-
'name': name,
22-
'createdAt': createdAt.toString(),
23-
'updatedAt': updatedAt.toString(),
24-
};
21+
'id': id,
22+
'name': name,
23+
'createdAt': createdAt.toString(),
24+
'updatedAt': updatedAt.toString(),
25+
};
2526

2627
@override
2728
bool operator ==(Object other) =>

‎lib/data/models/hello/organizer.dart‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -76,42 +76,42 @@ class Organizer {
7676

7777
/// Used to create [Organizer] instance from a JSON file
7878
factory Organizer.fromJson(Map<String, dynamic> map) => Organizer(
79-
id: map['id'] as String,
80-
name: map['name'] as String?,
81-
email: map['email'] as String?,
82-
avatarUrl: map['avatarUrl'] as String?,
83-
type: map['type'] as String?,
84-
organization: map['organization'] as String?,
85-
activityArea: ActivityArea.fromJson(map['activityArea'] as Map<String, dynamic>),
86-
isActive: map['isActive'] as bool?,
87-
profileDescription: map['profileDescription'] as String?,
88-
facebookLink: map['facebookLink'] as String?,
89-
instagramLink: map['instagramLink'] as String?,
90-
tikTokLink: map['tikTokLink'] as String?,
91-
xLink: map['xLink'] as String?,
92-
discordLink: map['discordLink'] as String?,
93-
linkedInLink: map['linkedInLink'] as String?,
94-
redditLink: map['redditLink'] as String?,
95-
webSiteLink: map['webSiteLink'] as String?,
96-
);
79+
id: map['id'] as String,
80+
name: map['name'] as String?,
81+
email: map['email'] as String?,
82+
avatarUrl: map['avatarUrl'] as String?,
83+
type: map['type'] as String?,
84+
organization: map['organization'] as String?,
85+
activityArea: ActivityArea.fromJson(map['activityArea'] as Map<String, dynamic>),
86+
isActive: map['isActive'] as bool?,
87+
profileDescription: map['profileDescription'] as String?,
88+
facebookLink: map['facebookLink'] as String?,
89+
instagramLink: map['instagramLink'] as String?,
90+
tikTokLink: map['tikTokLink'] as String?,
91+
xLink: map['xLink'] as String?,
92+
discordLink: map['discordLink'] as String?,
93+
linkedInLink: map['linkedInLink'] as String?,
94+
redditLink: map['redditLink'] as String?,
95+
webSiteLink: map['webSiteLink'] as String?,
96+
);
9797

9898
Map<String, dynamic> toJson() => {
99-
'id': id,
100-
'name': name,
101-
'email': email,
102-
'avatarUrl': avatarUrl,
103-
'type': type,
104-
'organization': organization,
105-
'activityArea': activityArea?.toJson(),
106-
'isActive': isActive,
107-
'profileDescription': profileDescription,
108-
'facebookLink': facebookLink,
109-
'instagramLink': instagramLink,
110-
'tikTokLink': tikTokLink,
111-
'xLink': xLink,
112-
'discordLink': discordLink,
113-
'linkedInLink': linkedInLink,
114-
'redditLink': redditLink,
115-
'webSiteLink': webSiteLink,
116-
};
99+
'id': id,
100+
'name': name,
101+
'email': email,
102+
'avatarUrl': avatarUrl,
103+
'type': type,
104+
'organization': organization,
105+
'activityArea': activityArea?.toJson(),
106+
'isActive': isActive,
107+
'profileDescription': profileDescription,
108+
'facebookLink': facebookLink,
109+
'instagramLink': instagramLink,
110+
'tikTokLink': tikTokLink,
111+
'xLink': xLink,
112+
'discordLink': discordLink,
113+
'linkedInLink': linkedInLink,
114+
'redditLink': redditLink,
115+
'webSiteLink': webSiteLink,
116+
};
117117
}

‎lib/data/models/hello/paginated_news.dart‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,29 @@ class PaginatedNews {
1717
/// News
1818
final List<News> news;
1919

20-
PaginatedNews(
21-
{required this.pageNumber,
22-
required this.pageSize,
23-
required this.totalPages,
24-
required this.totalRecords,
25-
required this.news});
20+
PaginatedNews({
21+
required this.pageNumber,
22+
required this.pageSize,
23+
required this.totalPages,
24+
required this.totalRecords,
25+
required this.news,
26+
});
2627

2728
factory PaginatedNews.fromJson(Map<String, dynamic> map) => PaginatedNews(
28-
pageNumber: map['pageNumber'] as int,
29-
pageSize: map['pageSize'] as int,
30-
totalPages: map['totalPages'] as int,
31-
totalRecords: map['totalRecords'] as int,
32-
news: (map['data'] as List<dynamic>).map((e) => News.fromJson(e as Map<String, dynamic>)).toList());
29+
pageNumber: map['pageNumber'] as int,
30+
pageSize: map['pageSize'] as int,
31+
totalPages: map['totalPages'] as int,
32+
totalRecords: map['totalRecords'] as int,
33+
news: (map['data'] as List<dynamic>).map((e) => News.fromJson(e as Map<String, dynamic>)).toList(),
34+
);
3335

3436
Map<String, dynamic> toJson() => {
35-
'pageNumber': pageNumber,
36-
'pageSize': pageSize,
37-
'totalPages': totalPages,
38-
'totalRecords': totalRecords,
39-
'data': news,
40-
};
37+
'pageNumber': pageNumber,
38+
'pageSize': pageSize,
39+
'totalPages': totalPages,
40+
'totalRecords': totalRecords,
41+
'data': news,
42+
};
4143

4244
@override
4345
bool operator ==(Object other) =>

0 commit comments

Comments
 (0)