diff --git a/assets/images/bitcoin.png b/assets/images/dark/bitcoin.png similarity index 100% rename from assets/images/bitcoin.png rename to assets/images/dark/bitcoin.png diff --git a/assets/images/bitcoincash.png b/assets/images/dark/bitcoincash.png similarity index 100% rename from assets/images/bitcoincash.png rename to assets/images/dark/bitcoincash.png diff --git a/assets/images/doge.png b/assets/images/dark/doge.png similarity index 100% rename from assets/images/doge.png rename to assets/images/dark/doge.png diff --git a/assets/images/epic-cash.png b/assets/images/dark/epic-cash.png similarity index 100% rename from assets/images/epic-cash.png rename to assets/images/dark/epic-cash.png diff --git a/assets/images/firo.png b/assets/images/dark/firo.png similarity index 100% rename from assets/images/firo.png rename to assets/images/dark/firo.png diff --git a/assets/images/litecoin.png b/assets/images/dark/litecoin.png similarity index 100% rename from assets/images/litecoin.png rename to assets/images/dark/litecoin.png diff --git a/assets/images/monero.png b/assets/images/dark/monero.png similarity index 100% rename from assets/images/monero.png rename to assets/images/dark/monero.png diff --git a/assets/images/namecoin.png b/assets/images/dark/namecoin.png similarity index 100% rename from assets/images/namecoin.png rename to assets/images/dark/namecoin.png diff --git a/assets/images/particl.png b/assets/images/dark/particl.png similarity index 100% rename from assets/images/particl.png rename to assets/images/dark/particl.png diff --git a/assets/images/stack.png b/assets/images/dark/stack.png similarity index 100% rename from assets/images/stack.png rename to assets/images/dark/stack.png diff --git a/assets/images/wownero.png b/assets/images/dark/wownero.png similarity index 100% rename from assets/images/wownero.png rename to assets/images/dark/wownero.png diff --git a/assets/images/forest/bitcoin.png b/assets/images/forest/bitcoin.png new file mode 100644 index 000000000..695b1d0ed Binary files /dev/null and b/assets/images/forest/bitcoin.png differ diff --git a/assets/images/forest/bitcoincash.png b/assets/images/forest/bitcoincash.png new file mode 100644 index 000000000..103ae537a Binary files /dev/null and b/assets/images/forest/bitcoincash.png differ diff --git a/assets/images/forest/doge.png b/assets/images/forest/doge.png new file mode 100644 index 000000000..714d2ad85 Binary files /dev/null and b/assets/images/forest/doge.png differ diff --git a/assets/images/forest/epic-cash.png b/assets/images/forest/epic-cash.png new file mode 100644 index 000000000..75b75c267 Binary files /dev/null and b/assets/images/forest/epic-cash.png differ diff --git a/assets/images/forest/epic.png b/assets/images/forest/epic.png new file mode 100644 index 000000000..75b75c267 Binary files /dev/null and b/assets/images/forest/epic.png differ diff --git a/assets/images/forest/firo.png b/assets/images/forest/firo.png new file mode 100644 index 000000000..508afc282 Binary files /dev/null and b/assets/images/forest/firo.png differ diff --git a/assets/images/forest/litecoin.png b/assets/images/forest/litecoin.png new file mode 100644 index 000000000..17994bd47 Binary files /dev/null and b/assets/images/forest/litecoin.png differ diff --git a/assets/images/forest/monero.png b/assets/images/forest/monero.png new file mode 100644 index 000000000..0fb273fba Binary files /dev/null and b/assets/images/forest/monero.png differ diff --git a/assets/images/forest/namecoin.png b/assets/images/forest/namecoin.png new file mode 100644 index 000000000..72706dc9c Binary files /dev/null and b/assets/images/forest/namecoin.png differ diff --git a/assets/images/forest/particl.png b/assets/images/forest/particl.png new file mode 100644 index 000000000..164cf389b Binary files /dev/null and b/assets/images/forest/particl.png differ diff --git a/assets/images/forest/stack.png b/assets/images/forest/stack.png new file mode 100644 index 000000000..17b4256cb Binary files /dev/null and b/assets/images/forest/stack.png differ diff --git a/assets/images/forest/wownero.png b/assets/images/forest/wownero.png new file mode 100644 index 000000000..7fd6a111d Binary files /dev/null and b/assets/images/forest/wownero.png differ diff --git a/assets/images/fruitSorbet/bitcoin.png b/assets/images/fruitSorbet/bitcoin.png new file mode 100644 index 000000000..63408e07e Binary files /dev/null and b/assets/images/fruitSorbet/bitcoin.png differ diff --git a/assets/images/fruitSorbet/bitcoincash.png b/assets/images/fruitSorbet/bitcoincash.png new file mode 100644 index 000000000..18552e02e Binary files /dev/null and b/assets/images/fruitSorbet/bitcoincash.png differ diff --git a/assets/images/fruitSorbet/doge.png b/assets/images/fruitSorbet/doge.png new file mode 100644 index 000000000..b08e82a5b Binary files /dev/null and b/assets/images/fruitSorbet/doge.png differ diff --git a/assets/images/fruitSorbet/epic-cash.png b/assets/images/fruitSorbet/epic-cash.png new file mode 100644 index 000000000..ad26be290 Binary files /dev/null and b/assets/images/fruitSorbet/epic-cash.png differ diff --git a/assets/images/fruitSorbet/firo.png b/assets/images/fruitSorbet/firo.png new file mode 100644 index 000000000..4a679586d Binary files /dev/null and b/assets/images/fruitSorbet/firo.png differ diff --git a/assets/images/fruitSorbet/litecoin.png b/assets/images/fruitSorbet/litecoin.png new file mode 100644 index 000000000..17994bd47 Binary files /dev/null and b/assets/images/fruitSorbet/litecoin.png differ diff --git a/assets/images/fruitSorbet/monero.png b/assets/images/fruitSorbet/monero.png new file mode 100644 index 000000000..679e647ea Binary files /dev/null and b/assets/images/fruitSorbet/monero.png differ diff --git a/assets/images/fruitSorbet/namecoin.png b/assets/images/fruitSorbet/namecoin.png new file mode 100644 index 000000000..45cf8abb7 Binary files /dev/null and b/assets/images/fruitSorbet/namecoin.png differ diff --git a/assets/images/fruitSorbet/particl.png b/assets/images/fruitSorbet/particl.png new file mode 100644 index 000000000..ef5939f47 Binary files /dev/null and b/assets/images/fruitSorbet/particl.png differ diff --git a/assets/images/fruitSorbet/stack.png b/assets/images/fruitSorbet/stack.png new file mode 100644 index 000000000..303c482af Binary files /dev/null and b/assets/images/fruitSorbet/stack.png differ diff --git a/assets/images/fruitSorbet/wownero.png b/assets/images/fruitSorbet/wownero.png new file mode 100644 index 000000000..857ab2b4c Binary files /dev/null and b/assets/images/fruitSorbet/wownero.png differ diff --git a/assets/images/light/bitcoin.png b/assets/images/light/bitcoin.png new file mode 100644 index 000000000..63408e07e Binary files /dev/null and b/assets/images/light/bitcoin.png differ diff --git a/assets/images/light/bitcoincash.png b/assets/images/light/bitcoincash.png new file mode 100644 index 000000000..18552e02e Binary files /dev/null and b/assets/images/light/bitcoincash.png differ diff --git a/assets/images/light/doge.png b/assets/images/light/doge.png new file mode 100644 index 000000000..b08e82a5b Binary files /dev/null and b/assets/images/light/doge.png differ diff --git a/assets/images/light/epic-cash.png b/assets/images/light/epic-cash.png new file mode 100644 index 000000000..ad26be290 Binary files /dev/null and b/assets/images/light/epic-cash.png differ diff --git a/assets/images/light/firo.png b/assets/images/light/firo.png new file mode 100644 index 000000000..4a679586d Binary files /dev/null and b/assets/images/light/firo.png differ diff --git a/assets/images/light/litecoin.png b/assets/images/light/litecoin.png new file mode 100644 index 000000000..17994bd47 Binary files /dev/null and b/assets/images/light/litecoin.png differ diff --git a/assets/images/light/monero.png b/assets/images/light/monero.png new file mode 100644 index 000000000..679e647ea Binary files /dev/null and b/assets/images/light/monero.png differ diff --git a/assets/images/light/namecoin.png b/assets/images/light/namecoin.png new file mode 100644 index 000000000..45cf8abb7 Binary files /dev/null and b/assets/images/light/namecoin.png differ diff --git a/assets/images/light/particl.png b/assets/images/light/particl.png new file mode 100644 index 000000000..ef5939f47 Binary files /dev/null and b/assets/images/light/particl.png differ diff --git a/assets/images/light/stack.png b/assets/images/light/stack.png new file mode 100644 index 000000000..b59af1608 Binary files /dev/null and b/assets/images/light/stack.png differ diff --git a/assets/images/light/wownero.png b/assets/images/light/wownero.png new file mode 100644 index 000000000..857ab2b4c Binary files /dev/null and b/assets/images/light/wownero.png differ diff --git a/assets/images/oceanBreeze/bitcoin.png b/assets/images/oceanBreeze/bitcoin.png new file mode 100644 index 000000000..63408e07e Binary files /dev/null and b/assets/images/oceanBreeze/bitcoin.png differ diff --git a/assets/images/oceanBreeze/bitcoincash.png b/assets/images/oceanBreeze/bitcoincash.png new file mode 100644 index 000000000..18552e02e Binary files /dev/null and b/assets/images/oceanBreeze/bitcoincash.png differ diff --git a/assets/images/oceanBreeze/doge.png b/assets/images/oceanBreeze/doge.png new file mode 100644 index 000000000..b08e82a5b Binary files /dev/null and b/assets/images/oceanBreeze/doge.png differ diff --git a/assets/images/oceanBreeze/epic-cash.png b/assets/images/oceanBreeze/epic-cash.png new file mode 100644 index 000000000..ad26be290 Binary files /dev/null and b/assets/images/oceanBreeze/epic-cash.png differ diff --git a/assets/images/oceanBreeze/firo.png b/assets/images/oceanBreeze/firo.png new file mode 100644 index 000000000..4a679586d Binary files /dev/null and b/assets/images/oceanBreeze/firo.png differ diff --git a/assets/images/oceanBreeze/litecoin.png b/assets/images/oceanBreeze/litecoin.png new file mode 100644 index 000000000..17994bd47 Binary files /dev/null and b/assets/images/oceanBreeze/litecoin.png differ diff --git a/assets/images/oceanBreeze/monero.png b/assets/images/oceanBreeze/monero.png new file mode 100644 index 000000000..679e647ea Binary files /dev/null and b/assets/images/oceanBreeze/monero.png differ diff --git a/assets/images/oceanBreeze/namecoin.png b/assets/images/oceanBreeze/namecoin.png new file mode 100644 index 000000000..45cf8abb7 Binary files /dev/null and b/assets/images/oceanBreeze/namecoin.png differ diff --git a/assets/images/oceanBreeze/particl.png b/assets/images/oceanBreeze/particl.png new file mode 100644 index 000000000..ef5939f47 Binary files /dev/null and b/assets/images/oceanBreeze/particl.png differ diff --git a/assets/images/oceanBreeze/stack.png b/assets/images/oceanBreeze/stack.png new file mode 100644 index 000000000..b59af1608 Binary files /dev/null and b/assets/images/oceanBreeze/stack.png differ diff --git a/assets/images/oceanBreeze/wownero.png b/assets/images/oceanBreeze/wownero.png new file mode 100644 index 000000000..857ab2b4c Binary files /dev/null and b/assets/images/oceanBreeze/wownero.png differ diff --git a/assets/images/oledBlack/bitcoin.png b/assets/images/oledBlack/bitcoin.png new file mode 100644 index 000000000..63408e07e Binary files /dev/null and b/assets/images/oledBlack/bitcoin.png differ diff --git a/assets/images/oledBlack/bitcoincash.png b/assets/images/oledBlack/bitcoincash.png new file mode 100644 index 000000000..18552e02e Binary files /dev/null and b/assets/images/oledBlack/bitcoincash.png differ diff --git a/assets/images/oledBlack/doge.png b/assets/images/oledBlack/doge.png new file mode 100644 index 000000000..b08e82a5b Binary files /dev/null and b/assets/images/oledBlack/doge.png differ diff --git a/assets/images/oledBlack/epic-cash.png b/assets/images/oledBlack/epic-cash.png new file mode 100644 index 000000000..ad26be290 Binary files /dev/null and b/assets/images/oledBlack/epic-cash.png differ diff --git a/assets/images/oledBlack/firo.png b/assets/images/oledBlack/firo.png new file mode 100644 index 000000000..4a679586d Binary files /dev/null and b/assets/images/oledBlack/firo.png differ diff --git a/assets/images/oledBlack/litecoin.png b/assets/images/oledBlack/litecoin.png new file mode 100644 index 000000000..17994bd47 Binary files /dev/null and b/assets/images/oledBlack/litecoin.png differ diff --git a/assets/images/oledBlack/monero.png b/assets/images/oledBlack/monero.png new file mode 100644 index 000000000..679e647ea Binary files /dev/null and b/assets/images/oledBlack/monero.png differ diff --git a/assets/images/oledBlack/namecoin.png b/assets/images/oledBlack/namecoin.png new file mode 100644 index 000000000..45cf8abb7 Binary files /dev/null and b/assets/images/oledBlack/namecoin.png differ diff --git a/assets/images/oledBlack/particl.png b/assets/images/oledBlack/particl.png new file mode 100644 index 000000000..ef5939f47 Binary files /dev/null and b/assets/images/oledBlack/particl.png differ diff --git a/assets/images/oledBlack/stack.png b/assets/images/oledBlack/stack.png new file mode 100644 index 000000000..b59af1608 Binary files /dev/null and b/assets/images/oledBlack/stack.png differ diff --git a/assets/images/oledBlack/wownero.png b/assets/images/oledBlack/wownero.png new file mode 100644 index 000000000..857ab2b4c Binary files /dev/null and b/assets/images/oledBlack/wownero.png differ diff --git a/assets/svg/coin_icons/Bitcoin.svg b/assets/svg/coin_icons/Bitcoin.svg index f1fa5a204..b86bdd431 100644 --- a/assets/svg/coin_icons/Bitcoin.svg +++ b/assets/svg/coin_icons/Bitcoin.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/assets/svg/coin_icons/Bitcoincash.svg b/assets/svg/coin_icons/Bitcoincash.svg index 4e700f9e0..a36597b89 100644 --- a/assets/svg/coin_icons/Bitcoincash.svg +++ b/assets/svg/coin_icons/Bitcoincash.svg @@ -1 +1 @@ -bitcoin-cash-bch \ No newline at end of file + \ No newline at end of file diff --git a/assets/svg/coin_icons/Dogecoin.svg b/assets/svg/coin_icons/Dogecoin.svg index c435731dc..04d8b88d9 100644 --- a/assets/svg/coin_icons/Dogecoin.svg +++ b/assets/svg/coin_icons/Dogecoin.svg @@ -1 +1 @@ -Dogecoin (DOGE) \ No newline at end of file + \ No newline at end of file diff --git a/assets/svg/coin_icons/EpicCash.svg b/assets/svg/coin_icons/EpicCash.svg index adf888ede..d334b9296 100644 --- a/assets/svg/coin_icons/EpicCash.svg +++ b/assets/svg/coin_icons/EpicCash.svg @@ -1,27 +1 @@ - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/assets/svg/coin_icons/Firo.svg b/assets/svg/coin_icons/Firo.svg index 5eea49eff..d4571d949 100644 --- a/assets/svg/coin_icons/Firo.svg +++ b/assets/svg/coin_icons/Firo.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/assets/svg/coin_icons/Litecoin.svg b/assets/svg/coin_icons/Litecoin.svg index 13e76a40e..f662c0a95 100644 --- a/assets/svg/coin_icons/Litecoin.svg +++ b/assets/svg/coin_icons/Litecoin.svg @@ -1 +1 @@ -litecoin-ltc-logo \ No newline at end of file + \ No newline at end of file diff --git a/assets/svg/coin_icons/Monero.svg b/assets/svg/coin_icons/Monero.svg index d1b70188e..0b2e38984 100644 --- a/assets/svg/coin_icons/Monero.svg +++ b/assets/svg/coin_icons/Monero.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/assets/svg/coin_icons/Namecoin.svg b/assets/svg/coin_icons/Namecoin.svg index 2cda6aaf0..d26988c61 100644 --- a/assets/svg/coin_icons/Namecoin.svg +++ b/assets/svg/coin_icons/Namecoin.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/svg/coin_icons/Particl.svg b/assets/svg/coin_icons/Particl.svg index 3f8a920ab..f9e792e14 100644 --- a/assets/svg/coin_icons/Particl.svg +++ b/assets/svg/coin_icons/Particl.svg @@ -1 +1 @@ -particl-part-logo \ No newline at end of file + \ No newline at end of file diff --git a/assets/svg/coin_icons/Wownero.svg b/assets/svg/coin_icons/Wownero.svg index f7a90e94c..c768d746f 100644 --- a/assets/svg/coin_icons/Wownero.svg +++ b/assets/svg/coin_icons/Wownero.svg @@ -1,7 +1 @@ - - - - - - - + \ No newline at end of file diff --git a/assets/svg/forest/bg.svg b/assets/svg/forest/bg.svg new file mode 100644 index 000000000..70a082bbe --- /dev/null +++ b/assets/svg/forest/bg.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 c96cc14ad..816a27cd2 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 @@ -16,7 +16,7 @@ class CoinImage extends StatelessWidget { Widget build(BuildContext context) { return Image( image: AssetImage( - Assets.png.imageFor(coin: coin), + Assets.png.imageFor(coin: coin, context: context), ), width: isDesktop ? 324 : MediaQuery.of(context).size.width / 3, ); 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 1718e554a..31af6b3bd 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 @@ -167,7 +167,7 @@ class _NameYourWalletViewState extends ConsumerState { if (!isDesktop) Image( image: AssetImage( - Assets.png.imageFor(coin: coin), + Assets.png.imageFor(coin: coin, context: context), ), height: 100, ), 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 884ee09e0..2afd1c9b1 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 @@ -284,7 +284,7 @@ class _RestoreOptionsViewState extends ConsumerState { if (!isDesktop) Image( image: AssetImage( - Assets.png.imageFor(coin: coin), + Assets.png.imageFor(coin: coin, context: context), ), height: 100, ), diff --git a/lib/pages/intro_view.dart b/lib/pages/intro_view.dart index b90eb0ab1..65990d64d 100644 --- a/lib/pages/intro_view.dart +++ b/lib/pages/intro_view.dart @@ -54,7 +54,7 @@ class _IntroViewState extends State { ), child: Image( image: AssetImage( - Assets.png.stack, + Assets.png.stack(context), ), ), ), diff --git a/lib/pages/wallets_view/sub_widgets/empty_wallets.dart b/lib/pages/wallets_view/sub_widgets/empty_wallets.dart index 2ba548957..7391eca9d 100644 --- a/lib/pages/wallets_view/sub_widgets/empty_wallets.dart +++ b/lib/pages/wallets_view/sub_widgets/empty_wallets.dart @@ -31,7 +31,7 @@ class EmptyWallets extends StatelessWidget { ), Image( image: AssetImage( - Assets.png.stack, + Assets.png.stack(context), ), width: isDesktop ? 324 : MediaQuery.of(context).size.width / 3, ), diff --git a/lib/utilities/assets.dart b/lib/utilities/assets.dart index 6a006b0fa..2c092dd34 100644 --- a/lib/utilities/assets.dart +++ b/lib/utilities/assets.dart @@ -55,11 +55,11 @@ class _SVG { case ThemeType.light: case ThemeType.dark: case ThemeType.oledBlack: - case ThemeType.forest: return null; case ThemeType.oceanBreeze: case ThemeType.fruitSorbet: + case ThemeType.forest: return "assets/svg/${Theme.of(context).extension()!.themeType.name}/bg.svg"; } } @@ -267,54 +267,63 @@ class _SVG { class _PNG { const _PNG(); - // String get themeFruit => "assets/svg/fruit-sorbet-theme.png"; - - String get stack => "assets/images/stack.png"; String get unclaimedPaynym => "assets/images/unclaimed.png"; + String stack(BuildContext context) => + "assets/images/${Theme.of(context).extension()!.themeType.name}/stack.png"; String get splash => "assets/images/splash.png"; - String get monero => "assets/images/monero.png"; - String get wownero => "assets/images/wownero.png"; - String get firo => "assets/images/firo.png"; - String get dogecoin => "assets/images/doge.png"; - String get bitcoin => "assets/images/bitcoin.png"; - String get litecoin => "assets/images/litecoin.png"; - String get epicCash => "assets/images/epic-cash.png"; - String get bitcoincash => "assets/images/bitcoincash.png"; - String get namecoin => "assets/images/namecoin.png"; - String get particl => "assets/images/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 get glasses => "assets/images/glasses.png"; String get glassesHidden => "assets/images/glasses-hidden.png"; - String imageFor({required Coin coin}) { + String imageFor({required BuildContext context, required Coin coin}) { switch (coin) { case Coin.bitcoin: case Coin.bitcoinTestNet: - return bitcoin; + return bitcoin(context); case Coin.litecoin: case Coin.litecoinTestNet: - return litecoin; + return litecoin(context); case Coin.bitcoincash: case Coin.bitcoincashTestnet: - return bitcoincash; + return bitcoincash(context); case Coin.dogecoin: case Coin.dogecoinTestNet: - return dogecoin; + return dogecoin(context); case Coin.epicCash: - return epicCash; + return epicCash(context); case Coin.firo: - return firo; + return firo(context); case Coin.firoTestNet: - return firo; + return firo(context); case Coin.monero: - return monero; + return monero(context); case Coin.wownero: - return wownero; + return wownero(context); case Coin.namecoin: - return namecoin; + return namecoin(context); case Coin.particl: - return particl; + return particl(context); } } } diff --git a/lib/utilities/theme/color_theme.dart b/lib/utilities/theme/color_theme.dart index 1e7b3ab82..713e186d1 100644 --- a/lib/utilities/theme/color_theme.dart +++ b/lib/utilities/theme/color_theme.dart @@ -105,6 +105,8 @@ abstract class StackColorTheme { Color get numberTextDefault; Color get numpadTextDefault; Color get bottomNavText; + Color get customTextButtonEnabledText; + Color get customTextButtonDisabledText; // switch background Color get switchBGOn; diff --git a/lib/utilities/theme/dark_colors.dart b/lib/utilities/theme/dark_colors.dart index 802717f7f..e91c7d126 100644 --- a/lib/utilities/theme/dark_colors.dart +++ b/lib/utilities/theme/dark_colors.dart @@ -106,6 +106,10 @@ class DarkColors extends StackColorTheme { Color get numpadTextDefault => const Color(0xFFFFFFFF); @override Color get bottomNavText => const Color(0xFFFFFFFF); + @override + Color get customTextButtonEnabledText => buttonTextBorderless; + @override + Color get customTextButtonDisabledText => textSubtitle1; // switch @override diff --git a/lib/utilities/theme/forest_colors.dart b/lib/utilities/theme/forest_colors.dart index ad4942a80..62e7f029a 100644 --- a/lib/utilities/theme/forest_colors.dart +++ b/lib/utilities/theme/forest_colors.dart @@ -106,6 +106,10 @@ class ForestColors extends StackColorTheme { Color get numpadTextDefault => const Color(0xFFFFFFFF); @override Color get bottomNavText => const Color(0xFF232323); + @override + Color get customTextButtonEnabledText => infoItemIcons; + @override + Color get customTextButtonDisabledText => textSubtitle1; // switch @override diff --git a/lib/utilities/theme/fruit_sorbet_colors.dart b/lib/utilities/theme/fruit_sorbet_colors.dart index 3394b3a9c..ef021fad1 100644 --- a/lib/utilities/theme/fruit_sorbet_colors.dart +++ b/lib/utilities/theme/fruit_sorbet_colors.dart @@ -82,6 +82,10 @@ class FruitSorbetColors extends StackColorTheme { Color get numpadBackDefault => const Color(0xFFF95369); @override Color get bottomNavBack => const Color(0xFFFFFFFF); + @override + Color get customTextButtonEnabledText => buttonTextBorderless; + @override + Color get customTextButtonDisabledText => textSubtitle1; // button text/element @override diff --git a/lib/utilities/theme/light_colors.dart b/lib/utilities/theme/light_colors.dart index b4d66d7f3..8c9b4dcc5 100644 --- a/lib/utilities/theme/light_colors.dart +++ b/lib/utilities/theme/light_colors.dart @@ -106,6 +106,10 @@ class LightColors extends StackColorTheme { Color get numpadTextDefault => const Color(0xFFFFFFFF); @override Color get bottomNavText => const Color(0xFF232323); + @override + Color get customTextButtonEnabledText => buttonTextBorderless; + @override + Color get customTextButtonDisabledText => textSubtitle1; // switch @override diff --git a/lib/utilities/theme/ocean_breeze_colors.dart b/lib/utilities/theme/ocean_breeze_colors.dart index f8bcaf0c1..51831f2e5 100644 --- a/lib/utilities/theme/ocean_breeze_colors.dart +++ b/lib/utilities/theme/ocean_breeze_colors.dart @@ -113,6 +113,10 @@ class OceanBreezeColors extends StackColorTheme { Color get numpadTextDefault => const Color(0xFFFFFFFF); @override Color get bottomNavText => const Color(0xFF232323); + @override + Color get customTextButtonEnabledText => buttonTextBorderless; + @override + Color get customTextButtonDisabledText => textSubtitle1; // switch @override diff --git a/lib/utilities/theme/oled_black_colors.dart b/lib/utilities/theme/oled_black_colors.dart index 84e2a7f96..97fd6ad5f 100644 --- a/lib/utilities/theme/oled_black_colors.dart +++ b/lib/utilities/theme/oled_black_colors.dart @@ -107,6 +107,10 @@ class OledBlackColors extends StackColorTheme { Color get numpadTextDefault => const Color(0xFF000000); @override Color get bottomNavText => const Color(0xFFDEDEDE); + @override + Color get customTextButtonEnabledText => buttonTextBorderless; + @override + Color get customTextButtonDisabledText => textSubtitle1; // switch @override diff --git a/lib/utilities/theme/stack_colors.dart b/lib/utilities/theme/stack_colors.dart index e9280fee5..bc26c3f80 100644 --- a/lib/utilities/theme/stack_colors.dart +++ b/lib/utilities/theme/stack_colors.dart @@ -59,6 +59,8 @@ class StackColors extends ThemeExtension { final Color numberTextDefault; final Color numpadTextDefault; final Color bottomNavText; + final Color customTextButtonEnabledText; + final Color customTextButtonDisabledText; // switch background final Color switchBGOn; @@ -235,6 +237,8 @@ class StackColors extends ThemeExtension { required this.numberTextDefault, required this.numpadTextDefault, required this.bottomNavText, + required this.customTextButtonEnabledText, + required this.customTextButtonDisabledText, required this.switchBGOn, required this.switchBGOff, required this.switchBGDisabled, @@ -383,6 +387,8 @@ class StackColors extends ThemeExtension { numberTextDefault: colorTheme.numberTextDefault, numpadTextDefault: colorTheme.numpadTextDefault, bottomNavText: colorTheme.bottomNavText, + customTextButtonEnabledText: colorTheme.customTextButtonEnabledText, + customTextButtonDisabledText: colorTheme.customTextButtonDisabledText, switchBGOn: colorTheme.switchBGOn, switchBGOff: colorTheme.switchBGOff, switchBGDisabled: colorTheme.switchBGDisabled, @@ -533,6 +539,8 @@ class StackColors extends ThemeExtension { Color? numberTextDefault, Color? numpadTextDefault, Color? bottomNavText, + Color? customTextButtonEnabledText, + Color? customTextButtonDisabledText, Color? switchBGOn, Color? switchBGOff, Color? switchBGDisabled, @@ -686,6 +694,10 @@ class StackColors extends ThemeExtension { numberTextDefault: numberTextDefault ?? this.numberTextDefault, numpadTextDefault: numpadTextDefault ?? this.numpadTextDefault, bottomNavText: bottomNavText ?? this.bottomNavText, + customTextButtonEnabledText: + customTextButtonEnabledText ?? this.customTextButtonEnabledText, + customTextButtonDisabledText: + customTextButtonDisabledText ?? this.customTextButtonDisabledText, switchBGOn: switchBGOn ?? this.switchBGOn, switchBGOff: switchBGOff ?? this.switchBGOff, switchBGDisabled: switchBGDisabled ?? this.switchBGDisabled, @@ -1061,6 +1073,16 @@ class StackColors extends ThemeExtension { other.bottomNavText, t, )!, + customTextButtonEnabledText: Color.lerp( + customTextButtonEnabledText, + other.customTextButtonEnabledText, + t, + )!, + customTextButtonDisabledText: Color.lerp( + customTextButtonDisabledText, + other.customTextButtonDisabledText, + t, + )!, switchBGOn: Color.lerp( switchBGOn, other.switchBGOn, diff --git a/lib/widgets/custom_buttons/blue_text_button.dart b/lib/widgets/custom_buttons/blue_text_button.dart index 8be6bb937..213dc55cc 100644 --- a/lib/widgets/custom_buttons/blue_text_button.dart +++ b/lib/widgets/custom_buttons/blue_text_button.dart @@ -134,9 +134,12 @@ class CustomTextButton extends StatelessWidget { return _CustomTextButton( key: UniqueKey(), text: text, - enabledColor: - Theme.of(context).extension()!.buttonTextBorderless, - disabledColor: Theme.of(context).extension()!.textSubtitle1, + enabledColor: Theme.of(context) + .extension()! + .customTextButtonEnabledText, + disabledColor: Theme.of(context) + .extension()! + .customTextButtonDisabledText, enabled: enabled, textSize: textSize, onTap: onTap, diff --git a/pubspec.yaml b/pubspec.yaml index 73a4b1c26..e8eb46665 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -205,18 +205,7 @@ flutter: - google_fonts/ - assets/svg/circle-check.svg - assets/svg/clipboard.svg - - assets/images/stack.png - assets/images/unclaimed.png - - assets/images/monero.png - - assets/images/wownero.png - - assets/images/firo.png - - assets/images/litecoin.png - - assets/images/doge.png - - assets/images/bitcoin.png - - assets/images/epic-cash.png - - assets/images/bitcoincash.png - - assets/images/namecoin.png - - assets/images/particl.png - assets/images/glasses.png - assets/images/glasses-hidden.png - assets/svg/plus.svg @@ -313,6 +302,71 @@ flutter: - assets/svg/configuration.svg - assets/svg/robot-head.svg - assets/svg/whirlpool.svg + # light theme coin + - assets/images/light/stack.png + - assets/images/light/monero.png + - assets/images/light/wownero.png + - assets/images/light/firo.png + - assets/images/light/litecoin.png + - assets/images/light/doge.png + - assets/images/light/bitcoin.png + - assets/images/light/epic-cash.png + - assets/images/light/bitcoincash.png + - assets/images/light/namecoin.png + - assets/images/light/particl.png + + # dark theme coin + - assets/images/dark/stack.png + - assets/images/dark/monero.png + - assets/images/dark/wownero.png + - assets/images/dark/firo.png + - assets/images/dark/litecoin.png + - assets/images/dark/doge.png + - assets/images/dark/bitcoin.png + - assets/images/dark/epic-cash.png + - assets/images/dark/bitcoincash.png + - assets/images/dark/namecoin.png + - assets/images/dark/particl.png + + # oled black theme coin + - assets/images/oledBlack/stack.png + - assets/images/oledBlack/monero.png + - assets/images/oledBlack/wownero.png + - assets/images/oledBlack/firo.png + - assets/images/oledBlack/litecoin.png + - assets/images/oledBlack/doge.png + - assets/images/oledBlack/bitcoin.png + - assets/images/oledBlack/epic-cash.png + - assets/images/oledBlack/bitcoincash.png + - assets/images/oledBlack/namecoin.png + - assets/images/oledBlack/particl.png + + # fruit sorbet theme coin + - assets/images/fruitSorbet/stack.png + - assets/images/fruitSorbet/monero.png + - assets/images/fruitSorbet/wownero.png + - assets/images/fruitSorbet/firo.png + - assets/images/fruitSorbet/litecoin.png + - assets/images/fruitSorbet/doge.png + - assets/images/fruitSorbet/bitcoin.png + - assets/images/fruitSorbet/epic-cash.png + - assets/images/fruitSorbet/bitcoincash.png + - assets/images/fruitSorbet/namecoin.png + - assets/images/fruitSorbet/particl.png + + # forest theme coin + - assets/images/forest/stack.png + - assets/images/forest/monero.png + - assets/images/forest/wownero.png + - assets/images/forest/firo.png + - assets/images/forest/litecoin.png + - assets/images/forest/doge.png + - assets/images/forest/bitcoin.png + - assets/images/forest/epic-cash.png + - assets/images/forest/bitcoincash.png + - assets/images/forest/namecoin.png + - assets/images/forest/particl.png + # coin icons - assets/svg/coin_icons/Bitcoin.svg - assets/svg/coin_icons/Litecoin.svg @@ -432,7 +486,7 @@ flutter: - assets/svg/fruitSorbet/buy-coins-icon.svg - assets/svg/fruitSorbet/bg.svg - # fruit forest theme specific + # forest theme specific - assets/svg/forest/tx-exchange-icon.svg - assets/svg/forest/tx-exchange-icon-pending.svg - assets/svg/forest/tx-exchange-icon-failed.svg @@ -446,6 +500,7 @@ flutter: - assets/svg/forest/bell-new.svg - assets/svg/forest/stack-icon1.svg - assets/svg/forest/buy-coins-icon.svg + - assets/svg/forest/bg.svg # buy - assets/svg/buy/Simplex-Nuvei-Logo.svg