From 6d517afb3446cf87e7bdb681a09c1a0d6ed5b065 Mon Sep 17 00:00:00 2001 From: Julian Date: Wed, 29 Jan 2025 16:53:55 -0600 Subject: [PATCH] firo balance type button changes --- .../desktop_balance_toggle_button.dart | 27 ++++++------------- .../sub_widgets/desktop_wallet_summary.dart | 18 ++++++++----- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_balance_toggle_button.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_balance_toggle_button.dart index abe41055c..659f5710a 100644 --- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_balance_toggle_button.dart +++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_balance_toggle_button.dart @@ -10,11 +10,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:flutter_svg/flutter_svg.dart'; + import '../../../../providers/wallet/public_private_balance_state_provider.dart'; import '../../../../providers/wallet/wallet_balance_toggle_state_provider.dart'; import '../../../../themes/stack_colors.dart'; -import '../../../../utilities/assets.dart'; import '../../../../utilities/constants.dart'; import '../../../../utilities/enums/wallet_balance_toggle_state.dart'; import '../../../../utilities/text_styles.dart'; @@ -86,7 +85,7 @@ class DesktopPrivateBalanceToggleButton extends ConsumerWidget { return SizedBox( height: 22, - width: 22, + width: 80, child: MaterialButton( color: Theme.of(context).extension()!.buttonBackSecondary, splashColor: Theme.of(context).extension()!.highlight, @@ -120,22 +119,12 @@ class DesktopPrivateBalanceToggleButton extends ConsumerWidget { ), ), child: Center( - child: currentType == FiroType.spark - ? SvgPicture.asset( - Assets.svg.spark, - width: 16, - // color: Theme.of(context) - // .extension()! - // .accentColorYellow, - ) - : Image( - image: AssetImage( - currentType == FiroType.public - ? Assets.png.glasses - : Assets.png.glassesHidden, - ), - width: 16, - ), + child: FittedBox( + child: Text( + currentType.name.toUpperCase(), + style: STextStyles.w500_10(context), + ), + ), ), ), ); diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_summary.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_summary.dart index 5f0e0f69b..c4a719510 100644 --- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_summary.dart +++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_summary.dart @@ -151,6 +151,16 @@ class _WDesktopWalletSummaryState extends ConsumerState { .textSubtitle1, ), ), + if (coin is Firo) + const Row( + children: [ + DesktopPrivateBalanceToggleButton(), + SizedBox( + width: 8, + ), + DesktopBalanceToggleButton(), + ], + ) ], ), const SizedBox( @@ -163,15 +173,11 @@ class _WDesktopWalletSummaryState extends ConsumerState { ? ref.watch(pCurrentTokenWallet)!.tokenContract.address : null, ), - if (coin is Firo) + if (coin is! Firo) const SizedBox( width: 8, ), - if (coin is Firo) const DesktopPrivateBalanceToggleButton(), - const SizedBox( - width: 8, - ), - const DesktopBalanceToggleButton(), + if (coin is! Firo) const DesktopBalanceToggleButton(), ], ); },