SolarNetwork/App
3
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

💄 Optimized wallet screen

Browse Source
This commit is contained in:
LittleSheep
2025-10-04 20:38:42 +08:00
parent 5dbe7371cb
commit 44dbfc36d9
4 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/i18n/en-US.json
View File

@@ -481,6 +481,7 @@
"pinCode": "PIN Code",
"biometric": "Biometric",
"enterPinToConfirm": "Enter your 6-digit PIN to confirm payment",
"enterPin": "Enter your PIN code",
"clearPin": "Clear PIN",
"useBiometricToConfirm": "Use biometric authentication to confirm payment",
"touchSensorToAuthenticate": "Touch the sensor to authenticate",

62
lib/screens/wallet.dart
View File

@@ -285,37 +285,6 @@ class _CreateFundSheetState extends State<CreateFundSheet> {
),
);
}),
if (selectedRecipients.length < 10)
OutlinedButton.icon(
onPressed: () async {
final recipient =
await showModalBottomSheet<SnAccount>(
context: context,
useRootNavigator: true,
isScrollControlled: true,
builder:
(context) =>
const AccountPickerSheet(),
);
if (recipient != null &&
!selectedRecipients.contains(
recipient,
)) {
setState(
() =>
selectedRecipients.add(recipient),
);
}
},
icon: const Icon(Icons.person_add),
label: Text('addRecipient'.tr()),
style: OutlinedButton.styleFrom(
minimumSize: const Size(
double.infinity,
48,
),
),
).padding(all: 16),
],
)
: Column(
@@ -470,7 +439,7 @@ class _CreateFundSheetState extends State<CreateFundSheet> {
bottom: MediaQuery.of(context).viewInsets.bottom,
),
child: SheetScaffold(
titleText: 'enterPinToConfirm'.tr(),
titleText: 'enterPin'.tr(),
heightFactor: 0.5,
child: Padding(
padding: const EdgeInsets.all(20),
@@ -481,7 +450,7 @@ class _CreateFundSheetState extends State<CreateFundSheet> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
'enterPinToConfirm'.tr(),
'enterPinToConfirmPayment'.tr(),
style: Theme.of(context).textTheme.titleMedium
?.copyWith(fontWeight: FontWeight.w500),
textAlign: TextAlign.center,
@@ -862,6 +831,29 @@ class WalletScreen extends HookConsumerWidget {
return 'walletCurrency${isShort ? 'Short' : ''}${currency[0].toUpperCase()}${currency.substring(1).toLowerCase()}';
}
List<SnWalletPocket> _getAllCurrencies(List<SnWalletPocket> pockets) {
final allCurrencies = <String>{};
allCurrencies.addAll(kCurrencyIconData.keys);
allCurrencies.addAll(pockets.map((p) => p.currency));
return allCurrencies.map((currency) {
final existingPocket = pockets.firstWhere(
(p) => p.currency == currency,
orElse:
() => SnWalletPocket(
id: '',
currency: currency,
amount: 0.0,
walletId: '',
createdAt: DateTime.now(),
updatedAt: DateTime.now(),
deletedAt: null,
),
);
return existingPocket;
}).toList();
}
return AppScaffold(
appBar: AppBar(
title: Text('wallet').tr(),
@@ -908,7 +900,7 @@ class WalletScreen extends HookConsumerWidget {
margin: EdgeInsets.zero,
child: Column(
children: [
...data.pockets.map(
..._getAllCurrencies(data.pockets).map(
(pocket) => ListTile(
leading: Icon(
kCurrencyIconData[pocket.currency] ??
@@ -932,6 +924,8 @@ class WalletScreen extends HookConsumerWidget {
).padding(horizontal: 12, top: 12),
),
SliverGap(8),
// Tab Bar
SliverToBoxAdapter(
child: TabBar(

2
lib/widgets/payment/README.md
View File

@@ -188,7 +188,7 @@ Add these keys to your localization files:
"description": "Description",
"pinCode": "PIN Code",
"biometric": "Biometric",
"enterPinToConfirm": "Enter your 6-digit PIN to confirm payment",
"enterPinToConfirmPayment": "Enter your 6-digit PIN to confirm payment",
"clearPin": "Clear PIN",
"useBiometricToConfirm": "Use biometric authentication to confirm payment",
"touchSensorToAuthenticate": "Touch the sensor to authenticate",

2
lib/widgets/payment/payment_overlay.dart
View File

@@ -385,7 +385,7 @@ class _PaymentContentState extends ConsumerState<_PaymentContent> {
return Column(
children: [
Text(
'enterPinToConfirm'.tr(),
'enterPinToConfirmPayment'.tr(),
style: Theme.of(
context,
).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w500),