diff --git a/assets/images/forest/stack.svg b/assets/images/forest/stack.svg index ea4215b0f..cbb754036 100644 --- a/assets/images/forest/stack.svg +++ b/assets/images/forest/stack.svg @@ -1,222 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/assets/images/fruitSorbet/stack.svg b/assets/images/fruitSorbet/stack.svg index 43f29e515..cedb7e1d5 100644 --- a/assets/images/fruitSorbet/stack.svg +++ b/assets/images/fruitSorbet/stack.svg @@ -1,440 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/lib/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/coin_image.dart b/lib/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/coin_image.dart index 5352dcf1f..bf479a08c 100644 --- a/lib/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/coin_image.dart +++ b/lib/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/coin_image.dart @@ -27,10 +27,6 @@ class CoinImage extends ConsumerWidget { coin != Coin.epicCash && coin != Coin.monero && coin != Coin.namecoin) - // ? SvgPicture.asset( - // Assets.svg.imageFor(coin: coin, context: context), - // width: isDesktop ? 324 : MediaQuery.of(context).size.width, - // ) ? ((isForest && coin != Coin.litecoin && coin != Coin.dogecoin) ? SvgPicture.asset( Assets.svg.imageFor(coin: coin, context: context), diff --git a/lib/pages/wallets_view/sub_widgets/empty_wallets.dart b/lib/pages/wallets_view/sub_widgets/empty_wallets.dart index 7391eca9d..09c6a876f 100644 --- a/lib/pages/wallets_view/sub_widgets/empty_wallets.dart +++ b/lib/pages/wallets_view/sub_widgets/empty_wallets.dart @@ -1,19 +1,26 @@ import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; import 'package:stackwallet/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart'; +import 'package:stackwallet/providers/ui/color_theme_provider.dart'; import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/text_styles.dart'; +import 'package:stackwallet/utilities/theme/color_theme.dart'; import 'package:stackwallet/utilities/theme/stack_colors.dart'; import 'package:stackwallet/utilities/util.dart'; -class EmptyWallets extends StatelessWidget { +class EmptyWallets extends ConsumerWidget { const EmptyWallets({Key? key}) : super(key: key); @override - Widget build(BuildContext context) { + Widget build(BuildContext context, WidgetRef ref) { debugPrint("BUILD: $runtimeType"); final isDesktop = Util.isDesktop; + final bool isSorbet = ref.read(colorThemeProvider.state).state.themeType == + ThemeType.fruitSorbet; + final bool isForest = + ref.read(colorThemeProvider.state).state.themeType == ThemeType.forest; return SafeArea( child: Padding( @@ -29,12 +36,21 @@ class EmptyWallets extends StatelessWidget { const Spacer( flex: 2, ), - Image( - image: AssetImage( - Assets.png.stack(context), - ), - width: isDesktop ? 324 : MediaQuery.of(context).size.width / 3, - ), + (isSorbet || isForest) + ? SvgPicture.asset( + Assets.svg.stack(context), + width: isDesktop + ? 324 + : MediaQuery.of(context).size.width / 3, + ) + : Image( + image: AssetImage( + Assets.png.stack(context), + ), + width: isDesktop + ? 324 + : MediaQuery.of(context).size.width / 3, + ), SizedBox( height: isDesktop ? 30 : 16, ), diff --git a/lib/utilities/assets.dart b/lib/utilities/assets.dart index f562be6e8..77fe586c4 100644 --- a/lib/utilities/assets.dart +++ b/lib/utilities/assets.dart @@ -99,6 +99,9 @@ class _SVG { String personaEasy(BuildContext context) => "assets/svg/${Theme.of(context).extension()!.themeType.name}/persona-easy-1.svg"; + String stack(BuildContext context) => + "assets/images/${Theme.of(context).extension()!.themeType.name}/stack.svg"; + String get themeFruit => "assets/svg/fruit-sorbet-theme.svg"; String get themeForest => "assets/svg/forest-theme.svg"; String get themeOledBlack => "assets/svg/oled-black-theme.svg"; diff --git a/pubspec.yaml b/pubspec.yaml index 29f343aba..a154cd734 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -365,6 +365,7 @@ flutter: - assets/images/fruitSorbet/namecoin.png # - assets/images/fruitSorbet/particl.png + - assets/images/fruitSorbet/stack.svg - assets/images/fruitSorbet/bitcoin.svg # - assets/images/fruitSorbet/monero.svg - assets/images/fruitSorbet/wownero.svg @@ -390,6 +391,7 @@ flutter: - assets/images/forest/namecoin.png # - assets/images/forest/particl.png + - assets/images/forest/stack.svg - assets/images/forest/bitcoin.svg # - assets/images/fruitSorbet/monero.svg - assets/images/forest/wownero.svg