diff --git a/Applications/AdminUi/apps/admin_ui/lib/home/announcement_details/announcement_details.dart b/Applications/AdminUi/apps/admin_ui/lib/home/announcement_details/announcement_details.dart index 362343f4b8..ab70d8cb0c 100644 --- a/Applications/AdminUi/apps/admin_ui/lib/home/announcement_details/announcement_details.dart +++ b/Applications/AdminUi/apps/admin_ui/lib/home/announcement_details/announcement_details.dart @@ -10,10 +10,7 @@ import '/core/core.dart'; class AnnouncementDetails extends StatefulWidget { final String announcementId; - const AnnouncementDetails({ - required this.announcementId, - super.key, - }); + const AnnouncementDetails({required this.announcementId, super.key}); @override State createState() => _AnnouncementDetailsState(); @@ -47,11 +44,7 @@ class _AnnouncementDetailsState extends State { Row( children: [ const BackButton(), - IconButton( - icon: const Icon(Icons.refresh), - onPressed: _loadAnnouncement, - tooltip: context.l10n.reload, - ), + IconButton(icon: const Icon(Icons.refresh), onPressed: _loadAnnouncement, tooltip: context.l10n.reload), ], ), Card( @@ -104,9 +97,7 @@ class _AnnouncementDetailsState extends State { class _AnnouncementsTextTable extends StatelessWidget { final List announcementTexts; - const _AnnouncementsTextTable({ - required this.announcementTexts, - }); + const _AnnouncementsTextTable({required this.announcementTexts}); @override Widget build(BuildContext context) { @@ -120,17 +111,18 @@ class _AnnouncementsTextTable extends StatelessWidget { DataColumn2(label: Text(context.l10n.title)), DataColumn2(label: Text(context.l10n.body)), ], - rows: announcementTexts - .map( - (announcementText) => DataRow( - cells: [ - DataCell(Text(AnnouncementLanguages.languages.firstWhere((language) => language.isoCode == announcementText.language).name)), - DataCell(Text(announcementText.title)), - DataCell(Text(announcementText.body)), - ], - ), - ) - .toList(), + rows: + announcementTexts + .map( + (announcementText) => DataRow( + cells: [ + DataCell(Text(AnnouncementLanguages.languages.firstWhere((language) => language.isoCode == announcementText.language).name)), + DataCell(Text(announcementText.title)), + DataCell(Text(announcementText.body)), + ], + ), + ) + .toList(), ), ), ); diff --git a/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/announcements_overview.dart b/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/announcements_overview.dart index e10711a0be..edf35216bd 100644 --- a/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/announcements_overview.dart +++ b/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/announcements_overview.dart @@ -41,11 +41,7 @@ class _AnnouncementsOverviewState extends State { mainAxisAlignment: MainAxisAlignment.end, children: [ if (kIsDesktop) - IconButton( - icon: const Icon(Icons.refresh), - onPressed: () async => _reloadAnnouncements(), - tooltip: context.l10n.reload, - ), + IconButton(icon: const Icon(Icons.refresh), onPressed: () async => _reloadAnnouncements(), tooltip: context.l10n.reload), IconButton.filled( icon: const Icon(Icons.add), onPressed: () => showCreateAnnouncementDialog(context: context, onAnnouncementCreated: _reloadAnnouncements), @@ -61,36 +57,38 @@ class _AnnouncementsOverviewState extends State { DataColumn2(label: Text(context.l10n.expiresAt)), DataColumn2(label: Text(context.l10n.announcementsOverview_severity)), ], - rows: _announcements - .map( - (announcement) => DataRow2( - onTap: () => context.go('/announcements/${announcement.id}'), - cells: [ - DataCell(Text(_getAnnouncementTitle(announcement, 'en'))), - DataCell( - Tooltip( - message: - '${DateFormat.yMd(Localizations.localeOf(context).languageCode).format(announcement.createdAt)} ${DateFormat.Hms().format(announcement.createdAt)}', - child: Text(DateFormat.yMd(Localizations.localeOf(context).languageCode).format(announcement.createdAt)), - ), - ), - DataCell( - Tooltip( - message: announcement.expiresAt != null - ? '${DateFormat.yMd(Localizations.localeOf(context).languageCode).format(announcement.expiresAt!)} ${DateFormat.Hms().format(announcement.expiresAt!)}' - : '', - child: Text( - announcement.expiresAt != null - ? DateFormat.yMd(Localizations.localeOf(context).languageCode).format(announcement.expiresAt!) - : '', + rows: + _announcements + .map( + (announcement) => DataRow2( + onTap: () => context.go('/announcements/${announcement.id}'), + cells: [ + DataCell(Text(_getAnnouncementTitle(announcement, 'en'))), + DataCell( + Tooltip( + message: + '${DateFormat.yMd(Localizations.localeOf(context).languageCode).format(announcement.createdAt)} ${DateFormat.Hms().format(announcement.createdAt)}', + child: Text(DateFormat.yMd(Localizations.localeOf(context).languageCode).format(announcement.createdAt)), + ), + ), + DataCell( + Tooltip( + message: + announcement.expiresAt != null + ? '${DateFormat.yMd(Localizations.localeOf(context).languageCode).format(announcement.expiresAt!)} ${DateFormat.Hms().format(announcement.expiresAt!)}' + : '', + child: Text( + announcement.expiresAt != null + ? DateFormat.yMd(Localizations.localeOf(context).languageCode).format(announcement.expiresAt!) + : '', + ), + ), ), - ), + DataCell(Text(announcement.severity)), + ], ), - DataCell(Text(announcement.severity)), - ], - ), - ) - .toList(), + ) + .toList(), ), ), ], diff --git a/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/modals/create_announcement_dialog.dart b/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/modals/create_announcement_dialog.dart index 401912a580..1f437a4de6 100644 --- a/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/modals/create_announcement_dialog.dart +++ b/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/modals/create_announcement_dialog.dart @@ -8,10 +8,7 @@ import 'package:intl/intl.dart'; import '/core/core.dart'; import '../widgets/language_picker.dart'; -Future showCreateAnnouncementDialog({ - required BuildContext context, - required VoidCallback onAnnouncementCreated, -}) async { +Future showCreateAnnouncementDialog({required BuildContext context, required VoidCallback onAnnouncementCreated}) async { await showDialog( context: context, builder: (BuildContext context) => _CreateAnnouncementDialog(onAnnouncementCreated: onAnnouncementCreated), @@ -40,13 +37,7 @@ class _CreateAnnouncementDialogState extends State<_CreateAnnouncementDialog> { void initState() { super.initState(); - _announcementTextWidgets.add( - _AnnouncementTextFormWidget( - defaultLanguage: 'en', - formKey: _formKey, - onRemove: _remove, - ), - ); + _announcementTextWidgets.add(_AnnouncementTextFormWidget(defaultLanguage: 'en', formKey: _formKey, onRemove: _remove)); } @override @@ -77,13 +68,11 @@ class _CreateAnnouncementDialogState extends State<_CreateAnnouncementDialog> { Gaps.h16, DropdownButtonFormField( validator: (value) => validateRequiredField(context, value?.name), - decoration: InputDecoration( - labelText: '${context.l10n.createAnnouncementDialog_impact}*', - border: const OutlineInputBorder(), - ), - items: _severityOptions.map((severity) { - return DropdownMenuItem(value: severity, child: Text(severity.name)); - }).toList(), + decoration: InputDecoration(labelText: '${context.l10n.createAnnouncementDialog_impact}*', border: const OutlineInputBorder()), + items: + _severityOptions.map((severity) { + return DropdownMenuItem(value: severity, child: Text(severity.name)); + }).toList(), onChanged: (newValue) => setState(() => _selectedSeverity = newValue), ), Gaps.h16, @@ -129,35 +118,21 @@ class _CreateAnnouncementDialogState extends State<_CreateAnnouncementDialog> { icon: const Icon(Icons.add), onPressed: () { setState(() { - _announcementTextWidgets.add( - _AnnouncementTextFormWidget( - formKey: _formKey, - onRemove: _remove, - ), - ); + _announcementTextWidgets.add(_AnnouncementTextFormWidget(formKey: _formKey, onRemove: _remove)); }); }, ), ], ), Gaps.h16, - Column( - spacing: 16, - children: _announcementTextWidgets, - ), + Column(spacing: 16, children: _announcementTextWidgets), ], ), ), ), ), actions: [ - SizedBox( - height: 40, - child: OutlinedButton( - onPressed: () => Navigator.of(context).pop(), - child: Text(context.l10n.cancel), - ), - ), + SizedBox(height: 40, child: OutlinedButton(onPressed: () => Navigator.of(context).pop(), child: Text(context.l10n.cancel))), SizedBox( height: 40, child: FilledButton( @@ -168,17 +143,12 @@ class _CreateAnnouncementDialogState extends State<_CreateAnnouncementDialog> { for (final announcementTextWidget in _announcementTextWidgets) { final title = announcementTextWidget.titleController.text; final body = announcementTextWidget.bodyController.text; - final language = announcementTextWidget.languageController.text == '' - ? announcementTextWidget.defaultLanguage - : announcementTextWidget.languageController.text; + final language = + announcementTextWidget.languageController.text == '' + ? announcementTextWidget.defaultLanguage + : announcementTextWidget.languageController.text; - announcementTexts.add( - AnnouncementText( - title: title, - body: body, - language: language!, - ), - ); + announcementTexts.add(AnnouncementText(title: title, body: body, language: language!)); } final response = await GetIt.I.get().announcements.createAnnouncement( @@ -216,10 +186,7 @@ class _CreateAnnouncementDialogState extends State<_CreateAnnouncementDialog> { void _showSuccessSnackbar() { final snackBar = SnackBar( - content: Text( - context.l10n.createAnnouncement_announcementSuccess, - style: const TextStyle(color: Colors.white), - ), + content: Text(context.l10n.createAnnouncement_announcementSuccess, style: const TextStyle(color: Colors.white)), backgroundColor: Colors.green, duration: const Duration(seconds: 3), showCloseIcon: true, @@ -229,10 +196,7 @@ class _CreateAnnouncementDialogState extends State<_CreateAnnouncementDialog> { void _showErrorSnackbar() { final snackBar = SnackBar( - content: Text( - context.l10n.createAnnouncement_announcementError, - style: const TextStyle(color: Colors.white), - ), + content: Text(context.l10n.createAnnouncement_announcementError, style: const TextStyle(color: Colors.white)), backgroundColor: Colors.red, duration: const Duration(seconds: 3), showCloseIcon: true, @@ -245,11 +209,7 @@ class _AnnouncementTextFormWidget extends StatefulWidget { final GlobalKey formKey; final void Function(_AnnouncementTextFormWidget index) onRemove; - _AnnouncementTextFormWidget({ - required this.formKey, - required this.onRemove, - this.defaultLanguage, - }); + _AnnouncementTextFormWidget({required this.formKey, required this.onRemove, this.defaultLanguage}); @override State<_AnnouncementTextFormWidget> createState() => _AnnouncementTextFormWidgetState(); @@ -283,9 +243,7 @@ class _AnnouncementTextFormWidgetState extends State<_AnnouncementTextFormWidget if (widget.defaultLanguage == null) ...[ Row( mainAxisAlignment: MainAxisAlignment.end, - children: [ - TextButton(onPressed: () => widget.onRemove(widget), child: Text(context.l10n.remove)), - ], + children: [TextButton(onPressed: () => widget.onRemove(widget), child: Text(context.l10n.remove))], ), LanguagePicker( width: MediaQuery.of(context).size.width, @@ -301,18 +259,12 @@ class _AnnouncementTextFormWidgetState extends State<_AnnouncementTextFormWidget TextFormField( controller: widget.titleController, validator: (value) => validateRequiredField(context, value), - decoration: InputDecoration( - labelText: '${context.l10n.title}*', - border: const OutlineInputBorder(), - ), + decoration: InputDecoration(labelText: '${context.l10n.title}*', border: const OutlineInputBorder()), ), TextFormField( controller: widget.bodyController, validator: (value) => validateRequiredField(context, value), - decoration: InputDecoration( - labelText: '${context.l10n.body}*', - border: const OutlineInputBorder(), - ), + decoration: InputDecoration(labelText: '${context.l10n.body}*', border: const OutlineInputBorder()), ), ], ), diff --git a/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/modals/show_announcement_details_dialog.dart b/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/modals/show_announcement_details_dialog.dart index 78f5e13607..224b06ff50 100644 --- a/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/modals/show_announcement_details_dialog.dart +++ b/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/modals/show_announcement_details_dialog.dart @@ -4,14 +4,8 @@ import 'package:go_router/go_router.dart'; import '/core/core.dart'; -Future showAnnouncementDetailsDialog({ - required BuildContext context, - required List announcementTexts, -}) async { - await showDialog( - context: context, - builder: (BuildContext context) => _AnnouncementTextDialog(announcementTexts: announcementTexts), - ); +Future showAnnouncementDetailsDialog({required BuildContext context, required List announcementTexts}) async { + await showDialog(context: context, builder: (BuildContext context) => _AnnouncementTextDialog(announcementTexts: announcementTexts)); } class _AnnouncementTextDialog extends StatelessWidget { @@ -38,15 +32,7 @@ class _AnnouncementTextDialog extends StatelessWidget { ], ), ), - actions: [ - SizedBox( - height: 40, - child: OutlinedButton( - child: Text(context.l10n.close), - onPressed: () => context.pop(), - ), - ), - ], + actions: [SizedBox(height: 40, child: OutlinedButton(child: Text(context.l10n.close), onPressed: () => context.pop()))], ), ); } diff --git a/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/widgets/language_picker.dart b/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/widgets/language_picker.dart index daeb88c1ed..6d1d39e505 100644 --- a/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/widgets/language_picker.dart +++ b/Applications/AdminUi/apps/admin_ui/lib/home/announcements_overview/widgets/language_picker.dart @@ -7,22 +7,16 @@ class LanguagePicker extends StatelessWidget { final ValueChanged onLanguageChanged; final double? width; - const LanguagePicker({ - required this.labelText, - required this.onLanguageChanged, - super.key, - this.validator, - this.width, - }); + const LanguagePicker({required this.labelText, required this.onLanguageChanged, super.key, this.validator, this.width}); @override Widget build(BuildContext context) { - final languageOptions = AnnouncementLanguages.languages.toList() - ..sort((a, b) { - if (a.isoCode == 'de') return -1; - if (b.isoCode == 'de') return 1; - return a.name.compareTo(b.name); - }); + final languageOptions = + AnnouncementLanguages.languages.toList()..sort((a, b) { + if (a.isoCode == 'de') return -1; + if (b.isoCode == 'de') return 1; + return a.name.compareTo(b.name); + }); return FormField( validator: validator, builder: (fieldState) { @@ -33,26 +27,20 @@ class LanguagePicker extends StatelessWidget { menuHeight: MediaQuery.of(context).size.height * 0.3, expandedInsets: EdgeInsets.zero, errorText: fieldState.errorText, - inputDecorationTheme: fieldState.hasError - ? InputDecorationTheme( - border: OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.error)), - enabledBorder: OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.error)), - ) - : const InputDecorationTheme( - border: OutlineInputBorder(), - ), - label: Text( - labelText, - style: fieldState.hasError ? TextStyle(color: Theme.of(context).colorScheme.error) : null, - ), + inputDecorationTheme: + fieldState.hasError + ? InputDecorationTheme( + border: OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.error)), + enabledBorder: OutlineInputBorder(borderSide: BorderSide(color: Theme.of(context).colorScheme.error)), + ) + : const InputDecorationTheme(border: OutlineInputBorder()), + label: Text(labelText, style: fieldState.hasError ? TextStyle(color: Theme.of(context).colorScheme.error) : null), requestFocusOnTap: true, enableFilter: true, - dropdownMenuEntries: languageOptions.map((language) { - return DropdownMenuEntry( - value: language.isoCode, - label: language.name, - ); - }).toList(), + dropdownMenuEntries: + languageOptions.map((language) { + return DropdownMenuEntry(value: language.isoCode, label: language.name); + }).toList(), onSelected: (String? selectedLanguageIsoCode) { if (selectedLanguageIsoCode != null) { onLanguageChanged(selectedLanguageIsoCode); diff --git a/Applications/AdminUi/packages/admin_api_sdk/lib/src/endpoints/announcements_endpoint.dart b/Applications/AdminUi/packages/admin_api_sdk/lib/src/endpoints/announcements_endpoint.dart index 96a10bce3d..c7419d35c3 100644 --- a/Applications/AdminUi/packages/admin_api_sdk/lib/src/endpoints/announcements_endpoint.dart +++ b/Applications/AdminUi/packages/admin_api_sdk/lib/src/endpoints/announcements_endpoint.dart @@ -6,25 +6,20 @@ import 'endpoint.dart'; class AnnouncementsEndpoint extends Endpoint { AnnouncementsEndpoint(super.dio); - Future>> getAnnouncements() => get( - '/api/v1/Announcements', - transformer: (e) => (e as List).map(Announcement.fromJson).toList(), - ); + Future>> getAnnouncements() => + get('/api/v1/Announcements', transformer: (e) => (e as List).map(Announcement.fromJson).toList()); - Future> getAnnouncement(String announcementId) => get( - '/api/v1/Announcements/$announcementId', - transformer: Announcement.fromJson, - ); + Future> getAnnouncement(String announcementId) => + get('/api/v1/Announcements/$announcementId', transformer: Announcement.fromJson); Future> createAnnouncement({ required AnnouncementSeverity severity, required List announcementTexts, String? expiresAt, List? recipients, - }) => - post( - '/api/v1/Announcements', - data: {'expiresAt': expiresAt, 'severity': severity.name, 'texts': announcementTexts, 'recipients': recipients}, - transformer: CreateAnnouncementResponse.fromJson, - ); + }) => post( + '/api/v1/Announcements', + data: {'expiresAt': expiresAt, 'severity': severity.name, 'texts': announcementTexts, 'recipients': recipients}, + transformer: CreateAnnouncementResponse.fromJson, + ); } diff --git a/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcement_severity_type.dart b/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcement_severity_type.dart index 5614824b9e..32a4c2e692 100644 --- a/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcement_severity_type.dart +++ b/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcement_severity_type.dart @@ -3,6 +3,9 @@ enum AnnouncementSeverity { medium, high; - String get name => - switch (this) { AnnouncementSeverity.low => 'Low', AnnouncementSeverity.medium => 'Medium', AnnouncementSeverity.high => 'High' }; + String get name => switch (this) { + AnnouncementSeverity.low => 'Low', + AnnouncementSeverity.medium => 'Medium', + AnnouncementSeverity.high => 'High', + }; } diff --git a/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcement_text.dart b/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcement_text.dart index 222702a03b..71b9cb45c6 100644 --- a/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcement_text.dart +++ b/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcement_text.dart @@ -10,11 +10,7 @@ class AnnouncementText { final String title; final String body; - AnnouncementText({ - required this.language, - required this.title, - required this.body, - }); + AnnouncementText({required this.language, required this.title, required this.body}); factory AnnouncementText.fromJson(dynamic json) => _$AnnouncementTextFromJson(json as Map); Map toJson() => _$AnnouncementTextToJson(this); diff --git a/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcement_text.g.dart b/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcement_text.g.dart index 7f219e4611..699e7511eb 100644 --- a/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcement_text.g.dart +++ b/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcement_text.g.dart @@ -6,14 +6,11 @@ part of 'announcement_text.dart'; // JsonSerializableGenerator // ************************************************************************** -AnnouncementText _$AnnouncementTextFromJson(Map json) => AnnouncementText( - language: json['language'] as String, - title: json['title'] as String, - body: json['body'] as String, - ); +AnnouncementText _$AnnouncementTextFromJson(Map json) => + AnnouncementText(language: json['language'] as String, title: json['title'] as String, body: json['body'] as String); Map _$AnnouncementTextToJson(AnnouncementText instance) => { - 'language': instance.language, - 'title': instance.title, - 'body': instance.body, - }; + 'language': instance.language, + 'title': instance.title, + 'body': instance.body, +}; diff --git a/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcements_overview.dart b/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcements_overview.dart index 677f8a6500..6ac112f0f0 100644 --- a/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcements_overview.dart +++ b/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcements_overview.dart @@ -14,13 +14,7 @@ class Announcement { final String severity; final List texts; - Announcement({ - required this.id, - required this.createdAt, - required this.expiresAt, - required this.severity, - required this.texts, - }); + Announcement({required this.id, required this.createdAt, required this.expiresAt, required this.severity, required this.texts}); factory Announcement.fromJson(dynamic json) => _$AnnouncementFromJson(json as Map); Map toJson() => _$AnnouncementToJson(this); diff --git a/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcements_overview.g.dart b/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcements_overview.g.dart index d3990b6330..025d7c6303 100644 --- a/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcements_overview.g.dart +++ b/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/announcements_overview.g.dart @@ -7,17 +7,17 @@ part of 'announcements_overview.dart'; // ************************************************************************** Announcement _$AnnouncementFromJson(Map json) => Announcement( - id: json['id'] as String, - createdAt: DateTime.parse(json['createdAt'] as String), - expiresAt: json['expiresAt'] == null ? null : DateTime.parse(json['expiresAt'] as String), - severity: json['severity'] as String, - texts: (json['texts'] as List).map(AnnouncementText.fromJson).toList(), - ); + id: json['id'] as String, + createdAt: DateTime.parse(json['createdAt'] as String), + expiresAt: json['expiresAt'] == null ? null : DateTime.parse(json['expiresAt'] as String), + severity: json['severity'] as String, + texts: (json['texts'] as List).map(AnnouncementText.fromJson).toList(), +); Map _$AnnouncementToJson(Announcement instance) => { - 'id': instance.id, - 'createdAt': instance.createdAt.toIso8601String(), - 'expiresAt': instance.expiresAt?.toIso8601String(), - 'severity': instance.severity, - 'texts': instance.texts, - }; + 'id': instance.id, + 'createdAt': instance.createdAt.toIso8601String(), + 'expiresAt': instance.expiresAt?.toIso8601String(), + 'severity': instance.severity, + 'texts': instance.texts, +}; diff --git a/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/create_announcement_response.dart b/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/create_announcement_response.dart index 901b1acc41..1911a73965 100644 --- a/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/create_announcement_response.dart +++ b/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/create_announcement_response.dart @@ -11,12 +11,7 @@ class CreateAnnouncementResponse { final List texts; final List? recipients; - CreateAnnouncementResponse({ - required this.severity, - required this.texts, - this.recipients, - this.expiresAt, - }); + CreateAnnouncementResponse({required this.severity, required this.texts, this.recipients, this.expiresAt}); factory CreateAnnouncementResponse.fromJson(dynamic json) => _$CreateAnnouncementResponseFromJson(json as Map); Map toJson() => _$CreateAnnouncementResponseToJson(this); diff --git a/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/create_announcement_response.g.dart b/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/create_announcement_response.g.dart index 1be105a062..d7510ff65d 100644 --- a/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/create_announcement_response.g.dart +++ b/Applications/AdminUi/packages/admin_api_types/lib/src/announcements/create_announcement_response.g.dart @@ -7,15 +7,15 @@ part of 'create_announcement_response.dart'; // ************************************************************************** CreateAnnouncementResponse _$CreateAnnouncementResponseFromJson(Map json) => CreateAnnouncementResponse( - severity: json['severity'] as String, - texts: (json['texts'] as List).map(AnnouncementText.fromJson).toList(), - recipients: (json['recipients'] as List?)?.map((e) => e as String).toList(), - expiresAt: json['expiresAt'] == null ? null : DateTime.parse(json['expiresAt'] as String), - ); + severity: json['severity'] as String, + texts: (json['texts'] as List).map(AnnouncementText.fromJson).toList(), + recipients: (json['recipients'] as List?)?.map((e) => e as String).toList(), + expiresAt: json['expiresAt'] == null ? null : DateTime.parse(json['expiresAt'] as String), +); Map _$CreateAnnouncementResponseToJson(CreateAnnouncementResponse instance) => { - 'expiresAt': instance.expiresAt?.toIso8601String(), - 'severity': instance.severity, - 'texts': instance.texts, - 'recipients': instance.recipients, - }; + 'expiresAt': instance.expiresAt?.toIso8601String(), + 'severity': instance.severity, + 'texts': instance.texts, + 'recipients': instance.recipients, +};