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 08df6fe4d..eda21d79d 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 @@ -1,10 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:stackwallet/providers/ui/color_theme_provider.dart'; import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart'; -import 'package:stackwallet/utilities/theme/color_theme.dart'; class CoinImage extends ConsumerWidget { const CoinImage({ @@ -18,34 +16,9 @@ class CoinImage extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final bool isSorbet = ref.read(colorThemeProvider.state).state.themeType == - ThemeType.fruitSorbet; - final bool isForest = - ref.read(colorThemeProvider.state).state.themeType == ThemeType.forest; - final bool isOcean = ref.read(colorThemeProvider.state).state.themeType == - ThemeType.oceanBreeze; - final bool isOled = ref.read(colorThemeProvider.state).state.themeType == - ThemeType.oledBlack; - final bool isLight = - ref.read(colorThemeProvider.state).state.themeType == ThemeType.light; - final bool isDark = - ref.read(colorThemeProvider.state).state.themeType == ThemeType.dark; - - return ((isSorbet && - coin != Coin.epicCash && - coin != Coin.monero && - coin != Coin.namecoin) || - (isForest && coin != Coin.dogecoin) || - ((isOcean || isOled || isLight || isDark) && (coin != Coin.monero))) - ? SvgPicture.asset( - Assets.svg.imageFor(coin: coin, context: context), - width: isDesktop ? 324 : MediaQuery.of(context).size.width, - ) - : Image( - image: AssetImage( - Assets.png.imageFor(coin: coin, context: context), - ), - width: isDesktop ? 324 : MediaQuery.of(context).size.width / 3, - ); + return SvgPicture.asset( + Assets.svg.imageFor(coin: coin, context: context), + width: isDesktop ? 324 : MediaQuery.of(context).size.width, + ); } } diff --git a/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart b/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart index 31af6b3bd..e699db58e 100644 --- a/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart +++ b/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:stackwallet/notifications/show_flush_bar.dart'; import 'package:stackwallet/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart'; import 'package:stackwallet/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart'; @@ -165,10 +166,8 @@ class _NameYourWalletViewState extends ConsumerState { flex: 1, ), if (!isDesktop) - Image( - image: AssetImage( - Assets.png.imageFor(coin: coin, context: context), - ), + SvgPicture.asset( + Assets.svg.imageFor(coin: coin, context: context), height: 100, ), SizedBox( diff --git a/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart b/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart index 2afd1c9b1..fcb932e56 100644 --- a/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart +++ b/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart @@ -282,10 +282,8 @@ class _RestoreOptionsViewState extends ConsumerState { flex: isDesktop ? 10 : 1, ), if (!isDesktop) - Image( - image: AssetImage( - Assets.png.imageFor(coin: coin, context: context), - ), + SvgPicture.asset( + Assets.svg.imageFor(coin: coin, context: context), height: 100, ), SizedBox( diff --git a/lib/utilities/assets.dart b/lib/utilities/assets.dart index 83dc2e963..ee280c52a 100644 --- a/lib/utilities/assets.dart +++ b/lib/utilities/assets.dart @@ -337,26 +337,26 @@ class _PNG { "assets/images/${Theme.of(context).extension()!.themeType.name}/stack.png"; String get splash => "assets/images/splash.png"; - String monero(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/monero.png"; - String wownero(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/wownero.png"; - String firo(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/firo.png"; - String dogecoin(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/doge.png"; - String bitcoin(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/bitcoin.png"; - String litecoin(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/litecoin.png"; - String epicCash(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/epic-cash.png"; - String bitcoincash(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/bitcoincash.png"; - String namecoin(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/namecoin.png"; - String particl(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/particl.png"; + // String monero(BuildContext context) => + // "assets/images/${Theme.of(context).extension()!.themeType.name}/monero.png"; + // String wownero(BuildContext context) => + // "assets/images/${Theme.of(context).extension()!.themeType.name}/wownero.png"; + // String firo(BuildContext context) => + // "assets/images/${Theme.of(context).extension()!.themeType.name}/firo.png"; + // String dogecoin(BuildContext context) => + // "assets/images/${Theme.of(context).extension()!.themeType.name}/doge.png"; + // String bitcoin(BuildContext context) => + // "assets/images/${Theme.of(context).extension()!.themeType.name}/bitcoin.png"; + // String litecoin(BuildContext context) => + // "assets/images/${Theme.of(context).extension()!.themeType.name}/litecoin.png"; + // String epicCash(BuildContext context) => + // "assets/images/${Theme.of(context).extension()!.themeType.name}/epic-cash.png"; + // String bitcoincash(BuildContext context) => + // "assets/images/${Theme.of(context).extension()!.themeType.name}/bitcoincash.png"; + // String namecoin(BuildContext context) => + // "assets/images/${Theme.of(context).extension()!.themeType.name}/namecoin.png"; + // String particl(BuildContext context) => + // "assets/images/${Theme.of(context).extension()!.themeType.name}/particl.png"; String personaIncognito(BuildContext context) => "assets/svg/${Theme.of(context).extension()!.themeType.name}/persona-incognito-1.png"; @@ -366,36 +366,36 @@ class _PNG { String get glasses => "assets/images/glasses.png"; String get glassesHidden => "assets/images/glasses-hidden.png"; - String imageFor({required BuildContext context, required Coin coin}) { - switch (coin) { - case Coin.bitcoin: - case Coin.bitcoinTestNet: - return bitcoin(context); - case Coin.litecoin: - case Coin.litecoinTestNet: - return litecoin(context); - case Coin.bitcoincash: - case Coin.bitcoincashTestnet: - return bitcoincash(context); - case Coin.dogecoin: - case Coin.dogecoinTestNet: - return dogecoin(context); - case Coin.epicCash: - return epicCash(context); - case Coin.firo: - return firo(context); - case Coin.firoTestNet: - return firo(context); - case Coin.monero: - return monero(context); - case Coin.wownero: - return wownero(context); - case Coin.namecoin: - return namecoin(context); - case Coin.particl: - return particl(context); - } - } + // String imageFor({required BuildContext context, required Coin coin}) { + // switch (coin) { + // case Coin.bitcoin: + // case Coin.bitcoinTestNet: + // return bitcoin(context); + // case Coin.litecoin: + // case Coin.litecoinTestNet: + // return litecoin(context); + // case Coin.bitcoincash: + // case Coin.bitcoincashTestnet: + // return bitcoincash(context); + // case Coin.dogecoin: + // case Coin.dogecoinTestNet: + // return dogecoin(context); + // case Coin.epicCash: + // return epicCash(context); + // case Coin.firo: + // return firo(context); + // case Coin.firoTestNet: + // return firo(context); + // case Coin.monero: + // return monero(context); + // case Coin.wownero: + // return wownero(context); + // case Coin.namecoin: + // return namecoin(context); + // case Coin.particl: + // return particl(context); + // } + // } } class _ANIMATIONS {