diff --git a/assets/images/ethereum2.svg b/assets/images/ethereum2.svg deleted file mode 100644 index df9a44d1e..000000000 --- a/assets/images/ethereum2.svg +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/images/oceanBreeze/stack.png b/assets/images/oceanBreeze/stack.png deleted file mode 100644 index b59af1608..000000000 Binary files a/assets/images/oceanBreeze/stack.png and /dev/null differ diff --git a/assets/svg/oceanBreeze/persona-easy-1.png b/assets/svg/oceanBreeze/persona-easy-1.png deleted file mode 100644 index 20cafb519..000000000 Binary files a/assets/svg/oceanBreeze/persona-easy-1.png and /dev/null differ diff --git a/assets/svg/oceanBreeze/persona-easy-1.svg b/assets/svg/oceanBreeze/persona-easy-1.svg deleted file mode 100644 index f21e19345..000000000 --- a/assets/svg/oceanBreeze/persona-easy-1.svg +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/svg/oceanBreeze/persona-incognito-1.png b/assets/svg/oceanBreeze/persona-incognito-1.png deleted file mode 100644 index 8453cfa76..000000000 Binary files a/assets/svg/oceanBreeze/persona-incognito-1.png and /dev/null differ diff --git a/assets/svg/oceanBreeze/persona-incognito-1.svg b/assets/svg/oceanBreeze/persona-incognito-1.svg deleted file mode 100644 index a8037e997..000000000 --- a/assets/svg/oceanBreeze/persona-incognito-1.svg +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/svg/dark/bell-new.svg b/assets/svg/themed/dark/bell-new.svg similarity index 100% rename from assets/svg/dark/bell-new.svg rename to assets/svg/themed/dark/bell-new.svg diff --git a/assets/images/dark/bitcoin.svg b/assets/svg/themed/dark/bitcoin.svg similarity index 100% rename from assets/images/dark/bitcoin.svg rename to assets/svg/themed/dark/bitcoin.svg diff --git a/assets/images/dark/bitcoincash.svg b/assets/svg/themed/dark/bitcoincash.svg similarity index 100% rename from assets/images/dark/bitcoincash.svg rename to assets/svg/themed/dark/bitcoincash.svg diff --git a/assets/svg/dark/buy-coins-icon.svg b/assets/svg/themed/dark/buy-coins-icon.svg similarity index 100% rename from assets/svg/dark/buy-coins-icon.svg rename to assets/svg/themed/dark/buy-coins-icon.svg diff --git a/assets/images/dark/doge.svg b/assets/svg/themed/dark/doge.svg similarity index 100% rename from assets/images/dark/doge.svg rename to assets/svg/themed/dark/doge.svg diff --git a/assets/images/dark/epic-cash.svg b/assets/svg/themed/dark/epic-cash.svg similarity index 100% rename from assets/images/dark/epic-cash.svg rename to assets/svg/themed/dark/epic-cash.svg diff --git a/assets/svg/dark/exchange-2.svg b/assets/svg/themed/dark/exchange-2.svg similarity index 100% rename from assets/svg/dark/exchange-2.svg rename to assets/svg/themed/dark/exchange-2.svg diff --git a/assets/images/dark/firo.svg b/assets/svg/themed/dark/firo.svg similarity index 100% rename from assets/images/dark/firo.svg rename to assets/svg/themed/dark/firo.svg diff --git a/assets/images/dark/litecoin.svg b/assets/svg/themed/dark/litecoin.svg similarity index 100% rename from assets/images/dark/litecoin.svg rename to assets/svg/themed/dark/litecoin.svg diff --git a/assets/images/dark/monero.svg b/assets/svg/themed/dark/monero.svg similarity index 100% rename from assets/images/dark/monero.svg rename to assets/svg/themed/dark/monero.svg diff --git a/assets/images/dark/namecoin.svg b/assets/svg/themed/dark/namecoin.svg similarity index 100% rename from assets/images/dark/namecoin.svg rename to assets/svg/themed/dark/namecoin.svg diff --git a/assets/images/dark/particl.svg b/assets/svg/themed/dark/particl.svg similarity index 100% rename from assets/images/dark/particl.svg rename to assets/svg/themed/dark/particl.svg diff --git a/assets/svg/dark/persona-easy-1.svg b/assets/svg/themed/dark/persona-easy-1.svg similarity index 100% rename from assets/svg/dark/persona-easy-1.svg rename to assets/svg/themed/dark/persona-easy-1.svg diff --git a/assets/svg/dark/persona-incognito-1.svg b/assets/svg/themed/dark/persona-incognito-1.svg similarity index 100% rename from assets/svg/dark/persona-incognito-1.svg rename to assets/svg/themed/dark/persona-incognito-1.svg diff --git a/assets/svg/dark/stack-icon1.svg b/assets/svg/themed/dark/stack-icon1.svg similarity index 100% rename from assets/svg/dark/stack-icon1.svg rename to assets/svg/themed/dark/stack-icon1.svg diff --git a/assets/images/dark/stack.svg b/assets/svg/themed/dark/stack.svg similarity index 100% rename from assets/images/dark/stack.svg rename to assets/svg/themed/dark/stack.svg diff --git a/assets/svg/dark/tx-exchange-icon-failed.svg b/assets/svg/themed/dark/tx-exchange-icon-failed.svg similarity index 100% rename from assets/svg/dark/tx-exchange-icon-failed.svg rename to assets/svg/themed/dark/tx-exchange-icon-failed.svg diff --git a/assets/svg/dark/tx-exchange-icon-pending.svg b/assets/svg/themed/dark/tx-exchange-icon-pending.svg similarity index 100% rename from assets/svg/dark/tx-exchange-icon-pending.svg rename to assets/svg/themed/dark/tx-exchange-icon-pending.svg diff --git a/assets/svg/dark/tx-exchange-icon.svg b/assets/svg/themed/dark/tx-exchange-icon.svg similarity index 100% rename from assets/svg/dark/tx-exchange-icon.svg rename to assets/svg/themed/dark/tx-exchange-icon.svg diff --git a/assets/svg/dark/tx-icon-receive-failed.svg b/assets/svg/themed/dark/tx-icon-receive-failed.svg similarity index 100% rename from assets/svg/dark/tx-icon-receive-failed.svg rename to assets/svg/themed/dark/tx-icon-receive-failed.svg diff --git a/assets/svg/dark/tx-icon-receive-pending.svg b/assets/svg/themed/dark/tx-icon-receive-pending.svg similarity index 100% rename from assets/svg/dark/tx-icon-receive-pending.svg rename to assets/svg/themed/dark/tx-icon-receive-pending.svg diff --git a/assets/svg/dark/tx-icon-receive.svg b/assets/svg/themed/dark/tx-icon-receive.svg similarity index 100% rename from assets/svg/dark/tx-icon-receive.svg rename to assets/svg/themed/dark/tx-icon-receive.svg diff --git a/assets/svg/dark/tx-icon-send-failed.svg b/assets/svg/themed/dark/tx-icon-send-failed.svg similarity index 100% rename from assets/svg/dark/tx-icon-send-failed.svg rename to assets/svg/themed/dark/tx-icon-send-failed.svg diff --git a/assets/svg/dark/tx-icon-send-pending.svg b/assets/svg/themed/dark/tx-icon-send-pending.svg similarity index 100% rename from assets/svg/dark/tx-icon-send-pending.svg rename to assets/svg/themed/dark/tx-icon-send-pending.svg diff --git a/assets/svg/dark/tx-icon-send.svg b/assets/svg/themed/dark/tx-icon-send.svg similarity index 100% rename from assets/svg/dark/tx-icon-send.svg rename to assets/svg/themed/dark/tx-icon-send.svg diff --git a/assets/images/dark/wownero.svg b/assets/svg/themed/dark/wownero.svg similarity index 100% rename from assets/images/dark/wownero.svg rename to assets/svg/themed/dark/wownero.svg diff --git a/assets/svg/forest/bell-new.svg b/assets/svg/themed/forest/bell-new.svg similarity index 100% rename from assets/svg/forest/bell-new.svg rename to assets/svg/themed/forest/bell-new.svg diff --git a/assets/svg/forest/bg.svg b/assets/svg/themed/forest/bg.svg similarity index 100% rename from assets/svg/forest/bg.svg rename to assets/svg/themed/forest/bg.svg diff --git a/assets/images/forest/bitcoin.svg b/assets/svg/themed/forest/bitcoin.svg similarity index 100% rename from assets/images/forest/bitcoin.svg rename to assets/svg/themed/forest/bitcoin.svg diff --git a/assets/images/forest/bitcoincash.svg b/assets/svg/themed/forest/bitcoincash.svg similarity index 100% rename from assets/images/forest/bitcoincash.svg rename to assets/svg/themed/forest/bitcoincash.svg diff --git a/assets/svg/forest/buy-coins-icon.svg b/assets/svg/themed/forest/buy-coins-icon.svg similarity index 100% rename from assets/svg/forest/buy-coins-icon.svg rename to assets/svg/themed/forest/buy-coins-icon.svg diff --git a/assets/images/forest/doge.svg b/assets/svg/themed/forest/doge.svg similarity index 100% rename from assets/images/forest/doge.svg rename to assets/svg/themed/forest/doge.svg diff --git a/assets/images/forest/epic-cash.svg b/assets/svg/themed/forest/epic-cash.svg similarity index 100% rename from assets/images/forest/epic-cash.svg rename to assets/svg/themed/forest/epic-cash.svg diff --git a/assets/images/forest/ethereum.svg b/assets/svg/themed/forest/ethereum.svg similarity index 100% rename from assets/images/forest/ethereum.svg rename to assets/svg/themed/forest/ethereum.svg diff --git a/assets/svg/forest/exchange-2.svg b/assets/svg/themed/forest/exchange-2.svg similarity index 100% rename from assets/svg/forest/exchange-2.svg rename to assets/svg/themed/forest/exchange-2.svg diff --git a/assets/images/forest/firo.svg b/assets/svg/themed/forest/firo.svg similarity index 100% rename from assets/images/forest/firo.svg rename to assets/svg/themed/forest/firo.svg diff --git a/assets/images/forest/litecoin.svg b/assets/svg/themed/forest/litecoin.svg similarity index 100% rename from assets/images/forest/litecoin.svg rename to assets/svg/themed/forest/litecoin.svg diff --git a/assets/images/forest/monero.svg b/assets/svg/themed/forest/monero.svg similarity index 100% rename from assets/images/forest/monero.svg rename to assets/svg/themed/forest/monero.svg diff --git a/assets/images/forest/namecoin.svg b/assets/svg/themed/forest/namecoin.svg similarity index 100% rename from assets/images/forest/namecoin.svg rename to assets/svg/themed/forest/namecoin.svg diff --git a/assets/images/forest/particl.svg b/assets/svg/themed/forest/particl.svg similarity index 100% rename from assets/images/forest/particl.svg rename to assets/svg/themed/forest/particl.svg diff --git a/assets/svg/forest/persona-easy-1.svg b/assets/svg/themed/forest/persona-easy-1.svg similarity index 100% rename from assets/svg/forest/persona-easy-1.svg rename to assets/svg/themed/forest/persona-easy-1.svg diff --git a/assets/svg/forest/persona-incognito-1.svg b/assets/svg/themed/forest/persona-incognito-1.svg similarity index 100% rename from assets/svg/forest/persona-incognito-1.svg rename to assets/svg/themed/forest/persona-incognito-1.svg diff --git a/assets/svg/forest/stack-icon1.svg b/assets/svg/themed/forest/stack-icon1.svg similarity index 100% rename from assets/svg/forest/stack-icon1.svg rename to assets/svg/themed/forest/stack-icon1.svg diff --git a/assets/images/forest/stack.svg b/assets/svg/themed/forest/stack.svg similarity index 100% rename from assets/images/forest/stack.svg rename to assets/svg/themed/forest/stack.svg diff --git a/assets/svg/forest/tx-exchange-icon-failed.svg b/assets/svg/themed/forest/tx-exchange-icon-failed.svg similarity index 100% rename from assets/svg/forest/tx-exchange-icon-failed.svg rename to assets/svg/themed/forest/tx-exchange-icon-failed.svg diff --git a/assets/svg/forest/tx-exchange-icon-pending.svg b/assets/svg/themed/forest/tx-exchange-icon-pending.svg similarity index 100% rename from assets/svg/forest/tx-exchange-icon-pending.svg rename to assets/svg/themed/forest/tx-exchange-icon-pending.svg diff --git a/assets/svg/forest/tx-exchange-icon.svg b/assets/svg/themed/forest/tx-exchange-icon.svg similarity index 100% rename from assets/svg/forest/tx-exchange-icon.svg rename to assets/svg/themed/forest/tx-exchange-icon.svg diff --git a/assets/svg/forest/tx-icon-receive-failed.svg b/assets/svg/themed/forest/tx-icon-receive-failed.svg similarity index 100% rename from assets/svg/forest/tx-icon-receive-failed.svg rename to assets/svg/themed/forest/tx-icon-receive-failed.svg diff --git a/assets/svg/forest/tx-icon-receive-pending.svg b/assets/svg/themed/forest/tx-icon-receive-pending.svg similarity index 100% rename from assets/svg/forest/tx-icon-receive-pending.svg rename to assets/svg/themed/forest/tx-icon-receive-pending.svg diff --git a/assets/svg/forest/tx-icon-receive.svg b/assets/svg/themed/forest/tx-icon-receive.svg similarity index 100% rename from assets/svg/forest/tx-icon-receive.svg rename to assets/svg/themed/forest/tx-icon-receive.svg diff --git a/assets/svg/forest/tx-icon-send-failed.svg b/assets/svg/themed/forest/tx-icon-send-failed.svg similarity index 100% rename from assets/svg/forest/tx-icon-send-failed.svg rename to assets/svg/themed/forest/tx-icon-send-failed.svg diff --git a/assets/svg/forest/tx-icon-send-pending.svg b/assets/svg/themed/forest/tx-icon-send-pending.svg similarity index 100% rename from assets/svg/forest/tx-icon-send-pending.svg rename to assets/svg/themed/forest/tx-icon-send-pending.svg diff --git a/assets/svg/forest/tx-icon-send.svg b/assets/svg/themed/forest/tx-icon-send.svg similarity index 100% rename from assets/svg/forest/tx-icon-send.svg rename to assets/svg/themed/forest/tx-icon-send.svg diff --git a/assets/images/forest/wownero.svg b/assets/svg/themed/forest/wownero.svg similarity index 100% rename from assets/images/forest/wownero.svg rename to assets/svg/themed/forest/wownero.svg diff --git a/assets/svg/fruitSorbet/bell-new.svg b/assets/svg/themed/fruitSorbet/bell-new.svg similarity index 100% rename from assets/svg/fruitSorbet/bell-new.svg rename to assets/svg/themed/fruitSorbet/bell-new.svg diff --git a/assets/svg/fruitSorbet/bg.svg b/assets/svg/themed/fruitSorbet/bg.svg similarity index 100% rename from assets/svg/fruitSorbet/bg.svg rename to assets/svg/themed/fruitSorbet/bg.svg diff --git a/assets/images/fruitSorbet/bitcoin.svg b/assets/svg/themed/fruitSorbet/bitcoin.svg similarity index 100% rename from assets/images/fruitSorbet/bitcoin.svg rename to assets/svg/themed/fruitSorbet/bitcoin.svg diff --git a/assets/images/fruitSorbet/bitcoincash.svg b/assets/svg/themed/fruitSorbet/bitcoincash.svg similarity index 100% rename from assets/images/fruitSorbet/bitcoincash.svg rename to assets/svg/themed/fruitSorbet/bitcoincash.svg diff --git a/assets/svg/fruitSorbet/buy-coins-icon.svg b/assets/svg/themed/fruitSorbet/buy-coins-icon.svg similarity index 100% rename from assets/svg/fruitSorbet/buy-coins-icon.svg rename to assets/svg/themed/fruitSorbet/buy-coins-icon.svg diff --git a/assets/images/fruitSorbet/doge.svg b/assets/svg/themed/fruitSorbet/doge.svg similarity index 100% rename from assets/images/fruitSorbet/doge.svg rename to assets/svg/themed/fruitSorbet/doge.svg diff --git a/assets/images/fruitSorbet/epic-cash.svg b/assets/svg/themed/fruitSorbet/epic-cash.svg similarity index 100% rename from assets/images/fruitSorbet/epic-cash.svg rename to assets/svg/themed/fruitSorbet/epic-cash.svg diff --git a/assets/svg/fruitSorbet/exchange-2.svg b/assets/svg/themed/fruitSorbet/exchange-2.svg similarity index 100% rename from assets/svg/fruitSorbet/exchange-2.svg rename to assets/svg/themed/fruitSorbet/exchange-2.svg diff --git a/assets/images/fruitSorbet/firo.svg b/assets/svg/themed/fruitSorbet/firo.svg similarity index 100% rename from assets/images/fruitSorbet/firo.svg rename to assets/svg/themed/fruitSorbet/firo.svg diff --git a/assets/images/fruitSorbet/litecoin.svg b/assets/svg/themed/fruitSorbet/litecoin.svg similarity index 100% rename from assets/images/fruitSorbet/litecoin.svg rename to assets/svg/themed/fruitSorbet/litecoin.svg diff --git a/assets/images/fruitSorbet/monero.svg b/assets/svg/themed/fruitSorbet/monero.svg similarity index 100% rename from assets/images/fruitSorbet/monero.svg rename to assets/svg/themed/fruitSorbet/monero.svg diff --git a/assets/images/fruitSorbet/namecoin.svg b/assets/svg/themed/fruitSorbet/namecoin.svg similarity index 100% rename from assets/images/fruitSorbet/namecoin.svg rename to assets/svg/themed/fruitSorbet/namecoin.svg diff --git a/assets/images/fruitSorbet/particl.svg b/assets/svg/themed/fruitSorbet/particl.svg similarity index 100% rename from assets/images/fruitSorbet/particl.svg rename to assets/svg/themed/fruitSorbet/particl.svg diff --git a/assets/svg/fruitSorbet/persona-easy-1.png b/assets/svg/themed/fruitSorbet/persona-easy-1.png similarity index 100% rename from assets/svg/fruitSorbet/persona-easy-1.png rename to assets/svg/themed/fruitSorbet/persona-easy-1.png diff --git a/assets/svg/fruitSorbet/persona-easy-1.svg b/assets/svg/themed/fruitSorbet/persona-easy-1.svg similarity index 100% rename from assets/svg/fruitSorbet/persona-easy-1.svg rename to assets/svg/themed/fruitSorbet/persona-easy-1.svg diff --git a/assets/svg/fruitSorbet/persona-incognito-1.png b/assets/svg/themed/fruitSorbet/persona-incognito-1.png similarity index 100% rename from assets/svg/fruitSorbet/persona-incognito-1.png rename to assets/svg/themed/fruitSorbet/persona-incognito-1.png diff --git a/assets/svg/fruitSorbet/persona-incognito-1.svg b/assets/svg/themed/fruitSorbet/persona-incognito-1.svg similarity index 100% rename from assets/svg/fruitSorbet/persona-incognito-1.svg rename to assets/svg/themed/fruitSorbet/persona-incognito-1.svg diff --git a/assets/svg/fruitSorbet/stack-icon1.svg b/assets/svg/themed/fruitSorbet/stack-icon1.svg similarity index 100% rename from assets/svg/fruitSorbet/stack-icon1.svg rename to assets/svg/themed/fruitSorbet/stack-icon1.svg diff --git a/assets/images/fruitSorbet/stack.svg b/assets/svg/themed/fruitSorbet/stack.svg similarity index 100% rename from assets/images/fruitSorbet/stack.svg rename to assets/svg/themed/fruitSorbet/stack.svg diff --git a/assets/svg/fruitSorbet/tx-exchange-icon-failed.svg b/assets/svg/themed/fruitSorbet/tx-exchange-icon-failed.svg similarity index 100% rename from assets/svg/fruitSorbet/tx-exchange-icon-failed.svg rename to assets/svg/themed/fruitSorbet/tx-exchange-icon-failed.svg diff --git a/assets/svg/fruitSorbet/tx-exchange-icon-pending.svg b/assets/svg/themed/fruitSorbet/tx-exchange-icon-pending.svg similarity index 100% rename from assets/svg/fruitSorbet/tx-exchange-icon-pending.svg rename to assets/svg/themed/fruitSorbet/tx-exchange-icon-pending.svg diff --git a/assets/svg/fruitSorbet/tx-exchange-icon.svg b/assets/svg/themed/fruitSorbet/tx-exchange-icon.svg similarity index 100% rename from assets/svg/fruitSorbet/tx-exchange-icon.svg rename to assets/svg/themed/fruitSorbet/tx-exchange-icon.svg diff --git a/assets/svg/fruitSorbet/tx-icon-receive-failed.svg b/assets/svg/themed/fruitSorbet/tx-icon-receive-failed.svg similarity index 100% rename from assets/svg/fruitSorbet/tx-icon-receive-failed.svg rename to assets/svg/themed/fruitSorbet/tx-icon-receive-failed.svg diff --git a/assets/svg/fruitSorbet/tx-icon-receive-pending.svg b/assets/svg/themed/fruitSorbet/tx-icon-receive-pending.svg similarity index 100% rename from assets/svg/fruitSorbet/tx-icon-receive-pending.svg rename to assets/svg/themed/fruitSorbet/tx-icon-receive-pending.svg diff --git a/assets/svg/fruitSorbet/tx-icon-receive.svg b/assets/svg/themed/fruitSorbet/tx-icon-receive.svg similarity index 100% rename from assets/svg/fruitSorbet/tx-icon-receive.svg rename to assets/svg/themed/fruitSorbet/tx-icon-receive.svg diff --git a/assets/svg/fruitSorbet/tx-icon-send-failed.svg b/assets/svg/themed/fruitSorbet/tx-icon-send-failed.svg similarity index 100% rename from assets/svg/fruitSorbet/tx-icon-send-failed.svg rename to assets/svg/themed/fruitSorbet/tx-icon-send-failed.svg diff --git a/assets/svg/fruitSorbet/tx-icon-send-pending.svg b/assets/svg/themed/fruitSorbet/tx-icon-send-pending.svg similarity index 100% rename from assets/svg/fruitSorbet/tx-icon-send-pending.svg rename to assets/svg/themed/fruitSorbet/tx-icon-send-pending.svg diff --git a/assets/svg/fruitSorbet/tx-icon-send.svg b/assets/svg/themed/fruitSorbet/tx-icon-send.svg similarity index 100% rename from assets/svg/fruitSorbet/tx-icon-send.svg rename to assets/svg/themed/fruitSorbet/tx-icon-send.svg diff --git a/assets/images/fruitSorbet/wownero.svg b/assets/svg/themed/fruitSorbet/wownero.svg similarity index 100% rename from assets/images/fruitSorbet/wownero.svg rename to assets/svg/themed/fruitSorbet/wownero.svg diff --git a/assets/svg/light/bell-new.svg b/assets/svg/themed/light/bell-new.svg similarity index 100% rename from assets/svg/light/bell-new.svg rename to assets/svg/themed/light/bell-new.svg diff --git a/assets/images/light/bitcoin.svg b/assets/svg/themed/light/bitcoin.svg similarity index 100% rename from assets/images/light/bitcoin.svg rename to assets/svg/themed/light/bitcoin.svg diff --git a/assets/images/light/bitcoincash.svg b/assets/svg/themed/light/bitcoincash.svg similarity index 100% rename from assets/images/light/bitcoincash.svg rename to assets/svg/themed/light/bitcoincash.svg diff --git a/assets/svg/light/buy-coins-icon.svg b/assets/svg/themed/light/buy-coins-icon.svg similarity index 100% rename from assets/svg/light/buy-coins-icon.svg rename to assets/svg/themed/light/buy-coins-icon.svg diff --git a/assets/images/light/doge.svg b/assets/svg/themed/light/doge.svg similarity index 100% rename from assets/images/light/doge.svg rename to assets/svg/themed/light/doge.svg diff --git a/assets/images/light/epic-cash.svg b/assets/svg/themed/light/epic-cash.svg similarity index 100% rename from assets/images/light/epic-cash.svg rename to assets/svg/themed/light/epic-cash.svg diff --git a/assets/svg/light/exchange-2.svg b/assets/svg/themed/light/exchange-2.svg similarity index 100% rename from assets/svg/light/exchange-2.svg rename to assets/svg/themed/light/exchange-2.svg diff --git a/assets/images/light/firo.svg b/assets/svg/themed/light/firo.svg similarity index 100% rename from assets/images/light/firo.svg rename to assets/svg/themed/light/firo.svg diff --git a/assets/images/light/litecoin.svg b/assets/svg/themed/light/litecoin.svg similarity index 100% rename from assets/images/light/litecoin.svg rename to assets/svg/themed/light/litecoin.svg diff --git a/assets/images/light/monero.svg b/assets/svg/themed/light/monero.svg similarity index 100% rename from assets/images/light/monero.svg rename to assets/svg/themed/light/monero.svg diff --git a/assets/images/light/namecoin.svg b/assets/svg/themed/light/namecoin.svg similarity index 100% rename from assets/images/light/namecoin.svg rename to assets/svg/themed/light/namecoin.svg diff --git a/assets/images/light/particl.svg b/assets/svg/themed/light/particl.svg similarity index 100% rename from assets/images/light/particl.svg rename to assets/svg/themed/light/particl.svg diff --git a/assets/svg/light/persona-easy-1.svg b/assets/svg/themed/light/persona-easy-1.svg similarity index 100% rename from assets/svg/light/persona-easy-1.svg rename to assets/svg/themed/light/persona-easy-1.svg diff --git a/assets/svg/light/persona-incognito-1.svg b/assets/svg/themed/light/persona-incognito-1.svg similarity index 100% rename from assets/svg/light/persona-incognito-1.svg rename to assets/svg/themed/light/persona-incognito-1.svg diff --git a/assets/svg/light/stack-icon1.svg b/assets/svg/themed/light/stack-icon1.svg similarity index 100% rename from assets/svg/light/stack-icon1.svg rename to assets/svg/themed/light/stack-icon1.svg diff --git a/assets/images/light/stack.svg b/assets/svg/themed/light/stack.svg similarity index 100% rename from assets/images/light/stack.svg rename to assets/svg/themed/light/stack.svg diff --git a/assets/svg/light/tx-exchange-icon-failed.svg b/assets/svg/themed/light/tx-exchange-icon-failed.svg similarity index 100% rename from assets/svg/light/tx-exchange-icon-failed.svg rename to assets/svg/themed/light/tx-exchange-icon-failed.svg diff --git a/assets/svg/light/tx-exchange-icon-pending.svg b/assets/svg/themed/light/tx-exchange-icon-pending.svg similarity index 100% rename from assets/svg/light/tx-exchange-icon-pending.svg rename to assets/svg/themed/light/tx-exchange-icon-pending.svg diff --git a/assets/svg/light/tx-exchange-icon.svg b/assets/svg/themed/light/tx-exchange-icon.svg similarity index 100% rename from assets/svg/light/tx-exchange-icon.svg rename to assets/svg/themed/light/tx-exchange-icon.svg diff --git a/assets/svg/light/tx-icon-receive-failed.svg b/assets/svg/themed/light/tx-icon-receive-failed.svg similarity index 100% rename from assets/svg/light/tx-icon-receive-failed.svg rename to assets/svg/themed/light/tx-icon-receive-failed.svg diff --git a/assets/svg/light/tx-icon-receive-pending.svg b/assets/svg/themed/light/tx-icon-receive-pending.svg similarity index 100% rename from assets/svg/light/tx-icon-receive-pending.svg rename to assets/svg/themed/light/tx-icon-receive-pending.svg diff --git a/assets/svg/light/tx-icon-receive.svg b/assets/svg/themed/light/tx-icon-receive.svg similarity index 100% rename from assets/svg/light/tx-icon-receive.svg rename to assets/svg/themed/light/tx-icon-receive.svg diff --git a/assets/svg/light/tx-icon-send-failed.svg b/assets/svg/themed/light/tx-icon-send-failed.svg similarity index 100% rename from assets/svg/light/tx-icon-send-failed.svg rename to assets/svg/themed/light/tx-icon-send-failed.svg diff --git a/assets/svg/light/tx-icon-send-pending.svg b/assets/svg/themed/light/tx-icon-send-pending.svg similarity index 100% rename from assets/svg/light/tx-icon-send-pending.svg rename to assets/svg/themed/light/tx-icon-send-pending.svg diff --git a/assets/svg/light/tx-icon-send.svg b/assets/svg/themed/light/tx-icon-send.svg similarity index 100% rename from assets/svg/light/tx-icon-send.svg rename to assets/svg/themed/light/tx-icon-send.svg diff --git a/assets/images/light/wownero.svg b/assets/svg/themed/light/wownero.svg similarity index 100% rename from assets/images/light/wownero.svg rename to assets/svg/themed/light/wownero.svg diff --git a/assets/svg/oceanBreeze/bell-new.svg b/assets/svg/themed/oceanBreeze/bell-new.svg similarity index 100% rename from assets/svg/oceanBreeze/bell-new.svg rename to assets/svg/themed/oceanBreeze/bell-new.svg diff --git a/assets/svg/oceanBreeze/bg.svg b/assets/svg/themed/oceanBreeze/bg.svg similarity index 100% rename from assets/svg/oceanBreeze/bg.svg rename to assets/svg/themed/oceanBreeze/bg.svg diff --git a/assets/images/oceanBreeze/bitcoin.svg b/assets/svg/themed/oceanBreeze/bitcoin.svg similarity index 100% rename from assets/images/oceanBreeze/bitcoin.svg rename to assets/svg/themed/oceanBreeze/bitcoin.svg diff --git a/assets/images/oceanBreeze/bitcoincash.svg b/assets/svg/themed/oceanBreeze/bitcoincash.svg similarity index 100% rename from assets/images/oceanBreeze/bitcoincash.svg rename to assets/svg/themed/oceanBreeze/bitcoincash.svg diff --git a/assets/svg/oceanBreeze/buy-coins-icon.svg b/assets/svg/themed/oceanBreeze/buy-coins-icon.svg similarity index 100% rename from assets/svg/oceanBreeze/buy-coins-icon.svg rename to assets/svg/themed/oceanBreeze/buy-coins-icon.svg diff --git a/assets/images/oceanBreeze/doge.svg b/assets/svg/themed/oceanBreeze/doge.svg similarity index 100% rename from assets/images/oceanBreeze/doge.svg rename to assets/svg/themed/oceanBreeze/doge.svg diff --git a/assets/images/oceanBreeze/epic-cash.svg b/assets/svg/themed/oceanBreeze/epic-cash.svg similarity index 100% rename from assets/images/oceanBreeze/epic-cash.svg rename to assets/svg/themed/oceanBreeze/epic-cash.svg diff --git a/assets/svg/oceanBreeze/exchange-2.svg b/assets/svg/themed/oceanBreeze/exchange-2.svg similarity index 100% rename from assets/svg/oceanBreeze/exchange-2.svg rename to assets/svg/themed/oceanBreeze/exchange-2.svg diff --git a/assets/images/oceanBreeze/firo.svg b/assets/svg/themed/oceanBreeze/firo.svg similarity index 100% rename from assets/images/oceanBreeze/firo.svg rename to assets/svg/themed/oceanBreeze/firo.svg diff --git a/assets/images/oceanBreeze/litecoin.svg b/assets/svg/themed/oceanBreeze/litecoin.svg similarity index 100% rename from assets/images/oceanBreeze/litecoin.svg rename to assets/svg/themed/oceanBreeze/litecoin.svg diff --git a/assets/images/oceanBreeze/monero.svg b/assets/svg/themed/oceanBreeze/monero.svg similarity index 100% rename from assets/images/oceanBreeze/monero.svg rename to assets/svg/themed/oceanBreeze/monero.svg diff --git a/assets/images/oceanBreeze/namecoin.svg b/assets/svg/themed/oceanBreeze/namecoin.svg similarity index 100% rename from assets/images/oceanBreeze/namecoin.svg rename to assets/svg/themed/oceanBreeze/namecoin.svg diff --git a/assets/images/oceanBreeze/particl.svg b/assets/svg/themed/oceanBreeze/particl.svg similarity index 100% rename from assets/images/oceanBreeze/particl.svg rename to assets/svg/themed/oceanBreeze/particl.svg diff --git a/assets/svg/themed/oceanBreeze/persona-easy-1.svg b/assets/svg/themed/oceanBreeze/persona-easy-1.svg new file mode 100644 index 000000000..7a7b0576e --- /dev/null +++ b/assets/svg/themed/oceanBreeze/persona-easy-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/svg/themed/oceanBreeze/persona-incognito-1.svg b/assets/svg/themed/oceanBreeze/persona-incognito-1.svg new file mode 100644 index 000000000..508d94233 --- /dev/null +++ b/assets/svg/themed/oceanBreeze/persona-incognito-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/svg/oceanBreeze/stack-icon1.svg b/assets/svg/themed/oceanBreeze/stack-icon1.svg similarity index 100% rename from assets/svg/oceanBreeze/stack-icon1.svg rename to assets/svg/themed/oceanBreeze/stack-icon1.svg diff --git a/assets/images/oceanBreeze/stack.svg b/assets/svg/themed/oceanBreeze/stack.svg similarity index 100% rename from assets/images/oceanBreeze/stack.svg rename to assets/svg/themed/oceanBreeze/stack.svg diff --git a/assets/svg/oceanBreeze/tx-exchange-icon-failed.svg b/assets/svg/themed/oceanBreeze/tx-exchange-icon-failed.svg similarity index 100% rename from assets/svg/oceanBreeze/tx-exchange-icon-failed.svg rename to assets/svg/themed/oceanBreeze/tx-exchange-icon-failed.svg diff --git a/assets/svg/oceanBreeze/tx-exchange-icon-pending.svg b/assets/svg/themed/oceanBreeze/tx-exchange-icon-pending.svg similarity index 100% rename from assets/svg/oceanBreeze/tx-exchange-icon-pending.svg rename to assets/svg/themed/oceanBreeze/tx-exchange-icon-pending.svg diff --git a/assets/svg/oceanBreeze/tx-exchange-icon.svg b/assets/svg/themed/oceanBreeze/tx-exchange-icon.svg similarity index 100% rename from assets/svg/oceanBreeze/tx-exchange-icon.svg rename to assets/svg/themed/oceanBreeze/tx-exchange-icon.svg diff --git a/assets/svg/oceanBreeze/tx-icon-receive-failed.svg b/assets/svg/themed/oceanBreeze/tx-icon-receive-failed.svg similarity index 100% rename from assets/svg/oceanBreeze/tx-icon-receive-failed.svg rename to assets/svg/themed/oceanBreeze/tx-icon-receive-failed.svg diff --git a/assets/svg/oceanBreeze/tx-icon-receive-pending.svg b/assets/svg/themed/oceanBreeze/tx-icon-receive-pending.svg similarity index 100% rename from assets/svg/oceanBreeze/tx-icon-receive-pending.svg rename to assets/svg/themed/oceanBreeze/tx-icon-receive-pending.svg diff --git a/assets/svg/oceanBreeze/tx-icon-receive.svg b/assets/svg/themed/oceanBreeze/tx-icon-receive.svg similarity index 100% rename from assets/svg/oceanBreeze/tx-icon-receive.svg rename to assets/svg/themed/oceanBreeze/tx-icon-receive.svg diff --git a/assets/svg/oceanBreeze/tx-icon-send-failed.svg b/assets/svg/themed/oceanBreeze/tx-icon-send-failed.svg similarity index 100% rename from assets/svg/oceanBreeze/tx-icon-send-failed.svg rename to assets/svg/themed/oceanBreeze/tx-icon-send-failed.svg diff --git a/assets/svg/oceanBreeze/tx-icon-send-pending.svg b/assets/svg/themed/oceanBreeze/tx-icon-send-pending.svg similarity index 100% rename from assets/svg/oceanBreeze/tx-icon-send-pending.svg rename to assets/svg/themed/oceanBreeze/tx-icon-send-pending.svg diff --git a/assets/svg/oceanBreeze/tx-icon-send.svg b/assets/svg/themed/oceanBreeze/tx-icon-send.svg similarity index 100% rename from assets/svg/oceanBreeze/tx-icon-send.svg rename to assets/svg/themed/oceanBreeze/tx-icon-send.svg diff --git a/assets/images/oceanBreeze/wownero.svg b/assets/svg/themed/oceanBreeze/wownero.svg similarity index 100% rename from assets/images/oceanBreeze/wownero.svg rename to assets/svg/themed/oceanBreeze/wownero.svg diff --git a/assets/svg/oledBlack/bell-new.svg b/assets/svg/themed/oledBlack/bell-new.svg similarity index 100% rename from assets/svg/oledBlack/bell-new.svg rename to assets/svg/themed/oledBlack/bell-new.svg diff --git a/assets/images/oledBlack/bitcoin.svg b/assets/svg/themed/oledBlack/bitcoin.svg similarity index 100% rename from assets/images/oledBlack/bitcoin.svg rename to assets/svg/themed/oledBlack/bitcoin.svg diff --git a/assets/images/oledBlack/bitcoincash.svg b/assets/svg/themed/oledBlack/bitcoincash.svg similarity index 100% rename from assets/images/oledBlack/bitcoincash.svg rename to assets/svg/themed/oledBlack/bitcoincash.svg diff --git a/assets/svg/oledBlack/buy-coins-icon.svg b/assets/svg/themed/oledBlack/buy-coins-icon.svg similarity index 100% rename from assets/svg/oledBlack/buy-coins-icon.svg rename to assets/svg/themed/oledBlack/buy-coins-icon.svg diff --git a/assets/images/oledBlack/doge.svg b/assets/svg/themed/oledBlack/doge.svg similarity index 100% rename from assets/images/oledBlack/doge.svg rename to assets/svg/themed/oledBlack/doge.svg diff --git a/assets/images/oledBlack/epic-cash.svg b/assets/svg/themed/oledBlack/epic-cash.svg similarity index 100% rename from assets/images/oledBlack/epic-cash.svg rename to assets/svg/themed/oledBlack/epic-cash.svg diff --git a/assets/svg/oledBlack/exchange-2.svg b/assets/svg/themed/oledBlack/exchange-2.svg similarity index 100% rename from assets/svg/oledBlack/exchange-2.svg rename to assets/svg/themed/oledBlack/exchange-2.svg diff --git a/assets/images/oledBlack/firo.svg b/assets/svg/themed/oledBlack/firo.svg similarity index 100% rename from assets/images/oledBlack/firo.svg rename to assets/svg/themed/oledBlack/firo.svg diff --git a/assets/images/oledBlack/litecoin.svg b/assets/svg/themed/oledBlack/litecoin.svg similarity index 100% rename from assets/images/oledBlack/litecoin.svg rename to assets/svg/themed/oledBlack/litecoin.svg diff --git a/assets/images/oledBlack/monero.svg b/assets/svg/themed/oledBlack/monero.svg similarity index 100% rename from assets/images/oledBlack/monero.svg rename to assets/svg/themed/oledBlack/monero.svg diff --git a/assets/images/oledBlack/namecoin.svg b/assets/svg/themed/oledBlack/namecoin.svg similarity index 100% rename from assets/images/oledBlack/namecoin.svg rename to assets/svg/themed/oledBlack/namecoin.svg diff --git a/assets/images/oledBlack/particl.svg b/assets/svg/themed/oledBlack/particl.svg similarity index 100% rename from assets/images/oledBlack/particl.svg rename to assets/svg/themed/oledBlack/particl.svg diff --git a/assets/svg/oledBlack/persona-easy-1.svg b/assets/svg/themed/oledBlack/persona-easy-1.svg similarity index 100% rename from assets/svg/oledBlack/persona-easy-1.svg rename to assets/svg/themed/oledBlack/persona-easy-1.svg diff --git a/assets/svg/oledBlack/persona-incognito-1.svg b/assets/svg/themed/oledBlack/persona-incognito-1.svg similarity index 100% rename from assets/svg/oledBlack/persona-incognito-1.svg rename to assets/svg/themed/oledBlack/persona-incognito-1.svg diff --git a/assets/svg/oledBlack/stack-icon1.svg b/assets/svg/themed/oledBlack/stack-icon1.svg similarity index 100% rename from assets/svg/oledBlack/stack-icon1.svg rename to assets/svg/themed/oledBlack/stack-icon1.svg diff --git a/assets/images/oledBlack/stack.svg b/assets/svg/themed/oledBlack/stack.svg similarity index 100% rename from assets/images/oledBlack/stack.svg rename to assets/svg/themed/oledBlack/stack.svg diff --git a/assets/svg/oledBlack/tx-exchange-icon-failed.svg b/assets/svg/themed/oledBlack/tx-exchange-icon-failed.svg similarity index 100% rename from assets/svg/oledBlack/tx-exchange-icon-failed.svg rename to assets/svg/themed/oledBlack/tx-exchange-icon-failed.svg diff --git a/assets/svg/oledBlack/tx-exchange-icon-pending.svg b/assets/svg/themed/oledBlack/tx-exchange-icon-pending.svg similarity index 100% rename from assets/svg/oledBlack/tx-exchange-icon-pending.svg rename to assets/svg/themed/oledBlack/tx-exchange-icon-pending.svg diff --git a/assets/svg/oledBlack/tx-exchange-icon.svg b/assets/svg/themed/oledBlack/tx-exchange-icon.svg similarity index 100% rename from assets/svg/oledBlack/tx-exchange-icon.svg rename to assets/svg/themed/oledBlack/tx-exchange-icon.svg diff --git a/assets/svg/oledBlack/tx-icon-receive-failed.svg b/assets/svg/themed/oledBlack/tx-icon-receive-failed.svg similarity index 100% rename from assets/svg/oledBlack/tx-icon-receive-failed.svg rename to assets/svg/themed/oledBlack/tx-icon-receive-failed.svg diff --git a/assets/svg/oledBlack/tx-icon-receive-pending.svg b/assets/svg/themed/oledBlack/tx-icon-receive-pending.svg similarity index 100% rename from assets/svg/oledBlack/tx-icon-receive-pending.svg rename to assets/svg/themed/oledBlack/tx-icon-receive-pending.svg diff --git a/assets/svg/oledBlack/tx-icon-receive.svg b/assets/svg/themed/oledBlack/tx-icon-receive.svg similarity index 100% rename from assets/svg/oledBlack/tx-icon-receive.svg rename to assets/svg/themed/oledBlack/tx-icon-receive.svg diff --git a/assets/svg/oledBlack/tx-icon-send-failed.svg b/assets/svg/themed/oledBlack/tx-icon-send-failed.svg similarity index 100% rename from assets/svg/oledBlack/tx-icon-send-failed.svg rename to assets/svg/themed/oledBlack/tx-icon-send-failed.svg diff --git a/assets/svg/oledBlack/tx-icon-send-pending.svg b/assets/svg/themed/oledBlack/tx-icon-send-pending.svg similarity index 100% rename from assets/svg/oledBlack/tx-icon-send-pending.svg rename to assets/svg/themed/oledBlack/tx-icon-send-pending.svg diff --git a/assets/svg/oledBlack/tx-icon-send.svg b/assets/svg/themed/oledBlack/tx-icon-send.svg similarity index 100% rename from assets/svg/oledBlack/tx-icon-send.svg rename to assets/svg/themed/oledBlack/tx-icon-send.svg diff --git a/assets/images/oledBlack/wownero.svg b/assets/svg/themed/oledBlack/wownero.svg similarity index 100% rename from assets/images/oledBlack/wownero.svg rename to assets/svg/themed/oledBlack/wownero.svg diff --git a/lib/pages/stack_privacy_calls.dart b/lib/pages/stack_privacy_calls.dart index b2c77dc5e..5a7420339 100644 --- a/lib/pages/stack_privacy_calls.dart +++ b/lib/pages/stack_privacy_calls.dart @@ -8,6 +8,7 @@ import 'package:stackwallet/pages/pinpad_views/create_pin_view.dart'; import 'package:stackwallet/pages_desktop_specific/password/create_password_view.dart'; import 'package:stackwallet/providers/global/prefs_provider.dart'; import 'package:stackwallet/providers/global/price_provider.dart'; +import 'package:stackwallet/providers/ui/color_theme_provider.dart'; import 'package:stackwallet/services/exchange/exchange_data_loading_service.dart'; import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/constants.dart'; @@ -22,8 +23,6 @@ import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; import 'package:stackwallet/widgets/rounded_white_container.dart'; -import '../providers/ui/color_theme_provider.dart'; - class StackPrivacyCalls extends ConsumerStatefulWidget { const StackPrivacyCalls({ Key? key, @@ -42,13 +41,11 @@ class _StackPrivacyCalls extends ConsumerState { late final bool isDesktop; late bool isEasy; late bool infoToggle; - late final bool usePNG; @override void initState() { isDesktop = Util.isDesktop; isEasy = ref.read(prefsChangeNotifierProvider).externalCalls; - usePNG = ref.read(colorThemeProvider.state).state == "fruitSorbet"; infoToggle = isEasy; super.initState(); } diff --git a/lib/utilities/assets.dart b/lib/utilities/assets.dart index 7675d86c2..24558d59a 100644 --- a/lib/utilities/assets.dart +++ b/lib/utilities/assets.dart @@ -3,6 +3,8 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/theme/color_theme.dart'; import 'package:stackwallet/utilities/theme/stack_colors.dart'; +const _kPath_themed = "assets/svg/themed/"; + abstract class Assets { static const svg = _SVG(); static const png = _PNG(); @@ -15,51 +17,62 @@ abstract class Assets { class _SOCIALS { const _SOCIALS(); - String get discord => "assets/svg/socials/discord.svg"; - String get reddit => "assets/svg/socials/reddit-alien-brands.svg"; - String get twitter => "assets/svg/socials/twitter-brands.svg"; - String get telegram => "assets/svg/socials/telegram-brands.svg"; + static const _path = "assets/svg/socials/"; + + String get discord => "${_path}discord.svg"; + String get reddit => "${_path}reddit-alien-brands.svg"; + String get twitter => "${_path}twitter-brands.svg"; + String get telegram => "${_path}telegram-brands.svg"; } class _EXCHANGE { const _EXCHANGE(); - String get changeNow => "assets/svg/exchange_icons/change_now_logo_1.svg"; - String get simpleSwap => "assets/svg/exchange_icons/simpleswap-icon.svg"; - String get majesticBankBlue => "assets/svg/exchange_icons/mb_blue.svg"; - String get majesticBankGreen => "assets/svg/exchange_icons/mb_green.svg"; + static const _path = "assets/svg/exchange_icons/"; + + String get changeNow => "${_path}change_now_logo_1.svg"; + String get simpleSwap => "${_path}simpleswap-icon.svg"; + String get majesticBankBlue => "${_path}mb_blue.svg"; + String get majesticBankGreen => "${_path}mb_green.svg"; } class _BUY { const _BUY(); - // TODO: switch this to something like String buy(BuildContext context) => "assets/svg/${Theme.of(context).extension()!.themeType.name}/buy-coins-icon.svg"; String simplexLogo(BuildContext context) { - return (Theme.of(context).extension()!.themeType == - ThemeType.dark || - Theme.of(context).extension()!.themeType == - ThemeType - .oledBlack) // TODO make sure this cover OLED black, too - ? "assets/svg/buy/Simplex-Nuvei-Logo-light.svg" - : "assets/svg/buy/Simplex-Nuvei-Logo.svg"; + switch (Theme.of(context).extension()!.themeType) { + case ThemeType.dark: + case ThemeType.oledBlack: + return "assets/svg/buy/Simplex-Nuvei-Logo-light.svg"; + + case ThemeType.fruitSorbet: + case ThemeType.forest: + case ThemeType.oceanBreeze: + case ThemeType.light: + return "assets/svg/buy/Simplex-Nuvei-Logo.svg"; + } } } class _COIN_CONTROL { const _COIN_CONTROL(); - String get blocked => "assets/svg/coin_control/frozen.svg"; - String get unBlocked => "assets/svg/coin_control/unfrozen.svg"; - String get gamePad => "assets/svg/coin_control/gamepad.svg"; - String get selected => "assets/svg/coin_control/selected.svg"; + static const _path = "assets/svg/coin_control/"; + + String get blocked => "${_path}frozen.svg"; + String get unBlocked => "${_path}unfrozen.svg"; + String get gamePad => "${_path}gamepad.svg"; + String get selected => "${_path}selected.svg"; } class _SVG { const _SVG(); + static const _path_themed = "assets/svg/themed/"; + final coinControl = const _COIN_CONTROL(); String? background(BuildContext context) { @@ -72,47 +85,47 @@ class _SVG { case ThemeType.oceanBreeze: case ThemeType.fruitSorbet: case ThemeType.forest: - return "assets/svg/${Theme.of(context).extension()!.themeType.name}/bg.svg"; + return "$_path_themed${Theme.of(context).extension()!.themeType.name}/bg.svg"; } } String bellNew(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/bell-new.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/bell-new.svg"; String stackIcon(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/stack-icon1.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/stack-icon1.svg"; String exchange(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/exchange-2.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/exchange-2.svg"; String buy(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/buy-coins-icon.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/buy-coins-icon.svg"; String receive(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/tx-icon-receive.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/tx-icon-receive.svg"; String receivePending(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/tx-icon-receive-pending.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/tx-icon-receive-pending.svg"; String receiveCancelled(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/tx-icon-receive-failed.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/tx-icon-receive-failed.svg"; String send(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/tx-icon-send.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/tx-icon-send.svg"; String sendPending(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/tx-icon-send-pending.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/tx-icon-send-pending.svg"; String sendCancelled(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/tx-icon-send-failed.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/tx-icon-send-failed.svg"; String txExchange(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/tx-exchange-icon.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/tx-exchange-icon.svg"; String txExchangePending(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/tx-exchange-icon-pending.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/tx-exchange-icon-pending.svg"; String txExchangeFailed(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/tx-exchange-icon-failed.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/tx-exchange-icon-failed.svg"; String personaIncognito(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/persona-incognito-1.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/persona-incognito-1.svg"; String personaEasy(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/persona-easy-1.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/persona-easy-1.svg"; String stack(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/stack.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/stack.svg"; String get themeFruit => "assets/svg/fruit-sorbet-theme.svg"; String get themeForest => "assets/svg/forest-theme.svg"; @@ -220,9 +233,20 @@ class _SVG { String get whirlPool => "assets/svg/whirlpool.svg"; String get fingerprint => "assets/svg/fingerprint.svg"; String get faceId => "assets/svg/faceid.svg"; - String get ellipse1 => "assets/svg/Ellipse-43.svg"; String get ellipse2 => "assets/svg/Ellipse-42.svg"; + String get chevronRight => "assets/svg/chevron-right.svg"; + String get minimize => "assets/svg/minimize.svg"; + String get walletFa => "assets/svg/wallet-fa.svg"; + String get exchange3 => "assets/svg/exchange-3.svg"; + String get messageQuestion => "assets/svg/message-question-1.svg"; + +// TODO provide proper assets + String get bitcoinTestnet => "assets/svg/coin_icons/Bitcoin.svg"; + String get bitcoincashTestnet => "assets/svg/coin_icons/Bitcoincash.svg"; + String get firoTestnet => "assets/svg/coin_icons/Firo.svg"; + String get dogecoinTestnet => "assets/svg/coin_icons/Dogecoin.svg"; + String get particlTestnet => "assets/svg/coin_icons/Particl.svg"; // small icons String get bitcoin => "assets/svg/coin_icons/Bitcoin.svg"; @@ -236,20 +260,6 @@ class _SVG { String get namecoin => "assets/svg/coin_icons/Namecoin.svg"; String get particl => "assets/svg/coin_icons/Particl.svg"; - String get chevronRight => "assets/svg/chevron-right.svg"; - String get minimize => "assets/svg/minimize.svg"; - String get walletFa => "assets/svg/wallet-fa.svg"; - String get exchange3 => "assets/svg/exchange-3.svg"; - String get messageQuestion => "assets/svg/message-question-1.svg"; - -// TODO provide proper assets - String get bitcoinTestnet => "assets/svg/coin_icons/Bitcoin.svg"; - String get bitcoincashTestnet => "assets/svg/coin_icons/Bitcoincash.svg"; - String get firoTestnet => "assets/svg/coin_icons/Firo.svg"; - String get dogecoinTestnet => "assets/svg/coin_icons/Dogecoin.svg"; - String get particlTestnet => - "assets/svg/coin_icons/Dogecoin.svg"; //TODO - Update icon to particl - String iconFor({required Coin coin}) { switch (coin) { case Coin.bitcoin: @@ -286,25 +296,25 @@ class _SVG { // big icons String bitcoinImage(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/bitcoin.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/bitcoin.svg"; String bitcoincashImage(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/bitcoincash.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/bitcoincash.svg"; String dogecoinImage(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/doge.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/doge.svg"; String epicCashImage(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/epic-cash.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/epic-cash.svg"; String firoImage(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/firo.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/firo.svg"; String litecoinImage(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/litecoin.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/litecoin.svg"; String moneroImage(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/monero.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/monero.svg"; String wowneroImage(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/wownero.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/wownero.svg"; String namecoinImage(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/namecoin.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/namecoin.svg"; String particlImage(BuildContext context) => - "assets/images/${Theme.of(context).extension()!.themeType.name}/particl.svg"; + "$_path_themed${Theme.of(context).extension()!.themeType.name}/particl.svg"; String imageFor({required BuildContext context, required Coin coin}) { switch (coin) { @@ -349,65 +359,13 @@ class _PNG { "assets/images/${Theme.of(context).extension()!.themeType.name}/stack.png"; String get splash => "assets/images/splash.png"; - // String monero(BuildContext context) => - // "assets/images/${Theme.of(context).extension()!.themeType.name}/monero.png"; - // String wownero(BuildContext context) => - // "assets/images/${Theme.of(context).extension()!.themeType.name}/wownero.png"; - // String firo(BuildContext context) => - // "assets/images/${Theme.of(context).extension()!.themeType.name}/firo.png"; - // String dogecoin(BuildContext context) => - // "assets/images/${Theme.of(context).extension()!.themeType.name}/doge.png"; - // String bitcoin(BuildContext context) => - // "assets/images/${Theme.of(context).extension()!.themeType.name}/bitcoin.png"; - // String litecoin(BuildContext context) => - // "assets/images/${Theme.of(context).extension()!.themeType.name}/litecoin.png"; - // String epicCash(BuildContext context) => - // "assets/images/${Theme.of(context).extension()!.themeType.name}/epic-cash.png"; - // String bitcoincash(BuildContext context) => - // "assets/images/${Theme.of(context).extension()!.themeType.name}/bitcoincash.png"; - // String namecoin(BuildContext context) => - // "assets/images/${Theme.of(context).extension()!.themeType.name}/namecoin.png"; - // String particl(BuildContext context) => - // "assets/images/${Theme.of(context).extension()!.themeType.name}/particl.png"; - String personaIncognito(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/persona-incognito-1.png"; + "$_kPath_themed${Theme.of(context).extension()!.themeType.name}/persona-incognito-1.png"; String personaEasy(BuildContext context) => - "assets/svg/${Theme.of(context).extension()!.themeType.name}/persona-easy-1.png"; + "$_kPath_themed${Theme.of(context).extension()!.themeType.name}/persona-easy-1.png"; String get glasses => "assets/images/glasses.png"; String get glassesHidden => "assets/images/glasses-hidden.png"; - - // String imageFor({required BuildContext context, required Coin coin}) { - // switch (coin) { - // case Coin.bitcoin: - // case Coin.bitcoinTestNet: - // return bitcoin(context); - // case Coin.litecoin: - // case Coin.litecoinTestNet: - // return litecoin(context); - // case Coin.bitcoincash: - // case Coin.bitcoincashTestnet: - // return bitcoincash(context); - // case Coin.dogecoin: - // case Coin.dogecoinTestNet: - // return dogecoin(context); - // case Coin.epicCash: - // return epicCash(context); - // case Coin.firo: - // return firo(context); - // case Coin.firoTestNet: - // return firo(context); - // case Coin.monero: - // return monero(context); - // case Coin.wownero: - // return wownero(context); - // case Coin.namecoin: - // return namecoin(context); - // case Coin.particl: - // return particl(context); - // } - // } } class _ANIMATIONS { diff --git a/pubspec.yaml b/pubspec.yaml index 9e4be9307..16e58dccc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -303,23 +303,16 @@ flutter: - assets/svg/whirlpool.svg - assets/svg/fingerprint.svg - assets/svg/faceid.svg - # light theme coin - - assets/images/light/ + - assets/svg/chevron-right.svg + - assets/svg/minimize.svg + - assets/svg/wallet-fa.svg + - assets/svg/exchange-3.svg + - assets/svg/message-question-1.svg + - assets/svg/drd-icon.svg + - assets/svg/box-auto.svg + - assets/svg/framed-address-book.svg + - assets/svg/framed-gear.svg - # dark theme coin - - assets/images/dark/ - - # oled black theme coin - - assets/images/oledBlack/ - - # ocean breeze theme coin - - assets/images/oceanBreeze/ - - # fruit sorbet theme coin - - assets/images/fruitSorbet/ - - # forest theme coin - - assets/images/forest/ # coin icons - assets/svg/coin_icons/ @@ -331,24 +324,10 @@ flutter: - assets/lottie/test.json - assets/lottie/test2.json # socials - - assets/svg/socials/discord.svg - - assets/svg/socials/reddit-alien-brands.svg - - assets/svg/socials/twitter-brands.svg - - assets/svg/socials/telegram-brands.svg - - assets/svg/chevron-right.svg - - assets/svg/minimize.svg - - assets/svg/wallet-fa.svg - - assets/svg/exchange-3.svg - - assets/svg/message-question-1.svg - - assets/svg/drd-icon.svg - - assets/svg/box-auto.svg - - assets/svg/framed-address-book.svg - - assets/svg/framed-gear.svg + - assets/svg/socials/ + # exchange icons - - assets/svg/exchange_icons/change_now_logo_1.svg - - assets/svg/exchange_icons/simpleswap-icon.svg - - assets/svg/exchange_icons/mb_green.svg - - assets/svg/exchange_icons/mb_blue.svg + - assets/svg/exchange_icons/ # theme selectors - assets/svg/dark-theme.svg @@ -359,26 +338,25 @@ flutter: - assets/svg/forest-theme.svg # light theme specific - - assets/svg/light/ + - assets/svg/themed/light/ # dark theme specific - - assets/svg/dark/ + - assets/svg/themed/dark/ # ocean theme specific - - assets/svg/oceanBreeze/ + - assets/svg/themed/oceanBreeze/ # OLED black theme specific - - assets/svg/oledBlack/ + - assets/svg/themed/oledBlack/ # fruit sorbet theme specific - - assets/svg/fruitSorbet/ + - assets/svg/themed/fruitSorbet/ # forest theme specific - - assets/svg/forest/ + - assets/svg/themed/forest/ # buy - - assets/svg/buy/Simplex-Nuvei-Logo.svg - - assets/svg/buy/Simplex-Nuvei-Logo-light.svg + - assets/svg/buy/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware.