Skip to content

Commit

Permalink
chore: format everything
Browse files Browse the repository at this point in the history
  • Loading branch information
jkoenig134 committed Feb 13, 2025
1 parent 4a161e8 commit cb74bf0
Show file tree
Hide file tree
Showing 92 changed files with 1,049 additions and 1,634 deletions.
3 changes: 2 additions & 1 deletion Applications/AdminUi/apps/admin_ui/lib/core/constants.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ class Gaps {
static const SizedBox w40 = SizedBox(width: 40);
}

final kIsDesktop = !kIsWeb &&
final kIsDesktop =
!kIsWeb &&
(defaultTargetPlatform == TargetPlatform.linux ||
defaultTargetPlatform == TargetPlatform.macOS ||
defaultTargetPlatform == TargetPlatform.windows);
12 changes: 2 additions & 10 deletions Applications/AdminUi/apps/admin_ui/lib/core/extensions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,10 @@ extension GetCustomColors on BuildContext {
}

extension SetClipboardDataWithSnack on BuildContext {
void setClipboardDataWithSuccessNotification({
required String clipboardText,
required String successMessage,
}) {
void setClipboardDataWithSuccessNotification({required String clipboardText, required String successMessage}) {
Clipboard.setData(ClipboardData(text: clipboardText));

ScaffoldMessenger.of(this).showSnackBar(
SnackBar(
content: Text(successMessage),
showCloseIcon: true,
),
);
ScaffoldMessenger.of(this).showSnackBar(SnackBar(content: Text(successMessage), showCloseIcon: true));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@ import 'package:get_it/get_it.dart';
import '../constants.dart';
import '../extensions.dart';

Future<void> showAddQuotaDialog({
required BuildContext context,
required VoidCallback onQuotaAdded,
String? tierId,
String? identityAddress,
}) async {
Future<void> showAddQuotaDialog({required BuildContext context, required VoidCallback onQuotaAdded, String? tierId, String? identityAddress}) async {
assert(tierId != null || identityAddress != null, 'Either tierId or address must be provided');
assert(tierId == null || identityAddress == null, 'Only one of tierId or address can be provided');

Expand All @@ -22,20 +17,23 @@ Future<void> showAddQuotaDialog({

await showDialog<void>(
context: context,
builder: (BuildContext context) => _AssignQuotaDialog(
availableMetrics: metrics.data,
addQuota: ({required String metricKey, required int max, required String period}) {
if (tierId != null) {
return GetIt.I.get<AdminApiClient>().quotas.createTierQuota(tierId: tierId, metricKey: metricKey, max: max, period: period);
}

return GetIt.I
.get<AdminApiClient>()
.identities
.createIndividualQuota(address: identityAddress!, metricKey: metricKey, max: max, period: period);
},
onQuotaAdded: onQuotaAdded,
),
builder:
(BuildContext context) => _AssignQuotaDialog(
availableMetrics: metrics.data,
addQuota: ({required String metricKey, required int max, required String period}) {
if (tierId != null) {
return GetIt.I.get<AdminApiClient>().quotas.createTierQuota(tierId: tierId, metricKey: metricKey, max: max, period: period);
}

return GetIt.I.get<AdminApiClient>().identities.createIndividualQuota(
address: identityAddress!,
metricKey: metricKey,
max: max,
period: period,
);
},
onQuotaAdded: onQuotaAdded,
),
);
}

Expand All @@ -44,11 +42,7 @@ class _AssignQuotaDialog extends StatefulWidget {
final Future<ApiResponse<dynamic>> Function({required String metricKey, required int max, required String period}) addQuota;
final VoidCallback onQuotaAdded;

const _AssignQuotaDialog({
required this.availableMetrics,
required this.addQuota,
required this.onQuotaAdded,
});
const _AssignQuotaDialog({required this.availableMetrics, required this.addQuota, required this.onQuotaAdded});

@override
State<_AssignQuotaDialog> createState() => _AssignQuotaDialogState();
Expand Down Expand Up @@ -94,19 +88,13 @@ class _AssignQuotaDialogState extends State<_AssignQuotaDialog> {
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.all(8),
child: Text('*${context.l10n.required}'),
),
Padding(padding: const EdgeInsets.all(8), child: Text('*${context.l10n.required}')),
Gaps.h32,
DropdownButtonFormField(
value: _selectedMetric,
items: widget.availableMetrics.map((metric) => DropdownMenuItem(value: metric.key, child: Text(metric.displayName))).toList(),
onChanged: _saving ? null : (String? selected) => setState(() => _selectedMetric = selected),
decoration: InputDecoration(
border: const OutlineInputBorder(),
labelText: '${context.l10n.metric}*',
),
decoration: InputDecoration(border: const OutlineInputBorder(), labelText: '${context.l10n.metric}*'),
),
Gaps.h24,
TextField(
Expand All @@ -131,10 +119,7 @@ class _AssignQuotaDialogState extends State<_AssignQuotaDialog> {
DropdownMenuItem(value: 'Year', child: Text(context.l10n.year)),
],
onChanged: _saving ? null : (String? selected) => setState(() => _selectedPeriod = selected),
decoration: InputDecoration(
border: const OutlineInputBorder(),
labelText: '${context.l10n.period}*',
),
decoration: InputDecoration(border: const OutlineInputBorder(), labelText: '${context.l10n.period}*'),
),
if (_errorMessage != null)
Padding(
Expand All @@ -145,14 +130,8 @@ class _AssignQuotaDialogState extends State<_AssignQuotaDialog> {
),
),
actions: [
OutlinedButton(
onPressed: _saving ? null : () => Navigator.of(context, rootNavigator: true).pop(),
child: Text(context.l10n.cancel),
),
FilledButton(
onPressed: _isValid && !_saving ? _addQuota : null,
child: Text(context.l10n.assign),
),
OutlinedButton(onPressed: _saving ? null : () => Navigator.of(context, rootNavigator: true).pop(), child: Text(context.l10n.cancel)),
FilledButton(onPressed: _isValid && !_saving ? _addQuota : null, child: Text(context.l10n.assign)),
],
),
);
Expand All @@ -163,11 +142,7 @@ class _AssignQuotaDialogState extends State<_AssignQuotaDialog> {

assert(_selectedMetric != null && _maxAmount != null && _selectedPeriod != null, 'Invalid State');

final response = await widget.addQuota(
metricKey: _selectedMetric!,
max: _maxAmount!,
period: _selectedPeriod!,
);
final response = await widget.addQuota(metricKey: _selectedMetric!, max: _maxAmount!, period: _selectedPeriod!);

if (response.hasError) {
setState(() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,15 @@ Future<void> showChangeMaxIdentitiesDialog({
}) async {
await showDialog<void>(
context: context,
builder: (BuildContext context) => _ShowChangeMaxIdentitiesDialog(
onMaxIdentitiesUpdated: onMaxIdentitiesUpdated,
clientDetails: clientDetails,
),
builder: (BuildContext context) => _ShowChangeMaxIdentitiesDialog(onMaxIdentitiesUpdated: onMaxIdentitiesUpdated, clientDetails: clientDetails),
);
}

class _ShowChangeMaxIdentitiesDialog extends StatefulWidget {
final VoidCallback onMaxIdentitiesUpdated;
final Client clientDetails;

const _ShowChangeMaxIdentitiesDialog({
required this.onMaxIdentitiesUpdated,
required this.clientDetails,
});
const _ShowChangeMaxIdentitiesDialog({required this.onMaxIdentitiesUpdated, required this.clientDetails});

@override
State<_ShowChangeMaxIdentitiesDialog> createState() => _ShowChangeMaxIdentitiesDialogState();
Expand Down Expand Up @@ -99,26 +93,26 @@ class _ShowChangeMaxIdentitiesDialogState extends State<_ShowChangeMaxIdentities
}

final response = await GetIt.I.get<AdminApiClient>().clients.updateClient(
widget.clientDetails.clientId,
defaultTier: widget.clientDetails.defaultTier,
maxIdentities: _maxIdentities,
);
widget.clientDetails.clientId,
defaultTier: widget.clientDetails.defaultTier,
maxIdentities: _maxIdentities,
);

if (!mounted) return;

if (response.hasError) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(context.l10n.maxIdentities_error_message), duration: const Duration(seconds: 3)),
);
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text(context.l10n.maxIdentities_error_message), duration: const Duration(seconds: 3)));

setState(() => _saving = false);

return;
}

ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(context.l10n.maxIdentities_success_message), duration: const Duration(seconds: 3)),
);
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text(context.l10n.maxIdentities_success_message), duration: const Duration(seconds: 3)));

