refactor of money utils with new money2 package

This commit is contained in:
Arseni
2026-03-13 03:17:29 +03:00
parent b4eb1437f6
commit 0091191d97
72 changed files with 453 additions and 982 deletions

View File

@@ -3,11 +3,11 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/utils/currency.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/models/state/visibility.dart';
import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
import 'package:pweb/pages/payout_page/wallet/currency_symbol_avatar.dart';
import 'package:pweb/widgets/refresh_balance/wallet.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -22,7 +22,7 @@ class WalletCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
return Card(
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
elevation: theme.cardTheme.elevation ?? 4,
@@ -35,10 +35,7 @@ class WalletCard extends StatelessWidget {
child: Row(
spacing: 3,
children: [
CircleAvatar(
radius: 24,
child: Icon(iconForCurrencyType(wallet.currency), size: 28),
),
CurrencySymbolAvatar(wallet: wallet),
const SizedBox(width: 16),
Expanded(
child: Column(
@@ -51,7 +48,9 @@ class WalletCard extends StatelessWidget {
BalanceAmount(
wallet: wallet,
onToggleMask: () {
context.read<WalletsController>().toggleBalanceMask(wallet.id);
context.read<WalletsController>().toggleBalanceMask(
wallet.id,
);
},
),
WalletBalanceRefreshButton(

View File

@@ -0,0 +1,26 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/utils/currency.dart';
class CurrencySymbolAvatar extends StatelessWidget {
final Wallet wallet;
const CurrencySymbolAvatar({super.key, required this.wallet});
@override
Widget build(BuildContext context) {
final code = currencyCodeToString(wallet.currency);
final symbol = currencySymbolFromCode(code) ?? code;
final textTheme = Theme.of(context).textTheme;
return CircleAvatar(
radius: 24,
child: Text(
symbol,
style: textTheme.titleLarge?.copyWith(fontWeight: FontWeight.w700),
),
);
}
}

View File

@@ -17,14 +17,10 @@ class LedgerBalanceFormatter {
final currency = account.currency.trim();
if (currency.isEmpty) return '••••';
try {
final symbol = currencyCodeToSymbol(currencyStringToCode(currency));
if (symbol.trim().isEmpty) {
return '•••• $currency';
}
return '•••• $symbol';
} catch (_) {
final symbol = currencySymbolFromCode(currency);
if (symbol == null || symbol.trim().isEmpty) {
return '•••• $currency';
}
return '•••• $symbol';
}
}

View File

@@ -1,96 +0,0 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/payment/status.dart';
import 'package:pshared/utils/localization.dart';
import 'package:pweb/models/wallet/wallet_transaction.dart';
import 'package:pweb/controllers/operations/wallet_transactions.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class WalletHistoryFilters extends StatelessWidget {
final WalletTransactionsController provider;
final VoidCallback onPickRange;
const WalletHistoryFilters({
super.key,
required this.provider,
required this.onPickRange,
});
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final loc = AppLocalizations.of(context)!;
return Card(
elevation: 2,
color: theme.colorScheme.onSecondary,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
loc.walletActivity,
style: theme.textTheme.titleMedium,
),
if (provider.hasFilters)
TextButton(
onPressed: provider.resetFilters,
child: Text(loc.reset),
),
],
),
const SizedBox(height: 12),
Wrap(
spacing: 8,
runSpacing: 8,
children: WalletTransactionType.values.map((type) {
final isSelected = provider.selectedTypes.contains(type);
return FilterChip(
label: Text(type.label(context)),
selected: isSelected,
onSelected: (_) => provider.toggleType(type),
pressElevation: 0,
);
}).toList(),
),
const SizedBox(height: 8),
Wrap(
spacing: 8,
runSpacing: 8,
children: OperationStatus.values.map((status) {
final isSelected = provider.selectedStatuses.contains(status);
return FilterChip(
label: Text(status.localized(context)),
selected: isSelected,
onSelected: (_) => provider.toggleStatus(status),
pressElevation: 0,
);
}).toList(),
),
const SizedBox(height: 12),
Align(
alignment: Alignment.centerRight,
child: OutlinedButton.icon(
onPressed: onPickRange,
icon: const Icon(Icons.date_range_outlined),
label: Text(
provider.dateRange == null
? loc.selectPeriod
: '${dateToLocalFormat(context, provider.dateRange!.start)} ${dateToLocalFormat(context, provider.dateRange!.end)}',
),
),
),
],
),
),
);
}
}