CW-260 show amount received for each account (#907)

* Show amount received for each account

* Enable litcoin send all

* disable litcoin send all

* Indent code

* Fix large font resolution for account title
This commit is contained in:
Godwin Asuquo 2023-05-05 15:58:41 +03:00 committed by GitHub
parent 25b743df47
commit 9714961298
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 84 additions and 45 deletions

View file

@ -1,10 +1,12 @@
class Account { class Account {
Account({required this.id, required this.label}); Account({required this.id, required this.label, this.balance});
Account.fromMap(Map<String, Object> map) Account.fromMap(Map<String, Object> map)
: this.id = map['id'] == null ? 0 : int.parse(map['id'] as String), : this.id = map['id'] == null ? 0 : int.parse(map['id'] as String),
this.label = (map['label'] ?? '') as String; this.label = (map['label'] ?? '') as String,
this.balance = (map['balance'] ?? '0.00') as String;
final int id; final int id;
final String label; final String label;
final String? balance;
} }

View file

@ -1,6 +1,8 @@
import 'package:cw_core/monero_amount_format.dart';
import 'package:mobx/mobx.dart'; import 'package:mobx/mobx.dart';
import 'package:cw_core/account.dart'; import 'package:cw_core/account.dart';
import 'package:cw_monero/api/account_list.dart' as account_list; import 'package:cw_monero/api/account_list.dart' as account_list;
import 'package:cw_monero/api/wallet.dart' as monero_wallet;
part 'monero_account_list.g.dart'; part 'monero_account_list.g.dart';
@ -41,12 +43,16 @@ abstract class MoneroAccountListBase with Store {
} }
} }
List<Account> getAll() => account_list List<Account> getAll() => account_list.getAllAccount().map((accountRow) {
.getAllAccount() final accountIndex = accountRow.getId();
.map((accountRow) => Account( final balance = monero_wallet.getFullBalance(accountIndex: accountIndex);
return Account(
id: accountRow.getId(), id: accountRow.getId(),
label: accountRow.getLabel())) label: accountRow.getLabel(),
.toList(); balance: moneroAmountToString(amount: balance),
);
}).toList();
Future<void> addAccount({required String label}) async { Future<void> addAccount({required String label}) async {
await account_list.addAccount(label: label); await account_list.addAccount(label: label);
@ -54,8 +60,7 @@ abstract class MoneroAccountListBase with Store {
} }
Future<void> setLabelAccount({required int accountIndex, required String label}) async { Future<void> setLabelAccount({required int accountIndex, required String label}) async {
await account_list.setLabelForAccount( await account_list.setLabelForAccount(accountIndex: accountIndex, label: label);
accountIndex: accountIndex, label: label);
update(); update();
} }

View file

@ -10,7 +10,7 @@ class CWMoneroAccountList extends MoneroAccountList {
final moneroWallet = _wallet as MoneroWallet; final moneroWallet = _wallet as MoneroWallet;
final accounts = moneroWallet.walletAddresses.accountList final accounts = moneroWallet.walletAddresses.accountList
.accounts .accounts
.map((acc) => Account(id: acc.id, label: acc.label)) .map((acc) => Account(id: acc.id, label: acc.label, balance: acc.balance))
.toList(); .toList();
return ObservableList<Account>.of(accounts); return ObservableList<Account>.of(accounts);
} }
@ -32,7 +32,7 @@ class CWMoneroAccountList extends MoneroAccountList {
final moneroWallet = wallet as MoneroWallet; final moneroWallet = wallet as MoneroWallet;
return moneroWallet.walletAddresses.accountList return moneroWallet.walletAddresses.accountList
.getAll() .getAll()
.map((acc) => Account(id: acc.id, label: acc.label)) .map((acc) => Account(id: acc.id, label: acc.label, balance: acc.balance))
.toList(); .toList();
} }
@ -122,7 +122,7 @@ class CWMoneroWalletDetails extends MoneroWalletDetails {
Account get account { Account get account {
final moneroWallet = _wallet as MoneroWallet; final moneroWallet = _wallet as MoneroWallet;
final acc = moneroWallet.walletAddresses.account; final acc = moneroWallet.walletAddresses.account;
return Account(id: acc!.id, label: acc.label); return Account(id: acc!.id, label: acc.label, balance: acc.balance);
} }
@computed @computed
@ -316,13 +316,13 @@ class CWMonero extends Monero {
Account getCurrentAccount(Object wallet) { Account getCurrentAccount(Object wallet) {
final moneroWallet = wallet as MoneroWallet; final moneroWallet = wallet as MoneroWallet;
final acc = moneroWallet.walletAddresses.account; final acc = moneroWallet.walletAddresses.account;
return Account(id: acc!.id, label: acc.label); return Account(id: acc!.id, label: acc.label, balance: acc.balance);
} }
@override @override
void setCurrentAccount(Object wallet, int id, String label) { void setCurrentAccount(Object wallet, int id, String label, String? balance) {
final moneroWallet = wallet as MoneroWallet; final moneroWallet = wallet as MoneroWallet;
moneroWallet.walletAddresses.account = monero_account.Account(id: id, label: label); moneroWallet.walletAddresses.account = monero_account.Account(id: id, label: label, balance: balance);
} }
@override @override

View file

@ -91,6 +91,9 @@ class MoneroAccountListPage extends StatelessWidget {
return AccountTile( return AccountTile(
isCurrent: account.isSelected, isCurrent: account.isSelected,
accountName: account.label, accountName: account.label,
accountBalance: account.balance ?? '0.00',
currency: accountListViewModel
.currency.toString(),
onTap: () { onTap: () {
if (account.isSelected) { if (account.isSelected) {
return; return;

View file

@ -1,36 +1,42 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:cake_wallet/generated/i18n.dart';
class AccountTile extends StatelessWidget { class AccountTile extends StatelessWidget {
AccountTile({ AccountTile({
required this.isCurrent, required this.isCurrent,
required this.accountName, required this.accountName,
this.accountBalance,
required this.currency,
required this.onTap, required this.onTap,
required this.onEdit required this.onEdit
}); });
final bool isCurrent; final bool isCurrent;
final String accountName; final String accountName;
final String? accountBalance;
final String currency;
final Function() onTap; final Function() onTap;
final Function() onEdit; final Function() onEdit;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final color = isCurrent final color = isCurrent
? Theme.of(context).textTheme!.subtitle2!.decorationColor! ? Theme.of(context).textTheme.subtitle2!.decorationColor!
: Theme.of(context).textTheme!.headline1!.decorationColor!; : Theme.of(context).textTheme.headline1!.decorationColor!;
final textColor = isCurrent final textColor = isCurrent
? Theme.of(context).textTheme!.subtitle2!.color! ? Theme.of(context).textTheme.subtitle2!.color!
: Theme.of(context).textTheme!.headline1!.color!; : Theme.of(context).textTheme.headline1!.color!;
final Widget cell = GestureDetector( final Widget cell = GestureDetector(
onTap: onTap, onTap: onTap,
child: Container( child: Container(
height: 77, height: 77,
padding: EdgeInsets.only(left: 24, right: 24), padding: EdgeInsets.only(left: 24, right: 24),
alignment: Alignment.centerLeft,
color: color, color: color,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
flex: 2,
child: Text( child: Text(
accountName, accountName,
style: TextStyle( style: TextStyle(
@ -42,6 +48,23 @@ class AccountTile extends StatelessWidget {
), ),
), ),
), ),
if (accountBalance != null)
Expanded(
child: Text(
'${accountBalance.toString()} $currency',
textAlign: TextAlign.end,
style: TextStyle(
fontSize: 15,
fontWeight: FontWeight.w600,
fontFamily: 'Lato',
color: Theme.of(context).textTheme.headline4!.color!,
decoration: TextDecoration.none,
),
),
),
],
),
),
); );
// FIX-ME: Splidable // FIX-ME: Splidable
return cell; return cell;

View file

@ -1,10 +1,9 @@
import 'package:flutter/foundation.dart';
class AccountListItem { class AccountListItem {
AccountListItem( AccountListItem(
{required this.label, required this.id, this.isSelected = false}); {required this.label, required this.id, this.balance, this.isSelected = false});
final String label; final String label;
final int id; final int id;
final bool isSelected; final bool isSelected;
final String? balance;
} }

View file

@ -1,3 +1,4 @@
import 'package:cw_core/crypto_currency.dart';
import 'package:cw_core/wallet_type.dart'; import 'package:cw_core/wallet_type.dart';
import 'package:mobx/mobx.dart'; import 'package:mobx/mobx.dart';
import 'package:cw_core/wallet_base.dart'; import 'package:cw_core/wallet_base.dart';
@ -21,6 +22,8 @@ abstract class MoneroAccountListViewModelBase with Store {
this.scrollOffsetFromTop = scrollOffsetFromTop; this.scrollOffsetFromTop = scrollOffsetFromTop;
} }
CryptoCurrency get currency => _wallet.currency;
@computed @computed
List<AccountListItem> get accounts { List<AccountListItem> get accounts {
if (_wallet.type == WalletType.haven) { if (_wallet.type == WalletType.haven) {
@ -39,6 +42,7 @@ abstract class MoneroAccountListViewModelBase with Store {
.accounts.map((acc) => AccountListItem( .accounts.map((acc) => AccountListItem(
label: acc.label, label: acc.label,
id: acc.id, id: acc.id,
balance: acc.balance,
isSelected: acc.id == monero!.getCurrentAccount(_wallet).id)) isSelected: acc.id == monero!.getCurrentAccount(_wallet).id))
.toList(); .toList();
} }
@ -53,7 +57,9 @@ abstract class MoneroAccountListViewModelBase with Store {
monero!.setCurrentAccount( monero!.setCurrentAccount(
_wallet, _wallet,
item.id, item.id,
item.label); item.label,
item.balance,
);
} }
if (_wallet.type == WalletType.haven) { if (_wallet.type == WalletType.haven) {

View file

@ -158,9 +158,10 @@ import 'package:cw_monero/pending_monero_transaction.dart';
const moneroCwPart = "part 'cw_monero.dart';"; const moneroCwPart = "part 'cw_monero.dart';";
const moneroContent = """ const moneroContent = """
class Account { class Account {
Account({required this.id, required this.label}); Account({required this.id, required this.label, this.balance});
final int id; final int id;
final String label; final String label;
final String? balance;
} }
class Subaddress { class Subaddress {
@ -246,7 +247,7 @@ abstract class Monero {
double formatterMoneroAmountToDouble({required int amount}); double formatterMoneroAmountToDouble({required int amount});
int formatterMoneroParseAmount({required String amount}); int formatterMoneroParseAmount({required String amount});
Account getCurrentAccount(Object wallet); Account getCurrentAccount(Object wallet);
void setCurrentAccount(Object wallet, int id, String label); void setCurrentAccount(Object wallet, int id, String label, String? balance);
void onStartup(); void onStartup();
int getTransactionInfoAccountId(TransactionInfo tx); int getTransactionInfoAccountId(TransactionInfo tx);
WalletService createMoneroWalletService(Box<WalletInfo> walletInfoSource); WalletService createMoneroWalletService(Box<WalletInfo> walletInfoSource);