Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,63 @@ class AppearanceSettingsView extends ConsumerWidget {
),
),
const SizedBox(height: 10),
RoundedWhiteContainer(
child: Consumer(
builder: (_, ref, __) {
return RawMaterialButton(
splashColor:
Theme.of(
context,
).extension<StackColors>()!.highlight,
materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius,
),
),
onPressed: null,
child: Padding(
padding: const EdgeInsets.symmetric(
vertical: 8,
),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
"Hide balances",
style: STextStyles.titleBold12(
context,
),
textAlign: TextAlign.left,
),
SizedBox(
height: 20,
width: 40,
child: DraggableSwitchButton(
isOn: ref.watch(
prefsChangeNotifierProvider.select(
(value) => value.hideBalances,
),
),
onValueChanged: (newValue) {
ref
.read(
prefsChangeNotifierProvider,
)
.hideBalances = newValue;
},
),
),
],
),
),
);
},
),
),
const SizedBox(height: 10),
RoundedWhiteContainer(
child: Column(
children: [
Expand Down
49 changes: 31 additions & 18 deletions lib/pages/token_view/sub_widgets/token_summary.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import '../../../wallets/isar/providers/eth/token_balance_provider.dart';
import '../../../wallets/isar/providers/wallet_info_provider.dart';
import '../../../widgets/coin_ticker_tag.dart';
import '../../../widgets/conditional_parent.dart';
import '../../../widgets/hideable_balance.dart';
import '../../../widgets/rounded_container.dart';
import '../../buy_view/buy_in_wallet_view.dart';
import '../../exchange_view/wallet_initiated_exchange_view.dart';
Expand Down Expand Up @@ -104,18 +105,24 @@ class TokenSummary extends ConsumerWidget {
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
ref
.watch(
pAmountFormatter(
Ethereum(CryptoCurrencyNetwork.main),
),
)
.format(balance.total, tokenContract: token),
style: STextStyles.pageTitleH1(context).copyWith(
color: Theme.of(
context,
).extension<StackColors>()!.tokenSummaryTextPrimary,
HideableBalance(
iconColor: Theme.of(
context,
).extension<StackColors>()!.tokenSummaryTextPrimary,
iconSize: 24,
child: Text(
ref
.watch(
pAmountFormatter(
Ethereum(CryptoCurrencyNetwork.main),
),
)
.format(balance.total, tokenContract: token),
style: STextStyles.pageTitleH1(context).copyWith(
color: Theme.of(
context,
).extension<StackColors>()!.tokenSummaryTextPrimary,
),
),
),
const SizedBox(width: 10),
Expand All @@ -128,12 +135,18 @@ class TokenSummary extends ConsumerWidget {
),
if (price != null) const SizedBox(height: 6),
if (price != null)
Text(
"${(balance.total.decimal * price).toAmount(fractionDigits: 2).fiatString(locale: ref.watch(localeServiceChangeNotifierProvider.select((value) => value.locale)))} ${ref.watch(prefsChangeNotifierProvider.select((value) => value.currency))}",
style: STextStyles.subtitle500(context).copyWith(
color: Theme.of(
context,
).extension<StackColors>()!.tokenSummaryTextPrimary,
HideableBalance(
iconColor: Theme.of(
context,
).extension<StackColors>()!.tokenSummaryTextPrimary,
iconSize: 16,
child: Text(
"${(balance.total.decimal * price).toAmount(fractionDigits: 2).fiatString(locale: ref.watch(localeServiceChangeNotifierProvider.select((value) => value.locale)))} ${ref.watch(prefsChangeNotifierProvider.select((value) => value.currency))}",
style: STextStyles.subtitle500(context).copyWith(
color: Theme.of(
context,
).extension<StackColors>()!.tokenSummaryTextPrimary,
),
),
),
const SizedBox(height: 20),
Expand Down
40 changes: 27 additions & 13 deletions lib/pages/token_view/sub_widgets/token_summary_sol.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ import '../../../utilities/amount/amount.dart';
import '../../../utilities/assets.dart';
import '../../../utilities/constants.dart';
import '../../../utilities/text_styles.dart';
import '../../../wallets/crypto_currency/crypto_currency.dart';
import '../../../wallets/isar/providers/solana/current_sol_token_wallet_provider.dart';
import '../../../wallets/isar/providers/solana/sol_token_balance_provider.dart';
import '../../../wallets/isar/providers/wallet_info_provider.dart';
import '../../../widgets/coin_ticker_tag.dart';
import '../../../widgets/conditional_parent.dart';
import '../../../widgets/hideable_balance.dart';
import '../../../widgets/rounded_container.dart';
import '../../receive_view/sol_token_receive_view.dart';
import '../../send_view/sol_token_send_view.dart';
Expand Down Expand Up @@ -124,12 +124,20 @@ class SolanaTokenSummary extends ConsumerWidget {
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
balance.total.decimal.toStringAsFixed(tokenWallet.tokenDecimals),
style: STextStyles.pageTitleH1(context).copyWith(
color: Theme.of(
context,
).extension<StackColors>()!.tokenSummaryTextPrimary,
HideableBalance(
iconColor: Theme.of(
context,
).extension<StackColors>()!.tokenSummaryTextPrimary,
iconSize: 24,
child: Text(
balance.total.decimal.toStringAsFixed(
tokenWallet.tokenDecimals,
),
style: STextStyles.pageTitleH1(context).copyWith(
color: Theme.of(
context,
).extension<StackColors>()!.tokenSummaryTextPrimary,
),
),
),
const SizedBox(width: 10),
Expand All @@ -140,12 +148,18 @@ class SolanaTokenSummary extends ConsumerWidget {
),
if (price != null) const SizedBox(height: 6),
if (price != null)
Text(
"${(balance.total.decimal * price).toAmount(fractionDigits: 2).fiatString(locale: ref.watch(localeServiceChangeNotifierProvider.select((value) => value.locale)))} ${ref.watch(prefsChangeNotifierProvider.select((value) => value.currency))}",
style: STextStyles.subtitle500(context).copyWith(
color: Theme.of(
context,
).extension<StackColors>()!.tokenSummaryTextPrimary,
HideableBalance(
iconColor: Theme.of(
context,
).extension<StackColors>()!.tokenSummaryTextPrimary,
iconSize: 16,
child: Text(
"${(balance.total.decimal * price).toAmount(fractionDigits: 2).fiatString(locale: ref.watch(localeServiceChangeNotifierProvider.select((value) => value.locale)))} ${ref.watch(prefsChangeNotifierProvider.select((value) => value.currency))}",
style: STextStyles.subtitle500(context).copyWith(
color: Theme.of(
context,
).extension<StackColors>()!.tokenSummaryTextPrimary,
),
),
),
const SizedBox(height: 20),
Expand Down
45 changes: 30 additions & 15 deletions lib/pages/wallet_view/sub_widgets/wallet_summary_info.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import '../../../wallets/crypto_currency/coins/firo.dart';
import '../../../wallets/isar/providers/wallet_info_provider.dart';
import '../../../wallets/wallet/impl/banano_wallet.dart';
import '../../../widgets/conditional_parent.dart';
import '../../../widgets/hideable_balance.dart';
import 'wallet_balance_toggle_sheet.dart';
import 'wallet_refresh_button.dart';

Expand Down Expand Up @@ -206,25 +207,39 @@ class WalletSummaryInfo extends ConsumerWidget {
const Spacer(),
FittedBox(
fit: BoxFit.scaleDown,
child: SelectableText(
ref.watch(pAmountFormatter(coin)).format(balanceToShow),
style: STextStyles.pageTitleH1(context).copyWith(
fontSize: 24,
color:
Theme.of(
context,
).extension<StackColors>()!.textFavoriteCard,
child: HideableBalance(
iconColor:
Theme.of(
context,
).extension<StackColors>()!.textFavoriteCard,
iconSize: 24,
child: SelectableText(
ref.watch(pAmountFormatter(coin)).format(balanceToShow),
style: STextStyles.pageTitleH1(context).copyWith(
fontSize: 24,
color:
Theme.of(
context,
).extension<StackColors>()!.textFavoriteCard,
),
),
),
),
if (price != null)
Text(
"${(price.value * balanceToShow.decimal).toAmount(fractionDigits: 2).fiatString(locale: locale)} $baseCurrency",
style: STextStyles.subtitle500(context).copyWith(
color:
Theme.of(
context,
).extension<StackColors>()!.textFavoriteCard,
HideableBalance(
iconColor:
Theme.of(
context,
).extension<StackColors>()!.textFavoriteCard,
iconSize: 16,
child: Text(
"${(price.value * balanceToShow.decimal).toAmount(fractionDigits: 2).fiatString(locale: locale)} $baseCurrency",
style: STextStyles.subtitle500(context).copyWith(
color:
Theme.of(
context,
).extension<StackColors>()!.textFavoriteCard,
),
),
),
],
Expand Down
52 changes: 34 additions & 18 deletions lib/pages/wallets_view/sub_widgets/favorite_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import '../../../wallets/isar/providers/wallet_info_provider.dart';
import '../../../wallets/wallet/intermediate/external_wallet.dart';
import '../../../widgets/coin_card.dart';
import '../../../widgets/conditional_parent.dart';
import '../../../widgets/hideable_balance.dart';
import '../../wallet_view/wallet_view.dart';

class FavoriteCard extends ConsumerStatefulWidget {
Expand Down Expand Up @@ -241,30 +242,45 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
children: [
FittedBox(
fit: BoxFit.scaleDown,
child: Text(
ref.watch(pAmountFormatter(coin)).format(total),
style: STextStyles.titleBold12(context).copyWith(
fontSize: 16,
color:
Theme.of(context)
.extension<StackColors>()!
.textFavoriteCard,
child: HideableBalance(
iconColor:
Theme.of(context)
.extension<StackColors>()!
.textFavoriteCard,
iconSize: 16,
child: Text(
ref.watch(pAmountFormatter(coin)).format(total),
style:
STextStyles.titleBold12(context).copyWith(
fontSize: 16,
color:
Theme.of(context)
.extension<StackColors>()!
.textFavoriteCard,
),
),
),
),
if (externalCalls && price != null)
const SizedBox(height: 4),
if (externalCalls && price != null)
Text(
"${fiatTotal.fiatString(locale: ref.watch(localeServiceChangeNotifierProvider.select((value) => value.locale)))} ${ref.watch(prefsChangeNotifierProvider.select((value) => value.currency))}",
style: STextStyles.itemSubtitle12(
context,
).copyWith(
fontSize: 10,
color:
Theme.of(context)
.extension<StackColors>()!
.textFavoriteCard,
HideableBalance(
iconColor:
Theme.of(context)
.extension<StackColors>()!
.textFavoriteCard,
iconSize: 10,
child: Text(
"${fiatTotal.fiatString(locale: ref.watch(localeServiceChangeNotifierProvider.select((value) => value.locale)))} ${ref.watch(prefsChangeNotifierProvider.select((value) => value.currency))}",
style: STextStyles.itemSubtitle12(
context,
).copyWith(
fontSize: 10,
color:
Theme.of(context)
.extension<StackColors>()!
.textFavoriteCard,
),
),
),
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import '../../../../wallets/isar/providers/eth/token_balance_provider.dart';
import '../../../../wallets/isar/providers/solana/current_sol_token_wallet_provider.dart';
import '../../../../wallets/isar/providers/solana/sol_token_balance_provider.dart';
import '../../../../wallets/isar/providers/wallet_info_provider.dart';
import '../../../../widgets/hideable_balance.dart';
import 'desktop_balance_toggle_button.dart';

class DesktopWalletSummary extends ConsumerStatefulWidget {
Expand Down Expand Up @@ -171,20 +172,30 @@ class _WDesktopWalletSummaryState extends ConsumerState<DesktopWalletSummary> {
children: [
FittedBox(
fit: BoxFit.scaleDown,
child: SelectableText(
ref
.watch(pAmountFormatter(coin))
.format(balanceToShow, tokenContract: tokenContract),
style: STextStyles.desktopH3(context),
child: HideableBalance(
iconSize: 24,
child: SelectableText(
ref
.watch(pAmountFormatter(coin))
.format(balanceToShow, tokenContract: tokenContract),
style: STextStyles.desktopH3(context),
),
),
),
if (externalCalls && price != null)
SelectableText(
"${Amount.fromDecimal(price.value * balanceToShow.decimal, fractionDigits: 2).fiatString(locale: locale)} $baseCurrency",
style: STextStyles.desktopTextExtraSmall(context).copyWith(
color: Theme.of(
context,
).extension<StackColors>()!.textSubtitle1,
HideableBalance(
iconColor: Theme.of(
context,
).extension<StackColors>()!.textSubtitle1,
iconSize: 16,
child: SelectableText(
"${Amount.fromDecimal(price.value * balanceToShow.decimal, fractionDigits: 2).fiatString(locale: locale)} $baseCurrency",
style:
STextStyles.desktopTextExtraSmall(context).copyWith(
color: Theme.of(
context,
).extension<StackColors>()!.textSubtitle1,
),
),
),
// if (coin is Firo)
Expand Down
Loading
Loading