widget.onMaxIdentitiesUpdated();

Expand Down
50 changes: 20 additions & 30 deletions Applications/AdminUi/apps/admin_ui/lib/core/modals/change_tier.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,23 @@ Future<void> showChangeTierDialog({

await showDialog<void>(
context: context,
builder: (BuildContext context) => _ShowChangeTierDialog(
onTierUpdated: onTierUpdated,
currentTier: (clientDetails?.defaultTier ?? identityDetails?.tierId)!,
assignTier: ({required String tierId}) {
if (clientDetails != null) {
return GetIt.I.get<AdminApiClient>().clients.updateClient(
builder:
(BuildContext context) => _ShowChangeTierDialog(
onTierUpdated: onTierUpdated,
currentTier: (clientDetails?.defaultTier ?? identityDetails?.tierId)!,
assignTier: ({required String tierId}) {
if (clientDetails != null) {
return GetIt.I.get<AdminApiClient>().clients.updateClient(
clientDetails.clientId,
defaultTier: tierId,
maxIdentities: clientDetails.maxIdentities,
);
}
}

return GetIt.I.get<AdminApiClient>().identities.updateIdentity(identityDetails!.address, tierId: tierId);
},
availableTiers: availableTiers,
),
return GetIt.I.get<AdminApiClient>().identities.updateIdentity(identityDetails!.address, tierId: tierId);
},
availableTiers: availableTiers,
),
);
}

Expand All @@ -42,12 +43,7 @@ class _ShowChangeTierDialog extends StatefulWidget {
final List<TierOverview> availableTiers;
final String currentTier;

const _ShowChangeTierDialog({
required this.onTierUpdated,
required this.availableTiers,
required this.assignTier,
required this.currentTier,
});
const _ShowChangeTierDialog({required this.onTierUpdated, required this.availableTiers, required this.assignTier, required this.currentTier});

@override
State<_ShowChangeTierDialog> createState() => _ShowChangeTierDialogState();
Expand Down Expand Up @@ -78,17 +74,15 @@ class _ShowChangeTierDialogState extends State<_ShowChangeTierDialog> {
value: _selectedTier,
decoration: const InputDecoration(border: OutlineInputBorder()),
onChanged: _saving ? null : (String? newValue) => setState(() => _selectedTier = newValue!),
items: widget.availableTiers.where((tier) => tier.canBeManuallyAssigned || tier.canBeUsedAsDefaultForClient).map((TierOverview tier) {
return DropdownMenuItem<String>(value: tier.id, child: Text(tier.name));
}).toList(),
items:
widget.availableTiers.where((tier) => tier.canBeManuallyAssigned || tier.canBeUsedAsDefaultForClient).map((TierOverview tier) {
return DropdownMenuItem<String>(value: tier.id, child: Text(tier.name));
}).toList(),
),
),
actions: [
OutlinedButton(onPressed: _saving ? null : () => Navigator.of(context, rootNavigator: true).pop(), child: Text(context.l10n.cancel)),
FilledButton(
onPressed: _saving || _selectedTier == widget.currentTier ? null : _changeTier,
child: Text(context.l10n.change),
),
FilledButton(onPressed: _saving || _selectedTier == widget.currentTier ? null : _changeTier, child: Text(context.l10n.change)),
],
),
);
Expand All @@ -102,18 +96,14 @@ class _ShowChangeTierDialogState extends State<_ShowChangeTierDialog> {
if (!mounted) return;

if (response.hasError) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(context.l10n.changeTierDialog_error), duration: const Duration(seconds: 3)),
);
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(context.l10n.changeTierDialog_error), duration: const Duration(seconds: 3)));

