Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-12-23 03:59:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cw 231 display balance in send and transaction screens when long pressing and when show balance is disabled (#926)

Browse source 
* feat: allow reversing displayMode by long pressing on transactions page

* feat: allow reversing displayMode by long pressing on send page

* revert: revert transaction_list_item.dart but keep BalanceDisplayMode get displayMode => balanceViewModel.displayMode
This commit is contained in:
Rafael Saes 2023-06-09 19:29:34 -03:00 committed by GitHub
parent a4c279b538
commit b16cfaaff5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 396 additions and 342 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
lib/src/screens/dashboard/widgets/transactions_page.dart
View file

@ -25,7 +25,12 @@ class TransactionsPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return GestureDetector(
onLongPress: () => dashboardViewModel.balanceViewModel.isReversing =
!dashboardViewModel.balanceViewModel.isReversing,
onLongPressUp: () => dashboardViewModel.balanceViewModel.isReversing =
!dashboardViewModel.balanceViewModel.isReversing,
child: Container(
color: ResponsiveLayoutUtil.instance.isMobile(context) color: ResponsiveLayoutUtil.instance.isMobile(context)
? null ? null
: Theme.of(context).colorScheme.background, : Theme.of(context).colorScheme.background,
@ -51,34 +56,40 @@ class TransactionsPage extends StatelessWidget {
return Observer( return Observer(
builder: (_) => TransactionRow( builder: (_) => TransactionRow(
onTap: () => Navigator.of(context) onTap: () => Navigator.of(context).pushNamed(
.pushNamed(Routes.transactionDetails, arguments: transaction), Routes.transactionDetails,
arguments: transaction),
direction: transaction.direction, direction: transaction.direction,
formattedDate: DateFormat('HH:mm').format(transaction.date), formattedDate: DateFormat('HH:mm')
.format(transaction.date),
formattedAmount: item.formattedCryptoAmount, formattedAmount: item.formattedCryptoAmount,
formattedFiatAmount: formattedFiatAmount: dashboardViewModel
dashboardViewModel.balanceViewModel.isFiatDisabled .balanceViewModel.isFiatDisabled
? '' ? ''
: item.formattedFiatAmount, : item.formattedFiatAmount,
isPending: transaction.isPending, isPending: transaction.isPending,
title: item.formattedTitle + item.formattedStatus)); title: item.formattedTitle +
item.formattedStatus));
} }
if (item is AnonpayTransactionListItem) { if (item is AnonpayTransactionListItem) {
final transactionInfo = item.transaction; final transactionInfo = item.transaction;
return AnonpayTransactionRow( return AnonpayTransactionRow(
onTap: () => Navigator.of(context) onTap: () => Navigator.of(context).pushNamed(
.pushNamed(Routes.anonPayDetailsPage, arguments: transactionInfo), Routes.anonPayDetailsPage,
arguments: transactionInfo),
currency: transactionInfo.fiatAmount != null currency: transactionInfo.fiatAmount != null
? transactionInfo.fiatEquiv ?? '' ? transactionInfo.fiatEquiv ?? ''
: CryptoCurrency.fromFullName(transactionInfo.coinTo) : CryptoCurrency.fromFullName(
transactionInfo.coinTo)
.name .name
.toUpperCase(), .toUpperCase(),
provider: transactionInfo.provider, provider: transactionInfo.provider,
amount: transactionInfo.fiatAmount?.toString() ?? amount: transactionInfo.fiatAmount?.toString() ??
(transactionInfo.amountTo?.toString() ?? ''), (transactionInfo.amountTo?.toString() ?? ''),
createdAt: DateFormat('HH:mm').format(transactionInfo.createdAt), createdAt: DateFormat('HH:mm')
.format(transactionInfo.createdAt),
); );
} }
@ -87,13 +98,16 @@ class TransactionsPage extends StatelessWidget {
return Observer( return Observer(
builder: (_) => TradeRow( builder: (_) => TradeRow(
onTap: () => Navigator.of(context) onTap: () => Navigator.of(context).pushNamed(
.pushNamed(Routes.tradeDetails, arguments: trade), Routes.tradeDetails,
arguments: trade),
provider: trade.provider, provider: trade.provider,
from: trade.from, from: trade.from,
to: trade.to, to: trade.to,
createdAtFormattedDate: trade.createdAt != null createdAtFormattedDate:
? DateFormat('HH:mm').format(trade.createdAt!) trade.createdAt != null
? DateFormat('HH:mm')
.format(trade.createdAt!)
: null, : null,
formattedAmount: item.tradeFormattedAmount)); formattedAmount: item.tradeFormattedAmount));
} }
@ -104,12 +118,13 @@ class TransactionsPage extends StatelessWidget {
return Observer( return Observer(
builder: (_) => OrderRow( builder: (_) => OrderRow(
onTap: () => Navigator.of(context) onTap: () => Navigator.of(context)
.pushNamed(Routes.orderDetails, arguments: order), .pushNamed(Routes.orderDetails,
arguments: order),
provider: order.provider, provider: order.provider,
from: order.from!, from: order.from!,
to: order.to!, to: order.to!,
createdAtFormattedDate: createdAtFormattedDate: DateFormat('HH:mm')
DateFormat('HH:mm').format(order.createdAt), .format(order.createdAt),
formattedAmount: item.orderFormattedAmount, formattedAmount: item.orderFormattedAmount,
)); ));
} }
@ -121,12 +136,16 @@ class TransactionsPage extends StatelessWidget {
S.of(context).placeholder_transactions, S.of(context).placeholder_transactions,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: Theme.of(context).primaryTextTheme!.labelSmall!.decorationColor!), color: Theme.of(context)
.primaryTextTheme
.labelSmall!
.decorationColor!),
), ),
); );
})) }))
], ],
), ),
),
); );
} }
} }

