This commit is contained in:
2026-03-26 00:57:25 +03:00
parent 71de991587
commit 8ba9ae0b9f
9 changed files with 64 additions and 54 deletions
@@ -1,6 +1,7 @@
import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../../core/constants.dart';
import '../../../../shared/models/account.dart';
import '../../../../shared/models/transaction.dart';
import '../../../../shared/widgets/byn_sign.dart';
@@ -281,13 +282,7 @@ class _AccountEditorOverlayState extends State<AccountEditorOverlay> {
),
child: Column(
mainAxisSize: MainAxisSize.min,
children:
[
('USD', '\$'),
('EUR', ''),
('BYN', 'Br'),
('RUB', ''),
].map((entry) {
children: kDisplayCurrencies.map((entry) {
final isSelected = entry.$1 == _selectedCurrency;
return InkWell(
onTap: () {
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../../core/constants.dart';
import '../../../../shared/widgets/byn_sign.dart';
class AccountEditorPanel extends ConsumerWidget {
@@ -169,12 +170,7 @@ class AccountEditorPanel extends ConsumerWidget {
).colorScheme.onSurface,
)
: Text(
[
('USD', '\$'),
('EUR', ''),
('BYN', 'Br'),
('RUB', ''),
]
kDisplayCurrencies
.firstWhere(
(c) => c.$1 == selectedCurrency,
)
@@ -12,8 +12,6 @@ import '../../settings/provider.dart';
import '../provider.dart';
String _smartBalance(double amount, AmountFormat fmt, String symbol) {
const spaceAfter = {'Br'};
final sep = spaceAfter.contains(symbol) || symbol.isEmpty ? ' ' : '';
final isWhole = amount == amount.floorToDouble();
String formatted;
@@ -25,7 +23,7 @@ String _smartBalance(double amount, AmountFormat fmt, String symbol) {
} else {
formatted = fmt.format(amount);
}
return symbol.isEmpty ? formatted : '$symbol$sep$formatted';
return symbol.isEmpty ? formatted : '$symbol$formatted';
}
class BalanceCard extends ConsumerStatefulWidget {
@@ -139,13 +137,7 @@ class BalanceCardState extends ConsumerState<BalanceCard>
final secondary = widget.previewSecondary ?? savedColors.secondary;
final gradientType = widget.previewGradientType ?? savedColors.gradientType;
final allCurrencies = [
('USD', r'$'),
('EUR', ''),
('BYN', 'Br'),
('RUB', ''),
];
final others = allCurrencies
final others = kDisplayCurrencies
.where((c) => c.$1 != widget.currencyInfo.code)
.toList();
@@ -253,7 +245,7 @@ class BalanceCardState extends ConsumerState<BalanceCard>
fontSize: 48,
color: onCard,
),
const SizedBox(width: 4),
const SizedBox(width: 2),
Text(
_smartBalance(
widget.balance,