diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index c84ab5920..acc209e4e 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -139,6 +139,10 @@ jobs: run: | dart run tool/generate_localization.dart + - name: Compile graphics + run: | + ./compile_graphics.sh + - name: Rename app run: | sanitized_branch_name=${BRANCH_NAME#origin/} # Remove 'origin/' prefix if it exists diff --git a/assets/new-ui/3dots.svg.vec b/assets/new-ui/3dots.svg.vec new file mode 100644 index 000000000..d8454242b Binary files /dev/null and b/assets/new-ui/3dots.svg.vec differ diff --git a/assets/new-ui/3dots_vertical.svg.vec b/assets/new-ui/3dots_vertical.svg.vec new file mode 100644 index 000000000..db0b74ebf Binary files /dev/null and b/assets/new-ui/3dots_vertical.svg.vec differ diff --git a/assets/new-ui/account.svg.vec b/assets/new-ui/account.svg.vec new file mode 100644 index 000000000..b93fe68e5 Binary files /dev/null and b/assets/new-ui/account.svg.vec differ diff --git a/assets/new-ui/add-label.svg.vec b/assets/new-ui/add-label.svg.vec new file mode 100644 index 000000000..5679bbf0f Binary files /dev/null and b/assets/new-ui/add-label.svg.vec differ diff --git a/assets/new-ui/addr-book.svg.vec b/assets/new-ui/addr-book.svg.vec new file mode 100644 index 000000000..63ccfefe3 Binary files /dev/null and b/assets/new-ui/addr-book.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/btc_lightning.svg.vec b/assets/new-ui/address-type-picker-icons/btc_lightning.svg.vec new file mode 100644 index 000000000..abd73e2af Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/btc_lightning.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/btc_standard.svg.vec b/assets/new-ui/address-type-picker-icons/btc_standard.svg.vec new file mode 100644 index 000000000..62f8067cc Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/btc_standard.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/legacy.svg.vec b/assets/new-ui/address-type-picker-icons/legacy.svg.vec new file mode 100644 index 000000000..131a526ef Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/legacy.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/litecoin.svg.vec b/assets/new-ui/address-type-picker-icons/litecoin.svg.vec new file mode 100644 index 000000000..35bc9c6b5 Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/litecoin.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/mweb.svg.vec b/assets/new-ui/address-type-picker-icons/mweb.svg.vec new file mode 100644 index 000000000..b2f94dd65 Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/mweb.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/payjoin.svg.vec b/assets/new-ui/address-type-picker-icons/payjoin.svg.vec new file mode 100644 index 000000000..fd083001c Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/payjoin.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/public.svg.vec b/assets/new-ui/address-type-picker-icons/public.svg.vec new file mode 100644 index 000000000..8a2eb9295 Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/public.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/sapling.svg.vec b/assets/new-ui/address-type-picker-icons/sapling.svg.vec new file mode 100644 index 000000000..7ead81590 Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/sapling.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/segwit.svg.vec b/assets/new-ui/address-type-picker-icons/segwit.svg.vec new file mode 100644 index 000000000..5788f9779 Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/segwit.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/shielded.svg.vec b/assets/new-ui/address-type-picker-icons/shielded.svg.vec new file mode 100644 index 000000000..35865322a Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/shielded.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/silent.svg.vec b/assets/new-ui/address-type-picker-icons/silent.svg.vec new file mode 100644 index 000000000..de2e49484 Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/silent.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/taproot.svg.vec b/assets/new-ui/address-type-picker-icons/taproot.svg.vec new file mode 100644 index 000000000..fb76ac3ed Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/taproot.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/transparent.svg.vec b/assets/new-ui/address-type-picker-icons/transparent.svg.vec new file mode 100644 index 000000000..0c9c26312 Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/transparent.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/unified.svg.vec b/assets/new-ui/address-type-picker-icons/unified.svg.vec new file mode 100644 index 000000000..79dbb4b36 Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/unified.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/zec/public.svg.vec b/assets/new-ui/address-type-picker-icons/zec/public.svg.vec new file mode 100644 index 000000000..8a2eb9295 Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/zec/public.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/zec/sapling.svg.vec b/assets/new-ui/address-type-picker-icons/zec/sapling.svg.vec new file mode 100644 index 000000000..7ead81590 Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/zec/sapling.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/zec/shielded.svg.vec b/assets/new-ui/address-type-picker-icons/zec/shielded.svg.vec new file mode 100644 index 000000000..35865322a Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/zec/shielded.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/zec/transparent.svg.vec b/assets/new-ui/address-type-picker-icons/zec/transparent.svg.vec new file mode 100644 index 000000000..0c9c26312 Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/zec/transparent.svg.vec differ diff --git a/assets/new-ui/address-type-picker-icons/zec/unified.svg.vec b/assets/new-ui/address-type-picker-icons/zec/unified.svg.vec new file mode 100644 index 000000000..79dbb4b36 Binary files /dev/null and b/assets/new-ui/address-type-picker-icons/zec/unified.svg.vec differ diff --git a/assets/new-ui/address_hide.svg.vec b/assets/new-ui/address_hide.svg.vec new file mode 100644 index 000000000..3840c93e7 Binary files /dev/null and b/assets/new-ui/address_hide.svg.vec differ diff --git a/assets/new-ui/address_set_label.svg.vec b/assets/new-ui/address_set_label.svg.vec new file mode 100644 index 000000000..579c6121a Binary files /dev/null and b/assets/new-ui/address_set_label.svg.vec differ diff --git a/assets/new-ui/app_settings.svg.vec b/assets/new-ui/app_settings.svg.vec new file mode 100644 index 000000000..df106bf4f Binary files /dev/null and b/assets/new-ui/app_settings.svg.vec differ diff --git a/assets/new-ui/apps.svg.vec b/assets/new-ui/apps.svg.vec new file mode 100644 index 000000000..0c4a475f5 Binary files /dev/null and b/assets/new-ui/apps.svg.vec differ diff --git a/assets/new-ui/arbitrum.svg.vec b/assets/new-ui/arbitrum.svg.vec new file mode 100644 index 000000000..420c531fd Binary files /dev/null and b/assets/new-ui/arbitrum.svg.vec differ diff --git a/assets/new-ui/arrow_forward.svg.vec b/assets/new-ui/arrow_forward.svg.vec new file mode 100644 index 000000000..6addb8056 Binary files /dev/null and b/assets/new-ui/arrow_forward.svg.vec differ diff --git a/assets/new-ui/arrow_right.svg.vec b/assets/new-ui/arrow_right.svg.vec new file mode 100644 index 000000000..f023af602 Binary files /dev/null and b/assets/new-ui/arrow_right.svg.vec differ diff --git a/assets/new-ui/backup.svg.vec b/assets/new-ui/backup.svg.vec new file mode 100644 index 000000000..383a54949 Binary files /dev/null and b/assets/new-ui/backup.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/arbitrum.svg.vec b/assets/new-ui/balance_card_backgrounds/arbitrum.svg.vec new file mode 100644 index 000000000..a570d4e99 Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/arbitrum.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/base.svg.vec b/assets/new-ui/balance_card_backgrounds/base.svg.vec new file mode 100644 index 000000000..87ce623b1 Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/base.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/bitcoin-cash.svg.vec b/assets/new-ui/balance_card_backgrounds/bitcoin-cash.svg.vec new file mode 100644 index 000000000..af571e587 Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/bitcoin-cash.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/bitcoin.svg.vec b/assets/new-ui/balance_card_backgrounds/bitcoin.svg.vec new file mode 100644 index 000000000..865bfaaed Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/bitcoin.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/bnb.svg.vec b/assets/new-ui/balance_card_backgrounds/bnb.svg.vec new file mode 100644 index 000000000..95197e29c Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/bnb.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/decred.svg.vec b/assets/new-ui/balance_card_backgrounds/decred.svg.vec new file mode 100644 index 000000000..670af3f34 Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/decred.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/dogecoin.svg.vec b/assets/new-ui/balance_card_backgrounds/dogecoin.svg.vec new file mode 100644 index 000000000..9bdd8dee3 Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/dogecoin.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/ethereum.svg.vec b/assets/new-ui/balance_card_backgrounds/ethereum.svg.vec new file mode 100644 index 000000000..681b8737e Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/ethereum.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/lightning.svg.vec b/assets/new-ui/balance_card_backgrounds/lightning.svg.vec new file mode 100644 index 000000000..7fd93e9d1 Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/lightning.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/litecoin.svg.vec b/assets/new-ui/balance_card_backgrounds/litecoin.svg.vec new file mode 100644 index 000000000..0c1a0452e Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/litecoin.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/monero.svg.vec b/assets/new-ui/balance_card_backgrounds/monero.svg.vec new file mode 100644 index 000000000..29a9f1dd8 Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/monero.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/nano.svg.vec b/assets/new-ui/balance_card_backgrounds/nano.svg.vec new file mode 100644 index 000000000..9efb3a037 Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/nano.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/polygon.svg.vec b/assets/new-ui/balance_card_backgrounds/polygon.svg.vec new file mode 100644 index 000000000..87b356c69 Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/polygon.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/solana.svg.vec b/assets/new-ui/balance_card_backgrounds/solana.svg.vec new file mode 100644 index 000000000..cc4cbec19 Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/solana.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/tron.svg.vec b/assets/new-ui/balance_card_backgrounds/tron.svg.vec new file mode 100644 index 000000000..19e626869 Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/tron.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/wownero.svg.vec b/assets/new-ui/balance_card_backgrounds/wownero.svg.vec new file mode 100644 index 000000000..0742fa4d8 Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/wownero.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/zano.svg.vec b/assets/new-ui/balance_card_backgrounds/zano.svg.vec new file mode 100644 index 000000000..3990fe326 Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/zano.svg.vec differ diff --git a/assets/new-ui/balance_card_backgrounds/zcash.svg.vec b/assets/new-ui/balance_card_backgrounds/zcash.svg.vec new file mode 100644 index 000000000..abd90789b Binary files /dev/null and b/assets/new-ui/balance_card_backgrounds/zcash.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/arbitrum.svg.vec b/assets/new-ui/balance_card_icons/arbitrum.svg.vec new file mode 100644 index 000000000..420c531fd Binary files /dev/null and b/assets/new-ui/balance_card_icons/arbitrum.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/base.svg.vec b/assets/new-ui/balance_card_icons/base.svg.vec new file mode 100644 index 000000000..0246ff9a7 Binary files /dev/null and b/assets/new-ui/balance_card_icons/base.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/bitcoin.svg.vec b/assets/new-ui/balance_card_icons/bitcoin.svg.vec new file mode 100644 index 000000000..96f09bb3e Binary files /dev/null and b/assets/new-ui/balance_card_icons/bitcoin.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/bitcoin_cash.svg.vec b/assets/new-ui/balance_card_icons/bitcoin_cash.svg.vec new file mode 100644 index 000000000..cfb6f78fb Binary files /dev/null and b/assets/new-ui/balance_card_icons/bitcoin_cash.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/bnb.svg.vec b/assets/new-ui/balance_card_icons/bnb.svg.vec new file mode 100644 index 000000000..efddbf77d Binary files /dev/null and b/assets/new-ui/balance_card_icons/bnb.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/decred.svg.vec b/assets/new-ui/balance_card_icons/decred.svg.vec new file mode 100644 index 000000000..d0114ccbc Binary files /dev/null and b/assets/new-ui/balance_card_icons/decred.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/dogecoin.svg.vec b/assets/new-ui/balance_card_icons/dogecoin.svg.vec new file mode 100644 index 000000000..df53491b0 Binary files /dev/null and b/assets/new-ui/balance_card_icons/dogecoin.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/ethereum.svg.vec b/assets/new-ui/balance_card_icons/ethereum.svg.vec new file mode 100644 index 000000000..f4acf8ee7 Binary files /dev/null and b/assets/new-ui/balance_card_icons/ethereum.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/lightning.svg.vec b/assets/new-ui/balance_card_icons/lightning.svg.vec new file mode 100644 index 000000000..dc7ccd561 Binary files /dev/null and b/assets/new-ui/balance_card_icons/lightning.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/litecoin.svg.vec b/assets/new-ui/balance_card_icons/litecoin.svg.vec new file mode 100644 index 000000000..bcbe728a5 Binary files /dev/null and b/assets/new-ui/balance_card_icons/litecoin.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/monero.svg.vec b/assets/new-ui/balance_card_icons/monero.svg.vec new file mode 100644 index 000000000..41512d0ca Binary files /dev/null and b/assets/new-ui/balance_card_icons/monero.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/nano.svg.vec b/assets/new-ui/balance_card_icons/nano.svg.vec new file mode 100644 index 000000000..9da5980d2 Binary files /dev/null and b/assets/new-ui/balance_card_icons/nano.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/polygon.svg.vec b/assets/new-ui/balance_card_icons/polygon.svg.vec new file mode 100644 index 000000000..67ea19a66 Binary files /dev/null and b/assets/new-ui/balance_card_icons/polygon.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/solana.svg.vec b/assets/new-ui/balance_card_icons/solana.svg.vec new file mode 100644 index 000000000..77d8a2cb5 Binary files /dev/null and b/assets/new-ui/balance_card_icons/solana.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/tron.svg.vec b/assets/new-ui/balance_card_icons/tron.svg.vec new file mode 100644 index 000000000..cfa751107 Binary files /dev/null and b/assets/new-ui/balance_card_icons/tron.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/wownero.svg.vec b/assets/new-ui/balance_card_icons/wownero.svg.vec new file mode 100644 index 000000000..c7538f19d Binary files /dev/null and b/assets/new-ui/balance_card_icons/wownero.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/zano.svg.vec b/assets/new-ui/balance_card_icons/zano.svg.vec new file mode 100644 index 000000000..207e709a2 Binary files /dev/null and b/assets/new-ui/balance_card_icons/zano.svg.vec differ diff --git a/assets/new-ui/balance_card_icons/zcash.svg.vec b/assets/new-ui/balance_card_icons/zcash.svg.vec new file mode 100644 index 000000000..d743fb593 Binary files /dev/null and b/assets/new-ui/balance_card_icons/zcash.svg.vec differ diff --git a/assets/new-ui/base.svg.vec b/assets/new-ui/base.svg.vec new file mode 100644 index 000000000..0246ff9a7 Binary files /dev/null and b/assets/new-ui/base.svg.vec differ diff --git a/assets/new-ui/bitcoin-cash.svg.vec b/assets/new-ui/bitcoin-cash.svg.vec new file mode 100644 index 000000000..af571e587 Binary files /dev/null and b/assets/new-ui/bitcoin-cash.svg.vec differ diff --git a/assets/new-ui/bitcoin.svg.vec b/assets/new-ui/bitcoin.svg.vec new file mode 100644 index 000000000..96f09bb3e Binary files /dev/null and b/assets/new-ui/bitcoin.svg.vec differ diff --git a/assets/new-ui/bitcoin_cash.svg.vec b/assets/new-ui/bitcoin_cash.svg.vec new file mode 100644 index 000000000..cfb6f78fb Binary files /dev/null and b/assets/new-ui/bitcoin_cash.svg.vec differ diff --git a/assets/new-ui/blank.svg.vec b/assets/new-ui/blank.svg.vec new file mode 100644 index 000000000..b777a9fa6 Binary files /dev/null and b/assets/new-ui/blank.svg.vec differ diff --git a/assets/new-ui/bnb smart chain.svg.vec b/assets/new-ui/bnb smart chain.svg.vec new file mode 100644 index 000000000..3005628a9 Binary files /dev/null and b/assets/new-ui/bnb smart chain.svg.vec differ diff --git a/assets/new-ui/bnb.svg.vec b/assets/new-ui/bnb.svg.vec new file mode 100644 index 000000000..efddbf77d Binary files /dev/null and b/assets/new-ui/bnb.svg.vec differ diff --git a/assets/new-ui/btc_lightning.svg.vec b/assets/new-ui/btc_lightning.svg.vec new file mode 100644 index 000000000..abd73e2af Binary files /dev/null and b/assets/new-ui/btc_lightning.svg.vec differ diff --git a/assets/new-ui/btc_standard.svg.vec b/assets/new-ui/btc_standard.svg.vec new file mode 100644 index 000000000..62f8067cc Binary files /dev/null and b/assets/new-ui/btc_standard.svg.vec differ diff --git a/assets/new-ui/btcqr.png b/assets/new-ui/btcqr.png deleted file mode 100644 index a5c34ed1f..000000000 Binary files a/assets/new-ui/btcqr.png and /dev/null differ diff --git a/assets/new-ui/by-cakelabs.svg.vec b/assets/new-ui/by-cakelabs.svg.vec new file mode 100644 index 000000000..2e8898e62 Binary files /dev/null and b/assets/new-ui/by-cakelabs.svg.vec differ diff --git a/assets/new-ui/cake_squircle_icon.svg.vec b/assets/new-ui/cake_squircle_icon.svg.vec new file mode 100644 index 000000000..00ebc3201 Binary files /dev/null and b/assets/new-ui/cake_squircle_icon.svg.vec differ diff --git a/assets/new-ui/cakelabs-icon.svg.vec b/assets/new-ui/cakelabs-icon.svg.vec new file mode 100644 index 000000000..a87955eb3 Binary files /dev/null and b/assets/new-ui/cakelabs-icon.svg.vec differ diff --git a/assets/new-ui/cakewallet-wordmark-light.svg.vec b/assets/new-ui/cakewallet-wordmark-light.svg.vec new file mode 100644 index 000000000..70d4dad27 Binary files /dev/null and b/assets/new-ui/cakewallet-wordmark-light.svg.vec differ diff --git a/assets/new-ui/cakewallet-wordmark.svg.vec b/assets/new-ui/cakewallet-wordmark.svg.vec new file mode 100644 index 000000000..1f64bcc17 Binary files /dev/null and b/assets/new-ui/cakewallet-wordmark.svg.vec differ diff --git a/assets/new-ui/chain_badges/arbitrum.svg.vec b/assets/new-ui/chain_badges/arbitrum.svg.vec new file mode 100644 index 000000000..deebadf0b Binary files /dev/null and b/assets/new-ui/chain_badges/arbitrum.svg.vec differ diff --git a/assets/new-ui/chain_badges/base.svg.vec b/assets/new-ui/chain_badges/base.svg.vec new file mode 100644 index 000000000..75d7aa009 Binary files /dev/null and b/assets/new-ui/chain_badges/base.svg.vec differ diff --git a/assets/new-ui/chain_badges/bnb smart chain.svg.vec b/assets/new-ui/chain_badges/bnb smart chain.svg.vec new file mode 100644 index 000000000..3005628a9 Binary files /dev/null and b/assets/new-ui/chain_badges/bnb smart chain.svg.vec differ diff --git a/assets/new-ui/chain_badges/ethereum.svg.vec b/assets/new-ui/chain_badges/ethereum.svg.vec new file mode 100644 index 000000000..32a89366b Binary files /dev/null and b/assets/new-ui/chain_badges/ethereum.svg.vec differ diff --git a/assets/new-ui/chain_badges/lightning.svg.vec b/assets/new-ui/chain_badges/lightning.svg.vec new file mode 100644 index 000000000..f6f922795 Binary files /dev/null and b/assets/new-ui/chain_badges/lightning.svg.vec differ diff --git a/assets/new-ui/chain_badges/mweb.svg.vec b/assets/new-ui/chain_badges/mweb.svg.vec new file mode 100644 index 000000000..e5eca011b Binary files /dev/null and b/assets/new-ui/chain_badges/mweb.svg.vec differ diff --git a/assets/new-ui/chain_badges/polygon.svg.vec b/assets/new-ui/chain_badges/polygon.svg.vec new file mode 100644 index 000000000..968ad33d3 Binary files /dev/null and b/assets/new-ui/chain_badges/polygon.svg.vec differ diff --git a/assets/new-ui/chain_badges/solana.svg.vec b/assets/new-ui/chain_badges/solana.svg.vec new file mode 100644 index 000000000..22aa68e6b Binary files /dev/null and b/assets/new-ui/chain_badges/solana.svg.vec differ diff --git a/assets/new-ui/chain_badges/tron.svg.vec b/assets/new-ui/chain_badges/tron.svg.vec new file mode 100644 index 000000000..6a26bc7ac Binary files /dev/null and b/assets/new-ui/chain_badges/tron.svg.vec differ diff --git a/assets/new-ui/chain_badges/zano.svg.vec b/assets/new-ui/chain_badges/zano.svg.vec new file mode 100644 index 000000000..a66a9d7a3 Binary files /dev/null and b/assets/new-ui/chain_badges/zano.svg.vec differ diff --git a/assets/new-ui/chainflip.svg.vec b/assets/new-ui/chainflip.svg.vec new file mode 100644 index 000000000..7978ac7fb Binary files /dev/null and b/assets/new-ui/chainflip.svg.vec differ diff --git a/assets/new-ui/changenow.svg.vec b/assets/new-ui/changenow.svg.vec new file mode 100644 index 000000000..7fb1d6bde Binary files /dev/null and b/assets/new-ui/changenow.svg.vec differ diff --git a/assets/new-ui/charts.svg.vec b/assets/new-ui/charts.svg.vec new file mode 100644 index 000000000..77fb12b4f Binary files /dev/null and b/assets/new-ui/charts.svg.vec differ diff --git a/assets/new-ui/checkmark.svg.vec b/assets/new-ui/checkmark.svg.vec new file mode 100644 index 000000000..582c3cc80 Binary files /dev/null and b/assets/new-ui/checkmark.svg.vec differ diff --git a/assets/new-ui/chooser.svg.vec b/assets/new-ui/chooser.svg.vec new file mode 100644 index 000000000..69befbc78 Binary files /dev/null and b/assets/new-ui/chooser.svg.vec differ diff --git a/assets/new-ui/coin-control.svg.vec b/assets/new-ui/coin-control.svg.vec new file mode 100644 index 000000000..2ac621c6c Binary files /dev/null and b/assets/new-ui/coin-control.svg.vec differ diff --git a/assets/new-ui/connections.svg.vec b/assets/new-ui/connections.svg.vec new file mode 100644 index 000000000..014a3e3b0 Binary files /dev/null and b/assets/new-ui/connections.svg.vec differ diff --git a/assets/new-ui/contacts.svg.vec b/assets/new-ui/contacts.svg.vec new file mode 100644 index 000000000..ea9b341a1 Binary files /dev/null and b/assets/new-ui/contacts.svg.vec differ diff --git a/assets/new-ui/contacts_outlined.svg.vec b/assets/new-ui/contacts_outlined.svg.vec new file mode 100644 index 000000000..965008a1b Binary files /dev/null and b/assets/new-ui/contacts_outlined.svg.vec differ diff --git a/assets/new-ui/copy-icon.svg.vec b/assets/new-ui/copy-icon.svg.vec new file mode 100644 index 000000000..4082b57da Binary files /dev/null and b/assets/new-ui/copy-icon.svg.vec differ diff --git a/assets/new-ui/copy.svg.vec b/assets/new-ui/copy.svg.vec new file mode 100644 index 000000000..71fba7d0d Binary files /dev/null and b/assets/new-ui/copy.svg.vec differ diff --git a/assets/new-ui/crypto-minimal-icons/Monero.svg.vec b/assets/new-ui/crypto-minimal-icons/Monero.svg.vec new file mode 100644 index 000000000..1be741c58 Binary files /dev/null and b/assets/new-ui/crypto-minimal-icons/Monero.svg.vec differ diff --git a/assets/new-ui/cupcake.svg.vec b/assets/new-ui/cupcake.svg.vec new file mode 100644 index 000000000..75ab5cf3e Binary files /dev/null and b/assets/new-ui/cupcake.svg.vec differ diff --git a/assets/new-ui/decred.svg.vec b/assets/new-ui/decred.svg.vec new file mode 100644 index 000000000..d0114ccbc Binary files /dev/null and b/assets/new-ui/decred.svg.vec differ diff --git a/assets/new-ui/defaults.svg.vec b/assets/new-ui/defaults.svg.vec new file mode 100644 index 000000000..5fc945831 Binary files /dev/null and b/assets/new-ui/defaults.svg.vec differ diff --git a/assets/new-ui/display.svg.vec b/assets/new-ui/display.svg.vec new file mode 100644 index 000000000..25d2ae0d3 Binary files /dev/null and b/assets/new-ui/display.svg.vec differ diff --git a/assets/new-ui/dogecoin.svg.vec b/assets/new-ui/dogecoin.svg.vec new file mode 100644 index 000000000..df53491b0 Binary files /dev/null and b/assets/new-ui/dogecoin.svg.vec differ diff --git a/assets/new-ui/dropdown_arrow.svg.vec b/assets/new-ui/dropdown_arrow.svg.vec new file mode 100644 index 000000000..00432a9c8 Binary files /dev/null and b/assets/new-ui/dropdown_arrow.svg.vec differ diff --git a/assets/new-ui/ethereum.svg.vec b/assets/new-ui/ethereum.svg.vec new file mode 100644 index 000000000..f4acf8ee7 Binary files /dev/null and b/assets/new-ui/ethereum.svg.vec differ diff --git a/assets/new-ui/exchange.svg.vec b/assets/new-ui/exchange.svg.vec new file mode 100644 index 000000000..ad0a98e66 Binary files /dev/null and b/assets/new-ui/exchange.svg.vec differ diff --git a/assets/new-ui/exchange_providers.svg.vec b/assets/new-ui/exchange_providers.svg.vec new file mode 100644 index 000000000..cc4ed5aa8 Binary files /dev/null and b/assets/new-ui/exchange_providers.svg.vec differ diff --git a/assets/new-ui/exolix.svg.vec b/assets/new-ui/exolix.svg.vec new file mode 100644 index 000000000..206ec1dca Binary files /dev/null and b/assets/new-ui/exolix.svg.vec differ diff --git a/assets/new-ui/frozen.svg.vec b/assets/new-ui/frozen.svg.vec new file mode 100644 index 000000000..739a1cca8 Binary files /dev/null and b/assets/new-ui/frozen.svg.vec differ diff --git a/assets/new-ui/help.svg.vec b/assets/new-ui/help.svg.vec new file mode 100644 index 000000000..99df9be83 Binary files /dev/null and b/assets/new-ui/help.svg.vec differ diff --git a/assets/new-ui/hide_keyboard.svg.vec b/assets/new-ui/hide_keyboard.svg.vec new file mode 100644 index 000000000..87ff5ec02 Binary files /dev/null and b/assets/new-ui/hide_keyboard.svg.vec differ diff --git a/assets/new-ui/history-received.svg.vec b/assets/new-ui/history-received.svg.vec new file mode 100644 index 000000000..e69a7de84 Binary files /dev/null and b/assets/new-ui/history-received.svg.vec differ diff --git a/assets/new-ui/history-receiving.svg.vec b/assets/new-ui/history-receiving.svg.vec new file mode 100644 index 000000000..f10d00c5e Binary files /dev/null and b/assets/new-ui/history-receiving.svg.vec differ diff --git a/assets/new-ui/history-sending.svg.vec b/assets/new-ui/history-sending.svg.vec new file mode 100644 index 000000000..c7313e765 Binary files /dev/null and b/assets/new-ui/history-sending.svg.vec differ diff --git a/assets/new-ui/history-sent.svg.vec b/assets/new-ui/history-sent.svg.vec new file mode 100644 index 000000000..6e37888a9 Binary files /dev/null and b/assets/new-ui/history-sent.svg.vec differ diff --git a/assets/new-ui/home.svg.vec b/assets/new-ui/home.svg.vec new file mode 100644 index 000000000..5d4c62590 Binary files /dev/null and b/assets/new-ui/home.svg.vec differ diff --git a/assets/new-ui/icon-accounts.svg.vec b/assets/new-ui/icon-accounts.svg.vec new file mode 100644 index 000000000..f4ee79688 Binary files /dev/null and b/assets/new-ui/icon-accounts.svg.vec differ diff --git a/assets/new-ui/info.svg.vec b/assets/new-ui/info.svg.vec new file mode 100644 index 000000000..acdbfc92d Binary files /dev/null and b/assets/new-ui/info.svg.vec differ diff --git a/assets/new-ui/jupiter.svg.vec b/assets/new-ui/jupiter.svg.vec new file mode 100644 index 000000000..78b66b4eb Binary files /dev/null and b/assets/new-ui/jupiter.svg.vec differ diff --git a/assets/new-ui/label.svg.vec b/assets/new-ui/label.svg.vec new file mode 100644 index 000000000..37afab8e7 Binary files /dev/null and b/assets/new-ui/label.svg.vec differ diff --git a/assets/new-ui/legacy.svg.vec b/assets/new-ui/legacy.svg.vec new file mode 100644 index 000000000..131a526ef Binary files /dev/null and b/assets/new-ui/legacy.svg.vec differ diff --git a/assets/new-ui/letsexchange.svg.vec b/assets/new-ui/letsexchange.svg.vec new file mode 100644 index 000000000..c6e2f182b Binary files /dev/null and b/assets/new-ui/letsexchange.svg.vec differ diff --git a/assets/new-ui/lightning.svg.vec b/assets/new-ui/lightning.svg.vec new file mode 100644 index 000000000..dc7ccd561 Binary files /dev/null and b/assets/new-ui/lightning.svg.vec differ diff --git a/assets/new-ui/lightning_deposit_help.svg.vec b/assets/new-ui/lightning_deposit_help.svg.vec new file mode 100644 index 000000000..295d93a28 Binary files /dev/null and b/assets/new-ui/lightning_deposit_help.svg.vec differ diff --git a/assets/new-ui/lightning_username.svg.vec b/assets/new-ui/lightning_username.svg.vec new file mode 100644 index 000000000..87f1a3f4c Binary files /dev/null and b/assets/new-ui/lightning_username.svg.vec differ diff --git a/assets/new-ui/lightning_username_setup.svg.vec b/assets/new-ui/lightning_username_setup.svg.vec new file mode 100644 index 000000000..8bafc99f0 Binary files /dev/null and b/assets/new-ui/lightning_username_setup.svg.vec differ diff --git a/assets/new-ui/lightning_username_setup_light.svg.vec b/assets/new-ui/lightning_username_setup_light.svg.vec new file mode 100644 index 000000000..fe9e85357 Binary files /dev/null and b/assets/new-ui/lightning_username_setup_light.svg.vec differ diff --git a/assets/new-ui/lightning_withdraw_help.svg.vec b/assets/new-ui/lightning_withdraw_help.svg.vec new file mode 100644 index 000000000..53c9a9e12 Binary files /dev/null and b/assets/new-ui/lightning_withdraw_help.svg.vec differ diff --git a/assets/new-ui/link_arrow.svg.vec b/assets/new-ui/link_arrow.svg.vec new file mode 100644 index 000000000..23119558e Binary files /dev/null and b/assets/new-ui/link_arrow.svg.vec differ diff --git a/assets/new-ui/litecoin.svg.vec b/assets/new-ui/litecoin.svg.vec new file mode 100644 index 000000000..bcbe728a5 Binary files /dev/null and b/assets/new-ui/litecoin.svg.vec differ diff --git a/assets/new-ui/mask.svg.vec b/assets/new-ui/mask.svg.vec new file mode 100644 index 000000000..88b9a8e0a Binary files /dev/null and b/assets/new-ui/mask.svg.vec differ diff --git a/assets/new-ui/monero.svg.vec b/assets/new-ui/monero.svg.vec new file mode 100644 index 000000000..41512d0ca Binary files /dev/null and b/assets/new-ui/monero.svg.vec differ diff --git a/assets/new-ui/mweb.svg.vec b/assets/new-ui/mweb.svg.vec new file mode 100644 index 000000000..b2f94dd65 Binary files /dev/null and b/assets/new-ui/mweb.svg.vec differ diff --git a/assets/new-ui/mweb_help.svg.vec b/assets/new-ui/mweb_help.svg.vec new file mode 100644 index 000000000..9e6668cbd Binary files /dev/null and b/assets/new-ui/mweb_help.svg.vec differ diff --git a/assets/new-ui/mweb_sync.svg.vec b/assets/new-ui/mweb_sync.svg.vec new file mode 100644 index 000000000..6dad0c3ab Binary files /dev/null and b/assets/new-ui/mweb_sync.svg.vec differ diff --git a/assets/new-ui/nano.svg.vec b/assets/new-ui/nano.svg.vec new file mode 100644 index 000000000..9da5980d2 Binary files /dev/null and b/assets/new-ui/nano.svg.vec differ diff --git a/assets/new-ui/navbar/apps.svg.vec b/assets/new-ui/navbar/apps.svg.vec new file mode 100644 index 000000000..0c4a475f5 Binary files /dev/null and b/assets/new-ui/navbar/apps.svg.vec differ diff --git a/assets/new-ui/navbar/charts.svg.vec b/assets/new-ui/navbar/charts.svg.vec new file mode 100644 index 000000000..77fb12b4f Binary files /dev/null and b/assets/new-ui/navbar/charts.svg.vec differ diff --git a/assets/new-ui/navbar/contacts.svg.vec b/assets/new-ui/navbar/contacts.svg.vec new file mode 100644 index 000000000..286de0adc Binary files /dev/null and b/assets/new-ui/navbar/contacts.svg.vec differ diff --git a/assets/new-ui/navbar/home.svg.vec b/assets/new-ui/navbar/home.svg.vec new file mode 100644 index 000000000..5d4c62590 Binary files /dev/null and b/assets/new-ui/navbar/home.svg.vec differ diff --git a/assets/new-ui/navbar/wallets.svg.vec b/assets/new-ui/navbar/wallets.svg.vec new file mode 100644 index 000000000..bca42069e Binary files /dev/null and b/assets/new-ui/navbar/wallets.svg.vec differ diff --git a/assets/new-ui/near-intents.svg.vec b/assets/new-ui/near-intents.svg.vec new file mode 100644 index 000000000..d19cca7c5 Binary files /dev/null and b/assets/new-ui/near-intents.svg.vec differ diff --git a/assets/new-ui/nodes.svg.vec b/assets/new-ui/nodes.svg.vec new file mode 100644 index 000000000..fa460673c Binary files /dev/null and b/assets/new-ui/nodes.svg.vec differ diff --git a/assets/new-ui/offline.svg.vec b/assets/new-ui/offline.svg.vec new file mode 100644 index 000000000..b9f626954 Binary files /dev/null and b/assets/new-ui/offline.svg.vec differ diff --git a/assets/new-ui/options.svg.vec b/assets/new-ui/options.svg.vec new file mode 100644 index 000000000..3fa79087f Binary files /dev/null and b/assets/new-ui/options.svg.vec differ diff --git a/assets/new-ui/options_slider.svg.vec b/assets/new-ui/options_slider.svg.vec new file mode 100644 index 000000000..be977b363 Binary files /dev/null and b/assets/new-ui/options_slider.svg.vec differ diff --git a/assets/new-ui/other.svg.vec b/assets/new-ui/other.svg.vec new file mode 100644 index 000000000..056d38d07 Binary files /dev/null and b/assets/new-ui/other.svg.vec differ diff --git a/assets/new-ui/paste.svg.vec b/assets/new-ui/paste.svg.vec new file mode 100644 index 000000000..cbaaffebb Binary files /dev/null and b/assets/new-ui/paste.svg.vec differ diff --git a/assets/new-ui/payjoin.svg.vec b/assets/new-ui/payjoin.svg.vec new file mode 100644 index 000000000..fd083001c Binary files /dev/null and b/assets/new-ui/payjoin.svg.vec differ diff --git a/assets/new-ui/pjmodal_btc.svg.vec b/assets/new-ui/pjmodal_btc.svg.vec new file mode 100644 index 000000000..063416b16 Binary files /dev/null and b/assets/new-ui/pjmodal_btc.svg.vec differ diff --git a/assets/new-ui/pjmodal_pj.svg.vec b/assets/new-ui/pjmodal_pj.svg.vec new file mode 100644 index 000000000..fd083001c Binary files /dev/null and b/assets/new-ui/pjmodal_pj.svg.vec differ diff --git a/assets/new-ui/polygon.svg.vec b/assets/new-ui/polygon.svg.vec new file mode 100644 index 000000000..67ea19a66 Binary files /dev/null and b/assets/new-ui/polygon.svg.vec differ diff --git a/assets/new-ui/privacy.svg.vec b/assets/new-ui/privacy.svg.vec new file mode 100644 index 000000000..f8d6e3e47 Binary files /dev/null and b/assets/new-ui/privacy.svg.vec differ diff --git a/assets/new-ui/public.svg.vec b/assets/new-ui/public.svg.vec new file mode 100644 index 000000000..8a2eb9295 Binary files /dev/null and b/assets/new-ui/public.svg.vec differ diff --git a/assets/new-ui/randomize.svg.vec b/assets/new-ui/randomize.svg.vec new file mode 100644 index 000000000..03c98d79a Binary files /dev/null and b/assets/new-ui/randomize.svg.vec differ diff --git a/assets/new-ui/receive.svg.vec b/assets/new-ui/receive.svg.vec new file mode 100644 index 000000000..ea5c0c0c1 Binary files /dev/null and b/assets/new-ui/receive.svg.vec differ diff --git a/assets/new-ui/refund_address.svg.vec b/assets/new-ui/refund_address.svg.vec new file mode 100644 index 000000000..5423e16a9 Binary files /dev/null and b/assets/new-ui/refund_address.svg.vec differ diff --git a/assets/new-ui/remove_recipient.svg.vec b/assets/new-ui/remove_recipient.svg.vec new file mode 100644 index 000000000..17b29679a Binary files /dev/null and b/assets/new-ui/remove_recipient.svg.vec differ diff --git a/assets/new-ui/sapling.svg.vec b/assets/new-ui/sapling.svg.vec new file mode 100644 index 000000000..7ead81590 Binary files /dev/null and b/assets/new-ui/sapling.svg.vec differ diff --git a/assets/new-ui/scan.svg.vec b/assets/new-ui/scan.svg.vec new file mode 100644 index 000000000..a920851d1 Binary files /dev/null and b/assets/new-ui/scan.svg.vec differ diff --git a/assets/new-ui/security.svg.vec b/assets/new-ui/security.svg.vec new file mode 100644 index 000000000..4ed940fcd Binary files /dev/null and b/assets/new-ui/security.svg.vec differ diff --git a/assets/new-ui/seed.svg.vec b/assets/new-ui/seed.svg.vec new file mode 100644 index 000000000..59392d03a Binary files /dev/null and b/assets/new-ui/seed.svg.vec differ diff --git a/assets/new-ui/segwit.svg.vec b/assets/new-ui/segwit.svg.vec new file mode 100644 index 000000000..5788f9779 Binary files /dev/null and b/assets/new-ui/segwit.svg.vec differ diff --git a/assets/new-ui/select_wallet.svg.vec b/assets/new-ui/select_wallet.svg.vec new file mode 100644 index 000000000..51d5c48ec Binary files /dev/null and b/assets/new-ui/select_wallet.svg.vec differ diff --git a/assets/new-ui/send.svg.vec b/assets/new-ui/send.svg.vec new file mode 100644 index 000000000..5fb785284 Binary files /dev/null and b/assets/new-ui/send.svg.vec differ diff --git a/assets/new-ui/send_from_external.svg.vec b/assets/new-ui/send_from_external.svg.vec new file mode 100644 index 000000000..e98139096 Binary files /dev/null and b/assets/new-ui/send_from_external.svg.vec differ diff --git a/assets/new-ui/set-amount.svg.vec b/assets/new-ui/set-amount.svg.vec new file mode 100644 index 000000000..0a78381c3 Binary files /dev/null and b/assets/new-ui/set-amount.svg.vec differ diff --git a/assets/new-ui/settings.png b/assets/new-ui/settings.png deleted file mode 100644 index b6cfb5b08..000000000 Binary files a/assets/new-ui/settings.png and /dev/null differ diff --git a/assets/new-ui/settings_row_icons/backup.svg.vec b/assets/new-ui/settings_row_icons/backup.svg.vec new file mode 100644 index 000000000..383a54949 Binary files /dev/null and b/assets/new-ui/settings_row_icons/backup.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/coin-control.svg.vec b/assets/new-ui/settings_row_icons/coin-control.svg.vec new file mode 100644 index 000000000..2ac621c6c Binary files /dev/null and b/assets/new-ui/settings_row_icons/coin-control.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/connections.svg.vec b/assets/new-ui/settings_row_icons/connections.svg.vec new file mode 100644 index 000000000..014a3e3b0 Binary files /dev/null and b/assets/new-ui/settings_row_icons/connections.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/cupcake.svg.vec b/assets/new-ui/settings_row_icons/cupcake.svg.vec new file mode 100644 index 000000000..75ab5cf3e Binary files /dev/null and b/assets/new-ui/settings_row_icons/cupcake.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/defaults.svg.vec b/assets/new-ui/settings_row_icons/defaults.svg.vec new file mode 100644 index 000000000..5fc945831 Binary files /dev/null and b/assets/new-ui/settings_row_icons/defaults.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/display.svg.vec b/assets/new-ui/settings_row_icons/display.svg.vec new file mode 100644 index 000000000..25d2ae0d3 Binary files /dev/null and b/assets/new-ui/settings_row_icons/display.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/info.svg.vec b/assets/new-ui/settings_row_icons/info.svg.vec new file mode 100644 index 000000000..acdbfc92d Binary files /dev/null and b/assets/new-ui/settings_row_icons/info.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/lightning_username.svg.vec b/assets/new-ui/settings_row_icons/lightning_username.svg.vec new file mode 100644 index 000000000..87f1a3f4c Binary files /dev/null and b/assets/new-ui/settings_row_icons/lightning_username.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/mweb.svg.vec b/assets/new-ui/settings_row_icons/mweb.svg.vec new file mode 100644 index 000000000..90b1b53dc Binary files /dev/null and b/assets/new-ui/settings_row_icons/mweb.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/nodes.svg.vec b/assets/new-ui/settings_row_icons/nodes.svg.vec new file mode 100644 index 000000000..fa460673c Binary files /dev/null and b/assets/new-ui/settings_row_icons/nodes.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/other.svg.vec b/assets/new-ui/settings_row_icons/other.svg.vec new file mode 100644 index 000000000..056d38d07 Binary files /dev/null and b/assets/new-ui/settings_row_icons/other.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/payjoin.svg.vec b/assets/new-ui/settings_row_icons/payjoin.svg.vec new file mode 100644 index 000000000..e5de916d8 Binary files /dev/null and b/assets/new-ui/settings_row_icons/payjoin.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/privacy.svg.vec b/assets/new-ui/settings_row_icons/privacy.svg.vec new file mode 100644 index 000000000..f8d6e3e47 Binary files /dev/null and b/assets/new-ui/settings_row_icons/privacy.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/security.svg.vec b/assets/new-ui/settings_row_icons/security.svg.vec new file mode 100644 index 000000000..4ed940fcd Binary files /dev/null and b/assets/new-ui/settings_row_icons/security.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/seed.svg.vec b/assets/new-ui/settings_row_icons/seed.svg.vec new file mode 100644 index 000000000..59392d03a Binary files /dev/null and b/assets/new-ui/settings_row_icons/seed.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/silent-payments.svg.vec b/assets/new-ui/settings_row_icons/silent-payments.svg.vec new file mode 100644 index 000000000..a3972eb89 Binary files /dev/null and b/assets/new-ui/settings_row_icons/silent-payments.svg.vec differ diff --git a/assets/new-ui/settings_row_icons/support.svg.vec b/assets/new-ui/settings_row_icons/support.svg.vec new file mode 100644 index 000000000..e482dd366 Binary files /dev/null and b/assets/new-ui/settings_row_icons/support.svg.vec differ diff --git a/assets/new-ui/shielded.svg.vec b/assets/new-ui/shielded.svg.vec new file mode 100644 index 000000000..35865322a Binary files /dev/null and b/assets/new-ui/shielded.svg.vec differ diff --git a/assets/new-ui/sideshift.svg.vec b/assets/new-ui/sideshift.svg.vec new file mode 100644 index 000000000..a753d9a7b Binary files /dev/null and b/assets/new-ui/sideshift.svg.vec differ diff --git a/assets/new-ui/silent-payments.svg.vec b/assets/new-ui/silent-payments.svg.vec new file mode 100644 index 000000000..a3972eb89 Binary files /dev/null and b/assets/new-ui/silent-payments.svg.vec differ diff --git a/assets/new-ui/silent.svg.vec b/assets/new-ui/silent.svg.vec new file mode 100644 index 000000000..de2e49484 Binary files /dev/null and b/assets/new-ui/silent.svg.vec differ diff --git a/assets/new-ui/silent_sync.svg.vec b/assets/new-ui/silent_sync.svg.vec new file mode 100644 index 000000000..a4e96e35b Binary files /dev/null and b/assets/new-ui/silent_sync.svg.vec differ diff --git a/assets/new-ui/simpleswap.svg.vec b/assets/new-ui/simpleswap.svg.vec new file mode 100644 index 000000000..dd6a1fb7c Binary files /dev/null and b/assets/new-ui/simpleswap.svg.vec differ diff --git a/assets/new-ui/solana.svg.vec b/assets/new-ui/solana.svg.vec new file mode 100644 index 000000000..77d8a2cb5 Binary files /dev/null and b/assets/new-ui/solana.svg.vec differ diff --git a/assets/new-ui/stealthex.svg.vec b/assets/new-ui/stealthex.svg.vec new file mode 100644 index 000000000..af552a952 Binary files /dev/null and b/assets/new-ui/stealthex.svg.vec differ diff --git a/assets/new-ui/support.svg.vec b/assets/new-ui/support.svg.vec new file mode 100644 index 000000000..e482dd366 Binary files /dev/null and b/assets/new-ui/support.svg.vec differ diff --git a/assets/new-ui/swap_amounts.svg.vec b/assets/new-ui/swap_amounts.svg.vec new file mode 100644 index 000000000..86d4838d5 Binary files /dev/null and b/assets/new-ui/swap_amounts.svg.vec differ diff --git a/assets/new-ui/swaps_xyz.svg.vec b/assets/new-ui/swaps_xyz.svg.vec new file mode 100644 index 000000000..e57dad7d0 Binary files /dev/null and b/assets/new-ui/swaps_xyz.svg.vec differ diff --git a/assets/new-ui/swaptrade.svg.vec b/assets/new-ui/swaptrade.svg.vec new file mode 100644 index 000000000..ccb3a27eb Binary files /dev/null and b/assets/new-ui/swaptrade.svg.vec differ diff --git a/assets/new-ui/switch.svg.vec b/assets/new-ui/switch.svg.vec new file mode 100644 index 000000000..8dc679745 Binary files /dev/null and b/assets/new-ui/switch.svg.vec differ diff --git a/assets/new-ui/switcher-bitcoin.svg.vec b/assets/new-ui/switcher-bitcoin.svg.vec new file mode 100644 index 000000000..0c2a4ed65 Binary files /dev/null and b/assets/new-ui/switcher-bitcoin.svg.vec differ diff --git a/assets/new-ui/switcher-lightning.svg.vec b/assets/new-ui/switcher-lightning.svg.vec new file mode 100644 index 000000000..242884095 Binary files /dev/null and b/assets/new-ui/switcher-lightning.svg.vec differ diff --git a/assets/new-ui/taproot.svg.vec b/assets/new-ui/taproot.svg.vec new file mode 100644 index 000000000..fb76ac3ed Binary files /dev/null and b/assets/new-ui/taproot.svg.vec differ diff --git a/assets/new-ui/thorchain.svg.vec b/assets/new-ui/thorchain.svg.vec new file mode 100644 index 000000000..1d95b17cb Binary files /dev/null and b/assets/new-ui/thorchain.svg.vec differ diff --git a/assets/new-ui/token-received.svg.vec b/assets/new-ui/token-received.svg.vec new file mode 100644 index 000000000..13dad5eac Binary files /dev/null and b/assets/new-ui/token-received.svg.vec differ diff --git a/assets/new-ui/token-sent.svg.vec b/assets/new-ui/token-sent.svg.vec new file mode 100644 index 000000000..5a189c298 Binary files /dev/null and b/assets/new-ui/token-sent.svg.vec differ diff --git a/assets/new-ui/top-settings.svg.vec b/assets/new-ui/top-settings.svg.vec new file mode 100644 index 000000000..b48ad4926 Binary files /dev/null and b/assets/new-ui/top-settings.svg.vec differ diff --git a/assets/new-ui/tor_sync.svg.vec b/assets/new-ui/tor_sync.svg.vec new file mode 100644 index 000000000..54b6ccb5f Binary files /dev/null and b/assets/new-ui/tor_sync.svg.vec differ diff --git a/assets/new-ui/trade_providers/chainflip.svg.vec b/assets/new-ui/trade_providers/chainflip.svg.vec new file mode 100644 index 000000000..7978ac7fb Binary files /dev/null and b/assets/new-ui/trade_providers/chainflip.svg.vec differ diff --git a/assets/new-ui/trade_providers/changenow.svg.vec b/assets/new-ui/trade_providers/changenow.svg.vec new file mode 100644 index 000000000..7fb1d6bde Binary files /dev/null and b/assets/new-ui/trade_providers/changenow.svg.vec differ diff --git a/assets/new-ui/trade_providers/exolix.svg.vec b/assets/new-ui/trade_providers/exolix.svg.vec new file mode 100644 index 000000000..206ec1dca Binary files /dev/null and b/assets/new-ui/trade_providers/exolix.svg.vec differ diff --git a/assets/new-ui/trade_providers/jupiter.svg.vec b/assets/new-ui/trade_providers/jupiter.svg.vec new file mode 100644 index 000000000..78b66b4eb Binary files /dev/null and b/assets/new-ui/trade_providers/jupiter.svg.vec differ diff --git a/assets/new-ui/trade_providers/letsexchange.svg.vec b/assets/new-ui/trade_providers/letsexchange.svg.vec new file mode 100644 index 000000000..c6e2f182b Binary files /dev/null and b/assets/new-ui/trade_providers/letsexchange.svg.vec differ diff --git a/assets/new-ui/trade_providers/near-intents.svg.vec b/assets/new-ui/trade_providers/near-intents.svg.vec new file mode 100644 index 000000000..d19cca7c5 Binary files /dev/null and b/assets/new-ui/trade_providers/near-intents.svg.vec differ diff --git a/assets/new-ui/trade_providers/sideshift.svg.vec b/assets/new-ui/trade_providers/sideshift.svg.vec new file mode 100644 index 000000000..a753d9a7b Binary files /dev/null and b/assets/new-ui/trade_providers/sideshift.svg.vec differ diff --git a/assets/new-ui/trade_providers/simpleswap.svg.vec b/assets/new-ui/trade_providers/simpleswap.svg.vec new file mode 100644 index 000000000..dd6a1fb7c Binary files /dev/null and b/assets/new-ui/trade_providers/simpleswap.svg.vec differ diff --git a/assets/new-ui/trade_providers/stealthex.svg.vec b/assets/new-ui/trade_providers/stealthex.svg.vec new file mode 100644 index 000000000..af552a952 Binary files /dev/null and b/assets/new-ui/trade_providers/stealthex.svg.vec differ diff --git a/assets/new-ui/trade_providers/swaps_xyz.svg.vec b/assets/new-ui/trade_providers/swaps_xyz.svg.vec new file mode 100644 index 000000000..e57dad7d0 Binary files /dev/null and b/assets/new-ui/trade_providers/swaps_xyz.svg.vec differ diff --git a/assets/new-ui/trade_providers/swaptrade.svg.vec b/assets/new-ui/trade_providers/swaptrade.svg.vec new file mode 100644 index 000000000..ccb3a27eb Binary files /dev/null and b/assets/new-ui/trade_providers/swaptrade.svg.vec differ diff --git a/assets/new-ui/trade_providers/thorchain.svg.vec b/assets/new-ui/trade_providers/thorchain.svg.vec new file mode 100644 index 000000000..1d95b17cb Binary files /dev/null and b/assets/new-ui/trade_providers/thorchain.svg.vec differ diff --git a/assets/new-ui/trade_providers/trocador.svg.vec b/assets/new-ui/trade_providers/trocador.svg.vec new file mode 100644 index 000000000..a1578eb08 Binary files /dev/null and b/assets/new-ui/trade_providers/trocador.svg.vec differ diff --git a/assets/new-ui/trade_providers/uniswap.svg.vec b/assets/new-ui/trade_providers/uniswap.svg.vec new file mode 100644 index 000000000..1a4caaecb Binary files /dev/null and b/assets/new-ui/trade_providers/uniswap.svg.vec differ diff --git a/assets/new-ui/trade_providers/xoswap.svg.vec b/assets/new-ui/trade_providers/xoswap.svg.vec new file mode 100644 index 000000000..9af250e92 Binary files /dev/null and b/assets/new-ui/trade_providers/xoswap.svg.vec differ diff --git a/assets/new-ui/transparent.svg.vec b/assets/new-ui/transparent.svg.vec new file mode 100644 index 000000000..0c9c26312 Binary files /dev/null and b/assets/new-ui/transparent.svg.vec differ diff --git a/assets/new-ui/trocador.svg.vec b/assets/new-ui/trocador.svg.vec new file mode 100644 index 000000000..a1578eb08 Binary files /dev/null and b/assets/new-ui/trocador.svg.vec differ diff --git a/assets/new-ui/tron.svg.vec b/assets/new-ui/tron.svg.vec new file mode 100644 index 000000000..cfa751107 Binary files /dev/null and b/assets/new-ui/tron.svg.vec differ diff --git a/assets/new-ui/unified.svg.vec b/assets/new-ui/unified.svg.vec new file mode 100644 index 000000000..79dbb4b36 Binary files /dev/null and b/assets/new-ui/unified.svg.vec differ diff --git a/assets/new-ui/uniswap.svg.vec b/assets/new-ui/uniswap.svg.vec new file mode 100644 index 000000000..1a4caaecb Binary files /dev/null and b/assets/new-ui/uniswap.svg.vec differ diff --git a/assets/new-ui/unmask.svg.vec b/assets/new-ui/unmask.svg.vec new file mode 100644 index 000000000..3553da4d5 Binary files /dev/null and b/assets/new-ui/unmask.svg.vec differ diff --git a/assets/new-ui/wallet-trezor.svg.vec b/assets/new-ui/wallet-trezor.svg.vec new file mode 100644 index 000000000..febf523db Binary files /dev/null and b/assets/new-ui/wallet-trezor.svg.vec differ diff --git a/assets/new-ui/wallet_settings.svg.vec b/assets/new-ui/wallet_settings.svg.vec new file mode 100644 index 000000000..f37dd95a7 Binary files /dev/null and b/assets/new-ui/wallet_settings.svg.vec differ diff --git a/assets/new-ui/wallets.svg.vec b/assets/new-ui/wallets.svg.vec new file mode 100644 index 000000000..bca42069e Binary files /dev/null and b/assets/new-ui/wallets.svg.vec differ diff --git a/assets/new-ui/warning.svg.vec b/assets/new-ui/warning.svg.vec new file mode 100644 index 000000000..efda3d1aa Binary files /dev/null and b/assets/new-ui/warning.svg.vec differ diff --git a/assets/new-ui/wownero.svg.vec b/assets/new-ui/wownero.svg.vec new file mode 100644 index 000000000..c7538f19d Binary files /dev/null and b/assets/new-ui/wownero.svg.vec differ diff --git a/assets/new-ui/xoswap.svg.vec b/assets/new-ui/xoswap.svg.vec new file mode 100644 index 000000000..9af250e92 Binary files /dev/null and b/assets/new-ui/xoswap.svg.vec differ diff --git a/assets/new-ui/zano.svg.vec b/assets/new-ui/zano.svg.vec new file mode 100644 index 000000000..207e709a2 Binary files /dev/null and b/assets/new-ui/zano.svg.vec differ diff --git a/assets/new-ui/zcash.svg.vec b/assets/new-ui/zcash.svg.vec new file mode 100644 index 000000000..d743fb593 Binary files /dev/null and b/assets/new-ui/zcash.svg.vec differ diff --git a/compile_graphics.sh b/compile_graphics.sh new file mode 100755 index 000000000..66feb580c --- /dev/null +++ b/compile_graphics.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# .svg -> .svg.vec +# to add images to the app, put .svgs in res/pictures then run this. +# compiled .svg.vec will be added to assets/new-ui +# CakeImageWidget automatically takes care of loading the compiled .vec file +# if for whatever reason you don't wanna use it, do SvgPicture(AssetBytesLoader("assets/new-ui/something.svg.vec")) + +src="res/pictures" +dst="assets/new-ui" + +while read -r dir; do + rel="${dir#"$src"}" + outdir="$dst$rel" + + mkdir -p "$outdir" + dart run vector_graphics_compiler --input-dir "$dir" --out-dir "$outdir" >/dev/null & +done < <(find "$src" -type d) + +wait \ No newline at end of file diff --git a/lib/new-ui/pages/about_page.dart b/lib/new-ui/pages/about_page.dart index 991b513c5..7a9a15acc 100644 --- a/lib/new-ui/pages/about_page.dart +++ b/lib/new-ui/pages/about_page.dart @@ -3,6 +3,7 @@ import 'dart:math'; import 'package:cake_wallet/entities/new_ui_entities/list_item/list_item_regular_row.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/src/widgets/new_list_row/new_list_section.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; @@ -67,8 +68,8 @@ class _AboutPageState extends State { SizedBox(), GestureDetector( onTap: _easterEgg, - child: SvgPicture.asset( - "assets/new-ui/cake_squircle_icon.svg", + child: CakeImageWidget( + imageUrl: "assets/new-ui/cake_squircle_icon.svg", width: 128, height: 128, ), diff --git a/lib/new-ui/pages/account_customizer.dart b/lib/new-ui/pages/account_customizer.dart index 4884f5a7f..20f3b7b7b 100644 --- a/lib/new-ui/pages/account_customizer.dart +++ b/lib/new-ui/pages/account_customizer.dart @@ -10,6 +10,7 @@ import 'package:cake_wallet/new-ui/widgets/new_primary_button.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; import 'package:cake_wallet/src/widgets/alert_with_one_action.dart'; import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart'; import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart'; @@ -447,8 +448,8 @@ class _AccountCreationModalState extends State { decoration: BoxDecoration( color: Theme.of(context).colorScheme.surfaceContainerHigh, borderRadius: BorderRadius.circular(5)), - child: SvgPicture.asset( - "assets/new-ui/randomize.svg", + child: CakeImageWidget( + imageUrl: "assets/new-ui/randomize.svg", colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.primary, BlendMode.srcIn), ), diff --git a/lib/new-ui/pages/addresses_page.dart b/lib/new-ui/pages/addresses_page.dart index 6cc5f6d30..a7a81d282 100644 --- a/lib/new-ui/pages/addresses_page.dart +++ b/lib/new-ui/pages/addresses_page.dart @@ -9,6 +9,7 @@ import 'package:cake_wallet/new-ui/widgets/coins_page/cards/balance_card.dart'; import 'package:cake_wallet/new-ui/widgets/long_press_menu.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; import 'package:cake_wallet/routes.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/utils/address_formatter.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart'; @@ -423,7 +424,8 @@ class AddressRow extends StatelessWidget { ], ), ), - if (selected) SvgPicture.asset("assets/new-ui/checkmark.svg") + if (selected) CakeImageWidget( + imageUrl: "assets/new-ui/checkmark.svg") ], ), ), @@ -462,7 +464,8 @@ class ShowHiddenButton extends StatelessWidget { Text(S.of(context).show_hidden_addresses), RotatedBox( quarterTurns: 1, - child: SvgPicture.asset("assets/new-ui/dropdown_arrow.svg")) + child:CakeImageWidget( + imageUrl: "assets/new-ui/dropdown_arrow.svg")) ], ), ), diff --git a/lib/new-ui/pages/lightning_username_page.dart b/lib/new-ui/pages/lightning_username_page.dart index 341bbfc68..f35ae6793 100644 --- a/lib/new-ui/pages/lightning_username_page.dart +++ b/lib/new-ui/pages/lightning_username_page.dart @@ -5,6 +5,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/new-ui/viewmodels/lightning_username/lightning_username_bloc.dart'; import 'package:cake_wallet/new-ui/widgets/new_primary_button.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/themes/core/theme_store.dart'; import 'package:cw_core/generate_name.dart'; import 'package:flutter/material.dart'; @@ -164,7 +165,8 @@ class LightningUsernameInfo extends StatelessWidget { return Column( spacing: 24, children: [ - SvgPicture.asset(isLightMode + CakeImageWidget( + imageUrl: isLightMode ? "assets/new-ui/lightning_username_setup_light.svg" : "assets/new-ui/lightning_username_setup.svg"), Row( @@ -219,7 +221,8 @@ class LightningUsernameEditor extends StatelessWidget { mainAxisSize: MainAxisSize.min, spacing: 12, children: [ - SvgPicture.asset(isLightMode + CakeImageWidget( + imageUrl: isLightMode ? "assets/new-ui/lightning_username_setup_light.svg" : "assets/new-ui/lightning_username_setup.svg"), if (isSetup) @@ -254,7 +257,8 @@ class LightningUsernameEditor extends StatelessWidget { color: Colors.transparent, child: InkWell( onTap: onRandomizeButtonTap, - child: SvgPicture.asset("assets/new-ui/randomize.svg", + child: CakeImageWidget( + imageUrl: "assets/new-ui/randomize.svg", colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.primary, BlendMode.srcIn)), ), diff --git a/lib/new-ui/pages/send_page.dart b/lib/new-ui/pages/send_page.dart index f62d2ded9..6387f54ed 100644 --- a/lib/new-ui/pages/send_page.dart +++ b/lib/new-ui/pages/send_page.dart @@ -19,6 +19,7 @@ import 'package:cake_wallet/new-ui/widgets/send_page/send_confirm_sheet.dart'; import 'package:cake_wallet/new-ui/widgets/send_page/send_memo_input.dart'; import 'package:cake_wallet/reactions/wallet_connect.dart'; import 'package:cake_wallet/src/widgets/bottom_sheet/token_selection_bottom_sheet.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/src/widgets/new_list_row/list_item_regular_row_widget.dart'; import 'package:cake_wallet/src/widgets/standard_checkbox.dart'; import 'package:cake_wallet/store/app_store.dart'; @@ -290,7 +291,7 @@ class _NewSendPageState extends State { if (widget.sendViewModel.outputs.length > 1) ModernButton( size: 36, - icon: SvgPicture.asset( + icon: CakeImageWidget(imageUrl: "assets/new-ui/remove_recipient.svg", colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.primary, @@ -321,7 +322,7 @@ class _NewSendPageState extends State { if (widget.mode.helpContent != null) ModernButton( size: 36, - icon: SvgPicture.asset( + icon: CakeImageWidget(imageUrl: "assets/new-ui/help.svg", colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.primary, BlendMode.srcIn), @@ -1336,7 +1337,7 @@ class SendHelpPage extends StatelessWidget { mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.center, children: [ - SvgPicture.asset(content.imagePath), + CakeImageWidget(imageUrl:content.imagePath), Text( content.description, textAlign: TextAlign.center, diff --git a/lib/new-ui/pages/swap_page.dart b/lib/new-ui/pages/swap_page.dart index 20b45a4c3..25dc949c0 100644 --- a/lib/new-ui/pages/swap_page.dart +++ b/lib/new-ui/pages/swap_page.dart @@ -25,6 +25,7 @@ import 'package:cake_wallet/src/screens/exchange/widgets/present_provider_picker import 'package:cake_wallet/src/screens/send/widgets/extract_address_from_parsed.dart'; import 'package:cake_wallet/src/widgets/alert_with_one_action.dart'; import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/src/widgets/primary_button.dart'; import 'package:cake_wallet/utils/debounce.dart'; import 'package:cake_wallet/utils/payment_request.dart'; @@ -458,7 +459,7 @@ class _NewSwapPageState extends State { title: S.of(context).swap, leadingIcon: Icon(Icons.close), onLeadingPressed: Navigator.of(context).maybePop, - trailingIcon: SvgPicture.asset( + trailingIcon: CakeImageWidget(imageUrl: "assets/new-ui/options.svg", colorFilter: ColorFilter.mode(Theme.of(context).colorScheme.primary, BlendMode.srcIn), @@ -737,9 +738,7 @@ class SwapProviderPreview extends StatelessWidget { spacing: 12, children: [ if (provider != null) - provider.description.image.toLowerCase().endsWith("svg") - ? SvgPicture.asset(provider.description.image, width: 28, height: 28) - : Image.asset(provider.description.image, width: 28, height: 28), + CakeImageWidget(imageUrl:provider.description.image,width:28,height:28), if (provider == null) CupertinoActivityIndicator(), Text( provider?.title ?? "${S.of(context).finding_provider}...", @@ -762,7 +761,7 @@ class SwapProviderPreview extends StatelessWidget { fontWeight: FontWeight.w400, color: Theme.of(context).colorScheme.onSurfaceVariant), ), - SvgPicture.asset( + CakeImageWidget(imageUrl: "assets/new-ui/chooser.svg", colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.onSurfaceVariant, BlendMode.srcIn), @@ -927,17 +926,17 @@ class SwapAmountBoxState extends State { currencyToShow, textAlign: TextAlign.center, ), - SizedBox(width: 10), - RotatedBox( - quarterTurns: 2, - child: SvgPicture.asset( - "assets/new-ui/dropdown_arrow.svg", - width: 4, - height: 4, - colorFilter: ColorFilter.mode( - Theme.of(context).colorScheme.primary, BlendMode.srcIn), - )), - SizedBox(width: 4), + SizedBox(width:10), + RotatedBox( + quarterTurns: 2, + child: CakeImageWidget(imageUrl: + "assets/new-ui/dropdown_arrow.svg", + width: 4, + height: 4, + colorFilter: ColorFilter.mode( + Theme.of(context).colorScheme.primary, BlendMode.srcIn), + )), + SizedBox(width:4), ], ), ), @@ -1040,7 +1039,7 @@ class SwapAmountBoxState extends State { ), RotatedBox( quarterTurns: 2, - child: SvgPicture.asset( + child: CakeImageWidget(imageUrl: "assets/new-ui/dropdown_arrow.svg", colorFilter: ColorFilter.mode( (addressEmpty && widget.isReceiverCard) diff --git a/lib/new-ui/widgets/changelog_modal.dart b/lib/new-ui/widgets/changelog_modal.dart index 079bac629..c157a60c7 100644 --- a/lib/new-ui/widgets/changelog_modal.dart +++ b/lib/new-ui/widgets/changelog_modal.dart @@ -4,6 +4,7 @@ import 'dart:io'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/new-ui/widgets/new_primary_button.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -144,8 +145,8 @@ class VersionNumberHeader extends StatelessWidget { spacing: 8, mainAxisSize: MainAxisSize.min, children: [ - SvgPicture.asset( - "assets/images/cake_logo_dark.svg", + CakeImageWidget( + imageUrl: "assets/images/cake_logo_dark.svg", height: 32, width: 32, colorFilter: @@ -174,8 +175,8 @@ class ChangelogItemWidget extends StatelessWidget { spacing: 12, children: [ if (item.iconFilename.isNotEmpty) - SvgPicture.asset( - "$changelogIconLocation/${item.iconFilename}.svg", + CakeImageWidget( + imageUrl: "$changelogIconLocation/${item.iconFilename}.svg", height: 36, width: 36, colorFilter: ColorFilter.mode(Theme.of(context).colorScheme.primary, BlendMode.srcIn), diff --git a/lib/new-ui/widgets/coin_control_page/coin_control_list_item.dart b/lib/new-ui/widgets/coin_control_page/coin_control_list_item.dart index 1ec608d97..ab58ea240 100644 --- a/lib/new-ui/widgets/coin_control_page/coin_control_list_item.dart +++ b/lib/new-ui/widgets/coin_control_page/coin_control_list_item.dart @@ -1,4 +1,5 @@ import 'package:auto_size_text/auto_size_text.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/src/widgets/new_list_row/new_simple_checkbox.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; @@ -63,7 +64,7 @@ class CoinControlListItem extends StatelessWidget { children: [ Text(amount, style: TextStyle(fontSize:14,fontWeight: FontWeight.w400,color: Theme.of(context).colorScheme.onSurface),), if(address.toLowerCase().contains("mweb")) // hack carried over from old ui, we really should just have a boolean in the object - SvgPicture.asset( + CakeImageWidget(imageUrl: "assets/new-ui/address-type-picker-icons/mweb.svg", width: 18, height: 18, @@ -71,7 +72,7 @@ class CoinControlListItem extends StatelessWidget { Theme.of(context).colorScheme.onSurfaceVariant, BlendMode.srcIn), ), if(isSilentPayment) - SvgPicture.asset( + CakeImageWidget(imageUrl: "assets/new-ui/address-type-picker-icons/silent.svg", width: 18, height: 18, @@ -100,7 +101,7 @@ class CoinControlListItem extends StatelessWidget { fontWeight: FontWeight.w400, color: Theme.of(context).colorScheme.onSurfaceVariant), ), - SvgPicture.asset( + CakeImageWidget(imageUrl: "assets/new-ui/arrow_right.svg", colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.onSurfaceVariant, BlendMode.srcIn), @@ -119,7 +120,7 @@ class CoinControlListItem extends StatelessWidget { } if(isFrozen) { - return SvgPicture.asset("assets/new-ui/frozen.svg"); + return CakeImageWidget(imageUrl:"assets/new-ui/frozen.svg"); } return NewSimpleCheckbox(value: isSending, onChanged: (value){onCheckBoxTap?.call();}); diff --git a/lib/new-ui/widgets/coins_page/action_row/coin_action_button.dart b/lib/new-ui/widgets/coins_page/action_row/coin_action_button.dart index 40c62d82f..de4de73c9 100644 --- a/lib/new-ui/widgets/coins_page/action_row/coin_action_button.dart +++ b/lib/new-ui/widgets/coins_page/action_row/coin_action_button.dart @@ -13,7 +13,7 @@ class CoinActionButton extends StatelessWidget { required this.action, }); - final SvgPicture icon; + final Widget icon; final String label; final VoidCallback action; diff --git a/lib/new-ui/widgets/coins_page/action_row/coin_action_row.dart b/lib/new-ui/widgets/coins_page/action_row/coin_action_row.dart index 2541e9efb..7732f92a1 100644 --- a/lib/new-ui/widgets/coins_page/action_row/coin_action_row.dart +++ b/lib/new-ui/widgets/coins_page/action_row/coin_action_row.dart @@ -7,6 +7,7 @@ import 'package:cake_wallet/new-ui/modal_navigator.dart'; import 'package:cake_wallet/new-ui/pages/send_page.dart'; import 'package:cake_wallet/new-ui/pages/swap_page.dart'; import 'package:cake_wallet/routes.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/utils/feature_flag.dart'; import 'package:cake_wallet/utils/payment_request.dart'; import 'package:cake_wallet/view_model/send/send_view_model.dart'; @@ -38,7 +39,7 @@ class CoinActionRow extends StatelessWidget { spacing: MediaQuery.of(context).size.width * 0.05, children: [ CoinActionButton( - icon: SvgPicture.asset( + icon: CakeImageWidget(imageUrl: "assets/new-ui/send.svg", colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.primary, @@ -57,6 +58,7 @@ class CoinActionRow extends StatelessWidget { CupertinoScaffold.showCupertinoModalBottomSheet( context: context, + isDismissible: true, barrierColor: Colors.black.withAlpha(60), builder: (context) { return Material( @@ -75,7 +77,7 @@ class CoinActionRow extends StatelessWidget { }, ), CoinActionButton( - icon: SvgPicture.asset( + icon: CakeImageWidget(imageUrl: "assets/new-ui/receive.svg", colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.primary, @@ -108,7 +110,7 @@ class CoinActionRow extends StatelessWidget { ), if (showSwap) CoinActionButton( - icon: SvgPicture.asset( + icon: CakeImageWidget(imageUrl: "assets/new-ui/exchange.svg", colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.primary, @@ -134,7 +136,7 @@ class CoinActionRow extends StatelessWidget { }, ), CoinActionButton( - icon: SvgPicture.asset( + icon: CakeImageWidget(imageUrl: "assets/new-ui/scan.svg", colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.primary, diff --git a/lib/new-ui/widgets/coins_page/assets_history/asset_details_modal.dart b/lib/new-ui/widgets/coins_page/assets_history/asset_details_modal.dart index 032dfad03..e555ae564 100644 --- a/lib/new-ui/widgets/coins_page/assets_history/asset_details_modal.dart +++ b/lib/new-ui/widgets/coins_page/assets_history/asset_details_modal.dart @@ -7,6 +7,7 @@ import 'package:cake_wallet/new-ui/pages/send_page.dart'; import 'package:cake_wallet/new-ui/pages/swap_page.dart'; import 'package:cake_wallet/new-ui/widgets/modern_button.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/utils/payment_request.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/unspent_coin_type.dart'; @@ -99,7 +100,7 @@ class AssetDetailsModal extends StatelessWidget { color: Colors.white), child: Padding( padding: const EdgeInsets.all(4.0), - child: SvgPicture.asset( + child: CakeImageWidget(imageUrl: chainIconPath, width: 18, height: 18, diff --git a/lib/new-ui/widgets/coins_page/assets_history/asset_tile.dart b/lib/new-ui/widgets/coins_page/assets_history/asset_tile.dart index a23dfa257..fd317d553 100644 --- a/lib/new-ui/widgets/coins_page/assets_history/asset_tile.dart +++ b/lib/new-ui/widgets/coins_page/assets_history/asset_tile.dart @@ -1,5 +1,6 @@ import 'package:cake_wallet/new-ui/widgets/coins_page/assets_history/asset_details_modal.dart'; import 'package:cake_wallet/src/screens/wallet_connect/utils/string_parsing.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/wallet_base.dart'; @@ -115,8 +116,8 @@ class AssetTile extends StatelessWidget { color: Colors.white), child: Padding( padding: const EdgeInsets.all(2.0), - child: SvgPicture.asset( - chainIconPath, + child: CakeImageWidget( + imageUrl: chainIconPath, width: 12, height: 12, colorFilter: diff --git a/lib/new-ui/widgets/coins_page/assets_history/assets_top_bar.dart b/lib/new-ui/widgets/coins_page/assets_history/assets_top_bar.dart index b213ccf26..0ca0aff5b 100644 --- a/lib/new-ui/widgets/coins_page/assets_history/assets_top_bar.dart +++ b/lib/new-ui/widgets/coins_page/assets_history/assets_top_bar.dart @@ -1,6 +1,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/new-ui/widgets/line_tab_switcher.dart'; import 'package:cake_wallet/routes.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; @@ -58,8 +59,11 @@ class AssetsTopBar extends StatelessWidget { child: Row( spacing: 4.0, children: [ - SvgPicture.asset("assets/new-ui/options_slider.svg", colorFilter: ColorFilter.mode(Theme.of(context).colorScheme.primary,BlendMode.srcIn)), - Text( + CakeImageWidget( + imageUrl: "assets/new-ui/options_slider.svg", + colorFilter: ColorFilter.mode( + Theme.of(context).colorScheme.primary, BlendMode.srcIn)), + Text( S.of(context).tokens, style: TextStyle(color: Theme.of(context).colorScheme.primary), ) diff --git a/lib/new-ui/widgets/coins_page/assets_history/history_tile.dart b/lib/new-ui/widgets/coins_page/assets_history/history_tile.dart index d27c8810c..ef4ed615a 100644 --- a/lib/new-ui/widgets/coins_page/assets_history/history_tile.dart +++ b/lib/new-ui/widgets/coins_page/assets_history/history_tile.dart @@ -1,4 +1,5 @@ import 'package:cake_wallet/new-ui/widgets/coins_page/assets_history/history_tile_base.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/transaction_direction.dart'; import 'package:flutter/material.dart'; @@ -61,7 +62,7 @@ class HistoryTile extends StatelessWidget { if (asset == CryptoCurrency.btcln) { return Stack( children: [ - SvgPicture.asset( + CakeImageWidget(imageUrl: "assets/images/lightning-icon.svg", width: 34, height: 34, @@ -73,7 +74,7 @@ class HistoryTile extends StatelessWidget { width: 16, height: 16, decoration: BoxDecoration(color: Theme.of(context).colorScheme.onInverseSurface, shape: BoxShape.circle), - child: SvgPicture.asset( + child: CakeImageWidget(imageUrl: _getDirectionIconToken(), colorFilter: ColorFilter.mode( direction == TransactionDirection.outgoing @@ -92,7 +93,7 @@ class HistoryTile extends StatelessWidget { ); } - return SvgPicture.asset(_getDirectionIcon(), + return CakeImageWidget(imageUrl:_getDirectionIcon(), colorFilter: ColorFilter.mode( direction == TransactionDirection.outgoing ? Theme.of(context).colorScheme.inverseSurface.withAlpha(175) diff --git a/lib/new-ui/widgets/coins_page/cards/balance_card.dart b/lib/new-ui/widgets/coins_page/cards/balance_card.dart index bbb993349..b39b3f481 100644 --- a/lib/new-ui/widgets/coins_page/cards/balance_card.dart +++ b/lib/new-ui/widgets/coins_page/cards/balance_card.dart @@ -1,3 +1,4 @@ +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cw_core/card_design.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -81,8 +82,8 @@ class BalanceCard extends StatelessWidget { ? ClipRSuperellipse( borderRadius: BorderRadius.circular(borderRadius), key: ValueKey(design.imagePath), - child: SvgPicture.asset( - design.imagePath, + child: CakeImageWidget( + imageUrl: design.imagePath, width: width, height: height, fit: BoxFit.fill, @@ -234,8 +235,8 @@ class BalanceCard extends StatelessWidget { switchInCurve: Curves.easeInOut, switchOutCurve: Curves.easeInOut, child: design.backgroundType == CardDesignBackgroundTypes.svgIcon - ? SvgPicture.asset( - design.imagePath, + ? CakeImageWidget( + imageUrl: design.imagePath, key: const ValueKey('svgIcon'), height: iconWidth, width: iconWidth, @@ -262,12 +263,13 @@ class BalanceCard extends StatelessWidget { child: GestureDetector( behavior: HitTestBehavior.opaque, onTap: onCustomizeTapped, - child: SizedBox( + child: Container( height: 40, width: 40, child: Center( - child: SvgPicture.asset( - "assets/new-ui/3dots_vertical.svg", + child: CakeImageWidget( + imageUrl: "assets/new-ui/3dots_vertical.svg", + alignment: Alignment.topRight, colorFilter: ColorFilter.mode(design.colors.textColorSecondary, BlendMode.srcIn), ), diff --git a/lib/new-ui/widgets/coins_page/mweb_ad.dart b/lib/new-ui/widgets/coins_page/mweb_ad.dart index 3791bd7f0..522750dcb 100644 --- a/lib/new-ui/widgets/coins_page/mweb_ad.dart +++ b/lib/new-ui/widgets/coins_page/mweb_ad.dart @@ -1,5 +1,6 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/routes.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; @@ -32,7 +33,7 @@ class MwebAd extends StatelessWidget { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - SvgPicture.asset( + CakeImageWidget(imageUrl: "assets/new-ui/settings_row_icons/mweb.svg", width: 24, height: 24, diff --git a/lib/new-ui/widgets/coins_page/top_bar_widget/chain_icon.dart b/lib/new-ui/widgets/coins_page/top_bar_widget/chain_icon.dart index 921a41e2f..d89411103 100644 --- a/lib/new-ui/widgets/coins_page/top_bar_widget/chain_icon.dart +++ b/lib/new-ui/widgets/coins_page/top_bar_widget/chain_icon.dart @@ -1,3 +1,4 @@ +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; @@ -37,9 +38,9 @@ class ChainIcon extends StatelessWidget { scale: done ? 1 : 0.8, child: AnimatedSwitcher( duration: Duration(milliseconds: 150), - child: SvgPicture.asset( + child: CakeImageWidget( + imageUrl: iconPath, key: ValueKey(progress >= 1), - iconPath, width: 36, height: 36, colorFilter: ColorFilter.mode( diff --git a/lib/new-ui/widgets/coins_page/top_bar_widget/lightning_switcher.dart b/lib/new-ui/widgets/coins_page/top_bar_widget/lightning_switcher.dart index a89149cf8..1bd189b4c 100644 --- a/lib/new-ui/widgets/coins_page/top_bar_widget/lightning_switcher.dart +++ b/lib/new-ui/widgets/coins_page/top_bar_widget/lightning_switcher.dart @@ -1,3 +1,4 @@ +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -47,9 +48,8 @@ class LightningSwitcher extends StatelessWidget { duration: Duration(milliseconds: 150), transitionBuilder: (child, animation) => FadeTransition(opacity: animation, child: child), - child: SvgPicture.asset( + child: CakeImageWidget(imageUrl:'assets/new-ui/switcher-bitcoin.svg', key: ValueKey(lightningMode), - 'assets/new-ui/switcher-bitcoin.svg', width: 32, height: 32, colorFilter: ColorFilter.mode( @@ -64,9 +64,8 @@ class LightningSwitcher extends StatelessWidget { duration: Duration(milliseconds: 150), transitionBuilder: (child, animation) => FadeTransition(opacity: animation, child: child), - child: SvgPicture.asset( + child: CakeImageWidget(imageUrl: 'assets/new-ui/switcher-lightning.svg', key: ValueKey(lightningMode), - 'assets/new-ui/switcher-lightning.svg', width: 32, height: 32, colorFilter: ColorFilter.mode( diff --git a/lib/new-ui/widgets/coins_page/top_bar_widget/sync_bar.dart b/lib/new-ui/widgets/coins_page/top_bar_widget/sync_bar.dart index 1bc3cfe9d..2c55d97fc 100644 --- a/lib/new-ui/widgets/coins_page/top_bar_widget/sync_bar.dart +++ b/lib/new-ui/widgets/coins_page/top_bar_widget/sync_bar.dart @@ -139,14 +139,14 @@ class SyncBar extends StatelessWidget { Widget? _getIcon(BuildContext context, Type status) { if (status == LostConnectionSyncStatus || status == FailedSyncStatus) { - return SvgPicture.asset( + return CakeImageWidget(imageUrl: "assets/new-ui/offline.svg", colorFilter: ColorFilter.mode(Theme.of(context).colorScheme.error, BlendMode.srcIn), ); } if (failStatuses.contains(status)) { - return SvgPicture.asset( + return CakeImageWidget(imageUrl: "assets/new-ui/warning.svg", colorFilter: ColorFilter.mode(Theme.of(context).colorScheme.error, BlendMode.srcIn), ); @@ -155,18 +155,18 @@ class SyncBar extends StatelessWidget { final List children = []; if (dashboardViewModel.isTorEnabled) { - children.add(SvgPicture.asset("assets/new-ui/tor_sync.svg", + children.add(CakeImageWidget(imageUrl:"assets/new-ui/tor_sync.svg", colorFilter: ColorFilter.mode(Color(0xFF8A38F5), BlendMode.srcIn))); } if (dashboardViewModel.hasMweb) { - children.add(SvgPicture.asset( + children.add(CakeImageWidget(imageUrl: "assets/new-ui/mweb_sync.svg", colorFilter: ColorFilter.mode(Theme.of(context).colorScheme.onSurfaceVariant, BlendMode.srcIn), )); } if (dashboardViewModel.hasSilentPayments) { - children.add(SvgPicture.asset( + children.add(CakeImageWidget(imageUrl: "assets/new-ui/silent_sync.svg", colorFilter: ColorFilter.mode(Color(0xFFEFBA5E), BlendMode.srcIn), )); diff --git a/lib/new-ui/widgets/coins_page/wallet_info.dart b/lib/new-ui/widgets/coins_page/wallet_info.dart index 0ebdf2440..21c83db44 100644 --- a/lib/new-ui/widgets/coins_page/wallet_info.dart +++ b/lib/new-ui/widgets/coins_page/wallet_info.dart @@ -1,4 +1,5 @@ import 'package:cake_wallet/new-ui/widgets/modern_button.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cw_core/wallet_info.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -45,7 +46,7 @@ class WalletInfoBar extends StatelessWidget { ? const SizedBox.shrink(key: ValueKey("empty")) : Padding( padding: const EdgeInsets.only(right: 8), - child: SvgPicture.asset( + child: CakeImageWidget(imageUrl: hardwareWalletIcon!, key: ValueKey("hardware_wallet_icon"), width: 24, diff --git a/lib/new-ui/widgets/dropdown_row.dart b/lib/new-ui/widgets/dropdown_row.dart index c555f6ab1..a75350aba 100644 --- a/lib/new-ui/widgets/dropdown_row.dart +++ b/lib/new-ui/widgets/dropdown_row.dart @@ -1,3 +1,4 @@ +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; @@ -36,7 +37,8 @@ class DropdownRow extends StatelessWidget { duration: Duration(milliseconds: 300), turns: expanded ? 0.0 : 0.5, curve: Curves.easeOut, - child: SvgPicture.asset( + child: CakeImageWidget( + imageUrl: "assets/new-ui/dropdown_arrow.svg", colorFilter: ColorFilter.mode(Theme.of(context).colorScheme.primary, BlendMode.srcIn), diff --git a/lib/new-ui/widgets/keyboard_hide_overlay.dart b/lib/new-ui/widgets/keyboard_hide_overlay.dart index 83f31f8d2..a6cbe643f 100644 --- a/lib/new-ui/widgets/keyboard_hide_overlay.dart +++ b/lib/new-ui/widgets/keyboard_hide_overlay.dart @@ -1,5 +1,6 @@ import 'dart:io'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -73,7 +74,8 @@ class _KeyboardHideButtonState extends State { ), child: Padding( padding: const EdgeInsets.all(8.0), - child: SvgPicture.asset( + child: CakeImageWidget( + imageUrl: "assets/new-ui/hide_keyboard.svg", colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.onPrimary, BlendMode.srcIn), diff --git a/lib/new-ui/widgets/long_press_menu.dart b/lib/new-ui/widgets/long_press_menu.dart index 43a0e9cca..796d0f78f 100644 --- a/lib/new-ui/widgets/long_press_menu.dart +++ b/lib/new-ui/widgets/long_press_menu.dart @@ -1,5 +1,6 @@ import 'dart:ui'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; @@ -74,7 +75,8 @@ class _LongPressMenuState extends State { mainAxisAlignment: MainAxisAlignment.start, spacing: 8, children: [ - SvgPicture.asset( + CakeImageWidget( + imageUrl: item.iconPath, height: 20, width: 20, diff --git a/lib/new-ui/widgets/modal_header.dart b/lib/new-ui/widgets/modal_header.dart index 7f1c90805..46c292cea 100644 --- a/lib/new-ui/widgets/modal_header.dart +++ b/lib/new-ui/widgets/modal_header.dart @@ -1,3 +1,4 @@ +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; @@ -22,7 +23,8 @@ class ModalHeader extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - SvgPicture.asset(iconPath, width: 36, height: 36), + CakeImageWidget( + imageUrl: iconPath, width: 36, height: 36), Text( title, style: TextStyle( diff --git a/lib/new-ui/widgets/modern_button.dart b/lib/new-ui/widgets/modern_button.dart index 988d887fd..5a0fcd8af 100644 --- a/lib/new-ui/widgets/modern_button.dart +++ b/lib/new-ui/widgets/modern_button.dart @@ -1,3 +1,4 @@ +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -41,8 +42,8 @@ class ModernButton extends StatelessWidget { final resolvedBackgroundColor = backgroundColor ?? Theme.of(context).colorScheme.surfaceContainer; final Widget resolvedIcon = svgPath != null - ? SvgPicture.asset( - svgPath!, + ? CakeImageWidget( + imageUrl: svgPath!, width: resolvedIconSize, height: resolvedIconSize, fit: BoxFit.contain, diff --git a/lib/new-ui/widgets/picker.dart b/lib/new-ui/widgets/picker.dart index 233770967..0956afa37 100644 --- a/lib/new-ui/widgets/picker.dart +++ b/lib/new-ui/widgets/picker.dart @@ -2,6 +2,7 @@ import 'dart:io'; import 'package:cake_wallet/new-ui/widgets/new_primary_button.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/src/widgets/new_list_row/new_simple_checkbox.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; @@ -216,7 +217,7 @@ class PickerSliderButton extends StatelessWidget { fontSize: 14, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w400)), - if(isSelected) SvgPicture.asset( + if(isSelected) CakeImageWidget(imageUrl: "assets/new-ui/arrow_right.svg", colorFilter: ColorFilter.mode(Theme.of(context).colorScheme.primary, BlendMode.srcIn),) @@ -229,7 +230,7 @@ class PickerSliderButton extends StatelessWidget { ], ), isSelected? NewSimpleCheckbox(value: true, onChanged: (val){}): - SvgPicture.asset( + CakeImageWidget(imageUrl: "assets/new-ui/arrow_right.svg", colorFilter: ColorFilter.mode(Theme.of(context).colorScheme.primary, BlendMode.srcIn), diff --git a/lib/new-ui/widgets/receive_page/receive_address_type.dart b/lib/new-ui/widgets/receive_page/receive_address_type.dart index 0fe737dfa..ada6fbc81 100644 --- a/lib/new-ui/widgets/receive_page/receive_address_type.dart +++ b/lib/new-ui/widgets/receive_page/receive_address_type.dart @@ -1,5 +1,6 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_address_type_selector.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/view_model/dashboard/receive_option_view_model.dart'; import 'package:cw_core/receive_page_option.dart'; import 'package:flutter/material.dart'; @@ -51,10 +52,9 @@ class ReceiveAddressTypeDisplay extends StatelessWidget { spacing: 12.0, children: [ if (iconPath != null) - SvgPicture.asset( + CakeImageWidget(imageUrl:iconPath, width: 24, height: 24, - iconPath!, colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.primary, BlendMode.srcIn, diff --git a/lib/new-ui/widgets/receive_page/receive_address_type_selector.dart b/lib/new-ui/widgets/receive_page/receive_address_type_selector.dart index 50d5f63b6..adae55ac1 100644 --- a/lib/new-ui/widgets/receive_page/receive_address_type_selector.dart +++ b/lib/new-ui/widgets/receive_page/receive_address_type_selector.dart @@ -1,5 +1,6 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/src/widgets/rounded_checkbox.dart'; import 'package:cake_wallet/src/widgets/section_divider.dart'; import 'package:cake_wallet/view_model/dashboard/receive_option_view_model.dart'; @@ -159,7 +160,7 @@ class _ReceiveAddressTypeSelectorState extends State ReceiveAddressTypeSelector.otherOptionsExpandDuration, turns: _otherOptionsExpanded ? 0.0 : 0.5, curve: Curves.easeOut, - child: SvgPicture.asset("assets/new-ui/dropdown_arrow.svg")) + child: CakeImageWidget(imageUrl:"assets/new-ui/dropdown_arrow.svg")) ], ), ), @@ -279,7 +280,7 @@ class ReceiveAddressTypeRow extends StatelessWidget { Row( children: [ if (iconPath != null) - SvgPicture.asset(iconPath!, width: iconSize, height: iconSize,colorFilter: ColorFilter.mode(Theme.of(context).colorScheme.onSurfaceVariant,BlendMode.srcIn),) + CakeImageWidget(imageUrl:iconPath!, width: iconSize, height: iconSize,colorFilter: ColorFilter.mode(Theme.of(context).colorScheme.onSurfaceVariant,BlendMode.srcIn),) else Container(width: iconSize, height: iconSize), Padding( diff --git a/lib/new-ui/widgets/receive_page/receive_amount_modal.dart b/lib/new-ui/widgets/receive_page/receive_amount_modal.dart index 3adb70522..ce2b0d35f 100644 --- a/lib/new-ui/widgets/receive_page/receive_amount_modal.dart +++ b/lib/new-ui/widgets/receive_page/receive_amount_modal.dart @@ -3,6 +3,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/new-ui/widgets/new_primary_button.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; import 'package:cake_wallet/src/screens/exchange/widgets/currency_picker.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart'; import 'package:cw_core/crypto_currency.dart'; @@ -100,7 +101,7 @@ class _ReceiveAmountModalState extends State { ), RotatedBox( quarterTurns: 2, - child: SvgPicture.asset("assets/new-ui/dropdown_arrow.svg")) + child: CakeImageWidget(imageUrl:"assets/new-ui/dropdown_arrow.svg")) ], ), ), diff --git a/lib/new-ui/widgets/receive_page/receive_info_box.dart b/lib/new-ui/widgets/receive_page/receive_info_box.dart index a8f1ef8af..f99a8f0cb 100644 --- a/lib/new-ui/widgets/receive_page/receive_info_box.dart +++ b/lib/new-ui/widgets/receive_page/receive_info_box.dart @@ -1,5 +1,6 @@ import 'package:cake_wallet/entities/auto_generate_subaddress_status.dart'; import 'package:cake_wallet/generated/i18n.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; @@ -55,7 +56,7 @@ class ReceiveInfoBox extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, spacing: 10, children: [ - SvgPicture.asset( + CakeImageWidget(imageUrl: iconPath, width: 16, height: 16, diff --git a/lib/new-ui/widgets/receive_page/receive_label_widget.dart b/lib/new-ui/widgets/receive_page/receive_label_widget.dart index f5f077f54..3ea3c71c7 100644 --- a/lib/new-ui/widgets/receive_page/receive_label_widget.dart +++ b/lib/new-ui/widgets/receive_page/receive_label_widget.dart @@ -1,3 +1,4 @@ +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -22,10 +23,9 @@ class ReceiveLabelWidget extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ ClipRect( - child: SvgPicture.asset( + child: CakeImageWidget(imageUrl:"assets/new-ui/label.svg", width: 24, height: 24, - "assets/new-ui/label.svg", colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.onSurfaceVariant, BlendMode.srcIn), )), diff --git a/lib/new-ui/widgets/receive_page/receive_large_amount_preview.dart b/lib/new-ui/widgets/receive_page/receive_large_amount_preview.dart index 3942bdf61..5e8809013 100644 --- a/lib/new-ui/widgets/receive_page/receive_large_amount_preview.dart +++ b/lib/new-ui/widgets/receive_page/receive_large_amount_preview.dart @@ -1,3 +1,4 @@ +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; @@ -29,7 +30,7 @@ class ReceiveLargeAmountPreview extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, spacing: 12, children: [ - SvgPicture.asset("assets/new-ui/send.svg", + CakeImageWidget(imageUrl:"assets/new-ui/send.svg", width: 24, height: 24, colorFilter: ColorFilter.mode( diff --git a/lib/new-ui/widgets/receive_page/receive_qr_code.dart b/lib/new-ui/widgets/receive_page/receive_qr_code.dart index 416717255..b5428421c 100644 --- a/lib/new-ui/widgets/receive_page/receive_qr_code.dart +++ b/lib/new-ui/widgets/receive_page/receive_qr_code.dart @@ -1,5 +1,6 @@ import 'package:cake_wallet/di.dart'; import 'package:cake_wallet/generated/i18n.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/themes/core/theme_store.dart'; import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart'; import 'package:cw_core/crypto_currency.dart'; @@ -35,7 +36,7 @@ class ReceiveQrCode extends StatelessWidget { AnimatedOpacity( duration: Duration(milliseconds: 300), opacity: largeQrMode ? 1 : 0, - child: SvgPicture.asset( + child: CakeImageWidget(imageUrl: isLightMode ? "assets/new-ui/cakewallet-wordmark-light.svg" : "assets/new-ui/cakewallet-wordmark.svg", @@ -98,7 +99,7 @@ class ReceiveQrCode extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, spacing: 4, children: [ - SvgPicture.asset("assets/new-ui/payjoin.svg"), + CakeImageWidget(imageUrl: "assets/new-ui/payjoin.svg"), Text(S.of(context).payjoin_enabled) ], ), diff --git a/lib/new-ui/widgets/receive_page/receive_token_display.dart b/lib/new-ui/widgets/receive_page/receive_token_display.dart index 601dbb27b..64d20d4ec 100644 --- a/lib/new-ui/widgets/receive_page/receive_token_display.dart +++ b/lib/new-ui/widgets/receive_page/receive_token_display.dart @@ -1,3 +1,4 @@ +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:flutter/material.dart'; @@ -32,7 +33,7 @@ class ReceiveTokenDisplay extends StatelessWidget { child: Row( spacing:4, children: [ - SvgPicture.asset( + CakeImageWidget(imageUrl: "assets/new-ui/chain_badges/${walletTypeToString(addressListViewModel.wallet.type).toLowerCase()}.svg", width: 16, height: 16, diff --git a/lib/new-ui/widgets/send_page/floating_icon_button.dart b/lib/new-ui/widgets/send_page/floating_icon_button.dart index 84cd3dfc6..5b6e2c9e9 100644 --- a/lib/new-ui/widgets/send_page/floating_icon_button.dart +++ b/lib/new-ui/widgets/send_page/floating_icon_button.dart @@ -1,3 +1,4 @@ +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; @@ -17,9 +18,8 @@ class FloatingIconButton extends StatelessWidget { onTap: onPressed, child: Padding( padding: const EdgeInsets.all(4.0), - child: SvgPicture.asset( + child: CakeImageWidget(imageUrl:iconPath, width: 22, height: 22, - iconPath, colorFilter: ColorFilter.mode(Theme .of(context) .colorScheme diff --git a/lib/new-ui/widgets/send_page/l2_action_wallet_selector.dart b/lib/new-ui/widgets/send_page/l2_action_wallet_selector.dart index f21039d39..40686a055 100644 --- a/lib/new-ui/widgets/send_page/l2_action_wallet_selector.dart +++ b/lib/new-ui/widgets/send_page/l2_action_wallet_selector.dart @@ -7,6 +7,7 @@ import 'package:cake_wallet/new-ui/widgets/new_primary_button.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; import 'package:cake_wallet/new-ui/widgets/send_page/l2_send_external_modal.dart'; import 'package:cake_wallet/new-ui/widgets/send_page/send_address_input.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/src/widgets/new_list_row/new_simple_checkbox.dart'; import 'package:cake_wallet/view_model/contact_list/contact_list_view_model.dart'; import 'package:cake_wallet/view_model/send/send_view_model.dart'; @@ -251,7 +252,7 @@ class _L2ActionWalletSelectorState extends State { mainAxisAlignment: MainAxisAlignment.center, spacing: 10, children: [ - SvgPicture.asset( + CakeImageWidget(imageUrl: "assets/new-ui/send_from_external.svg", colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.primary, BlendMode.srcIn), diff --git a/lib/new-ui/widgets/send_page/l2_send_external_modal.dart b/lib/new-ui/widgets/send_page/l2_send_external_modal.dart index de0fb6d4d..4ba56fb34 100644 --- a/lib/new-ui/widgets/send_page/l2_send_external_modal.dart +++ b/lib/new-ui/widgets/send_page/l2_send_external_modal.dart @@ -3,6 +3,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/new-ui/widgets/new_primary_button.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; import 'package:cake_wallet/src/screens/receive/widgets/qr_image.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/utils/address_formatter.dart'; import 'package:cake_wallet/view_model/send/send_view_model.dart'; import 'package:cw_core/payment_uris.dart'; @@ -65,7 +66,7 @@ class _L2SendExternalModalState extends State { spacing: 12, children: [ if(widget.sendViewModel.walletType == WalletType.bitcoin) - SvgPicture.asset("assets/new-ui/lightning_deposit_help.svg", height: 36), + CakeImageWidget(imageUrl:"assets/new-ui/lightning_deposit_help.svg", height: 36), Text( S.of(context).bitcoin_lightning_deposit, style: TextStyle(fontWeight: FontWeight.w500, fontSize: 20), diff --git a/lib/new-ui/widgets/send_page/send_amount_input.dart b/lib/new-ui/widgets/send_page/send_amount_input.dart index dd06dca75..d711622c5 100644 --- a/lib/new-ui/widgets/send_page/send_amount_input.dart +++ b/lib/new-ui/widgets/send_page/send_amount_input.dart @@ -1,4 +1,5 @@ import 'package:cake_wallet/new-ui/widgets/send_page/floating_icon_button.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; @@ -111,7 +112,7 @@ class _NewSendAmountInputState extends State { Image.asset(widget.currencyIconPath, width: 24, height: 24), Text(widget.currency), if (widget.hasPicker) - SvgPicture.asset( + CakeImageWidget(imageUrl: "assets/new-ui/chooser.svg", width: 12, height: 12, diff --git a/lib/new-ui/widgets/send_page/send_confirm_bottom_widget.dart b/lib/new-ui/widgets/send_page/send_confirm_bottom_widget.dart index ab04cd192..68f8c6889 100644 --- a/lib/new-ui/widgets/send_page/send_confirm_bottom_widget.dart +++ b/lib/new-ui/widgets/send_page/send_confirm_bottom_widget.dart @@ -2,6 +2,7 @@ import 'package:cake_wallet/core/execution_state.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/new-ui/widgets/confirm_swiper.dart'; import 'package:cake_wallet/new-ui/widgets/new_primary_button.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/view_model/send/send_view_model.dart'; import 'package:cake_wallet/view_model/send/send_view_model_state.dart'; import 'package:cw_core/wallet_info.dart'; @@ -9,6 +10,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:flutter_svg/svg.dart'; +import 'package:vector_graphics/vector_graphics.dart'; class SendConfirmBottomWidget extends StatelessWidget { const SendConfirmBottomWidget({super.key, required this.sendViewModel}); @@ -120,7 +122,7 @@ class TransactionErrorActions extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, spacing: 8, children: [ - SvgPicture.asset( + CakeImageWidget(imageUrl: "assets/new-ui/warning.svg", height: 24, width: 24, @@ -191,7 +193,7 @@ class HardwareWalletConfirmationMessage extends StatelessWidget { padding: const EdgeInsets.all(12.0), child: Column(spacing: 8, children: [ if (hardwareWalletIcon != null) - SvgPicture.asset( + CakeImageWidget(imageUrl: hardwareWalletIcon!, width: 36, height: 36, diff --git a/lib/new-ui/widgets/send_page/send_confirm_sheet.dart b/lib/new-ui/widgets/send_page/send_confirm_sheet.dart index 7f801e6cd..8516605c7 100644 --- a/lib/new-ui/widgets/send_page/send_confirm_sheet.dart +++ b/lib/new-ui/widgets/send_page/send_confirm_sheet.dart @@ -6,6 +6,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/new-ui/widgets/animated_dropdown.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; import 'package:cake_wallet/new-ui/widgets/send_page/send_confirm_bottom_widget.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/utils/address_formatter.dart'; import 'package:cake_wallet/view_model/send/send_view_model.dart'; import 'package:cake_wallet/view_model/send/send_view_model_state.dart'; @@ -118,7 +119,7 @@ class SendTransactionDetails extends StatelessWidget { spacing: 8, children: [ if (resolvedIconPath.toLowerCase().endsWith(".svg")) - SvgPicture.asset( + CakeImageWidget(imageUrl: resolvedIconPath, width: 28, height: 28, diff --git a/lib/new-ui/widgets/swap_page/refund_address_modal.dart b/lib/new-ui/widgets/swap_page/refund_address_modal.dart index 3de5ccb8d..ebee7ee64 100644 --- a/lib/new-ui/widgets/swap_page/refund_address_modal.dart +++ b/lib/new-ui/widgets/swap_page/refund_address_modal.dart @@ -2,6 +2,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/new-ui/widgets/new_primary_button.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; import 'package:cake_wallet/new-ui/widgets/send_page/send_address_input.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -51,8 +52,8 @@ class _RefundAddressModalState extends State { child: Column( spacing: 24, children: [ - SvgPicture.asset( - "assets/new-ui/refund_address.svg", + CakeImageWidget( + imageUrl:"assets/new-ui/refund_address.svg.vec", colorFilter: ColorFilter.mode(Theme.of(context).colorScheme.primary, BlendMode.srcIn), ), diff --git a/lib/new-ui/widgets/swap_page/swap_address_selection_modal.dart b/lib/new-ui/widgets/swap_page/swap_address_selection_modal.dart index e5eb77423..8b2e928c1 100644 --- a/lib/new-ui/widgets/swap_page/swap_address_selection_modal.dart +++ b/lib/new-ui/widgets/swap_page/swap_address_selection_modal.dart @@ -1,6 +1,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; import 'package:cake_wallet/new-ui/widgets/send_page/send_address_input.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/src/widgets/new_list_row/new_simple_checkbox.dart'; import 'package:cake_wallet/view_model/exchange/exchange_view_model.dart'; import 'package:cw_core/currency_for_wallet_type.dart'; @@ -152,7 +153,7 @@ class _SwapAddressSelectionModalState extends State { mainAxisAlignment: MainAxisAlignment.center, spacing: 10, children: [ - SvgPicture.asset("assets/new-ui/send_from_external.svg", + CakeImageWidget(imageUrl:"assets/new-ui/send_from_external.svg", colorFilter: ColorFilter.mode( Theme.of(context).colorScheme.primary, BlendMode.srcIn)), Text(S.of(context).send_from_external, @@ -271,7 +272,7 @@ class _SwapAddressSelectionModalRowState extends State { builder: (context, value, child) { return Container( height: NewMainNavBar.barHeight, - child: SvgPicture.asset( + child: CakeImageWidget(imageUrl: visibleActions[i].image, width: iconWidth, height: iconHeight, diff --git a/lib/src/screens/nodes/node_create_or_edit_page.dart b/lib/src/screens/nodes/node_create_or_edit_page.dart index 8b0397c45..bc407531a 100644 --- a/lib/src/screens/nodes/node_create_or_edit_page.dart +++ b/lib/src/screens/nodes/node_create_or_edit_page.dart @@ -5,6 +5,7 @@ import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; import 'package:cake_wallet/src/screens/nodes/widgets/node_form.dart'; import 'package:cake_wallet/src/widgets/alert_with_one_action.dart'; import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/src/widgets/primary_button.dart'; import 'package:cake_wallet/src/widgets/scrollable_with_bottom_section.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; @@ -89,7 +90,7 @@ class _NodeCreateOrEditPageState extends State { title: widget.editingNode != null ? S.current.edit_node : S.current.node_new, leadingIcon: Icon(Icons.arrow_back_ios_new), onLeadingPressed: Navigator.of(context).pop, - trailingIcon: SvgPicture.asset( + trailingIcon: CakeImageWidget(imageUrl: "assets/new-ui/scan.svg",width:24,height:24, colorFilter: ColorFilter.mode(Theme.of(context).colorScheme.primary, BlendMode.srcIn), ), diff --git a/lib/src/screens/receive/widgets/qr_image.dart b/lib/src/screens/receive/widgets/qr_image.dart index 32dec6aae..250f70724 100644 --- a/lib/src/screens/receive/widgets/qr_image.dart +++ b/lib/src/screens/receive/widgets/qr_image.dart @@ -1,3 +1,5 @@ +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; +import 'package:cw_core/utils/print_verbose.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:qr_flutter/qr_flutter.dart' as qr; @@ -42,7 +44,7 @@ class QrImage extends StatelessWidget { backgroundColor: backgroundColor, padding: const EdgeInsets.all(12.0), ), - SvgPicture.asset( + CakeImageWidget(imageUrl: imagePath, width: logoSize * 0.8, height: logoSize * 0.8, diff --git a/lib/src/widgets/cake_image_widget.dart b/lib/src/widgets/cake_image_widget.dart index 27c56e60e..8df0a7bc6 100644 --- a/lib/src/widgets/cake_image_widget.dart +++ b/lib/src/widgets/cake_image_widget.dart @@ -1,5 +1,8 @@ +import 'package:cw_core/utils/print_verbose.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import 'package:vector_graphics/vector_graphics.dart'; class CakeImageWidget extends StatelessWidget { const CakeImageWidget({ @@ -11,8 +14,8 @@ class CakeImageWidget extends StatelessWidget { this.loadingWidget, this.errorWidget, this.color, - this.borderRadius = 24.0, this.colorFilter, + this.borderRadius = 24.0, this.alignment, this.allowDrawingOutsideViewBox, }); final String? imageUrl; @@ -22,8 +25,10 @@ class CakeImageWidget extends StatelessWidget { final Widget? loadingWidget; final Widget? errorWidget; final Color? color; - final double borderRadius; final ColorFilter? colorFilter; + final AlignmentGeometry? alignment; + final bool? allowDrawingOutsideViewBox; + final double borderRadius; @override Widget build(BuildContext context) { @@ -38,21 +43,36 @@ class CakeImageWidget extends StatelessWidget { Widget imageWidget; if (isAsset) { - imageWidget = isSvg - ? SvgPicture.asset( - imageUrl!, - height: height, - width: width, - colorFilter: effectiveColorFilter, - fit: fit ?? BoxFit.contain, - ) - : Image.asset( - imageUrl!, - height: height, - width: width, - fit: fit, - color: color, - ); + if (isSvg) { + imageWidget = SvgPicture(AssetBytesLoader("${imageUrl}.vec"), + height: height, + width: width, + alignment: alignment ?? Alignment.center, + allowDrawingOutsideViewBox: allowDrawingOutsideViewBox ?? false, + colorFilter: + effectiveColorFilter, + fit: fit ?? BoxFit.contain, errorBuilder: (context, e, trace) { + return SvgPicture.asset( + imageUrl!, + height: height, + alignment: alignment ?? Alignment.center, + allowDrawingOutsideViewBox: allowDrawingOutsideViewBox ?? false, + width: width, + errorBuilder: (_, __, ___) => SizedBox(height: height, width: width), + colorFilter: + effectiveColorFilter, + fit: fit ?? BoxFit.contain, + ); + }); + } else { + imageWidget = Image.asset( + imageUrl!, + height: height, + width: width, + fit: fit, + color: color, + ); + } } else { imageWidget = isSvg ? SvgPicture.network( @@ -60,6 +80,8 @@ class CakeImageWidget extends StatelessWidget { height: height, width: width, colorFilter: effectiveColorFilter, + alignment: alignment ?? Alignment.center, + allowDrawingOutsideViewBox: allowDrawingOutsideViewBox ?? false, fit: fit ?? BoxFit.contain, placeholderBuilder: (_) { return loadingWidget ?? const Center(child: CircularProgressIndicator()); diff --git a/lib/src/widgets/new_list_row/list_item_checkbox_widget.dart b/lib/src/widgets/new_list_row/list_item_checkbox_widget.dart index 6853d69f7..0d2422182 100644 --- a/lib/src/widgets/new_list_row/list_item_checkbox_widget.dart +++ b/lib/src/widgets/new_list_row/list_item_checkbox_widget.dart @@ -1,3 +1,4 @@ +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/src/widgets/new_list_row/list_Item_style_wrapper.dart'; import 'package:cake_wallet/src/widgets/new_list_row/new_simple_checkbox.dart'; import 'package:flutter/material.dart'; @@ -52,7 +53,7 @@ class _ListItemCheckboxWidgetState extends State { children: [ if (widget.iconPath != null) widget.iconPath!.toLowerCase().endsWith("svg") - ? SvgPicture.asset(widget.iconPath!, height: 24, width: 24) + ? CakeImageWidget(imageUrl:widget.iconPath!, height: 24, width: 24) : Image.asset( widget.iconPath!, width: 24, diff --git a/lib/src/widgets/new_list_row/list_item_regular_row_widget.dart b/lib/src/widgets/new_list_row/list_item_regular_row_widget.dart index 3bded57f3..36e509229 100644 --- a/lib/src/widgets/new_list_row/list_item_regular_row_widget.dart +++ b/lib/src/widgets/new_list_row/list_item_regular_row_widget.dart @@ -1,3 +1,4 @@ +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/src/widgets/new_list_row/list_Item_style_wrapper.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; @@ -59,17 +60,7 @@ class ListItemRegularRowWidget extends StatelessWidget { if(iconPath != null) Padding( padding: const EdgeInsets.only(right: 12.0), - child: iconPath!.split(".").last.toLowerCase() == "svg" - ? SvgPicture.asset( - iconPath!, - width: 24, - height: 24, - ) - : Image.asset( - iconPath!, - width: 24, - height: 24, - ), + child: CakeImageWidget(imageUrl: iconPath!, width: 24,height: 24,) ), Flexible( child: Column( @@ -100,14 +91,14 @@ class ListItemRegularRowWidget extends StatelessWidget { ), ), if(trailingIconPath != null) - SvgPicture.asset( + CakeImageWidget(imageUrl: trailingIconPath!, height: trailingIconSize ?? 18, width:trailingIconSize ?? 18, colorFilter: ColorFilter.mode(foregroundColor ?? Theme.of(context).colorScheme.onSurfaceVariant,BlendMode.srcIn), ) else if(showArrow) - SvgPicture.asset( + CakeImageWidget(imageUrl: "assets/new-ui/arrow_forward.svg", height: 14, color: theme.colorScheme.onSurfaceVariant diff --git a/lib/src/widgets/new_list_row/list_item_selector_widget.dart b/lib/src/widgets/new_list_row/list_item_selector_widget.dart index 3a4a28526..b3e0790cf 100644 --- a/lib/src/widgets/new_list_row/list_item_selector_widget.dart +++ b/lib/src/widgets/new_list_row/list_item_selector_widget.dart @@ -1,3 +1,4 @@ +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/src/widgets/new_list_row/list_Item_style_wrapper.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; @@ -41,7 +42,7 @@ class ListItemSelectorWidget extends StatelessWidget { options[selectedIndex], style: labelStyle, ), - SvgPicture.asset( + CakeImageWidget(imageUrl: "assets/new-ui/chooser.svg", colorFilter: ColorFilter.mode(theme.colorScheme.onSurfaceVariant, BlendMode.srcIn), diff --git a/assets/new-ui/3dots.svg b/res/pictures/3dots.svg similarity index 100% rename from assets/new-ui/3dots.svg rename to res/pictures/3dots.svg diff --git a/assets/new-ui/3dots_vertical.svg b/res/pictures/3dots_vertical.svg similarity index 100% rename from assets/new-ui/3dots_vertical.svg rename to res/pictures/3dots_vertical.svg diff --git a/assets/new-ui/Contacts.svg b/res/pictures/Contacts.svg similarity index 100% rename from assets/new-ui/Contacts.svg rename to res/pictures/Contacts.svg diff --git a/assets/new-ui/account.svg b/res/pictures/account.svg similarity index 100% rename from assets/new-ui/account.svg rename to res/pictures/account.svg diff --git a/assets/new-ui/add-label.svg b/res/pictures/add-label.svg similarity index 100% rename from assets/new-ui/add-label.svg rename to res/pictures/add-label.svg diff --git a/assets/new-ui/addr-book.svg b/res/pictures/addr-book.svg similarity index 100% rename from assets/new-ui/addr-book.svg rename to res/pictures/addr-book.svg diff --git a/assets/new-ui/address-type-picker-icons/btc_lightning.svg b/res/pictures/address-type-picker-icons/btc_lightning.svg similarity index 100% rename from assets/new-ui/address-type-picker-icons/btc_lightning.svg rename to res/pictures/address-type-picker-icons/btc_lightning.svg diff --git a/assets/new-ui/address-type-picker-icons/btc_standard.svg b/res/pictures/address-type-picker-icons/btc_standard.svg similarity index 100% rename from assets/new-ui/address-type-picker-icons/btc_standard.svg rename to res/pictures/address-type-picker-icons/btc_standard.svg diff --git a/assets/new-ui/address-type-picker-icons/legacy.svg b/res/pictures/address-type-picker-icons/legacy.svg similarity index 100% rename from assets/new-ui/address-type-picker-icons/legacy.svg rename to res/pictures/address-type-picker-icons/legacy.svg diff --git a/assets/new-ui/address-type-picker-icons/litecoin.svg b/res/pictures/address-type-picker-icons/litecoin.svg similarity index 100% rename from assets/new-ui/address-type-picker-icons/litecoin.svg rename to res/pictures/address-type-picker-icons/litecoin.svg diff --git a/assets/new-ui/address-type-picker-icons/mweb.svg b/res/pictures/address-type-picker-icons/mweb.svg similarity index 100% rename from assets/new-ui/address-type-picker-icons/mweb.svg rename to res/pictures/address-type-picker-icons/mweb.svg diff --git a/assets/new-ui/address-type-picker-icons/payjoin.svg b/res/pictures/address-type-picker-icons/payjoin.svg similarity index 100% rename from assets/new-ui/address-type-picker-icons/payjoin.svg rename to res/pictures/address-type-picker-icons/payjoin.svg diff --git a/assets/new-ui/address-type-picker-icons/segwit.svg b/res/pictures/address-type-picker-icons/segwit.svg similarity index 100% rename from assets/new-ui/address-type-picker-icons/segwit.svg rename to res/pictures/address-type-picker-icons/segwit.svg diff --git a/assets/new-ui/address-type-picker-icons/silent.svg b/res/pictures/address-type-picker-icons/silent.svg similarity index 100% rename from assets/new-ui/address-type-picker-icons/silent.svg rename to res/pictures/address-type-picker-icons/silent.svg diff --git a/assets/new-ui/address-type-picker-icons/taproot.svg b/res/pictures/address-type-picker-icons/taproot.svg similarity index 100% rename from assets/new-ui/address-type-picker-icons/taproot.svg rename to res/pictures/address-type-picker-icons/taproot.svg diff --git a/assets/new-ui/address-type-picker-icons/zec/public.svg b/res/pictures/address-type-picker-icons/zec/public.svg similarity index 100% rename from assets/new-ui/address-type-picker-icons/zec/public.svg rename to res/pictures/address-type-picker-icons/zec/public.svg diff --git a/assets/new-ui/address-type-picker-icons/zec/sapling.svg b/res/pictures/address-type-picker-icons/zec/sapling.svg similarity index 100% rename from assets/new-ui/address-type-picker-icons/zec/sapling.svg rename to res/pictures/address-type-picker-icons/zec/sapling.svg diff --git a/assets/new-ui/address-type-picker-icons/zec/shielded.svg b/res/pictures/address-type-picker-icons/zec/shielded.svg similarity index 100% rename from assets/new-ui/address-type-picker-icons/zec/shielded.svg rename to res/pictures/address-type-picker-icons/zec/shielded.svg diff --git a/assets/new-ui/address-type-picker-icons/zec/transparent.svg b/res/pictures/address-type-picker-icons/zec/transparent.svg similarity index 100% rename from assets/new-ui/address-type-picker-icons/zec/transparent.svg rename to res/pictures/address-type-picker-icons/zec/transparent.svg diff --git a/assets/new-ui/address-type-picker-icons/zec/unified.svg b/res/pictures/address-type-picker-icons/zec/unified.svg similarity index 100% rename from assets/new-ui/address-type-picker-icons/zec/unified.svg rename to res/pictures/address-type-picker-icons/zec/unified.svg diff --git a/assets/new-ui/address_hide.svg b/res/pictures/address_hide.svg similarity index 100% rename from assets/new-ui/address_hide.svg rename to res/pictures/address_hide.svg diff --git a/assets/new-ui/address_set_label.svg b/res/pictures/address_set_label.svg similarity index 100% rename from assets/new-ui/address_set_label.svg rename to res/pictures/address_set_label.svg diff --git a/assets/new-ui/app_settings.svg b/res/pictures/app_settings.svg similarity index 100% rename from assets/new-ui/app_settings.svg rename to res/pictures/app_settings.svg diff --git a/assets/new-ui/arrow_forward.svg b/res/pictures/arrow_forward.svg similarity index 100% rename from assets/new-ui/arrow_forward.svg rename to res/pictures/arrow_forward.svg diff --git a/assets/new-ui/arrow_right.svg b/res/pictures/arrow_right.svg similarity index 100% rename from assets/new-ui/arrow_right.svg rename to res/pictures/arrow_right.svg diff --git a/assets/new-ui/balance_card_backgrounds/arbitrum.svg b/res/pictures/balance_card_backgrounds/arbitrum.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/arbitrum.svg rename to res/pictures/balance_card_backgrounds/arbitrum.svg diff --git a/assets/new-ui/balance_card_backgrounds/base.svg b/res/pictures/balance_card_backgrounds/base.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/base.svg rename to res/pictures/balance_card_backgrounds/base.svg diff --git a/assets/new-ui/balance_card_backgrounds/bitcoin-cash.svg b/res/pictures/balance_card_backgrounds/bitcoin-cash.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/bitcoin-cash.svg rename to res/pictures/balance_card_backgrounds/bitcoin-cash.svg diff --git a/assets/new-ui/balance_card_backgrounds/bitcoin.svg b/res/pictures/balance_card_backgrounds/bitcoin.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/bitcoin.svg rename to res/pictures/balance_card_backgrounds/bitcoin.svg diff --git a/assets/new-ui/balance_card_backgrounds/bnb.svg b/res/pictures/balance_card_backgrounds/bnb.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/bnb.svg rename to res/pictures/balance_card_backgrounds/bnb.svg diff --git a/assets/new-ui/balance_card_backgrounds/decred.svg b/res/pictures/balance_card_backgrounds/decred.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/decred.svg rename to res/pictures/balance_card_backgrounds/decred.svg diff --git a/assets/new-ui/balance_card_backgrounds/dogecoin.svg b/res/pictures/balance_card_backgrounds/dogecoin.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/dogecoin.svg rename to res/pictures/balance_card_backgrounds/dogecoin.svg diff --git a/assets/new-ui/balance_card_backgrounds/ethereum.svg b/res/pictures/balance_card_backgrounds/ethereum.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/ethereum.svg rename to res/pictures/balance_card_backgrounds/ethereum.svg diff --git a/assets/new-ui/balance_card_backgrounds/lightning.svg b/res/pictures/balance_card_backgrounds/lightning.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/lightning.svg rename to res/pictures/balance_card_backgrounds/lightning.svg diff --git a/assets/new-ui/balance_card_backgrounds/litecoin.svg b/res/pictures/balance_card_backgrounds/litecoin.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/litecoin.svg rename to res/pictures/balance_card_backgrounds/litecoin.svg diff --git a/assets/new-ui/balance_card_backgrounds/monero.svg b/res/pictures/balance_card_backgrounds/monero.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/monero.svg rename to res/pictures/balance_card_backgrounds/monero.svg diff --git a/assets/new-ui/balance_card_backgrounds/nano.svg b/res/pictures/balance_card_backgrounds/nano.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/nano.svg rename to res/pictures/balance_card_backgrounds/nano.svg diff --git a/assets/new-ui/balance_card_backgrounds/polygon.svg b/res/pictures/balance_card_backgrounds/polygon.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/polygon.svg rename to res/pictures/balance_card_backgrounds/polygon.svg diff --git a/assets/new-ui/balance_card_backgrounds/solana.svg b/res/pictures/balance_card_backgrounds/solana.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/solana.svg rename to res/pictures/balance_card_backgrounds/solana.svg diff --git a/assets/new-ui/balance_card_backgrounds/tron.svg b/res/pictures/balance_card_backgrounds/tron.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/tron.svg rename to res/pictures/balance_card_backgrounds/tron.svg diff --git a/assets/new-ui/balance_card_backgrounds/wownero.svg b/res/pictures/balance_card_backgrounds/wownero.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/wownero.svg rename to res/pictures/balance_card_backgrounds/wownero.svg diff --git a/assets/new-ui/balance_card_backgrounds/zano.svg b/res/pictures/balance_card_backgrounds/zano.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/zano.svg rename to res/pictures/balance_card_backgrounds/zano.svg diff --git a/assets/new-ui/balance_card_backgrounds/zcash.svg b/res/pictures/balance_card_backgrounds/zcash.svg similarity index 100% rename from assets/new-ui/balance_card_backgrounds/zcash.svg rename to res/pictures/balance_card_backgrounds/zcash.svg diff --git a/assets/new-ui/balance_card_icons/arbitrum.svg b/res/pictures/balance_card_icons/arbitrum.svg similarity index 100% rename from assets/new-ui/balance_card_icons/arbitrum.svg rename to res/pictures/balance_card_icons/arbitrum.svg diff --git a/assets/new-ui/balance_card_icons/base.svg b/res/pictures/balance_card_icons/base.svg similarity index 100% rename from assets/new-ui/balance_card_icons/base.svg rename to res/pictures/balance_card_icons/base.svg diff --git a/assets/new-ui/balance_card_icons/bitcoin.svg b/res/pictures/balance_card_icons/bitcoin.svg similarity index 100% rename from assets/new-ui/balance_card_icons/bitcoin.svg rename to res/pictures/balance_card_icons/bitcoin.svg diff --git a/assets/new-ui/balance_card_icons/bitcoin_cash.svg b/res/pictures/balance_card_icons/bitcoin_cash.svg similarity index 100% rename from assets/new-ui/balance_card_icons/bitcoin_cash.svg rename to res/pictures/balance_card_icons/bitcoin_cash.svg diff --git a/assets/new-ui/balance_card_icons/bnb.svg b/res/pictures/balance_card_icons/bnb.svg similarity index 100% rename from assets/new-ui/balance_card_icons/bnb.svg rename to res/pictures/balance_card_icons/bnb.svg diff --git a/assets/new-ui/balance_card_icons/decred.svg b/res/pictures/balance_card_icons/decred.svg similarity index 100% rename from assets/new-ui/balance_card_icons/decred.svg rename to res/pictures/balance_card_icons/decred.svg diff --git a/assets/new-ui/balance_card_icons/dogecoin.svg b/res/pictures/balance_card_icons/dogecoin.svg similarity index 100% rename from assets/new-ui/balance_card_icons/dogecoin.svg rename to res/pictures/balance_card_icons/dogecoin.svg diff --git a/assets/new-ui/balance_card_icons/ethereum.svg b/res/pictures/balance_card_icons/ethereum.svg similarity index 100% rename from assets/new-ui/balance_card_icons/ethereum.svg rename to res/pictures/balance_card_icons/ethereum.svg diff --git a/assets/new-ui/balance_card_icons/lightning.svg b/res/pictures/balance_card_icons/lightning.svg similarity index 100% rename from assets/new-ui/balance_card_icons/lightning.svg rename to res/pictures/balance_card_icons/lightning.svg diff --git a/assets/new-ui/balance_card_icons/litecoin.svg b/res/pictures/balance_card_icons/litecoin.svg similarity index 100% rename from assets/new-ui/balance_card_icons/litecoin.svg rename to res/pictures/balance_card_icons/litecoin.svg diff --git a/assets/new-ui/balance_card_icons/monero.svg b/res/pictures/balance_card_icons/monero.svg similarity index 100% rename from assets/new-ui/balance_card_icons/monero.svg rename to res/pictures/balance_card_icons/monero.svg diff --git a/assets/new-ui/balance_card_icons/nano.svg b/res/pictures/balance_card_icons/nano.svg similarity index 100% rename from assets/new-ui/balance_card_icons/nano.svg rename to res/pictures/balance_card_icons/nano.svg diff --git a/assets/new-ui/balance_card_icons/polygon.svg b/res/pictures/balance_card_icons/polygon.svg similarity index 100% rename from assets/new-ui/balance_card_icons/polygon.svg rename to res/pictures/balance_card_icons/polygon.svg diff --git a/assets/new-ui/balance_card_icons/solana.svg b/res/pictures/balance_card_icons/solana.svg similarity index 100% rename from assets/new-ui/balance_card_icons/solana.svg rename to res/pictures/balance_card_icons/solana.svg diff --git a/assets/new-ui/balance_card_icons/tron.svg b/res/pictures/balance_card_icons/tron.svg similarity index 100% rename from assets/new-ui/balance_card_icons/tron.svg rename to res/pictures/balance_card_icons/tron.svg diff --git a/assets/new-ui/balance_card_icons/wownero.svg b/res/pictures/balance_card_icons/wownero.svg similarity index 100% rename from assets/new-ui/balance_card_icons/wownero.svg rename to res/pictures/balance_card_icons/wownero.svg diff --git a/assets/new-ui/balance_card_icons/zano.svg b/res/pictures/balance_card_icons/zano.svg similarity index 100% rename from assets/new-ui/balance_card_icons/zano.svg rename to res/pictures/balance_card_icons/zano.svg diff --git a/assets/new-ui/balance_card_icons/zcash.svg b/res/pictures/balance_card_icons/zcash.svg similarity index 100% rename from assets/new-ui/balance_card_icons/zcash.svg rename to res/pictures/balance_card_icons/zcash.svg diff --git a/assets/new-ui/bitcoin.svg b/res/pictures/bitcoin.svg similarity index 100% rename from assets/new-ui/bitcoin.svg rename to res/pictures/bitcoin.svg diff --git a/assets/new-ui/blank.svg b/res/pictures/blank.svg similarity index 100% rename from assets/new-ui/blank.svg rename to res/pictures/blank.svg diff --git a/assets/new-ui/by-cakelabs.svg b/res/pictures/by-cakelabs.svg similarity index 100% rename from assets/new-ui/by-cakelabs.svg rename to res/pictures/by-cakelabs.svg diff --git a/assets/new-ui/cake_squircle_icon.svg b/res/pictures/cake_squircle_icon.svg similarity index 100% rename from assets/new-ui/cake_squircle_icon.svg rename to res/pictures/cake_squircle_icon.svg diff --git a/assets/new-ui/cakelabs-icon.svg b/res/pictures/cakelabs-icon.svg similarity index 100% rename from assets/new-ui/cakelabs-icon.svg rename to res/pictures/cakelabs-icon.svg diff --git a/assets/new-ui/cakewallet-wordmark-light.svg b/res/pictures/cakewallet-wordmark-light.svg similarity index 100% rename from assets/new-ui/cakewallet-wordmark-light.svg rename to res/pictures/cakewallet-wordmark-light.svg diff --git a/assets/new-ui/cakewallet-wordmark.svg b/res/pictures/cakewallet-wordmark.svg similarity index 100% rename from assets/new-ui/cakewallet-wordmark.svg rename to res/pictures/cakewallet-wordmark.svg diff --git a/assets/new-ui/chain_badges/arbitrum.svg b/res/pictures/chain_badges/arbitrum.svg similarity index 100% rename from assets/new-ui/chain_badges/arbitrum.svg rename to res/pictures/chain_badges/arbitrum.svg diff --git a/assets/new-ui/chain_badges/base.svg b/res/pictures/chain_badges/base.svg similarity index 100% rename from assets/new-ui/chain_badges/base.svg rename to res/pictures/chain_badges/base.svg diff --git a/assets/new-ui/chain_badges/bnb smart chain.svg b/res/pictures/chain_badges/bnb smart chain.svg similarity index 100% rename from assets/new-ui/chain_badges/bnb smart chain.svg rename to res/pictures/chain_badges/bnb smart chain.svg diff --git a/assets/new-ui/chain_badges/ethereum.svg b/res/pictures/chain_badges/ethereum.svg similarity index 100% rename from assets/new-ui/chain_badges/ethereum.svg rename to res/pictures/chain_badges/ethereum.svg diff --git a/assets/new-ui/chain_badges/lightning.svg b/res/pictures/chain_badges/lightning.svg similarity index 100% rename from assets/new-ui/chain_badges/lightning.svg rename to res/pictures/chain_badges/lightning.svg diff --git a/assets/new-ui/chain_badges/mweb.svg b/res/pictures/chain_badges/mweb.svg similarity index 100% rename from assets/new-ui/chain_badges/mweb.svg rename to res/pictures/chain_badges/mweb.svg diff --git a/assets/new-ui/chain_badges/polygon.svg b/res/pictures/chain_badges/polygon.svg similarity index 100% rename from assets/new-ui/chain_badges/polygon.svg rename to res/pictures/chain_badges/polygon.svg diff --git a/assets/new-ui/chain_badges/solana.svg b/res/pictures/chain_badges/solana.svg similarity index 100% rename from assets/new-ui/chain_badges/solana.svg rename to res/pictures/chain_badges/solana.svg diff --git a/assets/new-ui/chain_badges/tron.svg b/res/pictures/chain_badges/tron.svg similarity index 100% rename from assets/new-ui/chain_badges/tron.svg rename to res/pictures/chain_badges/tron.svg diff --git a/assets/new-ui/chain_badges/zano.svg b/res/pictures/chain_badges/zano.svg similarity index 100% rename from assets/new-ui/chain_badges/zano.svg rename to res/pictures/chain_badges/zano.svg diff --git a/assets/new-ui/checkmark.svg b/res/pictures/checkmark.svg similarity index 100% rename from assets/new-ui/checkmark.svg rename to res/pictures/checkmark.svg diff --git a/assets/new-ui/chooser.svg b/res/pictures/chooser.svg similarity index 100% rename from assets/new-ui/chooser.svg rename to res/pictures/chooser.svg diff --git a/assets/new-ui/contacts_outlined.svg b/res/pictures/contacts_outlined.svg similarity index 100% rename from assets/new-ui/contacts_outlined.svg rename to res/pictures/contacts_outlined.svg diff --git a/assets/new-ui/copy-icon.svg b/res/pictures/copy-icon.svg similarity index 100% rename from assets/new-ui/copy-icon.svg rename to res/pictures/copy-icon.svg diff --git a/assets/new-ui/copy.svg b/res/pictures/copy.svg similarity index 100% rename from assets/new-ui/copy.svg rename to res/pictures/copy.svg diff --git a/assets/new-ui/crypto-minimal-icons/Monero.svg b/res/pictures/crypto-minimal-icons/Monero.svg similarity index 100% rename from assets/new-ui/crypto-minimal-icons/Monero.svg rename to res/pictures/crypto-minimal-icons/Monero.svg diff --git a/assets/new-ui/dropdown_arrow.svg b/res/pictures/dropdown_arrow.svg similarity index 100% rename from assets/new-ui/dropdown_arrow.svg rename to res/pictures/dropdown_arrow.svg diff --git a/assets/new-ui/exchange.svg b/res/pictures/exchange.svg similarity index 100% rename from assets/new-ui/exchange.svg rename to res/pictures/exchange.svg diff --git a/assets/new-ui/exchange_providers.svg b/res/pictures/exchange_providers.svg similarity index 100% rename from assets/new-ui/exchange_providers.svg rename to res/pictures/exchange_providers.svg diff --git a/assets/new-ui/frozen.svg b/res/pictures/frozen.svg similarity index 100% rename from assets/new-ui/frozen.svg rename to res/pictures/frozen.svg diff --git a/assets/new-ui/help.svg b/res/pictures/help.svg similarity index 100% rename from assets/new-ui/help.svg rename to res/pictures/help.svg diff --git a/assets/new-ui/hide_keyboard.svg b/res/pictures/hide_keyboard.svg similarity index 100% rename from assets/new-ui/hide_keyboard.svg rename to res/pictures/hide_keyboard.svg diff --git a/assets/new-ui/history-received.svg b/res/pictures/history-received.svg similarity index 100% rename from assets/new-ui/history-received.svg rename to res/pictures/history-received.svg diff --git a/assets/new-ui/history-receiving.svg b/res/pictures/history-receiving.svg similarity index 100% rename from assets/new-ui/history-receiving.svg rename to res/pictures/history-receiving.svg diff --git a/assets/new-ui/history-sending.svg b/res/pictures/history-sending.svg similarity index 100% rename from assets/new-ui/history-sending.svg rename to res/pictures/history-sending.svg diff --git a/assets/new-ui/history-sent.svg b/res/pictures/history-sent.svg similarity index 100% rename from assets/new-ui/history-sent.svg rename to res/pictures/history-sent.svg diff --git a/assets/new-ui/icon-accounts.svg b/res/pictures/icon-accounts.svg similarity index 100% rename from assets/new-ui/icon-accounts.svg rename to res/pictures/icon-accounts.svg diff --git a/assets/new-ui/info.svg b/res/pictures/info.svg similarity index 100% rename from assets/new-ui/info.svg rename to res/pictures/info.svg diff --git a/assets/new-ui/label.svg b/res/pictures/label.svg similarity index 100% rename from assets/new-ui/label.svg rename to res/pictures/label.svg diff --git a/assets/new-ui/lightning.svg b/res/pictures/lightning.svg similarity index 100% rename from assets/new-ui/lightning.svg rename to res/pictures/lightning.svg diff --git a/assets/new-ui/lightning_deposit_help.svg b/res/pictures/lightning_deposit_help.svg similarity index 100% rename from assets/new-ui/lightning_deposit_help.svg rename to res/pictures/lightning_deposit_help.svg diff --git a/assets/new-ui/lightning_username_setup.svg b/res/pictures/lightning_username_setup.svg similarity index 100% rename from assets/new-ui/lightning_username_setup.svg rename to res/pictures/lightning_username_setup.svg diff --git a/assets/new-ui/lightning_username_setup_light.svg b/res/pictures/lightning_username_setup_light.svg similarity index 100% rename from assets/new-ui/lightning_username_setup_light.svg rename to res/pictures/lightning_username_setup_light.svg diff --git a/assets/new-ui/lightning_withdraw_help.svg b/res/pictures/lightning_withdraw_help.svg similarity index 100% rename from assets/new-ui/lightning_withdraw_help.svg rename to res/pictures/lightning_withdraw_help.svg diff --git a/assets/new-ui/link_arrow.svg b/res/pictures/link_arrow.svg similarity index 100% rename from assets/new-ui/link_arrow.svg rename to res/pictures/link_arrow.svg diff --git a/assets/new-ui/mask.svg b/res/pictures/mask.svg similarity index 100% rename from assets/new-ui/mask.svg rename to res/pictures/mask.svg diff --git a/assets/new-ui/mweb_help.svg b/res/pictures/mweb_help.svg similarity index 100% rename from assets/new-ui/mweb_help.svg rename to res/pictures/mweb_help.svg diff --git a/assets/new-ui/mweb_sync.svg b/res/pictures/mweb_sync.svg similarity index 100% rename from assets/new-ui/mweb_sync.svg rename to res/pictures/mweb_sync.svg diff --git a/assets/new-ui/navbar/apps.svg b/res/pictures/navbar/apps.svg similarity index 100% rename from assets/new-ui/navbar/apps.svg rename to res/pictures/navbar/apps.svg diff --git a/assets/new-ui/navbar/charts.svg b/res/pictures/navbar/charts.svg similarity index 100% rename from assets/new-ui/navbar/charts.svg rename to res/pictures/navbar/charts.svg diff --git a/assets/new-ui/navbar/contacts.svg b/res/pictures/navbar/contacts.svg similarity index 100% rename from assets/new-ui/navbar/contacts.svg rename to res/pictures/navbar/contacts.svg diff --git a/assets/new-ui/navbar/home.svg b/res/pictures/navbar/home.svg similarity index 100% rename from assets/new-ui/navbar/home.svg rename to res/pictures/navbar/home.svg diff --git a/assets/new-ui/navbar/wallets.svg b/res/pictures/navbar/wallets.svg similarity index 100% rename from assets/new-ui/navbar/wallets.svg rename to res/pictures/navbar/wallets.svg diff --git a/assets/new-ui/offline.svg b/res/pictures/offline.svg similarity index 100% rename from assets/new-ui/offline.svg rename to res/pictures/offline.svg diff --git a/assets/new-ui/options.svg b/res/pictures/options.svg similarity index 100% rename from assets/new-ui/options.svg rename to res/pictures/options.svg diff --git a/assets/new-ui/options_slider.svg b/res/pictures/options_slider.svg similarity index 100% rename from assets/new-ui/options_slider.svg rename to res/pictures/options_slider.svg diff --git a/assets/new-ui/paste.svg b/res/pictures/paste.svg similarity index 100% rename from assets/new-ui/paste.svg rename to res/pictures/paste.svg diff --git a/assets/new-ui/payjoin.svg b/res/pictures/payjoin.svg similarity index 100% rename from assets/new-ui/payjoin.svg rename to res/pictures/payjoin.svg diff --git a/assets/new-ui/pjmodal_btc.svg b/res/pictures/pjmodal_btc.svg similarity index 100% rename from assets/new-ui/pjmodal_btc.svg rename to res/pictures/pjmodal_btc.svg diff --git a/assets/new-ui/pjmodal_pj.svg b/res/pictures/pjmodal_pj.svg similarity index 100% rename from assets/new-ui/pjmodal_pj.svg rename to res/pictures/pjmodal_pj.svg diff --git a/assets/new-ui/randomize.svg b/res/pictures/randomize.svg similarity index 100% rename from assets/new-ui/randomize.svg rename to res/pictures/randomize.svg diff --git a/assets/new-ui/receive.svg b/res/pictures/receive.svg similarity index 100% rename from assets/new-ui/receive.svg rename to res/pictures/receive.svg diff --git a/assets/new-ui/refund_address.svg b/res/pictures/refund_address.svg similarity index 100% rename from assets/new-ui/refund_address.svg rename to res/pictures/refund_address.svg diff --git a/assets/new-ui/remove_recipient.svg b/res/pictures/remove_recipient.svg similarity index 100% rename from assets/new-ui/remove_recipient.svg rename to res/pictures/remove_recipient.svg diff --git a/assets/new-ui/scan.svg b/res/pictures/scan.svg similarity index 100% rename from assets/new-ui/scan.svg rename to res/pictures/scan.svg diff --git a/assets/new-ui/select_wallet.svg b/res/pictures/select_wallet.svg similarity index 100% rename from assets/new-ui/select_wallet.svg rename to res/pictures/select_wallet.svg diff --git a/assets/new-ui/send.svg b/res/pictures/send.svg similarity index 100% rename from assets/new-ui/send.svg rename to res/pictures/send.svg diff --git a/assets/new-ui/send_from_external.svg b/res/pictures/send_from_external.svg similarity index 100% rename from assets/new-ui/send_from_external.svg rename to res/pictures/send_from_external.svg diff --git a/assets/new-ui/set-amount.svg b/res/pictures/set-amount.svg similarity index 100% rename from assets/new-ui/set-amount.svg rename to res/pictures/set-amount.svg diff --git a/assets/new-ui/settings_row_icons/backup.svg b/res/pictures/settings_row_icons/backup.svg similarity index 100% rename from assets/new-ui/settings_row_icons/backup.svg rename to res/pictures/settings_row_icons/backup.svg diff --git a/assets/new-ui/settings_row_icons/coin-control.svg b/res/pictures/settings_row_icons/coin-control.svg similarity index 100% rename from assets/new-ui/settings_row_icons/coin-control.svg rename to res/pictures/settings_row_icons/coin-control.svg diff --git a/assets/new-ui/settings_row_icons/connections.svg b/res/pictures/settings_row_icons/connections.svg similarity index 100% rename from assets/new-ui/settings_row_icons/connections.svg rename to res/pictures/settings_row_icons/connections.svg diff --git a/assets/new-ui/settings_row_icons/cupcake.svg b/res/pictures/settings_row_icons/cupcake.svg similarity index 100% rename from assets/new-ui/settings_row_icons/cupcake.svg rename to res/pictures/settings_row_icons/cupcake.svg diff --git a/assets/new-ui/settings_row_icons/defaults.svg b/res/pictures/settings_row_icons/defaults.svg similarity index 100% rename from assets/new-ui/settings_row_icons/defaults.svg rename to res/pictures/settings_row_icons/defaults.svg diff --git a/assets/new-ui/settings_row_icons/display.svg b/res/pictures/settings_row_icons/display.svg similarity index 100% rename from assets/new-ui/settings_row_icons/display.svg rename to res/pictures/settings_row_icons/display.svg diff --git a/assets/new-ui/settings_row_icons/info.svg b/res/pictures/settings_row_icons/info.svg similarity index 100% rename from assets/new-ui/settings_row_icons/info.svg rename to res/pictures/settings_row_icons/info.svg diff --git a/assets/new-ui/settings_row_icons/lightning_username.svg b/res/pictures/settings_row_icons/lightning_username.svg similarity index 100% rename from assets/new-ui/settings_row_icons/lightning_username.svg rename to res/pictures/settings_row_icons/lightning_username.svg diff --git a/assets/new-ui/settings_row_icons/mweb.svg b/res/pictures/settings_row_icons/mweb.svg similarity index 100% rename from assets/new-ui/settings_row_icons/mweb.svg rename to res/pictures/settings_row_icons/mweb.svg diff --git a/assets/new-ui/settings_row_icons/nodes.svg b/res/pictures/settings_row_icons/nodes.svg similarity index 100% rename from assets/new-ui/settings_row_icons/nodes.svg rename to res/pictures/settings_row_icons/nodes.svg diff --git a/assets/new-ui/settings_row_icons/other.svg b/res/pictures/settings_row_icons/other.svg similarity index 100% rename from assets/new-ui/settings_row_icons/other.svg rename to res/pictures/settings_row_icons/other.svg diff --git a/assets/new-ui/settings_row_icons/payjoin.svg b/res/pictures/settings_row_icons/payjoin.svg similarity index 100% rename from assets/new-ui/settings_row_icons/payjoin.svg rename to res/pictures/settings_row_icons/payjoin.svg diff --git a/assets/new-ui/settings_row_icons/privacy.svg b/res/pictures/settings_row_icons/privacy.svg similarity index 100% rename from assets/new-ui/settings_row_icons/privacy.svg rename to res/pictures/settings_row_icons/privacy.svg diff --git a/assets/new-ui/settings_row_icons/security.svg b/res/pictures/settings_row_icons/security.svg similarity index 100% rename from assets/new-ui/settings_row_icons/security.svg rename to res/pictures/settings_row_icons/security.svg diff --git a/assets/new-ui/settings_row_icons/seed.svg b/res/pictures/settings_row_icons/seed.svg similarity index 100% rename from assets/new-ui/settings_row_icons/seed.svg rename to res/pictures/settings_row_icons/seed.svg diff --git a/assets/new-ui/settings_row_icons/silent-payments.svg b/res/pictures/settings_row_icons/silent-payments.svg similarity index 100% rename from assets/new-ui/settings_row_icons/silent-payments.svg rename to res/pictures/settings_row_icons/silent-payments.svg diff --git a/assets/new-ui/settings_row_icons/support.svg b/res/pictures/settings_row_icons/support.svg similarity index 100% rename from assets/new-ui/settings_row_icons/support.svg rename to res/pictures/settings_row_icons/support.svg diff --git a/assets/new-ui/silent_sync.svg b/res/pictures/silent_sync.svg similarity index 100% rename from assets/new-ui/silent_sync.svg rename to res/pictures/silent_sync.svg diff --git a/assets/new-ui/swap_amounts.svg b/res/pictures/swap_amounts.svg similarity index 100% rename from assets/new-ui/swap_amounts.svg rename to res/pictures/swap_amounts.svg diff --git a/assets/new-ui/switch.svg b/res/pictures/switch.svg similarity index 100% rename from assets/new-ui/switch.svg rename to res/pictures/switch.svg diff --git a/assets/new-ui/switcher-bitcoin.svg b/res/pictures/switcher-bitcoin.svg similarity index 100% rename from assets/new-ui/switcher-bitcoin.svg rename to res/pictures/switcher-bitcoin.svg diff --git a/assets/new-ui/switcher-lightning.svg b/res/pictures/switcher-lightning.svg similarity index 100% rename from assets/new-ui/switcher-lightning.svg rename to res/pictures/switcher-lightning.svg diff --git a/assets/new-ui/token-received.svg b/res/pictures/token-received.svg similarity index 100% rename from assets/new-ui/token-received.svg rename to res/pictures/token-received.svg diff --git a/assets/new-ui/token-sent.svg b/res/pictures/token-sent.svg similarity index 100% rename from assets/new-ui/token-sent.svg rename to res/pictures/token-sent.svg diff --git a/assets/new-ui/top-settings.svg b/res/pictures/top-settings.svg similarity index 100% rename from assets/new-ui/top-settings.svg rename to res/pictures/top-settings.svg diff --git a/assets/new-ui/tor.svg b/res/pictures/tor.svg similarity index 100% rename from assets/new-ui/tor.svg rename to res/pictures/tor.svg diff --git a/assets/new-ui/tor_sync.svg b/res/pictures/tor_sync.svg similarity index 100% rename from assets/new-ui/tor_sync.svg rename to res/pictures/tor_sync.svg diff --git a/assets/new-ui/trade_providers/chainflip.svg b/res/pictures/trade_providers/chainflip.svg similarity index 100% rename from assets/new-ui/trade_providers/chainflip.svg rename to res/pictures/trade_providers/chainflip.svg diff --git a/assets/new-ui/trade_providers/changenow.svg b/res/pictures/trade_providers/changenow.svg similarity index 100% rename from assets/new-ui/trade_providers/changenow.svg rename to res/pictures/trade_providers/changenow.svg diff --git a/assets/new-ui/trade_providers/exolix.svg b/res/pictures/trade_providers/exolix.svg similarity index 100% rename from assets/new-ui/trade_providers/exolix.svg rename to res/pictures/trade_providers/exolix.svg diff --git a/assets/new-ui/trade_providers/jupiter.svg b/res/pictures/trade_providers/jupiter.svg similarity index 100% rename from assets/new-ui/trade_providers/jupiter.svg rename to res/pictures/trade_providers/jupiter.svg diff --git a/assets/new-ui/trade_providers/letsexchange.svg b/res/pictures/trade_providers/letsexchange.svg similarity index 100% rename from assets/new-ui/trade_providers/letsexchange.svg rename to res/pictures/trade_providers/letsexchange.svg diff --git a/assets/new-ui/trade_providers/near-intents.svg b/res/pictures/trade_providers/near-intents.svg similarity index 100% rename from assets/new-ui/trade_providers/near-intents.svg rename to res/pictures/trade_providers/near-intents.svg diff --git a/assets/new-ui/trade_providers/sideshift.svg b/res/pictures/trade_providers/sideshift.svg similarity index 100% rename from assets/new-ui/trade_providers/sideshift.svg rename to res/pictures/trade_providers/sideshift.svg diff --git a/assets/new-ui/trade_providers/simpleswap.svg b/res/pictures/trade_providers/simpleswap.svg similarity index 100% rename from assets/new-ui/trade_providers/simpleswap.svg rename to res/pictures/trade_providers/simpleswap.svg diff --git a/assets/new-ui/trade_providers/stealthex.svg b/res/pictures/trade_providers/stealthex.svg similarity index 100% rename from assets/new-ui/trade_providers/stealthex.svg rename to res/pictures/trade_providers/stealthex.svg diff --git a/assets/new-ui/trade_providers/swaps_xyz.svg b/res/pictures/trade_providers/swaps_xyz.svg similarity index 100% rename from assets/new-ui/trade_providers/swaps_xyz.svg rename to res/pictures/trade_providers/swaps_xyz.svg diff --git a/assets/new-ui/trade_providers/swaptrade.svg b/res/pictures/trade_providers/swaptrade.svg similarity index 100% rename from assets/new-ui/trade_providers/swaptrade.svg rename to res/pictures/trade_providers/swaptrade.svg diff --git a/assets/new-ui/trade_providers/thorchain.svg b/res/pictures/trade_providers/thorchain.svg similarity index 100% rename from assets/new-ui/trade_providers/thorchain.svg rename to res/pictures/trade_providers/thorchain.svg diff --git a/assets/new-ui/trade_providers/trocador.svg b/res/pictures/trade_providers/trocador.svg similarity index 100% rename from assets/new-ui/trade_providers/trocador.svg rename to res/pictures/trade_providers/trocador.svg diff --git a/assets/new-ui/trade_providers/uniswap.svg b/res/pictures/trade_providers/uniswap.svg similarity index 100% rename from assets/new-ui/trade_providers/uniswap.svg rename to res/pictures/trade_providers/uniswap.svg diff --git a/assets/new-ui/trade_providers/xoswap.svg b/res/pictures/trade_providers/xoswap.svg similarity index 100% rename from assets/new-ui/trade_providers/xoswap.svg rename to res/pictures/trade_providers/xoswap.svg diff --git a/assets/new-ui/unmask.svg b/res/pictures/unmask.svg similarity index 100% rename from assets/new-ui/unmask.svg rename to res/pictures/unmask.svg diff --git a/assets/new-ui/wallet-trezor.svg b/res/pictures/wallet-trezor.svg similarity index 100% rename from assets/new-ui/wallet-trezor.svg rename to res/pictures/wallet-trezor.svg diff --git a/assets/new-ui/wallet_settings.svg b/res/pictures/wallet_settings.svg similarity index 100% rename from assets/new-ui/wallet_settings.svg rename to res/pictures/wallet_settings.svg diff --git a/assets/new-ui/warning.svg b/res/pictures/warning.svg similarity index 100% rename from assets/new-ui/warning.svg rename to res/pictures/warning.svg