114
lib/src/screens/send/send_page.dart
View file

@ -145,7 +145,12 @@ class SendPage extends BasePage {
Widget body(BuildContext context) { Widget body(BuildContext context) {
_setEffects(context); _setEffects(context);
return Form( return GestureDetector(
onLongPress: () => sendViewModel.balanceViewModel.isReversing =
!sendViewModel.balanceViewModel.isReversing,
onLongPressUp: () => sendViewModel.balanceViewModel.isReversing =
!sendViewModel.balanceViewModel.isReversing,
child: Form(
key: _formKey, key: _formKey,
child: ScrollableWithBottomSection( child: ScrollableWithBottomSection(
contentPadding: EdgeInsets.only(bottom: 24), contentPadding: EdgeInsets.only(bottom: 24),
@ -174,8 +179,8 @@ class SendPage extends BasePage {
}, },
)), )),
Padding( Padding(
padding: padding: EdgeInsets.only(
EdgeInsets.only(top: 10, left: 24, right: 24, bottom: 10), top: 10, left: 24, right: 24, bottom: 10),
child: Container( child: Container(
height: 10, height: 10,
child: Observer( child: Observer(
@ -192,10 +197,12 @@ class SendPage extends BasePage {
dotWidth: 6.0, dotWidth: 6.0,
dotHeight: 6.0, dotHeight: 6.0,
dotColor: Theme.of(context) dotColor: Theme.of(context)
.primaryTextTheme!.displaySmall! .primaryTextTheme
!.displaySmall!
.backgroundColor!, .backgroundColor!,
activeDotColor: Theme.of(context) activeDotColor: Theme.of(context)
.primaryTextTheme!.displayMedium! .primaryTextTheme
!.displayMedium!
.backgroundColor!), .backgroundColor!),
) )
: Offstage(); : Offstage();
@ -218,7 +225,8 @@ class SendPage extends BasePage {
return Row( return Row(
children: <Widget>[ children: <Widget>[
AddTemplateButton( AddTemplateButton(
onTap: () => Navigator.of(context).pushNamed(Routes.sendTemplate), onTap: () => Navigator.of(context)
.pushNamed(Routes.sendTemplate),
currentTemplatesLength: templates.length, currentTemplatesLength: templates.length,
), ),
ListView.builder( ListView.builder(
@ -231,35 +239,52 @@ class SendPage extends BasePage {
return TemplateTile( return TemplateTile(
key: UniqueKey(), key: UniqueKey(),
to: template.name, to: template.name,
amount: template.isCurrencySelected ? template.amount : template.amountFiat, amount: template.isCurrencySelected
from: template.isCurrencySelected ? template.cryptoCurrency : template.fiatCurrency, ? template.amount
: template.amountFiat,
from: template.isCurrencySelected
? template.cryptoCurrency
: template.fiatCurrency,
onTap: () async { onTap: () async {
final fiatFromTemplate = FiatCurrency.all.singleWhere((element) => element.title == template.fiatCurrency); final fiatFromTemplate = FiatCurrency
.all
.singleWhere((element) =>
element.title ==
template.fiatCurrency);
final output = _defineCurrentOutput(); final output = _defineCurrentOutput();
output.address = template.address; output.address = template.address;
if(template.isCurrencySelected){ if (template.isCurrencySelected) {
output.setCryptoAmount(template.amount); output
}else{ .setCryptoAmount(template.amount);
sendViewModel.setFiatCurrency(fiatFromTemplate); } else {
output.setFiatAmount(template.amountFiat); sendViewModel.setFiatCurrency(
fiatFromTemplate);
output.setFiatAmount(
template.amountFiat);
} }
output.resetParsedAddress(); output.resetParsedAddress();
await output.fetchParsedAddress(context); await output
.fetchParsedAddress(context);
}, },
onRemove: () { onRemove: () {
showPopUp<void>( showPopUp<void>(
context: context, context: context,
builder: (dialogContext) { builder: (dialogContext) {
return AlertWithTwoActions( return AlertWithTwoActions(
alertTitle: S.of(context).template, alertTitle:
S.of(context).template,
alertContent: S alertContent: S
.of(context) .of(context)
.confirm_delete_template, .confirm_delete_template,
rightButtonText: S.of(context).delete, rightButtonText:
leftButtonText: S.of(context).cancel, S.of(context).delete,
leftButtonText:
S.of(context).cancel,
actionRightButton: () { actionRightButton: () {
Navigator.of(dialogContext).pop(); Navigator.of(dialogContext)
sendViewModel.sendTemplateViewModel .pop();
sendViewModel
.sendTemplateViewModel
.removeTemplate( .removeTemplate(
template: template); template: template);
}, },
@ -286,19 +311,19 @@ class SendPage extends BasePage {
bottomSection: Column( bottomSection: Column(
children: [ children: [
if (sendViewModel.hasCurrecyChanger) if (sendViewModel.hasCurrecyChanger)
Observer(builder: (_) => Observer(
Padding( builder: (_) => Padding(
padding: EdgeInsets.only(bottom: 12), padding: EdgeInsets.only(bottom: 12),
child: PrimaryButton( child: PrimaryButton(
onPressed: () => presentCurrencyPicker(context), onPressed: () => presentCurrencyPicker(context),
text: 'Change your asset (${sendViewModel.selectedCryptoCurrency})', text:
'Change your asset (${sendViewModel.selectedCryptoCurrency})',
color: Colors.transparent, color: Colors.transparent,
textColor: Theme.of(context) textColor: Theme.of(context)
.accentTextTheme!.displaySmall! .accentTextTheme
!.displaySmall!
.decorationColor!, .decorationColor!,
) ))),
)
),
if (sendViewModel.hasMultiRecipient) if (sendViewModel.hasMultiRecipient)
Padding( Padding(
padding: EdgeInsets.only(bottom: 12), padding: EdgeInsets.only(bottom: 12),
@ -306,24 +331,28 @@ class SendPage extends BasePage {
onPressed: () { onPressed: () {
sendViewModel.addOutput(); sendViewModel.addOutput();
Future.delayed(const Duration(milliseconds: 250), () { Future.delayed(const Duration(milliseconds: 250), () {
controller.jumpToPage(sendViewModel.outputs.length - 1); controller
.jumpToPage(sendViewModel.outputs.length - 1);
}); });
}, },
text: S.of(context).add_receiver, text: S.of(context).add_receiver,
color: Colors.transparent, color: Colors.transparent,
textColor: Theme.of(context) textColor: Theme.of(context)
.accentTextTheme!.displaySmall! .accentTextTheme
!.displaySmall!
.decorationColor!, .decorationColor!,
isDottedBorder: true, isDottedBorder: true,
borderColor: Theme.of(context) borderColor: Theme.of(context)
.primaryTextTheme!.displaySmall! .primaryTextTheme
!.displaySmall!
.decorationColor!, .decorationColor!,
)), )),
Observer( Observer(
builder: (_) { builder: (_) {
return LoadingPrimaryButton( return LoadingPrimaryButton(
onPressed: () async { onPressed: () async {
if (_formKey.currentState != null && !_formKey.currentState!.validate()) { if (_formKey.currentState != null &&
!_formKey.currentState!.validate()) {
if (sendViewModel.outputs.length > 1) { if (sendViewModel.outputs.length > 1) {
showErrorValidationAlert(context); showErrorValidationAlert(context);
} }
@ -333,7 +362,8 @@ class SendPage extends BasePage {
final notValidItems = sendViewModel.outputs final notValidItems = sendViewModel.outputs
.where((item) => .where((item) =>
item.address.isEmpty || item.cryptoAmount.isEmpty) item.address.isEmpty ||
item.cryptoAmount.isEmpty)
.toList(); .toList();
if (notValidItems.isNotEmpty ?? false) { if (notValidItems.isNotEmpty ?? false) {
@ -342,10 +372,10 @@ class SendPage extends BasePage {
} }
await sendViewModel.createTransaction(); await sendViewModel.createTransaction();
}, },
text: S.of(context).send, text: S.of(context).send,
color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, color:
Theme.of(context).accentTextTheme!.bodyLarge!.color!,
textColor: Colors.white, textColor: Colors.white,
isLoading: sendViewModel.state is IsExecutingState || isLoading: sendViewModel.state is IsExecutingState ||
sendViewModel.state is TransactionCommitting, sendViewModel.state is TransactionCommitting,
@ -355,6 +385,7 @@ class SendPage extends BasePage {
) )
], ],
)), )),
),
); );
} }
@ -389,10 +420,12 @@ class SendPage extends BasePage {
amount: S.of(context).send_amount, amount: S.of(context).send_amount,
amountValue: amountValue:
sendViewModel.pendingTransaction!.amountFormatted, sendViewModel.pendingTransaction!.amountFormatted,
fiatAmountValue: sendViewModel.pendingTransactionFiatAmountFormatted, fiatAmountValue:
sendViewModel.pendingTransactionFiatAmountFormatted,
fee: S.of(context).send_fee, fee: S.of(context).send_fee,
feeValue: sendViewModel.pendingTransaction!.feeFormatted, feeValue: sendViewModel.pendingTransaction!.feeFormatted,
feeFiatAmount: sendViewModel.pendingTransactionFeeFiatAmountFormatted, feeFiatAmount: sendViewModel
.pendingTransactionFeeFiatAmountFormatted,
outputs: sendViewModel.outputs, outputs: sendViewModel.outputs,
rightButtonText: S.of(context).ok, rightButtonText: S.of(context).ok,
leftButtonText: S.of(context).cancel, leftButtonText: S.of(context).cancel,
@ -413,7 +446,8 @@ class SendPage extends BasePage {
return AlertWithOneAction( return AlertWithOneAction(
alertTitle: '', alertTitle: '',
alertContent: S.of(context).send_success( alertContent: S.of(context).send_success(
sendViewModel.selectedCryptoCurrency.toString()), sendViewModel.selectedCryptoCurrency
.toString()),
buttonText: S.of(context).ok, buttonText: S.of(context).ok,
buttonAction: () { buttonAction: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
@ -466,10 +500,12 @@ class SendPage extends BasePage {
builder: (_) => Picker( builder: (_) => Picker(
items: sendViewModel.currencies, items: sendViewModel.currencies,
displayItem: (Object item) => item.toString(), displayItem: (Object item) => item.toString(),
selectedAtIndex: sendViewModel.currencies.indexOf(sendViewModel.selectedCryptoCurrency), selectedAtIndex: sendViewModel.currencies
.indexOf(sendViewModel.selectedCryptoCurrency),
title: S.of(context).please_select, title: S.of(context).please_select,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
onItemSelected: (CryptoCurrency cur) => sendViewModel.selectedCryptoCurrency = cur, onItemSelected: (CryptoCurrency cur) =>
sendViewModel.selectedCryptoCurrency = cur,
), ),
context: context); context: context);
} }

3
lib/view_model/dashboard/transaction_list_item.dart
View file

@ -13,7 +13,6 @@ import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart';
import 'package:cw_core/keyable.dart'; import 'package:cw_core/keyable.dart';
import 'package:cw_core/wallet_type.dart'; import 'package:cw_core/wallet_type.dart';
class TransactionListItem extends ActionListItem with Keyable { class TransactionListItem extends ActionListItem with Keyable {
TransactionListItem( TransactionListItem(
{required this.transaction, {required this.transaction,
@ -28,7 +27,7 @@ class TransactionListItem extends ActionListItem with Keyable {
FiatCurrency get fiatCurrency => settingsStore.fiatCurrency; FiatCurrency get fiatCurrency => settingsStore.fiatCurrency;
BalanceDisplayMode get displayMode => settingsStore.balanceDisplayMode; BalanceDisplayMode get displayMode => balanceViewModel.displayMode;
@override @override
dynamic get keyIndex => transaction.id; dynamic get keyIndex => transaction.id;