setState(() => _saving = false);

return;
}

ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(context.l10n.changeTierDialog_success), duration: const Duration(seconds: 3)),
);
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(context.l10n.changeTierDialog_success), duration: const Duration(seconds: 3)));

widget.onTierUpdated();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@ Future<bool> showConfirmationDialog({
}) async {
final result = await showDialog<bool>(
context: context,
builder: (BuildContext context) => _ConfirmationDialog(
title: title,
message: message,
actionText: actionText,
cancelActionText: cancelActionText,
),
builder:
(BuildContext context) => _ConfirmationDialog(title: title, message: message, actionText: actionText, cancelActionText: cancelActionText),
);

return result ?? false;
Expand All @@ -28,12 +24,7 @@ class _ConfirmationDialog extends StatelessWidget {
final String actionText;
final String? cancelActionText;

const _ConfirmationDialog({
required this.title,
required this.message,
required this.actionText,
this.cancelActionText,
});
const _ConfirmationDialog({required this.title, required this.message, required this.actionText, this.cancelActionText});

@override
Widget build(BuildContext context) {
Expand All @@ -43,14 +34,8 @@ class _ConfirmationDialog extends StatelessWidget {
contentPadding: const EdgeInsets.only(left: 24, right: 24, top: 20, bottom: 32),
content: Text(message),
actions: [
OutlinedButton(
onPressed: () => Navigator.of(context).pop(false),
child: Text(cancelActionText ?? context.l10n.cancel),
),
FilledButton(
onPressed: () => Navigator.of(context).pop(true),
child: Text(actionText),
),
OutlinedButton(onPressed: () => Navigator.of(context).pop(false), child: Text(cancelActionText ?? context.l10n.cancel)),
FilledButton(onPressed: () => Navigator.of(context).pop(true), child: Text(actionText)),
],
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ class ThemeModeModel {

final ValueNotifier<ThemeMode> themeMode;

ThemeModeModel._(
this._sharedPreferences, {
required ThemeMode initialThemeMode,
}) : themeMode = ValueNotifier(initialThemeMode);
ThemeModeModel._(this._sharedPreferences, {required ThemeMode initialThemeMode}) : themeMode = ValueNotifier(initialThemeMode);

static Future<ThemeModeModel> create() async {
final sharedPreferences = await SharedPreferences.getInstance();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,4 @@ final darkColorScheme = SeedColorScheme.fromSeeds(
tones: FlexTones.material(Brightness.dark),
);

final cardThemeDark = CardTheme(
color: darkColorScheme.surface,
shadowColor: darkColorScheme.shadow,
surfaceTintColor: darkColorScheme.surfaceTint,
);
final cardThemeDark = CardTheme(color: darkColorScheme.surface, shadowColor: darkColorScheme.shadow, surfaceTintColor: darkColorScheme.surfaceTint);
Loading

0 comments on commit cb74bf0

Please sign in to comment.