From 05e7cb3a1002e6c9f01d8f7f041e68d0f948b9fc Mon Sep 17 00:00:00 2001 From: Serhii Date: Mon, 27 Mar 2023 10:27:54 +0300 Subject: [PATCH] code formatting --- cw_bitcoin/lib/electrum_balance.dart | 11 ++--- .../unspent_coins_details_page.dart | 22 ++++----- .../unspent_coins_details_view_model.dart | 47 ++++++++----------- .../unspent_coins_list_view_model.dart | 44 +++++++++-------- 4 files changed, 53 insertions(+), 71 deletions(-) diff --git a/cw_bitcoin/lib/electrum_balance.dart b/cw_bitcoin/lib/electrum_balance.dart index f81f9d9cf..faaaa304c 100644 --- a/cw_bitcoin/lib/electrum_balance.dart +++ b/cw_bitcoin/lib/electrum_balance.dart @@ -25,21 +25,18 @@ class ElectrumBalance extends Balance { final int frozen; @override - String get formattedAvailableBalance => - bitcoinAmountToString(amount: confirmed); + String get formattedAvailableBalance => bitcoinAmountToString(amount: confirmed); @override - String get formattedAdditionalBalance => - bitcoinAmountToString(amount: unconfirmed); + String get formattedAdditionalBalance => bitcoinAmountToString(amount: unconfirmed); String get formattedFrozenBalance { final frozenFormatted = bitcoinAmountToString(amount: frozen); - return frozenFormatted == '0.0' ? '' : frozenFormatted; + return frozenFormatted == '0.0' ? '' : frozenFormatted; } @override - String get formattedTotalAvailableBalance => - bitcoinAmountToString(amount: confirmed - frozen); + String get formattedTotalAvailableBalance => bitcoinAmountToString(amount: confirmed - frozen); String toJSON() => json.encode({'confirmed': confirmed, 'unconfirmed': unconfirmed, 'frozen': frozen}); diff --git a/lib/src/screens/unspent_coins/unspent_coins_details_page.dart b/lib/src/screens/unspent_coins/unspent_coins_details_page.dart index d686bf992..00c7b9796 100644 --- a/lib/src/screens/unspent_coins/unspent_coins_details_page.dart +++ b/lib/src/screens/unspent_coins/unspent_coins_details_page.dart @@ -33,15 +33,12 @@ class UnspentCoinsDetailsPage extends BasePage { final item = unspentCoinsDetailsViewModel.items[index]; if (item is StandartListItem) { - return GestureDetector( onTap: () { Clipboard.setData(ClipboardData(text: item.value)); - showBar(context, - S.of(context).transaction_details_copied(item.title)); + showBar(context, S.of(context).transaction_details_copied(item.title)); }, - child: - ListRow(title: '${item.title}:', value: item.value), + child: ListRow(title: '${item.title}:', value: item.value), ); } @@ -54,22 +51,21 @@ class UnspentCoinsDetailsPage extends BasePage { } if (item is UnspentCoinsSwitchItem) { - return Observer(builder: (_) => UnspentCoinsSwitchRow( - title: item.title, - switchValue: item.switchValue(), - onSwitchValueChange: item.onSwitchValueChange - )); + return Observer( + builder: (_) => UnspentCoinsSwitchRow( + title: item.title, + switchValue: item.switchValue(), + onSwitchValueChange: item.onSwitchValueChange)); } if (item is BlockExplorerListItem) { return GestureDetector( onTap: item.onTap, - child: - ListRow(title: '${item.title}:', value: item.value), + child: ListRow(title: '${item.title}:', value: item.value), ); } return Container(); }); } -} \ No newline at end of file +} diff --git a/lib/view_model/unspent_coins/unspent_coins_details_view_model.dart b/lib/view_model/unspent_coins/unspent_coins_details_view_model.dart index eb874ed31..ef9360fcc 100644 --- a/lib/view_model/unspent_coins/unspent_coins_details_view_model.dart +++ b/lib/view_model/unspent_coins/unspent_coins_details_view_model.dart @@ -16,21 +16,14 @@ class UnspentCoinsDetailsViewModel = UnspentCoinsDetailsViewModelBase with _$UnspentCoinsDetailsViewModel; abstract class UnspentCoinsDetailsViewModelBase with Store { - UnspentCoinsDetailsViewModelBase({ - required this.unspentCoinsItem, - required this.unspentCoinsListViewModel}) + UnspentCoinsDetailsViewModelBase( + {required this.unspentCoinsItem, required this.unspentCoinsListViewModel}) : items = [], isFrozen = unspentCoinsItem.isFrozen, note = unspentCoinsItem.note { items = [ - StandartListItem( - title: S.current.transaction_details_amount, - value: unspentCoinsItem.amount - ), - StandartListItem( - title: S.current.widgets_address, - value: unspentCoinsItem.address - ), + StandartListItem(title: S.current.transaction_details_amount, value: unspentCoinsItem.amount), + StandartListItem(title: S.current.widgets_address, value: unspentCoinsItem.address), TextFieldListItem( title: S.current.note_tap_to_change, value: note, @@ -39,27 +32,25 @@ abstract class UnspentCoinsDetailsViewModelBase with Store { unspentCoinsListViewModel.saveUnspentCoinInfo(unspentCoinsItem); }), UnspentCoinsSwitchItem( - title: S.current.freeze, - value: '', - switchValue: () => isFrozen, - onSwitchValueChange: (value) async { - isFrozen = value; - unspentCoinsItem.isFrozen = value; - if (value) { - unspentCoinsItem.isSending = !value; - } - await unspentCoinsListViewModel.saveUnspentCoinInfo(unspentCoinsItem); - } - ), + title: S.current.freeze, + value: '', + switchValue: () => isFrozen, + onSwitchValueChange: (value) async { + isFrozen = value; + unspentCoinsItem.isFrozen = value; + if (value) { + unspentCoinsItem.isSending = !value; + } + await unspentCoinsListViewModel.saveUnspentCoinInfo(unspentCoinsItem); + }), BlockExplorerListItem( title: S.current.view_in_block_explorer, value: _explorerDescription(unspentCoinsListViewModel.wallet.type), onTap: () { - final url = Uri.parse(_explorerUrl(unspentCoinsListViewModel.wallet.type, - unspentCoinsItem.hash)); + final url = Uri.parse( + _explorerUrl(unspentCoinsListViewModel.wallet.type, unspentCoinsItem.hash)); return launchUrl(url); - } - ) + }) ]; } @@ -94,4 +85,4 @@ abstract class UnspentCoinsDetailsViewModelBase with Store { final UnspentCoinsItem unspentCoinsItem; final UnspentCoinsListViewModel unspentCoinsListViewModel; List items; -} \ No newline at end of file +} diff --git a/lib/view_model/unspent_coins/unspent_coins_list_view_model.dart b/lib/view_model/unspent_coins/unspent_coins_list_view_model.dart index f61255f5e..51cea3724 100644 --- a/lib/view_model/unspent_coins/unspent_coins_list_view_model.dart +++ b/lib/view_model/unspent_coins/unspent_coins_list_view_model.dart @@ -13,10 +13,9 @@ part 'unspent_coins_list_view_model.g.dart'; class UnspentCoinsListViewModel = UnspentCoinsListViewModelBase with _$UnspentCoinsListViewModel; abstract class UnspentCoinsListViewModelBase with Store { - UnspentCoinsListViewModelBase({ - required this.wallet, - required Box unspentCoinsInfo}) - : _unspentCoinsInfo = unspentCoinsInfo { + UnspentCoinsListViewModelBase( + {required this.wallet, required Box unspentCoinsInfo}) + : _unspentCoinsInfo = unspentCoinsInfo { bitcoin!.updateUnspents(wallet); } @@ -24,28 +23,27 @@ abstract class UnspentCoinsListViewModelBase with Store { final Box _unspentCoinsInfo; @computed - ObservableList get items => ObservableList.of(bitcoin!.getUnspents(wallet).map((elem) { - final amount = bitcoin!.formatterBitcoinAmountToString(amount: elem.value) + - ' ${wallet.currency.title}'; - - final info = _unspentCoinsInfo.values - .firstWhere((element) => element.walletId == wallet.id && element.hash == elem.hash); + ObservableList get items => + ObservableList.of(bitcoin!.getUnspents(wallet).map((elem) { + final amount = bitcoin!.formatterBitcoinAmountToString(amount: elem.value) + + ' ${wallet.currency.title}'; - return UnspentCoinsItem( - address: elem.address, - amount: amount, - hash: elem.hash, - isFrozen: info.isFrozen, - note: info.note, - isSending: info.isSending - ); - })); + final info = _unspentCoinsInfo.values + .firstWhere((element) => element.walletId == wallet.id && element.hash == elem.hash); + + return UnspentCoinsItem( + address: elem.address, + amount: amount, + hash: elem.hash, + isFrozen: info.isFrozen, + note: info.note, + isSending: info.isSending); + })); Future saveUnspentCoinInfo(UnspentCoinsItem item) async { try { - final info = _unspentCoinsInfo.values - .firstWhere((element) => element.walletId.contains(wallet.id) && - element.hash.contains(item.hash)); + final info = _unspentCoinsInfo.values.firstWhere( + (element) => element.walletId.contains(wallet.id) && element.hash.contains(item.hash)); info.isFrozen = item.isFrozen; info.isSending = item.isSending; @@ -58,4 +56,4 @@ abstract class UnspentCoinsListViewModelBase with Store { print(e.toString()); } } -} \ No newline at end of file +}