Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-02-02 03:06:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

firo private/public balance desktop toggle

Browse source
This commit is contained in:
julian 2022-11-19 18:04:53 -06:00
parent b333253287
commit e2a172f747
6 changed files with 215 additions and 225 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
assets/images/glasses-hidden.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
assets/images/glasses.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

60
lib/pages_desktop_specific/home/my_stack_view/wallet_view/sub_widgets/desktop_balance_toggle_button.dart Normal file
View file

@ -0,0 +1,60 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/providers/wallet/wallet_balance_toggle_state_provider.dart';
import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/wallet_balance_toggle_state.dart';
import 'package:stackwallet/utilities/theme/stack_colors.dart';
class DesktopBalanceToggleButton extends ConsumerWidget {
const DesktopBalanceToggleButton({
Key? key,
this.onPressed,
}) : super(key: key);
final VoidCallback? onPressed;
@override
Widget build(BuildContext context, WidgetRef ref) {
return SizedBox(
height: 22,
width: 22,
child: MaterialButton(
color: Theme.of(context).extension<StackColors>()!.buttonBackSecondary,
splashColor: Theme.of(context).extension<StackColors>()!.highlight,
onPressed: () {
if (ref.read(walletBalanceToggleStateProvider.state).state ==
WalletBalanceToggleState.available) {
ref.read(walletBalanceToggleStateProvider.state).state =
WalletBalanceToggleState.full;
} else {
ref.read(walletBalanceToggleStateProvider.state).state =
WalletBalanceToggleState.available;
}
onPressed?.call();
},
elevation: 0,
highlightElevation: 0,
hoverElevation: 0,
padding: EdgeInsets.zero,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius,
),
),
child: Center(
child: Image(
image: AssetImage(
ref.watch(walletBalanceToggleStateProvider.state).state ==
WalletBalanceToggleState.available
? Assets.png.glassesHidden
: Assets.png.glasses,
),
width: 16,
),
),
),
);
}
}

143
lib/pages_desktop_specific/home/my_stack_view/wallet_view/sub_widgets/desktop_wallet_summary.dart
View file

