Skip to content

Commit

Permalink
fix: reformat new code
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkoenig134
jkoenig134 committed Feb 27, 2025
1 parent 39f83c2 commit 743c0e3
Show file tree
Hide file tree
Showing 13 changed files with 134 additions and 238 deletions.
38 changes: 15 additions & 23 deletions Applications/AdminUi/apps/admin_ui/lib/home/announcement_details/announcement_details.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<AnnouncementDetails> createState() => _AnnouncementDetailsState();
Expand Down Expand Up @@ -47,11 +44,7 @@ class _AnnouncementDetailsState extends State<AnnouncementDetails> {
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(
Expand Down Expand Up @@ -104,9 +97,7 @@ class _AnnouncementDetailsState extends State<AnnouncementDetails> {
class _AnnouncementsTextTable extends StatelessWidget {
final List<AnnouncementText> announcementTexts;

const _AnnouncementsTextTable({
required this.announcementTexts,
});
const _AnnouncementsTextTable({required this.announcementTexts});

@override
Widget build(BuildContext context) {
Expand All @@ -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(),
),
),
);
Expand Down
64 changes: 31 additions & 33 deletions ...cations/AdminUi/apps/admin_ui/lib/home/announcements_overview/announcements_overview.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,7 @@ class _AnnouncementsOverviewState extends State<AnnouncementsOverview> {
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),
Expand All @@ -61,36 +57,38 @@ class _AnnouncementsOverviewState extends State<AnnouncementsOverview> {
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(),
),
),
],
Expand Down
90 changes: 21 additions & 69 deletions ...inUi/apps/admin_ui/lib/home/announcements_overview/modals/create_announcement_dialog.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ import 'package:intl/intl.dart';
import '/core/core.dart';
import '../widgets/language_picker.dart';

Future<void> showCreateAnnouncementDialog({
required BuildContext context,
required VoidCallback onAnnouncementCreated,
}) async {
Future<void> showCreateAnnouncementDialog({required BuildContext context, required VoidCallback onAnnouncementCreated}) async {
await showDialog<void>(
context: context,
builder: (BuildContext context) => _CreateAnnouncementDialog(onAnnouncementCreated: onAnnouncementCreated),
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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<AnnouncementSeverity>(value: severity, child: Text(severity.name));
}).toList(),
decoration: InputDecoration(labelText: '${context.l10n.createAnnouncementDialog_impact}*', border: const OutlineInputBorder()),
items:
_severityOptions.map((severity) {
return DropdownMenuItem<AnnouncementSeverity>(value: severity, child: Text(severity.name));
}).toList(),
onChanged: (newValue) => setState(() => _selectedSeverity = newValue),
),
Gaps.h16,
Expand Down Expand Up @@ -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(
Expand All @@ -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<AdminApiClient>().announcements.createAnnouncement(
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -245,11 +209,7 @@ class _AnnouncementTextFormWidget extends StatefulWidget {
final GlobalKey<FormState> 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();
Expand Down Expand Up @@ -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,
Expand All @@ -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()),
),
],
),
Expand Down
20 changes: 3 additions & 17 deletions ...pps/admin_ui/lib/home/announcements_overview/modals/show_announcement_details_dialog.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,8 @@ import 'package:go_router/go_router.dart';

import '/core/core.dart';

Future<void> showAnnouncementDetailsDialog({
required BuildContext context,
required List<AnnouncementText> announcementTexts,
}) async {
await showDialog<void>(
context: context,
builder: (BuildContext context) => _AnnouncementTextDialog(announcementTexts: announcementTexts),
);
Future<void> showAnnouncementDetailsDialog({required BuildContext context, required List<AnnouncementText> announcementTexts}) async {
await showDialog<void>(context: context, builder: (BuildContext context) => _AnnouncementTextDialog(announcementTexts: announcementTexts));
}

class _AnnouncementTextDialog extends StatelessWidget {
Expand All @@ -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()))],
),
);
}
Expand Down
Loading

0 comments on commit 743c0e3

Please sign in to comment.