@ -1,13 +1,15 @@
import 'package:decimal/decimal.dart'; import 'package:decimal/decimal.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/pages/wallet_view/sub_widgets/wallet_balance_toggle_sheet.dart';
import 'package:stackwallet/pages/wallet_view/sub_widgets/wallet_refresh_button.dart'; import 'package:stackwallet/pages/wallet_view/sub_widgets/wallet_refresh_button.dart';
import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/wallet_view/sub_widgets/desktop_balance_toggle_button.dart';
import 'package:stackwallet/providers/providers.dart'; import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/providers/wallet/wallet_balance_toggle_state_provider.dart';
import 'package:stackwallet/services/coins/firo/firo_wallet.dart'; import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
import 'package:stackwallet/services/coins/manager.dart'; import 'package:stackwallet/services/coins/manager.dart';
import 'package:stackwallet/services/event_bus/events/global/wallet_sync_status_changed_event.dart'; import 'package:stackwallet/services/event_bus/events/global/wallet_sync_status_changed_event.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/wallet_balance_toggle_state.dart';
import 'package:stackwallet/utilities/format.dart'; import 'package:stackwallet/utilities/format.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_colors.dart'; import 'package:stackwallet/utilities/theme/stack_colors.dart';
@ -33,19 +35,6 @@ class _WDesktopWalletSummaryState extends State<DesktopWalletSummary> {
late final String walletId; late final String walletId;
late final ChangeNotifierProvider<Manager> managerProvider; late final ChangeNotifierProvider<Manager> managerProvider;
void showSheet() {
showModalBottomSheet<dynamic>(
backgroundColor: Colors.transparent,
context: context,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
top: Radius.circular(20),
),
),
builder: (_) => WalletBalanceToggleSheet(walletId: walletId),
);
}
Decimal? _balanceTotalCached; Decimal? _balanceTotalCached;
Decimal? _balanceCached; Decimal? _balanceCached;
@ -59,6 +48,10 @@ class _WDesktopWalletSummaryState extends State<DesktopWalletSummary> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
debugPrint("BUILD: $runtimeType"); debugPrint("BUILD: $runtimeType");
return Consumer(
builder: (context, ref, __) {
final Coin coin =
ref.watch(managerProvider.select((value) => value.coin));
return Row( return Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -66,22 +59,21 @@ class _WDesktopWalletSummaryState extends State<DesktopWalletSummary> {
children: [ children: [
Consumer( Consumer(
builder: (_, ref, __) { builder: (_, ref, __) {
final Coin coin =
ref.watch(managerProvider.select((value) => value.coin));
final externalCalls = ref.watch(prefsChangeNotifierProvider final externalCalls = ref.watch(prefsChangeNotifierProvider
.select((value) => value.externalCalls)); .select((value) => value.externalCalls));
Future<Decimal>? totalBalanceFuture; Future<Decimal>? totalBalanceFuture;
Future<Decimal>? availableBalanceFuture; Future<Decimal>? availableBalanceFuture;
if (coin == Coin.firo || coin == Coin.firoTestNet) { if (coin == Coin.firo || coin == Coin.firoTestNet) {
final firoWallet = final firoWallet = ref.watch(
ref.watch(managerProvider.select((value) => value.wallet)) managerProvider.select((value) => value.wallet))
as FiroWallet; as FiroWallet;
totalBalanceFuture = firoWallet.availablePublicBalance(); totalBalanceFuture = firoWallet.availablePublicBalance();
availableBalanceFuture = firoWallet.availablePrivateBalance(); availableBalanceFuture =
firoWallet.availablePrivateBalance();
} else { } else {
totalBalanceFuture = ref.watch( totalBalanceFuture = ref.watch(managerProvider
managerProvider.select((value) => value.totalBalance)); .select((value) => value.totalBalance));
availableBalanceFuture = ref.watch(managerProvider availableBalanceFuture = ref.watch(managerProvider
.select((value) => value.availableBalance)); .select((value) => value.availableBalance));
@ -93,12 +85,14 @@ class _WDesktopWalletSummaryState extends State<DesktopWalletSummary> {
final baseCurrency = ref.watch(prefsChangeNotifierProvider final baseCurrency = ref.watch(prefsChangeNotifierProvider
.select((value) => value.currency)); .select((value) => value.currency));
final priceTuple = ref.watch(priceAnd24hChangeNotifierProvider final priceTuple = ref.watch(
priceAnd24hChangeNotifierProvider
.select((value) => value.getPrice(coin))); .select((value) => value.getPrice(coin)));
final _showAvailable = false; final _showAvailable = ref
// ref.watch(walletBalanceToggleStateProvider.state).state == .watch(walletBalanceToggleStateProvider.state)
// WalletBalanceToggleState.available; .state ==
WalletBalanceToggleState.available;
return FutureBuilder( return FutureBuilder(
future: _showAvailable future: _showAvailable
@ -114,53 +108,14 @@ class _WDesktopWalletSummaryState extends State<DesktopWalletSummary> {
_balanceTotalCached = snapshot.data!; _balanceTotalCached = snapshot.data!;
} }
} }
Decimal? balanceToShow = Decimal? balanceToShow = _showAvailable
_showAvailable ? _balanceCached : _balanceTotalCached; ? _balanceCached
: _balanceTotalCached;
if (balanceToShow != null) { if (balanceToShow != null) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
// GestureDetector(
// onTap: showSheet,
// child: Row(
// children: [
// if (coin == Coin.firo ||
// coin == Coin.firoTestNet)
// Text(
// "${_showAvailable ? "Private" : "Public"} Balance",
// style: STextStyles.subtitle500(context)
// .copyWith(
// color: Theme.of(context)
// .extension<StackColors>()!
// .textFavoriteCard,
// ),
// ),
// if (coin != Coin.firo &&
// coin != Coin.firoTestNet)
// Text(
// "${_showAvailable ? "Available" : "Full"} Balance",
// style: STextStyles.subtitle500(context)
// .copyWith(
// color: Theme.of(context)
// .extension<StackColors>()!
// .textFavoriteCard,
// ),
// ),
// const SizedBox(
// width: 4,
// ),
// SvgPicture.asset(
// Assets.svg.chevronDown,
// color: Theme.of(context)
// .extension<StackColors>()!
// .textFavoriteCard,
// width: 8,
// height: 4,
// ),
// ],
// ),
// ),
FittedBox( FittedBox(
fit: BoxFit.scaleDown, fit: BoxFit.scaleDown,
child: Text( child: Text(
@ -179,7 +134,8 @@ class _WDesktopWalletSummaryState extends State<DesktopWalletSummary> {
locale: locale, locale: locale,
decimalPlaces: 2, decimalPlaces: 2,
)} $baseCurrency", )} $baseCurrency",
style: STextStyles.desktopTextExtraSmall(context) style:
STextStyles.desktopTextExtraSmall(context)
.copyWith( .copyWith(
color: Theme.of(context) color: Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
@ -192,46 +148,6 @@ class _WDesktopWalletSummaryState extends State<DesktopWalletSummary> {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
// GestureDetector(
// onTap: showSheet,
// child: Row(
// children: [
// if (coin == Coin.firo ||
// coin == Coin.firoTestNet)
// Text(
// "${_showAvailable ? "Private" : "Public"} Balance",
// style: STextStyles.subtitle500(context)
// .copyWith(
// color: Theme.of(context)
// .extension<StackColors>()!
// .textFavoriteCard,
// ),
// ),
// if (coin != Coin.firo &&
// coin != Coin.firoTestNet)
// Text(
// "${_showAvailable ? "Available" : "Full"} Balance",
// style: STextStyles.subtitle500(context)
// .copyWith(
// color: Theme.of(context)
// .extension<StackColors>()!
// .textFavoriteCard,
// ),
// ),
// const SizedBox(
// width: 4,
// ),
// SvgPicture.asset(
// Assets.svg.chevronDown,
// width: 8,
// height: 4,
// color: Theme.of(context)
// .extension<StackColors>()!
// .textFavoriteCard,
// ),
// ],
// ),
// ),
AnimatedText( AnimatedText(
stringsToLoopThrough: const [ stringsToLoopThrough: const [
"Loading balance ", "Loading balance ",
@ -254,7 +170,8 @@ class _WDesktopWalletSummaryState extends State<DesktopWalletSummary> {
"Loading balance.. ", "Loading balance.. ",
"Loading balance..." "Loading balance..."
], ],
style: STextStyles.desktopTextExtraSmall(context) style:
STextStyles.desktopTextExtraSmall(context)
.copyWith( .copyWith(
color: Theme.of(context) color: Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
@ -270,6 +187,12 @@ class _WDesktopWalletSummaryState extends State<DesktopWalletSummary> {
), ),
], ],
), ),
if (coin == Coin.firo || coin == Coin.firoTestNet)
const SizedBox(
width: 8,
),
if (coin == Coin.firo || coin == Coin.firoTestNet)
const DesktopBalanceToggleButton(),
const SizedBox( const SizedBox(
width: 8, width: 8,
), ),
@ -279,5 +202,7 @@ class _WDesktopWalletSummaryState extends State<DesktopWalletSummary> {
) )
], ],
); );
},
);
} }
} }

3
lib/utilities/assets.dart
View file

@ -231,6 +231,9 @@ class _PNG {
String get bitcoincash => "assets/images/bitcoincash.png"; String get bitcoincash => "assets/images/bitcoincash.png";
String get namecoin => "assets/images/namecoin.png"; String get namecoin => "assets/images/namecoin.png";
String get glasses => "assets/images/glasses.png";
String get glassesHidden => "assets/images/glasses-hidden.png";
String imageFor({required Coin coin}) { String imageFor({required Coin coin}) {
switch (coin) { switch (coin) {
case Coin.bitcoin: case Coin.bitcoin:

2
pubspec.yaml
View file

@ -202,6 +202,8 @@ flutter:
- assets/images/epic-cash.png - assets/images/epic-cash.png
- assets/images/bitcoincash.png - assets/images/bitcoincash.png
- assets/images/namecoin.png - assets/images/namecoin.png
- assets/images/glasses.png
- assets/images/glasses-hidden.png
- assets/svg/plus.svg - assets/svg/plus.svg
- assets/svg/gear.svg - assets/svg/gear.svg
- assets/svg/bell.svg - assets/svg/bell.svg