diff --git a/assets/images/categories/1.5x/categories_defi.png b/assets/images/categories/1.5x/categories_defi.png deleted file mode 100644 index 1c44ef659..000000000 Binary files a/assets/images/categories/1.5x/categories_defi.png and /dev/null differ diff --git a/assets/images/categories/1.5x/categories_games.png b/assets/images/categories/1.5x/categories_games.png deleted file mode 100644 index 4c110329a..000000000 Binary files a/assets/images/categories/1.5x/categories_games.png and /dev/null differ diff --git a/assets/images/categories/1.5x/categories_marketplace.png b/assets/images/categories/1.5x/categories_marketplace.png deleted file mode 100644 index 71f774c54..000000000 Binary files a/assets/images/categories/1.5x/categories_marketplace.png and /dev/null differ diff --git a/assets/images/categories/1.5x/categories_nft.png b/assets/images/categories/1.5x/categories_nft.png deleted file mode 100644 index 595f9b64b..000000000 Binary files a/assets/images/categories/1.5x/categories_nft.png and /dev/null differ diff --git a/assets/images/categories/1.5x/categories_other.png b/assets/images/categories/1.5x/categories_other.png deleted file mode 100644 index 25325836e..000000000 Binary files a/assets/images/categories/1.5x/categories_other.png and /dev/null differ diff --git a/assets/images/categories/1.5x/categories_social.png b/assets/images/categories/1.5x/categories_social.png deleted file mode 100644 index 5c54931f3..000000000 Binary files a/assets/images/categories/1.5x/categories_social.png and /dev/null differ diff --git a/assets/images/categories/1.5x/categories_utilites.png b/assets/images/categories/1.5x/categories_utilites.png deleted file mode 100644 index 3d913fe60..000000000 Binary files a/assets/images/categories/1.5x/categories_utilites.png and /dev/null differ diff --git a/assets/images/categories/2.0x/categories_defi.png b/assets/images/categories/2.0x/categories_defi.png deleted file mode 100644 index 9c8d920e8..000000000 Binary files a/assets/images/categories/2.0x/categories_defi.png and /dev/null differ diff --git a/assets/images/categories/2.0x/categories_games.png b/assets/images/categories/2.0x/categories_games.png deleted file mode 100644 index fe9d858a0..000000000 Binary files a/assets/images/categories/2.0x/categories_games.png and /dev/null differ diff --git a/assets/images/categories/2.0x/categories_marketplace.png b/assets/images/categories/2.0x/categories_marketplace.png deleted file mode 100644 index 8fb64e11c..000000000 Binary files a/assets/images/categories/2.0x/categories_marketplace.png and /dev/null differ diff --git a/assets/images/categories/2.0x/categories_nft.png b/assets/images/categories/2.0x/categories_nft.png deleted file mode 100644 index 75489b5f9..000000000 Binary files a/assets/images/categories/2.0x/categories_nft.png and /dev/null differ diff --git a/assets/images/categories/2.0x/categories_other.png b/assets/images/categories/2.0x/categories_other.png deleted file mode 100644 index 6282f6221..000000000 Binary files a/assets/images/categories/2.0x/categories_other.png and /dev/null differ diff --git a/assets/images/categories/2.0x/categories_social.png b/assets/images/categories/2.0x/categories_social.png deleted file mode 100644 index 3f9373045..000000000 Binary files a/assets/images/categories/2.0x/categories_social.png and /dev/null differ diff --git a/assets/images/categories/2.0x/categories_utilites.png b/assets/images/categories/2.0x/categories_utilites.png deleted file mode 100644 index cde0d2e44..000000000 Binary files a/assets/images/categories/2.0x/categories_utilites.png and /dev/null differ diff --git a/assets/images/categories/3.0x/categories_defi.png b/assets/images/categories/3.0x/categories_defi.png deleted file mode 100644 index 69a25c6dd..000000000 Binary files a/assets/images/categories/3.0x/categories_defi.png and /dev/null differ diff --git a/assets/images/categories/3.0x/categories_games.png b/assets/images/categories/3.0x/categories_games.png deleted file mode 100644 index 66ec1d6d3..000000000 Binary files a/assets/images/categories/3.0x/categories_games.png and /dev/null differ diff --git a/assets/images/categories/3.0x/categories_marketplace.png b/assets/images/categories/3.0x/categories_marketplace.png deleted file mode 100644 index 0d9508509..000000000 Binary files a/assets/images/categories/3.0x/categories_marketplace.png and /dev/null differ diff --git a/assets/images/categories/3.0x/categories_nft.png b/assets/images/categories/3.0x/categories_nft.png deleted file mode 100644 index b87a59cfa..000000000 Binary files a/assets/images/categories/3.0x/categories_nft.png and /dev/null differ diff --git a/assets/images/categories/3.0x/categories_other.png b/assets/images/categories/3.0x/categories_other.png deleted file mode 100644 index d7c8d074d..000000000 Binary files a/assets/images/categories/3.0x/categories_other.png and /dev/null differ diff --git a/assets/images/categories/3.0x/categories_social.png b/assets/images/categories/3.0x/categories_social.png deleted file mode 100644 index c70308883..000000000 Binary files a/assets/images/categories/3.0x/categories_social.png and /dev/null differ diff --git a/assets/images/categories/3.0x/categories_utilites.png b/assets/images/categories/3.0x/categories_utilites.png deleted file mode 100644 index a3a3818f4..000000000 Binary files a/assets/images/categories/3.0x/categories_utilites.png and /dev/null differ diff --git a/assets/images/categories/4.0x/categories_defi.png b/assets/images/categories/4.0x/categories_defi.png deleted file mode 100644 index 88cd45e00..000000000 Binary files a/assets/images/categories/4.0x/categories_defi.png and /dev/null differ diff --git a/assets/images/categories/4.0x/categories_games.png b/assets/images/categories/4.0x/categories_games.png deleted file mode 100644 index 3ee6bd231..000000000 Binary files a/assets/images/categories/4.0x/categories_games.png and /dev/null differ diff --git a/assets/images/categories/4.0x/categories_marketplace.png b/assets/images/categories/4.0x/categories_marketplace.png deleted file mode 100644 index dec4be8de..000000000 Binary files a/assets/images/categories/4.0x/categories_marketplace.png and /dev/null differ diff --git a/assets/images/categories/4.0x/categories_nft.png b/assets/images/categories/4.0x/categories_nft.png deleted file mode 100644 index 69863c37c..000000000 Binary files a/assets/images/categories/4.0x/categories_nft.png and /dev/null differ diff --git a/assets/images/categories/4.0x/categories_other.png b/assets/images/categories/4.0x/categories_other.png deleted file mode 100644 index e76c893d4..000000000 Binary files a/assets/images/categories/4.0x/categories_other.png and /dev/null differ diff --git a/assets/images/categories/4.0x/categories_social.png b/assets/images/categories/4.0x/categories_social.png deleted file mode 100644 index ceb7c367c..000000000 Binary files a/assets/images/categories/4.0x/categories_social.png and /dev/null differ diff --git a/assets/images/categories/4.0x/categories_utilites.png b/assets/images/categories/4.0x/categories_utilites.png deleted file mode 100644 index 5281401e4..000000000 Binary files a/assets/images/categories/4.0x/categories_utilites.png and /dev/null differ diff --git a/assets/images/categories/categories_defi.png b/assets/images/categories/categories_defi.png deleted file mode 100644 index 34366cb4e..000000000 Binary files a/assets/images/categories/categories_defi.png and /dev/null differ diff --git a/assets/images/categories/categories_games.png b/assets/images/categories/categories_games.png deleted file mode 100644 index 27bc370af..000000000 Binary files a/assets/images/categories/categories_games.png and /dev/null differ diff --git a/assets/images/categories/categories_marketplace.png b/assets/images/categories/categories_marketplace.png deleted file mode 100644 index 7d5e40f7d..000000000 Binary files a/assets/images/categories/categories_marketplace.png and /dev/null differ diff --git a/assets/images/categories/categories_nft.png b/assets/images/categories/categories_nft.png deleted file mode 100644 index 8b447aaa2..000000000 Binary files a/assets/images/categories/categories_nft.png and /dev/null differ diff --git a/assets/images/categories/categories_other.png b/assets/images/categories/categories_other.png deleted file mode 100644 index b81de554c..000000000 Binary files a/assets/images/categories/categories_other.png and /dev/null differ diff --git a/assets/images/categories/categories_social.png b/assets/images/categories/categories_social.png deleted file mode 100644 index 5e2aa3378..000000000 Binary files a/assets/images/categories/categories_social.png and /dev/null differ diff --git a/assets/images/categories/categories_utilites.png b/assets/images/categories/categories_utilites.png deleted file mode 100644 index 43026bc5c..000000000 Binary files a/assets/images/categories/categories_utilites.png and /dev/null differ diff --git a/assets/images/identity/1.5x/wallet_login_cloud.png b/assets/images/identity/1.5x/wallet_login_cloud.png deleted file mode 100755 index 8feed12ac..000000000 Binary files a/assets/images/identity/1.5x/wallet_login_cloud.png and /dev/null differ diff --git a/assets/images/identity/1.5x/wallet_login_recovery.png b/assets/images/identity/1.5x/wallet_login_recovery.png deleted file mode 100755 index 7124f8687..000000000 Binary files a/assets/images/identity/1.5x/wallet_login_recovery.png and /dev/null differ diff --git a/assets/images/identity/2.0x/wallet_login_cloud.png b/assets/images/identity/2.0x/wallet_login_cloud.png deleted file mode 100755 index 3414fb028..000000000 Binary files a/assets/images/identity/2.0x/wallet_login_cloud.png and /dev/null differ diff --git a/assets/images/identity/2.0x/wallet_login_recovery.png b/assets/images/identity/2.0x/wallet_login_recovery.png deleted file mode 100755 index ffdb9f617..000000000 Binary files a/assets/images/identity/2.0x/wallet_login_recovery.png and /dev/null differ diff --git a/assets/images/identity/3.0x/wallet_login_cloud.png b/assets/images/identity/3.0x/wallet_login_cloud.png deleted file mode 100755 index 34de2ff66..000000000 Binary files a/assets/images/identity/3.0x/wallet_login_cloud.png and /dev/null differ diff --git a/assets/images/identity/3.0x/wallet_login_recovery.png b/assets/images/identity/3.0x/wallet_login_recovery.png deleted file mode 100755 index 7a5b8b173..000000000 Binary files a/assets/images/identity/3.0x/wallet_login_recovery.png and /dev/null differ diff --git a/assets/images/identity/4.0x/wallet_login_cloud.png b/assets/images/identity/4.0x/wallet_login_cloud.png deleted file mode 100755 index 23ad3f0f1..000000000 Binary files a/assets/images/identity/4.0x/wallet_login_cloud.png and /dev/null differ diff --git a/assets/images/identity/4.0x/wallet_login_recovery.png b/assets/images/identity/4.0x/wallet_login_recovery.png deleted file mode 100755 index d7eb2468e..000000000 Binary files a/assets/images/identity/4.0x/wallet_login_recovery.png and /dev/null differ diff --git a/assets/images/identity/wallet_login_cloud.png b/assets/images/identity/wallet_login_cloud.png deleted file mode 100755 index 9bde481f4..000000000 Binary files a/assets/images/identity/wallet_login_cloud.png and /dev/null differ diff --git a/assets/images/identity/wallet_login_recovery.png b/assets/images/identity/wallet_login_recovery.png deleted file mode 100755 index d916416b5..000000000 Binary files a/assets/images/identity/wallet_login_recovery.png and /dev/null differ diff --git a/assets/images/misc/1.5x/action_deletewallet.png b/assets/images/misc/1.5x/action_deletewallet.png deleted file mode 100644 index 290552cdb..000000000 Binary files a/assets/images/misc/1.5x/action_deletewallet.png and /dev/null differ diff --git a/assets/images/misc/1.5x/auth_photo_placeholder.png b/assets/images/misc/1.5x/auth_photo_placeholder.png deleted file mode 100644 index 37d9e8aac..000000000 Binary files a/assets/images/misc/1.5x/auth_photo_placeholder.png and /dev/null differ diff --git a/assets/images/misc/1.5x/dapps_empty.png b/assets/images/misc/1.5x/dapps_empty.png deleted file mode 100644 index 6c036a451..000000000 Binary files a/assets/images/misc/1.5x/dapps_empty.png and /dev/null differ diff --git a/assets/images/misc/1.5x/empty_coins.png b/assets/images/misc/1.5x/empty_coins.png deleted file mode 100644 index 127acee4f..000000000 Binary files a/assets/images/misc/1.5x/empty_coins.png and /dev/null differ diff --git a/assets/images/misc/1.5x/empty_history.png b/assets/images/misc/1.5x/empty_history.png deleted file mode 100644 index 75abc47a2..000000000 Binary files a/assets/images/misc/1.5x/empty_history.png and /dev/null differ diff --git a/assets/images/misc/1.5x/empty_nft.png b/assets/images/misc/1.5x/empty_nft.png deleted file mode 100644 index 3902ebf4d..000000000 Binary files a/assets/images/misc/1.5x/empty_nft.png and /dev/null differ diff --git a/assets/images/misc/1.5x/empty_search.png b/assets/images/misc/1.5x/empty_search.png deleted file mode 100644 index 3a05cfb40..000000000 Binary files a/assets/images/misc/1.5x/empty_search.png and /dev/null differ diff --git a/assets/images/misc/1.5x/icon_camera.png b/assets/images/misc/1.5x/icon_camera.png deleted file mode 100644 index 12a2df3f9..000000000 Binary files a/assets/images/misc/1.5x/icon_camera.png and /dev/null differ diff --git a/assets/images/misc/2.0x/action_deletewallet.png b/assets/images/misc/2.0x/action_deletewallet.png deleted file mode 100644 index 7c113f3e6..000000000 Binary files a/assets/images/misc/2.0x/action_deletewallet.png and /dev/null differ diff --git a/assets/images/misc/2.0x/auth_photo_placeholder.png b/assets/images/misc/2.0x/auth_photo_placeholder.png deleted file mode 100644 index 29f46aab5..000000000 Binary files a/assets/images/misc/2.0x/auth_photo_placeholder.png and /dev/null differ diff --git a/assets/images/misc/2.0x/dapps_empty.png b/assets/images/misc/2.0x/dapps_empty.png deleted file mode 100644 index f5858db75..000000000 Binary files a/assets/images/misc/2.0x/dapps_empty.png and /dev/null differ diff --git a/assets/images/misc/2.0x/empty_coins.png b/assets/images/misc/2.0x/empty_coins.png deleted file mode 100644 index 187c25363..000000000 Binary files a/assets/images/misc/2.0x/empty_coins.png and /dev/null differ diff --git a/assets/images/misc/2.0x/empty_history.png b/assets/images/misc/2.0x/empty_history.png deleted file mode 100644 index c2ac1f169..000000000 Binary files a/assets/images/misc/2.0x/empty_history.png and /dev/null differ diff --git a/assets/images/misc/2.0x/empty_nft.png b/assets/images/misc/2.0x/empty_nft.png deleted file mode 100644 index 6f4aa2bd1..000000000 Binary files a/assets/images/misc/2.0x/empty_nft.png and /dev/null differ diff --git a/assets/images/misc/2.0x/empty_search.png b/assets/images/misc/2.0x/empty_search.png deleted file mode 100644 index 527e96604..000000000 Binary files a/assets/images/misc/2.0x/empty_search.png and /dev/null differ diff --git a/assets/images/misc/2.0x/icon_camera.png b/assets/images/misc/2.0x/icon_camera.png deleted file mode 100644 index 4cbc5ee4d..000000000 Binary files a/assets/images/misc/2.0x/icon_camera.png and /dev/null differ diff --git a/assets/images/misc/3.0x/action_deletewallet.png b/assets/images/misc/3.0x/action_deletewallet.png deleted file mode 100644 index 54c1928d1..000000000 Binary files a/assets/images/misc/3.0x/action_deletewallet.png and /dev/null differ diff --git a/assets/images/misc/3.0x/auth_photo_placeholder.png b/assets/images/misc/3.0x/auth_photo_placeholder.png deleted file mode 100644 index c0d1ed223..000000000 Binary files a/assets/images/misc/3.0x/auth_photo_placeholder.png and /dev/null differ diff --git a/assets/images/misc/3.0x/dapps_empty.png b/assets/images/misc/3.0x/dapps_empty.png deleted file mode 100644 index 6c6f6f60e..000000000 Binary files a/assets/images/misc/3.0x/dapps_empty.png and /dev/null differ diff --git a/assets/images/misc/3.0x/empty_coins.png b/assets/images/misc/3.0x/empty_coins.png deleted file mode 100644 index 00a9acbed..000000000 Binary files a/assets/images/misc/3.0x/empty_coins.png and /dev/null differ diff --git a/assets/images/misc/3.0x/empty_history.png b/assets/images/misc/3.0x/empty_history.png deleted file mode 100644 index 3aac7778e..000000000 Binary files a/assets/images/misc/3.0x/empty_history.png and /dev/null differ diff --git a/assets/images/misc/3.0x/empty_nft.png b/assets/images/misc/3.0x/empty_nft.png deleted file mode 100644 index 8b79813f6..000000000 Binary files a/assets/images/misc/3.0x/empty_nft.png and /dev/null differ diff --git a/assets/images/misc/3.0x/empty_search.png b/assets/images/misc/3.0x/empty_search.png deleted file mode 100644 index 8c8996f58..000000000 Binary files a/assets/images/misc/3.0x/empty_search.png and /dev/null differ diff --git a/assets/images/misc/3.0x/icon_camera.png b/assets/images/misc/3.0x/icon_camera.png deleted file mode 100644 index 9514fd91e..000000000 Binary files a/assets/images/misc/3.0x/icon_camera.png and /dev/null differ diff --git a/assets/images/misc/4.0x/action_deletewallet.png b/assets/images/misc/4.0x/action_deletewallet.png deleted file mode 100644 index a70f45576..000000000 Binary files a/assets/images/misc/4.0x/action_deletewallet.png and /dev/null differ diff --git a/assets/images/misc/4.0x/auth_photo_placeholder.png b/assets/images/misc/4.0x/auth_photo_placeholder.png deleted file mode 100644 index a9cac0f7f..000000000 Binary files a/assets/images/misc/4.0x/auth_photo_placeholder.png and /dev/null differ diff --git a/assets/images/misc/4.0x/dapps_empty.png b/assets/images/misc/4.0x/dapps_empty.png deleted file mode 100644 index d8216e4dd..000000000 Binary files a/assets/images/misc/4.0x/dapps_empty.png and /dev/null differ diff --git a/assets/images/misc/4.0x/empty_coins.png b/assets/images/misc/4.0x/empty_coins.png deleted file mode 100644 index 84c4abda3..000000000 Binary files a/assets/images/misc/4.0x/empty_coins.png and /dev/null differ diff --git a/assets/images/misc/4.0x/empty_history.png b/assets/images/misc/4.0x/empty_history.png deleted file mode 100644 index b2003830e..000000000 Binary files a/assets/images/misc/4.0x/empty_history.png and /dev/null differ diff --git a/assets/images/misc/4.0x/empty_nft.png b/assets/images/misc/4.0x/empty_nft.png deleted file mode 100644 index 12fe52391..000000000 Binary files a/assets/images/misc/4.0x/empty_nft.png and /dev/null differ diff --git a/assets/images/misc/4.0x/empty_search.png b/assets/images/misc/4.0x/empty_search.png deleted file mode 100644 index d5a418941..000000000 Binary files a/assets/images/misc/4.0x/empty_search.png and /dev/null differ diff --git a/assets/images/misc/4.0x/icon_camera.png b/assets/images/misc/4.0x/icon_camera.png deleted file mode 100644 index d1dca2cd3..000000000 Binary files a/assets/images/misc/4.0x/icon_camera.png and /dev/null differ diff --git a/assets/images/misc/action_deletewallet.png b/assets/images/misc/action_deletewallet.png deleted file mode 100644 index ee68a6e34..000000000 Binary files a/assets/images/misc/action_deletewallet.png and /dev/null differ diff --git a/assets/images/misc/auth_photo_placeholder.png b/assets/images/misc/auth_photo_placeholder.png deleted file mode 100644 index 7b8acf3a8..000000000 Binary files a/assets/images/misc/auth_photo_placeholder.png and /dev/null differ diff --git a/assets/images/misc/dapps_empty.png b/assets/images/misc/dapps_empty.png deleted file mode 100644 index 14e6cc7a3..000000000 Binary files a/assets/images/misc/dapps_empty.png and /dev/null differ diff --git a/assets/images/misc/empty_coins.png b/assets/images/misc/empty_coins.png deleted file mode 100644 index 35dea90fe..000000000 Binary files a/assets/images/misc/empty_coins.png and /dev/null differ diff --git a/assets/images/misc/empty_history.png b/assets/images/misc/empty_history.png deleted file mode 100644 index e97f51862..000000000 Binary files a/assets/images/misc/empty_history.png and /dev/null differ diff --git a/assets/images/misc/empty_nft.png b/assets/images/misc/empty_nft.png deleted file mode 100644 index 138a6f51f..000000000 Binary files a/assets/images/misc/empty_nft.png and /dev/null differ diff --git a/assets/images/misc/empty_search.png b/assets/images/misc/empty_search.png deleted file mode 100644 index 00fc7779f..000000000 Binary files a/assets/images/misc/empty_search.png and /dev/null differ diff --git a/assets/images/misc/icon_camera.png b/assets/images/misc/icon_camera.png deleted file mode 100644 index 42df1ee7f..000000000 Binary files a/assets/images/misc/icon_camera.png and /dev/null differ diff --git a/assets/images/icons/action_sendfunds_successful.svg b/assets/svg/action_sendfunds_successful.svg similarity index 100% rename from assets/images/icons/action_sendfunds_successful.svg rename to assets/svg/action_sendfunds_successful.svg diff --git a/assets/images/icons/action_wallet_autherror.svg b/assets/svg/action_wallet_autherror.svg similarity index 100% rename from assets/images/icons/action_wallet_autherror.svg rename to assets/svg/action_wallet_autherror.svg diff --git a/assets/images/icons/action_wallet_confirmemail.svg b/assets/svg/action_wallet_confirmemail.svg similarity index 100% rename from assets/images/icons/action_wallet_confirmemail.svg rename to assets/svg/action_wallet_confirmemail.svg diff --git a/assets/images/icons/action_wallet_confirmphone.svg b/assets/svg/action_wallet_confirmphone.svg similarity index 100% rename from assets/images/icons/action_wallet_confirmphone.svg rename to assets/svg/action_wallet_confirmphone.svg diff --git a/assets/svg/action_wallet_delete.svg b/assets/svg/action_wallet_delete.svg new file mode 100644 index 000000000..09a34404e --- /dev/null +++ b/assets/svg/action_wallet_delete.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/images/icons/action_wallet_googleauth.svg b/assets/svg/action_wallet_googleauth.svg similarity index 100% rename from assets/images/icons/action_wallet_googleauth.svg rename to assets/svg/action_wallet_googleauth.svg diff --git a/assets/images/icons/action_wallet_id_key.svg b/assets/svg/action_wallet_id_key.svg similarity index 100% rename from assets/images/icons/action_wallet_id_key.svg rename to assets/svg/action_wallet_id_key.svg diff --git a/assets/images/icons/action_wallet_keyserror.svg b/assets/svg/action_wallet_keyserror.svg similarity index 100% rename from assets/images/icons/action_wallet_keyserror.svg rename to assets/svg/action_wallet_keyserror.svg diff --git a/assets/images/icons/action_wallet_lock.svg b/assets/svg/action_wallet_lock.svg similarity index 100% rename from assets/images/icons/action_wallet_lock.svg rename to assets/svg/action_wallet_lock.svg diff --git a/assets/images/icons/action_wallet_screenshot.svg b/assets/svg/action_wallet_screenshot.svg similarity index 100% rename from assets/images/icons/action_wallet_screenshot.svg rename to assets/svg/action_wallet_screenshot.svg diff --git a/assets/images/icons/action_wallet_secureaccount.svg b/assets/svg/action_wallet_secureaccount.svg similarity index 100% rename from assets/images/icons/action_wallet_secureaccount.svg rename to assets/svg/action_wallet_secureaccount.svg diff --git a/assets/images/icons/action_wallet_secureaccsuccess.svg b/assets/svg/action_wallet_secureaccsuccess.svg similarity index 100% rename from assets/images/icons/action_wallet_secureaccsuccess.svg rename to assets/svg/action_wallet_secureaccsuccess.svg diff --git a/assets/images/icons/action_wallet_success2_fa.svg b/assets/svg/action_wallet_success2_fa.svg similarity index 100% rename from assets/images/icons/action_wallet_success2_fa.svg rename to assets/svg/action_wallet_success2_fa.svg diff --git a/assets/svg/categories_defi.svg b/assets/svg/categories_defi.svg new file mode 100644 index 000000000..9795e8df5 --- /dev/null +++ b/assets/svg/categories_defi.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/svg/categories_games.svg b/assets/svg/categories_games.svg new file mode 100644 index 000000000..e18741e2f --- /dev/null +++ b/assets/svg/categories_games.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/svg/categories_marketplace.svg b/assets/svg/categories_marketplace.svg new file mode 100644 index 000000000..6c5227ce5 --- /dev/null +++ b/assets/svg/categories_marketplace.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/svg/categories_nft.svg b/assets/svg/categories_nft.svg new file mode 100644 index 000000000..beb04c02c --- /dev/null +++ b/assets/svg/categories_nft.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/svg/categories_other.svg b/assets/svg/categories_other.svg new file mode 100644 index 000000000..11a1fe87e --- /dev/null +++ b/assets/svg/categories_other.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/svg/categories_social.svg b/assets/svg/categories_social.svg new file mode 100644 index 000000000..6cd18c120 --- /dev/null +++ b/assets/svg/categories_social.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/svg/categories_utilites.svg b/assets/svg/categories_utilites.svg new file mode 100644 index 000000000..0e5b61fb4 --- /dev/null +++ b/assets/svg/categories_utilites.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/images/icons/icon_2fa_authsetup.svg b/assets/svg/icon_2fa_authsetup.svg similarity index 100% rename from assets/images/icons/icon_2fa_authsetup.svg rename to assets/svg/icon_2fa_authsetup.svg diff --git a/assets/images/icons/icon_2fa_authy.svg b/assets/svg/icon_2fa_authy.svg similarity index 100% rename from assets/images/icons/icon_2fa_authy.svg rename to assets/svg/icon_2fa_authy.svg diff --git a/assets/images/icons/icon_2fa_emailauth.svg b/assets/svg/icon_2fa_emailauth.svg similarity index 100% rename from assets/images/icons/icon_2fa_emailauth.svg rename to assets/svg/icon_2fa_emailauth.svg diff --git a/assets/images/icons/icon_2fa_followinstuction.svg b/assets/svg/icon_2fa_followinstuction.svg similarity index 100% rename from assets/images/icons/icon_2fa_followinstuction.svg rename to assets/svg/icon_2fa_followinstuction.svg diff --git a/assets/images/icons/icon_2fa_googleauth.svg b/assets/svg/icon_2fa_googleauth.svg similarity index 100% rename from assets/images/icons/icon_2fa_googleauth.svg rename to assets/svg/icon_2fa_googleauth.svg diff --git a/assets/images/icons/icon_2fa_lastpass.svg b/assets/svg/icon_2fa_lastpass.svg similarity index 100% rename from assets/images/icons/icon_2fa_lastpass.svg rename to assets/svg/icon_2fa_lastpass.svg diff --git a/assets/images/icons/icon_2fa_userlock.svg b/assets/svg/icon_2fa_userlock.svg similarity index 100% rename from assets/images/icons/icon_2fa_userlock.svg rename to assets/svg/icon_2fa_userlock.svg diff --git a/assets/images/icons/icon_2famicrosoft.svg b/assets/svg/icon_2famicrosoft.svg similarity index 100% rename from assets/images/icons/icon_2famicrosoft.svg rename to assets/svg/icon_2famicrosoft.svg diff --git a/assets/images/icons/icon_arrow_down.svg b/assets/svg/icon_arrow_down.svg similarity index 100% rename from assets/images/icons/icon_arrow_down.svg rename to assets/svg/icon_arrow_down.svg diff --git a/assets/images/icons/icon_arrow_right.svg b/assets/svg/icon_arrow_right.svg similarity index 100% rename from assets/images/icons/icon_arrow_right.svg rename to assets/svg/icon_arrow_right.svg diff --git a/assets/images/icons/icon_arrow_select.svg b/assets/svg/icon_arrow_select.svg similarity index 100% rename from assets/images/icons/icon_arrow_select.svg rename to assets/svg/icon_arrow_select.svg diff --git a/assets/images/icons/icon_arrow_up.svg b/assets/svg/icon_arrow_up.svg similarity index 100% rename from assets/images/icons/icon_arrow_up.svg rename to assets/svg/icon_arrow_up.svg diff --git a/assets/images/icons/icon_back_arrow.svg b/assets/svg/icon_back_arrow.svg similarity index 100% rename from assets/images/icons/icon_back_arrow.svg rename to assets/svg/icon_back_arrow.svg diff --git a/assets/images/icons/icon_badge_company.svg b/assets/svg/icon_badge_company.svg similarity index 100% rename from assets/images/icons/icon_badge_company.svg rename to assets/svg/icon_badge_company.svg diff --git a/assets/images/icons/icon_badge_icelogo.svg b/assets/svg/icon_badge_icelogo.svg similarity index 100% rename from assets/images/icons/icon_badge_icelogo.svg rename to assets/svg/icon_badge_icelogo.svg diff --git a/assets/images/icons/icon_badge_linkedin.svg b/assets/svg/icon_badge_linkedin.svg similarity index 100% rename from assets/images/icons/icon_badge_linkedin.svg rename to assets/svg/icon_badge_linkedin.svg diff --git a/assets/images/icons/icon_badge_verify.svg b/assets/svg/icon_badge_verify.svg similarity index 100% rename from assets/images/icons/icon_badge_verify.svg rename to assets/svg/icon_badge_verify.svg diff --git a/assets/images/icons/icon_block.svg b/assets/svg/icon_block.svg similarity index 100% rename from assets/images/icons/icon_block.svg rename to assets/svg/icon_block.svg diff --git a/assets/images/icons/icon_block_check_green.svg b/assets/svg/icon_block_check_green.svg similarity index 100% rename from assets/images/icons/icon_block_check_green.svg rename to assets/svg/icon_block_check_green.svg diff --git a/assets/images/icons/icon_block_checkbox_off.svg b/assets/svg/icon_block_checkbox_off.svg similarity index 100% rename from assets/images/icons/icon_block_checkbox_off.svg rename to assets/svg/icon_block_checkbox_off.svg diff --git a/assets/images/icons/icon_block_checkbox_on.svg b/assets/svg/icon_block_checkbox_on.svg similarity index 100% rename from assets/images/icons/icon_block_checkbox_on.svg rename to assets/svg/icon_block_checkbox_on.svg diff --git a/assets/images/icons/icon_block_checkbox_onblue.svg b/assets/svg/icon_block_checkbox_onblue.svg similarity index 100% rename from assets/images/icons/icon_block_checkbox_onblue.svg rename to assets/svg/icon_block_checkbox_onblue.svg diff --git a/assets/images/icons/icon_block_coins.svg b/assets/svg/icon_block_coins.svg similarity index 100% rename from assets/images/icons/icon_block_coins.svg rename to assets/svg/icon_block_coins.svg diff --git a/assets/images/icons/icon_block_comment.svg b/assets/svg/icon_block_comment.svg similarity index 100% rename from assets/images/icons/icon_block_comment.svg rename to assets/svg/icon_block_comment.svg diff --git a/assets/images/icons/icon_block_commenton.svg b/assets/svg/icon_block_commenton.svg similarity index 100% rename from assets/images/icons/icon_block_commenton.svg rename to assets/svg/icon_block_commenton.svg diff --git a/assets/images/icons/icon_block_copy_1.svg b/assets/svg/icon_block_copy_1.svg similarity index 100% rename from assets/images/icons/icon_block_copy_1.svg rename to assets/svg/icon_block_copy_1.svg diff --git a/assets/images/icons/icon_block_copy_blue.svg b/assets/svg/icon_block_copy_blue.svg similarity index 100% rename from assets/images/icons/icon_block_copy_blue.svg rename to assets/svg/icon_block_copy_blue.svg diff --git a/assets/images/icons/icon_block_delete.svg b/assets/svg/icon_block_delete.svg similarity index 100% rename from assets/images/icons/icon_block_delete.svg rename to assets/svg/icon_block_delete.svg diff --git a/assets/images/icons/icon_block_eye_off.svg b/assets/svg/icon_block_eye_off.svg similarity index 100% rename from assets/images/icons/icon_block_eye_off.svg rename to assets/svg/icon_block_eye_off.svg diff --git a/assets/images/icons/icon_block_eye_on.svg b/assets/svg/icon_block_eye_on.svg similarity index 100% rename from assets/images/icons/icon_block_eye_on.svg rename to assets/svg/icon_block_eye_on.svg diff --git a/assets/images/icons/icon_block_grid.svg b/assets/svg/icon_block_grid.svg similarity index 100% rename from assets/images/icons/icon_block_grid.svg rename to assets/svg/icon_block_grid.svg diff --git a/assets/images/icons/icon_block_information.svg b/assets/svg/icon_block_information.svg similarity index 100% rename from assets/images/icons/icon_block_information.svg rename to assets/svg/icon_block_information.svg diff --git a/assets/images/icons/icon_block_list.svg b/assets/svg/icon_block_list.svg similarity index 100% rename from assets/images/icons/icon_block_list.svg rename to assets/svg/icon_block_list.svg diff --git a/assets/images/icons/icon_block_repost.svg b/assets/svg/icon_block_repost.svg similarity index 100% rename from assets/images/icons/icon_block_repost.svg rename to assets/svg/icon_block_repost.svg diff --git a/assets/images/icons/icon_block_rocket.svg b/assets/svg/icon_block_rocket.svg similarity index 100% rename from assets/images/icons/icon_block_rocket.svg rename to assets/svg/icon_block_rocket.svg diff --git a/assets/images/icons/icon_block_share.svg b/assets/svg/icon_block_share.svg similarity index 100% rename from assets/images/icons/icon_block_share.svg rename to assets/svg/icon_block_share.svg diff --git a/assets/images/icons/icon_block_time.svg b/assets/svg/icon_block_time.svg similarity index 100% rename from assets/images/icons/icon_block_time.svg rename to assets/svg/icon_block_time.svg diff --git a/assets/images/icons/icon_bookmarks.svg b/assets/svg/icon_bookmarks.svg similarity index 100% rename from assets/images/icons/icon_bookmarks.svg rename to assets/svg/icon_bookmarks.svg diff --git a/assets/images/icons/icon_bookmarks_on.svg b/assets/svg/icon_bookmarks_on.svg similarity index 100% rename from assets/images/icons/icon_bookmarks_on.svg rename to assets/svg/icon_bookmarks_on.svg diff --git a/assets/images/icons/icon_button_addstroke.svg b/assets/svg/icon_button_addstroke.svg similarity index 100% rename from assets/images/icons/icon_button_addstroke.svg rename to assets/svg/icon_button_addstroke.svg diff --git a/assets/images/icons/icon_button_details.svg b/assets/svg/icon_button_details.svg similarity index 100% rename from assets/images/icons/icon_button_details.svg rename to assets/svg/icon_button_details.svg diff --git a/assets/images/icons/icon_button_down.svg b/assets/svg/icon_button_down.svg similarity index 100% rename from assets/images/icons/icon_button_down.svg rename to assets/svg/icon_button_down.svg diff --git a/assets/images/icons/icon_button_history.svg b/assets/svg/icon_button_history.svg similarity index 100% rename from assets/images/icons/icon_button_history.svg rename to assets/svg/icon_button_history.svg diff --git a/assets/images/icons/icon_button_ice_stroke.svg b/assets/svg/icon_button_ice_stroke.svg similarity index 100% rename from assets/images/icons/icon_button_ice_stroke.svg rename to assets/svg/icon_button_ice_stroke.svg diff --git a/assets/images/icons/icon_button_internet.svg b/assets/svg/icon_button_internet.svg similarity index 100% rename from assets/images/icons/icon_button_internet.svg rename to assets/svg/icon_button_internet.svg diff --git a/assets/images/icons/icon_button_invite.svg b/assets/svg/icon_button_invite.svg similarity index 100% rename from assets/images/icons/icon_button_invite.svg rename to assets/svg/icon_button_invite.svg diff --git a/assets/images/icons/icon_button_manage_wallet.svg b/assets/svg/icon_button_manage_wallet.svg similarity index 100% rename from assets/images/icons/icon_button_manage_wallet.svg rename to assets/svg/icon_button_manage_wallet.svg diff --git a/assets/images/icons/icon_button_managecoin.svg b/assets/svg/icon_button_managecoin.svg similarity index 100% rename from assets/images/icons/icon_button_managecoin.svg rename to assets/svg/icon_button_managecoin.svg diff --git a/assets/images/icons/icon_button_next.svg b/assets/svg/icon_button_next.svg similarity index 100% rename from assets/images/icons/icon_button_next.svg rename to assets/svg/icon_button_next.svg diff --git a/assets/images/icons/icon_button_qrcode.svg b/assets/svg/icon_button_qrcode.svg similarity index 100% rename from assets/images/icons/icon_button_qrcode.svg rename to assets/svg/icon_button_qrcode.svg diff --git a/assets/images/icons/icon_button_receive.svg b/assets/svg/icon_button_receive.svg similarity index 100% rename from assets/images/icons/icon_button_receive.svg rename to assets/svg/icon_button_receive.svg diff --git a/assets/images/icons/icon_button_send.svg b/assets/svg/icon_button_send.svg similarity index 100% rename from assets/images/icons/icon_button_send.svg rename to assets/svg/icon_button_send.svg diff --git a/assets/images/icons/icon_button_share.svg b/assets/svg/icon_button_share.svg similarity index 100% rename from assets/images/icons/icon_button_share.svg rename to assets/svg/icon_button_share.svg diff --git a/assets/images/icons/icon_button_up.svg b/assets/svg/icon_button_up.svg similarity index 100% rename from assets/images/icons/icon_button_up.svg rename to assets/svg/icon_button_up.svg diff --git a/assets/images/icons/icon_button_walletnft.svg b/assets/svg/icon_button_walletnft.svg similarity index 100% rename from assets/images/icons/icon_button_walletnft.svg rename to assets/svg/icon_button_walletnft.svg diff --git a/assets/images/icons/icon_camera_open.svg b/assets/svg/icon_camera_open.svg similarity index 100% rename from assets/images/icons/icon_camera_open.svg rename to assets/svg/icon_camera_open.svg diff --git a/assets/images/icons/icon_categories_following.svg b/assets/svg/icon_categories_following.svg similarity index 100% rename from assets/images/icons/icon_categories_following.svg rename to assets/svg/icon_categories_following.svg diff --git a/assets/images/icons/icon_categories_foryou.svg b/assets/svg/icon_categories_foryou.svg similarity index 100% rename from assets/images/icons/icon_categories_foryou.svg rename to assets/svg/icon_categories_foryou.svg diff --git a/assets/images/icons/icon_channel_admin.svg b/assets/svg/icon_channel_admin.svg similarity index 100% rename from assets/images/icons/icon_channel_admin.svg rename to assets/svg/icon_channel_admin.svg diff --git a/assets/images/icons/icon_channel_private.svg b/assets/svg/icon_channel_private.svg similarity index 100% rename from assets/images/icons/icon_channel_private.svg rename to assets/svg/icon_channel_private.svg diff --git a/assets/images/icons/icon_channel_type.svg b/assets/svg/icon_channel_type.svg similarity index 100% rename from assets/images/icons/icon_channel_type.svg rename to assets/svg/icon_channel_type.svg diff --git a/assets/images/icons/icon_chat_back.svg b/assets/svg/icon_chat_back.svg similarity index 100% rename from assets/images/icons/icon_chat_back.svg rename to assets/svg/icon_chat_back.svg diff --git a/assets/images/icons/icon_chat_darkmode.svg b/assets/svg/icon_chat_darkmode.svg similarity index 100% rename from assets/images/icons/icon_chat_darkmode.svg rename to assets/svg/icon_chat_darkmode.svg diff --git a/assets/images/icons/icon_chat_off.svg b/assets/svg/icon_chat_off.svg similarity index 100% rename from assets/images/icons/icon_chat_off.svg rename to assets/svg/icon_chat_off.svg diff --git a/assets/images/icons/icon_checkbox_off.svg b/assets/svg/icon_checkbox_off.svg similarity index 100% rename from assets/images/icons/icon_checkbox_off.svg rename to assets/svg/icon_checkbox_off.svg diff --git a/assets/images/icons/icon_checkbox_on.svg b/assets/svg/icon_checkbox_on.svg similarity index 100% rename from assets/images/icons/icon_checkbox_on.svg rename to assets/svg/icon_checkbox_on.svg diff --git a/assets/images/icons/icon_code4.svg b/assets/svg/icon_code4.svg similarity index 100% rename from assets/images/icons/icon_code4.svg rename to assets/svg/icon_code4.svg diff --git a/assets/images/icons/icon_contact_list.svg b/assets/svg/icon_contact_list.svg similarity index 100% rename from assets/images/icons/icon_contact_list.svg rename to assets/svg/icon_contact_list.svg diff --git a/assets/images/icons/icon_dapp_check.svg b/assets/svg/icon_dapp_check.svg similarity index 100% rename from assets/images/icons/icon_dapp_check.svg rename to assets/svg/icon_dapp_check.svg diff --git a/assets/images/icons/icon_dapp_games.svg b/assets/svg/icon_dapp_games.svg similarity index 100% rename from assets/images/icons/icon_dapp_games.svg rename to assets/svg/icon_dapp_games.svg diff --git a/assets/images/icons/icon_dapp_off.svg b/assets/svg/icon_dapp_off.svg similarity index 100% rename from assets/images/icons/icon_dapp_off.svg rename to assets/svg/icon_dapp_off.svg diff --git a/assets/images/icons/icon_feed_addfile.svg b/assets/svg/icon_feed_addfile.svg similarity index 100% rename from assets/images/icons/icon_feed_addfile.svg rename to assets/svg/icon_feed_addfile.svg diff --git a/assets/images/icons/icon_feed_more.svg b/assets/svg/icon_feed_more.svg similarity index 100% rename from assets/images/icons/icon_feed_more.svg rename to assets/svg/icon_feed_more.svg diff --git a/assets/images/icons/icon_feed_post.svg b/assets/svg/icon_feed_post.svg similarity index 100% rename from assets/images/icons/icon_feed_post.svg rename to assets/svg/icon_feed_post.svg diff --git a/assets/images/icons/icon_feed_quote.svg b/assets/svg/icon_feed_quote.svg similarity index 100% rename from assets/images/icons/icon_feed_quote.svg rename to assets/svg/icon_feed_quote.svg diff --git a/assets/images/icons/icon_feed_repost.svg b/assets/svg/icon_feed_repost.svg similarity index 100% rename from assets/images/icons/icon_feed_repost.svg rename to assets/svg/icon_feed_repost.svg diff --git a/assets/images/icons/icon_feed_scale.svg b/assets/svg/icon_feed_scale.svg similarity index 100% rename from assets/images/icons/icon_feed_scale.svg rename to assets/svg/icon_feed_scale.svg diff --git a/assets/images/icons/icon_feed_sendbutton.svg b/assets/svg/icon_feed_sendbutton.svg similarity index 100% rename from assets/images/icons/icon_feed_sendbutton.svg rename to assets/svg/icon_feed_sendbutton.svg diff --git a/assets/images/icons/icon_feed_stories.svg b/assets/svg/icon_feed_stories.svg similarity index 100% rename from assets/images/icons/icon_feed_stories.svg rename to assets/svg/icon_feed_stories.svg diff --git a/assets/images/icons/icon_feed_story.svg b/assets/svg/icon_feed_story.svg similarity index 100% rename from assets/images/icons/icon_feed_story.svg rename to assets/svg/icon_feed_story.svg diff --git a/assets/images/icons/icon_feed_whatsapp.svg b/assets/svg/icon_feed_whatsapp.svg similarity index 100% rename from assets/images/icons/icon_feed_whatsapp.svg rename to assets/svg/icon_feed_whatsapp.svg diff --git a/assets/images/icons/icon_field_clearall.svg b/assets/svg/icon_field_clearall.svg similarity index 100% rename from assets/images/icons/icon_field_clearall.svg rename to assets/svg/icon_field_clearall.svg diff --git a/assets/images/icons/icon_field_email.svg b/assets/svg/icon_field_email.svg similarity index 100% rename from assets/images/icons/icon_field_email.svg rename to assets/svg/icon_field_email.svg diff --git a/assets/images/icons/icon_field_identitykey.svg b/assets/svg/icon_field_identitykey.svg similarity index 100% rename from assets/images/icons/icon_field_identitykey.svg rename to assets/svg/icon_field_identitykey.svg diff --git a/assets/images/icons/icon_field_inviter.svg b/assets/svg/icon_field_inviter.svg similarity index 100% rename from assets/images/icons/icon_field_inviter.svg rename to assets/svg/icon_field_inviter.svg diff --git a/assets/images/icons/icon_field_name.svg b/assets/svg/icon_field_name.svg similarity index 100% rename from assets/images/icons/icon_field_name.svg rename to assets/svg/icon_field_name.svg diff --git a/assets/images/icons/icon_field_nickname.svg b/assets/svg/icon_field_nickname.svg similarity index 100% rename from assets/images/icons/icon_field_nickname.svg rename to assets/svg/icon_field_nickname.svg diff --git a/assets/images/icons/icon_field_phone.svg b/assets/svg/icon_field_phone.svg similarity index 100% rename from assets/images/icons/icon_field_phone.svg rename to assets/svg/icon_field_phone.svg diff --git a/assets/images/icons/icon_field_search.svg b/assets/svg/icon_field_search.svg similarity index 100% rename from assets/images/icons/icon_field_search.svg rename to assets/svg/icon_field_search.svg diff --git a/assets/images/icons/icon_followuser.svg b/assets/svg/icon_followuser.svg similarity index 100% rename from assets/images/icons/icon_followuser.svg rename to assets/svg/icon_followuser.svg diff --git a/assets/images/icons/icon_gallery_open.svg b/assets/svg/icon_gallery_open.svg similarity index 100% rename from assets/images/icons/icon_gallery_open.svg rename to assets/svg/icon_gallery_open.svg diff --git a/assets/images/icons/icon_header_copy.svg b/assets/svg/icon_header_copy.svg similarity index 100% rename from assets/images/icons/icon_header_copy.svg rename to assets/svg/icon_header_copy.svg diff --git a/assets/images/icons/icon_header_menu.svg b/assets/svg/icon_header_menu.svg similarity index 100% rename from assets/images/icons/icon_header_menu.svg rename to assets/svg/icon_header_menu.svg diff --git a/assets/images/icons/icon_header_scan.svg b/assets/svg/icon_header_scan.svg similarity index 100% rename from assets/images/icons/icon_header_scan.svg rename to assets/svg/icon_header_scan.svg diff --git a/assets/images/icons/icon_header_scan1.svg b/assets/svg/icon_header_scan1.svg similarity index 100% rename from assets/images/icons/icon_header_scan1.svg rename to assets/svg/icon_header_scan1.svg diff --git a/assets/images/icons/icon_home_notification.svg b/assets/svg/icon_home_notification.svg similarity index 100% rename from assets/images/icons/icon_home_notification.svg rename to assets/svg/icon_home_notification.svg diff --git a/assets/images/icons/icon_home_off.svg b/assets/svg/icon_home_off.svg similarity index 100% rename from assets/images/icons/icon_home_off.svg rename to assets/svg/icon_home_off.svg diff --git a/assets/images/icons/icon_icelogo_securedby.svg b/assets/svg/icon_icelogo_securedby.svg similarity index 100% rename from assets/images/icons/icon_icelogo_securedby.svg rename to assets/svg/icon_icelogo_securedby.svg diff --git a/assets/images/icons/icon_identitykey.svg b/assets/svg/icon_identitykey.svg similarity index 100% rename from assets/images/icons/icon_identitykey.svg rename to assets/svg/icon_identitykey.svg diff --git a/assets/images/icons/icon_login_authcode.svg b/assets/svg/icon_login_authcode.svg similarity index 100% rename from assets/images/icons/icon_login_authcode.svg rename to assets/svg/icon_login_authcode.svg diff --git a/assets/images/icons/icon_login_createacc.svg b/assets/svg/icon_login_createacc.svg similarity index 100% rename from assets/images/icons/icon_login_createacc.svg rename to assets/svg/icon_login_createacc.svg diff --git a/assets/images/icons/icon_login_device.svg b/assets/svg/icon_login_device.svg similarity index 100% rename from assets/images/icons/icon_login_device.svg rename to assets/svg/icon_login_device.svg diff --git a/assets/images/icons/icon_login_dropdown.svg b/assets/svg/icon_login_dropdown.svg similarity index 100% rename from assets/images/icons/icon_login_dropdown.svg rename to assets/svg/icon_login_dropdown.svg diff --git a/assets/images/icons/icon_login_fingerprint.svg b/assets/svg/icon_login_fingerprint.svg similarity index 100% rename from assets/images/icons/icon_login_fingerprint.svg rename to assets/svg/icon_login_fingerprint.svg diff --git a/assets/images/icons/icon_login_hack.svg b/assets/svg/icon_login_hack.svg similarity index 100% rename from assets/images/icons/icon_login_hack.svg rename to assets/svg/icon_login_hack.svg diff --git a/assets/images/icons/icon_login_icelogo.svg b/assets/svg/icon_login_icelogo.svg similarity index 100% rename from assets/images/icons/icon_login_icelogo.svg rename to assets/svg/icon_login_icelogo.svg diff --git a/assets/images/icons/icon_login_identity.svg b/assets/svg/icon_login_identity.svg similarity index 100% rename from assets/images/icons/icon_login_identity.svg rename to assets/svg/icon_login_identity.svg diff --git a/assets/images/icons/icon_login_manage.svg b/assets/svg/icon_login_manage.svg similarity index 100% rename from assets/images/icons/icon_login_manage.svg rename to assets/svg/icon_login_manage.svg diff --git a/assets/images/icons/icon_login_passkey.svg b/assets/svg/icon_login_passkey.svg similarity index 100% rename from assets/images/icons/icon_login_passkey.svg rename to assets/svg/icon_login_passkey.svg diff --git a/assets/images/icons/icon_login_password.svg b/assets/svg/icon_login_password.svg similarity index 100% rename from assets/images/icons/icon_login_password.svg rename to assets/svg/icon_login_password.svg diff --git a/assets/images/icons/icon_login_restorekey.svg b/assets/svg/icon_login_restorekey.svg similarity index 100% rename from assets/images/icons/icon_login_restorekey.svg rename to assets/svg/icon_login_restorekey.svg diff --git a/assets/images/icons/icon_login_reused.svg b/assets/svg/icon_login_reused.svg similarity index 100% rename from assets/images/icons/icon_login_reused.svg rename to assets/svg/icon_login_reused.svg diff --git a/assets/images/icons/icon_login_safeacc.svg b/assets/svg/icon_login_safeacc.svg similarity index 100% rename from assets/images/icons/icon_login_safeacc.svg rename to assets/svg/icon_login_safeacc.svg diff --git a/assets/images/icons/icon_login_smscode.svg b/assets/svg/icon_login_smscode.svg similarity index 100% rename from assets/images/icons/icon_login_smscode.svg rename to assets/svg/icon_login_smscode.svg diff --git a/assets/images/icons/icon_menu_logout.svg b/assets/svg/icon_menu_logout.svg similarity index 100% rename from assets/images/icons/icon_menu_logout.svg rename to assets/svg/icon_menu_logout.svg diff --git a/assets/images/icons/icon_more_popup.svg b/assets/svg/icon_more_popup.svg similarity index 100% rename from assets/images/icons/icon_more_popup.svg rename to assets/svg/icon_more_popup.svg diff --git a/assets/images/icons/icon_notinterested.svg b/assets/svg/icon_notinterested.svg similarity index 100% rename from assets/images/icons/icon_notinterested.svg rename to assets/svg/icon_notinterested.svg diff --git a/assets/images/icons/icon_pass.svg b/assets/svg/icon_pass.svg similarity index 100% rename from assets/images/icons/icon_pass.svg rename to assets/svg/icon_pass.svg diff --git a/assets/images/icons/icon_plus_createchannel.svg b/assets/svg/icon_plus_createchannel.svg similarity index 100% rename from assets/images/icons/icon_plus_createchannel.svg rename to assets/svg/icon_plus_createchannel.svg diff --git a/assets/svg/icon_profile_camera.svg b/assets/svg/icon_profile_camera.svg new file mode 100644 index 000000000..bd507d75e --- /dev/null +++ b/assets/svg/icon_profile_camera.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/icons/icon_profile_feed.svg b/assets/svg/icon_profile_feed.svg similarity index 100% rename from assets/images/icons/icon_profile_feed.svg rename to assets/svg/icon_profile_feed.svg diff --git a/assets/images/icons/icon_profile_help.svg b/assets/svg/icon_profile_help.svg similarity index 100% rename from assets/images/icons/icon_profile_help.svg rename to assets/svg/icon_profile_help.svg diff --git a/assets/images/icons/icon_profile_save.svg b/assets/svg/icon_profile_save.svg similarity index 100% rename from assets/images/icons/icon_profile_save.svg rename to assets/svg/icon_profile_save.svg diff --git a/assets/images/icons/icon_profile_settings.svg b/assets/svg/icon_profile_settings.svg similarity index 100% rename from assets/images/icons/icon_profile_settings.svg rename to assets/svg/icon_profile_settings.svg diff --git a/assets/images/icons/icon_profile_user.svg b/assets/svg/icon_profile_user.svg similarity index 100% rename from assets/images/icons/icon_profile_user.svg rename to assets/svg/icon_profile_user.svg diff --git a/assets/images/icons/icon_protectwallet_icloud.svg b/assets/svg/icon_protectwallet_icloud.svg similarity index 100% rename from assets/images/icons/icon_protectwallet_icloud.svg rename to assets/svg/icon_protectwallet_icloud.svg diff --git a/assets/images/icons/icon_recovery_code.svg b/assets/svg/icon_recovery_code.svg similarity index 100% rename from assets/images/icons/icon_recovery_code.svg rename to assets/svg/icon_recovery_code.svg diff --git a/assets/images/icons/icon_replysearch_scale.svg b/assets/svg/icon_replysearch_scale.svg similarity index 100% rename from assets/images/icons/icon_replysearch_scale.svg rename to assets/svg/icon_replysearch_scale.svg diff --git a/assets/images/icons/icon_report.svg b/assets/svg/icon_report.svg similarity index 100% rename from assets/images/icons/icon_report.svg rename to assets/svg/icon_report.svg diff --git a/assets/images/icons/icon_restore.svg b/assets/svg/icon_restore.svg similarity index 100% rename from assets/images/icons/icon_restore.svg rename to assets/svg/icon_restore.svg diff --git a/assets/images/icons/icon_restorekey.svg b/assets/svg/icon_restorekey.svg similarity index 100% rename from assets/images/icons/icon_restorekey.svg rename to assets/svg/icon_restorekey.svg diff --git a/assets/images/icons/icon_select2.svg b/assets/svg/icon_select2.svg similarity index 100% rename from assets/images/icons/icon_select2.svg rename to assets/svg/icon_select2.svg diff --git a/assets/images/icons/icon_sheet_close.svg b/assets/svg/icon_sheet_close.svg similarity index 100% rename from assets/images/icons/icon_sheet_close.svg rename to assets/svg/icon_sheet_close.svg diff --git a/assets/images/icons/icon_steps_check_active.svg b/assets/svg/icon_steps_check_active.svg similarity index 100% rename from assets/images/icons/icon_steps_check_active.svg rename to assets/svg/icon_steps_check_active.svg diff --git a/assets/images/icons/icon_steps_check_inactive.svg b/assets/svg/icon_steps_check_inactive.svg similarity index 100% rename from assets/images/icons/icon_steps_check_inactive.svg rename to assets/svg/icon_steps_check_inactive.svg diff --git a/assets/images/icons/icon_switch_profile.svg b/assets/svg/icon_switch_profile.svg similarity index 100% rename from assets/images/icons/icon_switch_profile.svg rename to assets/svg/icon_switch_profile.svg diff --git a/assets/images/icons/icon_tabs_coins.svg b/assets/svg/icon_tabs_coins.svg similarity index 100% rename from assets/images/icons/icon_tabs_coins.svg rename to assets/svg/icon_tabs_coins.svg diff --git a/assets/images/icons/icon_video_like_off.svg b/assets/svg/icon_video_like_off.svg similarity index 100% rename from assets/images/icons/icon_video_like_off.svg rename to assets/svg/icon_video_like_off.svg diff --git a/assets/images/icons/icon_video_like_on.svg b/assets/svg/icon_video_like_on.svg similarity index 100% rename from assets/images/icons/icon_video_like_on.svg rename to assets/svg/icon_video_like_on.svg diff --git a/assets/images/icons/icon_videos_trading.svg b/assets/svg/icon_videos_trading.svg similarity index 100% rename from assets/images/icons/icon_videos_trading.svg rename to assets/svg/icon_videos_trading.svg diff --git a/assets/images/icons/icon_wallet_link.svg b/assets/svg/icon_wallet_link.svg similarity index 100% rename from assets/images/icons/icon_wallet_link.svg rename to assets/svg/icon_wallet_link.svg diff --git a/assets/images/icons/icon_wallet_protect.svg b/assets/svg/icon_wallet_protect.svg similarity index 100% rename from assets/images/icons/icon_wallet_protect.svg rename to assets/svg/icon_wallet_protect.svg diff --git a/assets/images/icons/icon_wallet_protect_account.svg b/assets/svg/icon_wallet_protect_account.svg similarity index 100% rename from assets/images/icons/icon_wallet_protect_account.svg rename to assets/svg/icon_wallet_protect_account.svg diff --git a/assets/images/icons/icon_wallet_protect_fill.svg b/assets/svg/icon_wallet_protect_fill.svg similarity index 100% rename from assets/images/icons/icon_wallet_protect_fill.svg rename to assets/svg/icon_wallet_protect_fill.svg diff --git a/assets/images/icons/icons_wallet_off.svg b/assets/svg/icons_wallet_off.svg similarity index 100% rename from assets/images/icons/icons_wallet_off.svg rename to assets/svg/icons_wallet_off.svg diff --git a/assets/svg/user_photo_area.svg b/assets/svg/user_photo_area.svg new file mode 100644 index 000000000..9641a713f --- /dev/null +++ b/assets/svg/user_photo_area.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/svg/wallet_icon_wallet_emptycoins.svg b/assets/svg/wallet_icon_wallet_emptycoins.svg new file mode 100644 index 000000000..ca3d5cfa8 --- /dev/null +++ b/assets/svg/wallet_icon_wallet_emptycoins.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/svg/wallet_icon_wallet_emptyfavourites.svg b/assets/svg/wallet_icon_wallet_emptyfavourites.svg new file mode 100644 index 000000000..af1777f09 --- /dev/null +++ b/assets/svg/wallet_icon_wallet_emptyfavourites.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/svg/wallet_icon_wallet_emptyhistory.svg b/assets/svg/wallet_icon_wallet_emptyhistory.svg new file mode 100644 index 000000000..984aabfe5 --- /dev/null +++ b/assets/svg/wallet_icon_wallet_emptyhistory.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/svg/wallet_icon_wallet_emptysearch.svg b/assets/svg/wallet_icon_wallet_emptysearch.svg new file mode 100644 index 000000000..789e13987 --- /dev/null +++ b/assets/svg/wallet_icon_wallet_emptysearch.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/svg/wallet_icon_wallet_searching.svg b/assets/svg/wallet_icon_wallet_searching.svg new file mode 100644 index 000000000..2fbdedfe8 --- /dev/null +++ b/assets/svg/wallet_icon_wallet_searching.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/svg/wallet_login_cloud.svg b/assets/svg/wallet_login_cloud.svg new file mode 100644 index 000000000..f360a84ea --- /dev/null +++ b/assets/svg/wallet_login_cloud.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/svg/wallet_login_recovery.svg b/assets/svg/wallet_login_recovery.svg new file mode 100644 index 000000000..a809f5520 --- /dev/null +++ b/assets/svg/wallet_login_recovery.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/lib/app/components/button/variants/button_dropdown.dart b/lib/app/components/button/variants/button_dropdown.dart index 7fd351fd7..d669974a7 100644 --- a/lib/app/components/button/variants/button_dropdown.dart +++ b/lib/app/components/button/variants/button_dropdown.dart @@ -36,8 +36,7 @@ class _ButtonDropdown extends Button { ), ), leadingIconOffset: leadingIconOffset ?? 10.0.s, - trailingIcon: - (opened ? Assets.images.icons.iconArrowUp : Assets.images.icons.iconArrowDown).icon(), + trailingIcon: (opened ? Assets.svg.iconArrowUp : Assets.svg.iconArrowDown).icon(), trailingIconOffset: trailingIconOffset ?? 8.0.s, ); } diff --git a/lib/app/components/button/widgetbook.dart b/lib/app/components/button/widgetbook.dart index d34f99771..0f20ea2e3 100644 --- a/lib/app/components/button/widgetbook.dart +++ b/lib/app/components/button/widgetbook.dart @@ -26,21 +26,21 @@ Widget regularButtonUseCase(BuildContext context) { ), ), mainAxisSize: MainAxisSize.max, - leadingIcon: Assets.images.icons.iconBookmarks.icon(), + leadingIcon: Assets.svg.iconBookmarks.icon(), onPressed: () {}, ), Button( type: ButtonType.secondary, label: const Text('Secondary'), mainAxisSize: MainAxisSize.max, - trailingIcon: Assets.images.icons.iconBookmarks.icon(), + trailingIcon: Assets.svg.iconBookmarks.icon(), onPressed: () {}, ), Button( type: ButtonType.outlined, label: const Text('Outlined'), mainAxisSize: MainAxisSize.max, - leadingIcon: Assets.images.icons.iconBookmarks.icon(), + leadingIcon: Assets.svg.iconBookmarks.icon(), onPressed: () {}, ), Button( @@ -48,14 +48,14 @@ Widget regularButtonUseCase(BuildContext context) { tintColor: context.theme.appColors.attentionRed, label: const Text('Outlined with Tint color'), mainAxisSize: MainAxisSize.max, - leadingIcon: Assets.images.icons.iconBookmarks.icon(), + leadingIcon: Assets.svg.iconBookmarks.icon(), onPressed: () {}, ), Button( type: ButtonType.disabled, label: const Text('Disabled'), mainAxisSize: MainAxisSize.max, - trailingIcon: Assets.images.icons.iconBookmarks.icon(), + trailingIcon: Assets.svg.iconBookmarks.icon(), onPressed: () {}, ), Button( @@ -76,7 +76,7 @@ Widget regularButtonUseCase(BuildContext context) { backgroundColor: context.theme.appColors.onTerararyFill, ), mainAxisSize: MainAxisSize.max, - trailingIcon: Assets.images.icons.iconBookmarks.icon( + trailingIcon: Assets.svg.iconBookmarks.icon( color: context.theme.appColors.attentionRed, ), onPressed: () {}, @@ -96,18 +96,18 @@ Widget iconButtonUseCase(BuildContext context) { mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Button.icon( - icon: Assets.images.icons.iconHeaderMenu.icon(), + icon: Assets.svg.iconHeaderMenu.icon(), onPressed: () {}, ), Button.icon( type: ButtonType.outlined, - icon: Assets.images.icons.iconHeaderMenu.icon(), + icon: Assets.svg.iconHeaderMenu.icon(), onPressed: () {}, ), Button.icon( size: 40.0.s, type: ButtonType.outlined, - icon: Assets.images.icons.iconHeaderMenu.icon( + icon: Assets.svg.iconHeaderMenu.icon( size: 20.0.s, ), style: OutlinedButton.styleFrom( @@ -121,7 +121,7 @@ Widget iconButtonUseCase(BuildContext context) { size: 40.0.s, tintColor: context.theme.appColors.attentionRed, type: ButtonType.outlined, - icon: Assets.images.icons.iconHeaderMenu.icon( + icon: Assets.svg.iconHeaderMenu.icon( size: 20.0.s, ), onPressed: () {}, @@ -145,7 +145,7 @@ Widget compactButtonUseCase(BuildContext context) { children: [ Expanded( child: Button.compact( - leadingIcon: Assets.images.icons.iconButtonReceive.icon(), + leadingIcon: Assets.svg.iconButtonReceive.icon(), label: Text( context.knobs.string( label: 'Label', @@ -161,7 +161,7 @@ Widget compactButtonUseCase(BuildContext context) { Expanded( child: Button.compact( type: ButtonType.outlined, - leadingIcon: Assets.images.icons.iconButtonSend.icon(), + leadingIcon: Assets.svg.iconButtonSend.icon(), label: Text( context.knobs.string( label: 'Label', @@ -190,7 +190,7 @@ Widget menuButtonUseCase(BuildContext context) { Button.menu( onPressed: () {}, leadingIcon: ButtonIconFrame( - icon: Assets.images.icons.iconTabsCoins.icon( + icon: Assets.svg.iconTabsCoins.icon( size: 20.0.s, ), ), @@ -200,7 +200,7 @@ Widget menuButtonUseCase(BuildContext context) { onPressed: () {}, leadingIcon: ButtonIconFrame( color: context.theme.appColors.primaryAccent, - icon: Assets.images.icons.iconTabsCoins.icon( + icon: Assets.svg.iconTabsCoins.icon( size: 20.0.s, color: context.theme.appColors.secondaryBackground, ), @@ -238,7 +238,7 @@ Widget dropdownButtonUseCase(BuildContext context) { onPressed: () {}, leadingIcon: ButtonIconFrame( color: context.theme.appColors.success, - icon: Assets.images.icons.iconFeedStories.icon( + icon: Assets.svg.iconFeedStories.icon( size: 24.0.s, color: context.theme.appColors.secondaryBackground, ), @@ -249,7 +249,7 @@ Widget dropdownButtonUseCase(BuildContext context) { onPressed: () {}, leadingIcon: ButtonIconFrame( color: context.theme.appColors.success, - icon: Assets.images.icons.iconFeedStories.icon( + icon: Assets.svg.iconFeedStories.icon( size: 24.0.s, color: context.theme.appColors.secondaryBackground, ), @@ -260,7 +260,7 @@ Widget dropdownButtonUseCase(BuildContext context) { Button.dropdown( onPressed: () {}, leadingIcon: ButtonIconFrame( - icon: Assets.images.icons.iconBadgeIcelogo.icon(size: 26.0.s), + icon: Assets.svg.iconBadgeIcelogo.icon(size: 26.0.s), ), leadingIconOffset: 4.0.s, backgroundColor: context.theme.appColors.tertararyBackground, diff --git a/lib/app/components/card/warning_card.dart b/lib/app/components/card/warning_card.dart index 5c958c928..3fea4b162 100644 --- a/lib/app/components/card/warning_card.dart +++ b/lib/app/components/card/warning_card.dart @@ -19,7 +19,7 @@ class WarningCard extends StatelessWidget { child: ListItem( contentPadding: EdgeInsets.zero, borderRadius: BorderRadius.all(Radius.circular(16.0.s)), - leading: Assets.images.icons.iconReport.icon( + leading: Assets.svg.iconReport.icon( size: 20.0.s, color: context.theme.appColors.attentionRed, ), diff --git a/lib/app/components/empty_list/empty_list.dart b/lib/app/components/empty_list/empty_list.dart index a2d87f631..c6fc059e9 100644 --- a/lib/app/components/empty_list/empty_list.dart +++ b/lib/app/components/empty_list/empty_list.dart @@ -3,7 +3,6 @@ import 'package:ice/app/extensions/asset_gen_image.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/generated/assets.gen.dart'; class EmptyList extends StatelessWidget { EmptyList({ @@ -13,7 +12,7 @@ class EmptyList extends StatelessWidget { double? imageSize, }) : imageSize = imageSize ?? 48.0.s; - final AssetGenImage asset; + final String asset; final String title; final double imageSize; diff --git a/lib/app/components/inputs/search_input/components/search_clear_button.dart b/lib/app/components/inputs/search_input/components/search_clear_button.dart index 0e083c283..0e8e30610 100644 --- a/lib/app/components/inputs/search_input/components/search_clear_button.dart +++ b/lib/app/components/inputs/search_input/components/search_clear_button.dart @@ -15,7 +15,7 @@ class SearchClearButton extends StatelessWidget { Widget build(BuildContext context) { return IconButton( onPressed: onPressed, - icon: Assets.images.icons.iconFieldClearall.icon(size: 20.0.s), + icon: Assets.svg.iconFieldClearall.icon(size: 20.0.s), ); } } diff --git a/lib/app/components/inputs/search_input/search_input.dart b/lib/app/components/inputs/search_input/search_input.dart index 044ee4702..aba9b360d 100644 --- a/lib/app/components/inputs/search_input/search_input.dart +++ b/lib/app/components/inputs/search_input/search_input.dart @@ -13,24 +13,26 @@ import 'package:ice/generated/assets.gen.dart'; class SearchInput extends HookWidget { const SearchInput({ - required this.onTextChanged, super.key, + this.onTextChanged, this.loading = false, this.onCancelSearch, this.defaultValue = '', - }); + FocusNode? focusNode, + }) : externalFocusNode = focusNode; static double get height => 40.0.s; - final void Function(String) onTextChanged; + final void Function(String)? onTextChanged; final VoidCallback? onCancelSearch; final bool loading; final String defaultValue; + final FocusNode? externalFocusNode; @override Widget build(BuildContext context) { final searchController = useTextEditingController(text: defaultValue); - final focusNode = useFocusNode(); + final focusNode = externalFocusNode ?? useFocusNode(); final showClear = useState(false); final focused = useNodeFocused(focusNode); @@ -38,7 +40,7 @@ class SearchInput extends HookWidget { useTextChanged( controller: searchController, onTextChanged: (String text) { - onTextChanged(text); + onTextChanged?.call(text); showClear.value = text.isNotEmpty; }, ); @@ -76,7 +78,7 @@ class SearchInput extends HookWidget { ), prefixIcon: Padding( padding: EdgeInsets.only(left: 12.0.s, right: 6.0.s), - child: Assets.images.icons.iconFieldSearch.icon( + child: Assets.svg.iconFieldSearch.icon( color: context.theme.appColors.tertararyText, size: 18.0.s, ), diff --git a/lib/app/components/inputs/text_input/components/text_input_clear_button.dart b/lib/app/components/inputs/text_input/components/text_input_clear_button.dart index 9087fb300..76eff2da6 100644 --- a/lib/app/components/inputs/text_input/components/text_input_clear_button.dart +++ b/lib/app/components/inputs/text_input/components/text_input_clear_button.dart @@ -19,7 +19,7 @@ class TextInputClearButton extends StatelessWidget { onPressed: controller.clear, icon: Padding( padding: EdgeInsets.all(6.0.s), - child: Assets.images.icons.iconSheetClose + child: Assets.svg.iconSheetClose .icon(size: 16.0.s, color: context.theme.appColors.secondaryText), ), ); diff --git a/lib/app/components/inputs/text_input/widgetbook.dart b/lib/app/components/inputs/text_input/widgetbook.dart index d3b449217..def71f13b 100644 --- a/lib/app/components/inputs/text_input/widgetbook.dart +++ b/lib/app/components/inputs/text_input/widgetbook.dart @@ -60,7 +60,7 @@ Widget regularTextInputUseCase(BuildContext context) { labelText: 'Basic text input with prefix icon', prefixIcon: TextInputIcons( icons: [ - Assets.images.icons.iconBadgeCompany.icon(), + Assets.svg.iconBadgeCompany.icon(), ], hasRightDivider: true, ), @@ -70,11 +70,11 @@ Widget regularTextInputUseCase(BuildContext context) { suffixIcon: TextInputIcons( icons: [ IconButton( - icon: Assets.images.icons.iconBlockEyeOn.icon(), + icon: Assets.svg.iconBlockEyeOn.icon(), onPressed: () {}, ), IconButton( - icon: Assets.images.icons.iconArrowDown.icon(), + icon: Assets.svg.iconArrowDown.icon(), onPressed: () {}, ), ], @@ -116,7 +116,7 @@ class TextInputWithClear extends HookWidget { labelText: 'With clear button', prefixIcon: TextInputIcons( icons: [ - Assets.images.icons.iconBadgeCompany.icon(), + Assets.svg.iconBadgeCompany.icon(), ], hasRightDivider: true, ), diff --git a/lib/app/components/list_item/variants/list_item_user.dart b/lib/app/components/list_item/variants/list_item_user.dart index 8b386de27..34f5a0cd4 100644 --- a/lib/app/components/list_item/variants/list_item_user.dart +++ b/lib/app/components/list_item/variants/list_item_user.dart @@ -44,12 +44,12 @@ class _ListItemUser extends ListItem { if (iceBadge) Padding( padding: EdgeInsets.only(left: 4.0.s), - child: Assets.images.icons.iconBadgeIcelogo.icon(size: badgeSize), + child: Assets.svg.iconBadgeIcelogo.icon(size: badgeSize), ), if (verifiedBadge) Padding( padding: EdgeInsets.only(left: 4.0.s), - child: Assets.images.icons.iconBadgeVerify.icon(size: badgeSize), + child: Assets.svg.iconBadgeVerify.icon(size: badgeSize), ), ], ), @@ -127,7 +127,7 @@ class _IceBadge extends StatelessWidget { color: context.theme.appColors.darkBlue, ), child: Center( - child: Assets.images.icons.iconIcelogoSecuredby.icon( + child: Assets.svg.iconIcelogoSecuredby.icon( color: context.theme.appColors.secondaryBackground, size: 10.0.s, ), diff --git a/lib/app/components/list_item/widgetbook.dart b/lib/app/components/list_item/widgetbook.dart index eb4eaf6e0..8a606dc0f 100644 --- a/lib/app/components/list_item/widgetbook.dart +++ b/lib/app/components/list_item/widgetbook.dart @@ -20,14 +20,14 @@ Widget regularListItemUseCase(BuildContext context) { title: const Text('Simple'), subtitle: const Text('List Item'), backgroundColor: context.theme.appColors.primaryBackground, - leading: Assets.images.icons.iconBadgeLinkedin.icon(), + leading: Assets.svg.iconBadgeLinkedin.icon(), ), ListItem( title: const Text('With On Tap'), subtitle: const Text('List Item'), onTap: () {}, backgroundColor: context.theme.appColors.primaryBackground, - trailing: Assets.images.icons.iconArrowRight.icon(), + trailing: Assets.svg.iconArrowRight.icon(), ), ], ), @@ -90,7 +90,7 @@ Widget userListItemUseCase(BuildContext context) { verifiedBadge: true, iceBadge: true, trailing: IconButton( - icon: Assets.images.icons.iconMorePopup.icon(), + icon: Assets.svg.iconMorePopup.icon(), onPressed: () {}, ), ), @@ -101,7 +101,7 @@ Widget userListItemUseCase(BuildContext context) { verifiedBadge: true, iceBadge: true, trailing: IconButton( - icon: Assets.images.icons.iconCheckboxOn.icon(), + icon: Assets.svg.iconCheckboxOn.icon(), onPressed: () {}, ), onTap: () {}, @@ -138,7 +138,7 @@ Widget textListItemUseCase(BuildContext context) { ListItem.textWithIcon( title: const Text('List Item title'), value: 'List Item value long long long long long', - icon: Assets.images.icons.iconBadgeLinkedin.icon(), + icon: Assets.svg.iconBadgeLinkedin.icon(), ), ListItem.textWithIcon( title: const Text('List Item title'), @@ -148,7 +148,7 @@ Widget textListItemUseCase(BuildContext context) { textAlign: TextAlign.right, style: context.theme.appTextThemes.caption3.copyWith(), ), - icon: Assets.images.icons.iconBadgeLinkedin.icon(), + icon: Assets.svg.iconBadgeLinkedin.icon(), ), ], ), diff --git a/lib/app/components/section_header/section_header_button.dart b/lib/app/components/section_header/section_header_button.dart index 417f99758..64146e13e 100644 --- a/lib/app/components/section_header/section_header_button.dart +++ b/lib/app/components/section_header/section_header_button.dart @@ -23,7 +23,7 @@ class SectionHeaderButton extends StatelessWidget { child: IconButton( padding: EdgeInsets.zero, onPressed: onPress, - icon: Assets.images.icons.iconButtonNext.icon( + icon: Assets.svg.iconButtonNext.icon( size: iconSize, ), ), diff --git a/lib/app/components/slider/slider_thumb.dart b/lib/app/components/slider/slider_thumb.dart index 50da4cf96..16ead818e 100644 --- a/lib/app/components/slider/slider_thumb.dart +++ b/lib/app/components/slider/slider_thumb.dart @@ -46,7 +46,7 @@ class SliderThumb extends StatelessWidget { ); onChanged(sliderValue.value); }, - child: Assets.images.icons.iconBlockRocket.icon( + child: Assets.svg.iconBlockRocket.icon( size: thumbIconSize.s, ), ); diff --git a/lib/app/features/auth/data/models/twofa_type.dart b/lib/app/features/auth/data/models/twofa_type.dart index 94ccbae57..5bf45014a 100644 --- a/lib/app/features/auth/data/models/twofa_type.dart +++ b/lib/app/features/auth/data/models/twofa_type.dart @@ -17,9 +17,9 @@ enum TwoFaType { String get iconAsset { return switch (this) { - TwoFaType.auth => Assets.images.icons.iconLoginAuthcode, - TwoFaType.email => Assets.images.icons.iconFieldEmail, - TwoFaType.sms => Assets.images.icons.iconLoginSmscode, + TwoFaType.auth => Assets.svg.iconLoginAuthcode, + TwoFaType.email => Assets.svg.iconFieldEmail, + TwoFaType.sms => Assets.svg.iconLoginSmscode, }; } } diff --git a/lib/app/features/auth/views/components/identity_key_name_input/identity_info.dart b/lib/app/features/auth/views/components/identity_key_name_input/identity_info.dart index d9e102b17..b1dee893f 100644 --- a/lib/app/features/auth/views/components/identity_key_name_input/identity_info.dart +++ b/lib/app/features/auth/views/components/identity_key_name_input/identity_info.dart @@ -28,7 +28,7 @@ class IdentityInfo extends StatelessWidget { child: Column( children: [ InfoCard( - iconAsset: Assets.images.icons.actionWalletIdKey, + iconAsset: Assets.svg.actionWalletIdKey, title: context.i18n.common_identity_key_name, description: context.i18n.identity_key_name_description, ), diff --git a/lib/app/features/auth/views/components/identity_key_name_input/identity_key_name_input.dart b/lib/app/features/auth/views/components/identity_key_name_input/identity_key_name_input.dart index b8714d1d8..31b25e822 100644 --- a/lib/app/features/auth/views/components/identity_key_name_input/identity_key_name_input.dart +++ b/lib/app/features/auth/views/components/identity_key_name_input/identity_key_name_input.dart @@ -32,7 +32,7 @@ class IdentityKeyNameInput extends HookWidget { keyboardType: TextInputType.emailAddress, prefixIcon: TextInputIcons( hasRightDivider: true, - icons: [Assets.images.icons.iconIdentitykey.icon()], + icons: [Assets.svg.iconIdentitykey.icon()], ), suffixIcon: notShowInfoIcon ? null @@ -40,7 +40,7 @@ class IdentityKeyNameInput extends HookWidget { SizedBox.square( dimension: 40.0.s, child: IconButton( - icon: Assets.images.icons.iconBlockInformation.icon(), + icon: Assets.svg.iconBlockInformation.icon(), onPressed: () { hideKeyboardAndCallOnce(callback: () { showSimpleBottomSheet( diff --git a/lib/app/features/auth/views/components/identity_link/identity_link.dart b/lib/app/features/auth/views/components/identity_link/identity_link.dart index 0e0a3aabf..884eee9de 100644 --- a/lib/app/features/auth/views/components/identity_link/identity_link.dart +++ b/lib/app/features/auth/views/components/identity_link/identity_link.dart @@ -14,7 +14,7 @@ class IdentityLink extends StatelessWidget { child: Row( mainAxisSize: MainAxisSize.min, children: [ - Assets.images.icons.iconLoginIdentity.icon(size: 20.0.s), + Assets.svg.iconLoginIdentity.icon(size: 20.0.s), SizedBox(width: 4.0.s), Text( context.i18n.auth_identity_io, diff --git a/lib/app/features/auth/views/components/recovery_keys_input_container/recovery_keys_input_container.dart b/lib/app/features/auth/views/components/recovery_keys_input_container/recovery_keys_input_container.dart index f5b03aef8..0b35d297b 100644 --- a/lib/app/features/auth/views/components/recovery_keys_input_container/recovery_keys_input_container.dart +++ b/lib/app/features/auth/views/components/recovery_keys_input_container/recovery_keys_input_container.dart @@ -32,7 +32,7 @@ class RecoveryKeysInputContainer extends HookConsumerWidget { body: AuthScrollContainer( title: context.i18n.backup_option_with_recovery_keys_title, description: context.i18n.restore_identity_creds_description, - icon: Assets.images.icons.iconLoginRestorekey.icon(size: 36.0.s), + icon: Assets.svg.iconLoginRestorekey.icon(size: 36.0.s), titleStyle: context.theme.appTextThemes.headline2, descriptionStyle: context.theme.appTextThemes.body2.copyWith( color: context.theme.appColors.secondaryText, diff --git a/lib/app/features/auth/views/pages/fill_profile/components/avatar_picker.dart b/lib/app/features/auth/views/pages/fill_profile/components/avatar_picker.dart index 94f034e2e..1a85eaba4 100644 --- a/lib/app/features/auth/views/pages/fill_profile/components/avatar_picker.dart +++ b/lib/app/features/auth/views/pages/fill_profile/components/avatar_picker.dart @@ -2,9 +2,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; -import 'package:ice/app/extensions/build_context.dart'; -import 'package:ice/app/extensions/num.dart'; -import 'package:ice/app/extensions/theme_data.dart'; +import 'package:ice/app/extensions/extensions.dart'; import 'package:ice/app/utils/image.dart'; import 'package:ice/generated/assets.gen.dart'; import 'package:image_cropper/image_cropper.dart'; @@ -34,20 +32,13 @@ class AvatarPicker extends HookWidget { backgroundImage: FileImage(File(avatar.value!.path)), ) else - CircleAvatar( - radius: 50.0.s, - backgroundImage: Assets.images.misc.authPhotoPlaceholder.provider(), - backgroundColor: context.theme.appColors.secondaryBackground, - ), + Assets.svg.userPhotoArea.icon(size: 100.0.s), Positioned( bottom: 0, right: 0, child: GestureDetector( onTap: pickAvatar, - child: CircleAvatar( - radius: 18.0.s, - backgroundImage: Assets.images.misc.iconCamera.provider(), - ), + child: Assets.svg.iconProfileCamera.icon(size: 36.0.s), ), ), ], diff --git a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart index a39830e68..987138d81 100644 --- a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart +++ b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart @@ -46,7 +46,7 @@ class FillProfile extends HookWidget { title: context.i18n.fill_profile_title, description: context.i18n.fill_profile_description, icon: AuthHeaderIcon( - icon: Assets.images.icons.iconLoginIcelogo.icon(size: 44.0.s), + icon: Assets.svg.iconLoginIcelogo.icon(size: 44.0.s), ), ), ScreenSideOffset.large( @@ -65,7 +65,7 @@ class FillProfile extends HookWidget { prefixIcon: TextInputIcons( hasRightDivider: true, icons: [ - Assets.images.icons.iconFieldName.icon(), + Assets.svg.iconFieldName.icon(), ], ), labelText: context.i18n.fill_profile_input_name, @@ -84,7 +84,7 @@ class FillProfile extends HookWidget { prefixIcon: TextInputIcons( hasRightDivider: true, icons: [ - Assets.images.icons.iconFieldNickname.icon(), + Assets.svg.iconFieldNickname.icon(), ], ), labelText: context.i18n.fill_profile_input_nickname, @@ -109,7 +109,7 @@ class FillProfile extends HookWidget { prefixIcon: TextInputIcons( hasRightDivider: true, icons: [ - Assets.images.icons.iconFieldInviter.icon(), + Assets.svg.iconFieldInviter.icon(), ], ), labelText: context.i18n.fill_profile_input_who_invited, @@ -128,7 +128,7 @@ class FillProfile extends HookWidget { disabled: loading.value, trailingIcon: loading.value ? const IceLoadingIndicator() - : Assets.images.icons.iconProfileSave.icon( + : Assets.svg.iconProfileSave.icon( color: context.theme.appColors.onPrimaryAccent, ), onPressed: () async { diff --git a/lib/app/features/auth/views/pages/get_started/get_started.dart b/lib/app/features/auth/views/pages/get_started/get_started.dart index efbfb0ce0..bbae07e3f 100644 --- a/lib/app/features/auth/views/pages/get_started/get_started.dart +++ b/lib/app/features/auth/views/pages/get_started/get_started.dart @@ -28,7 +28,7 @@ class GetStartedPage extends HookWidget { showBackButton: false, title: context.i18n.get_started_title, description: context.i18n.get_started_description, - icon: Assets.images.icons.iconLoginIcelogo.icon(size: 44.0.s), + icon: Assets.svg.iconLoginIcelogo.icon(size: 44.0.s), children: [ ScreenSideOffset.large( child: Column( @@ -45,7 +45,7 @@ class GetStartedPage extends HookWidget { SizedBox(height: 14.0.s), Button( type: ButtonType.outlined, - leadingIcon: Assets.images.icons.iconLoginCreateacc.icon( + leadingIcon: Assets.svg.iconLoginCreateacc.icon( color: context.theme.appColors.secondaryText, ), onPressed: () { @@ -59,7 +59,7 @@ class GetStartedPage extends HookWidget { SizedBox(height: 16.0.s), Button( type: ButtonType.outlined, - leadingIcon: Assets.images.icons.iconRestorekey.icon( + leadingIcon: Assets.svg.iconRestorekey.icon( color: context.theme.appColors.secondaryText, ), onPressed: () { diff --git a/lib/app/features/auth/views/pages/get_started/login_form.dart b/lib/app/features/auth/views/pages/get_started/login_form.dart index 1634e0765..edcb8311c 100644 --- a/lib/app/features/auth/views/pages/get_started/login_form.dart +++ b/lib/app/features/auth/views/pages/get_started/login_form.dart @@ -33,8 +33,7 @@ class LoginForm extends HookConsumerWidget { disabled: authState is AuthenticationLoading, trailingIcon: switch (authState) { AuthenticationLoading() || Authenticated(authToken: _) => const IceLoadingIndicator(), - _ => Assets.images.icons.iconButtonNext - .icon(color: context.theme.appColors.onPrimaryAccent), + _ => Assets.svg.iconButtonNext.icon(color: context.theme.appColors.onPrimaryAccent), }, onPressed: () { if (formKey.value.currentState!.validate()) { diff --git a/lib/app/features/auth/views/pages/intro_page/intro_page.dart b/lib/app/features/auth/views/pages/intro_page/intro_page.dart index 1a6ecd8ce..d73d7cc78 100644 --- a/lib/app/features/auth/views/pages/intro_page/intro_page.dart +++ b/lib/app/features/auth/views/pages/intro_page/intro_page.dart @@ -44,7 +44,7 @@ class IntroPage extends HookWidget { child: Button( onPressed: () => GetStartedRoute().go(context), label: Text(context.i18n.button_continue), - trailingIcon: Assets.images.icons.iconButtonNext.icon( + trailingIcon: Assets.svg.iconButtonNext.icon( color: context.theme.appColors.secondaryBackground, ), ), diff --git a/lib/app/features/auth/views/pages/ion_identity_client_test/ion_identity_client_test_page.dart b/lib/app/features/auth/views/pages/ion_identity_client_test/ion_identity_client_test_page.dart index 6be46a95b..bf273751d 100644 --- a/lib/app/features/auth/views/pages/ion_identity_client_test/ion_identity_client_test_page.dart +++ b/lib/app/features/auth/views/pages/ion_identity_client_test/ion_identity_client_test_page.dart @@ -147,7 +147,7 @@ class _UsersTab extends ConsumerWidget { onTap: () { ionClient(username: users[index]).auth.logOut(); }, - child: Assets.images.icons.iconMenuLogout.icon(), + child: Assets.svg.iconMenuLogout.icon(), ), ), ); diff --git a/lib/app/features/auth/views/pages/restore_creds/recovery_code_input.dart b/lib/app/features/auth/views/pages/restore_creds/recovery_code_input.dart index cd739d76b..c4d6de57e 100644 --- a/lib/app/features/auth/views/pages/restore_creds/recovery_code_input.dart +++ b/lib/app/features/auth/views/pages/restore_creds/recovery_code_input.dart @@ -15,7 +15,7 @@ class RecoveryCodeInput extends StatelessWidget { return TextInput( prefixIcon: TextInputIcons( hasRightDivider: true, - icons: [Assets.images.icons.iconCode4.icon()], + icons: [Assets.svg.iconCode4.icon()], ), labelText: context.i18n.restore_identity_creds_recovery_code, controller: controller, diff --git a/lib/app/features/auth/views/pages/restore_creds/recovery_key_id_input.dart b/lib/app/features/auth/views/pages/restore_creds/recovery_key_id_input.dart index 51db67ae1..7e467efa9 100644 --- a/lib/app/features/auth/views/pages/restore_creds/recovery_key_id_input.dart +++ b/lib/app/features/auth/views/pages/restore_creds/recovery_key_id_input.dart @@ -15,7 +15,7 @@ class RecoveryKeyIdInput extends StatelessWidget { return TextInput( prefixIcon: TextInputIcons( hasRightDivider: true, - icons: [Assets.images.icons.iconChannelPrivate.icon()], + icons: [Assets.svg.iconChannelPrivate.icon()], ), labelText: context.i18n.restore_identity_creds_recovery_key, controller: controller, diff --git a/lib/app/features/auth/views/pages/restore_creds/restore_creds.dart b/lib/app/features/auth/views/pages/restore_creds/restore_creds.dart index 45e1cb1db..c4b12d2e9 100644 --- a/lib/app/features/auth/views/pages/restore_creds/restore_creds.dart +++ b/lib/app/features/auth/views/pages/restore_creds/restore_creds.dart @@ -28,7 +28,7 @@ class RestoreCredsPage extends HookWidget { body: AuthScrollContainer( title: context.i18n.restore_identity_title, description: context.i18n.restore_identity_creds_description, - icon: Assets.images.icons.iconLoginRestorekey.icon(size: 36.0.s), + icon: Assets.svg.iconLoginRestorekey.icon(size: 36.0.s), children: [ Column( children: [ diff --git a/lib/app/features/auth/views/pages/restore_menu/restore_menu.dart b/lib/app/features/auth/views/pages/restore_menu/restore_menu.dart index 0db2ad1e4..cc6070465 100644 --- a/lib/app/features/auth/views/pages/restore_menu/restore_menu.dart +++ b/lib/app/features/auth/views/pages/restore_menu/restore_menu.dart @@ -22,7 +22,7 @@ class RestoreMenuPage extends HookWidget { body: AuthScrollContainer( title: context.i18n.restore_identity_title, description: context.i18n.restore_identity_type_description, - icon: Assets.images.icons.iconLoginRestorekey.icon(size: 36.0.s), + icon: Assets.svg.iconLoginRestorekey.icon(size: 36.0.s), children: [ Padding( padding: EdgeInsets.symmetric(horizontal: 38.0.s), @@ -30,14 +30,14 @@ class RestoreMenuPage extends HookWidget { children: [ SizedBox(height: 12.0.s), RestoreMenuItem( - icon: Assets.images.identity.walletLoginCloud.icon(size: 48.0.s), + icon: Assets.svg.walletLoginCloud.icon(size: 48.0.s), title: context.i18n.restore_identity_type_icloud_title, description: context.i18n.restore_identity_type_icloud_description, onPressed: () {}, ), SizedBox(height: 16.0.s), RestoreMenuItem( - icon: Assets.images.identity.walletLoginRecovery.icon(size: 48.0.s), + icon: Assets.svg.walletLoginRecovery.icon(size: 48.0.s), title: context.i18n.restore_identity_type_credentials_title, description: context.i18n.restore_identity_type_credentials_description, onPressed: () { diff --git a/lib/app/features/auth/views/pages/select_languages/language_list_item.dart b/lib/app/features/auth/views/pages/select_languages/language_list_item.dart index 2fb7d0ffb..9a6da44b0 100644 --- a/lib/app/features/auth/views/pages/select_languages/language_list_item.dart +++ b/lib/app/features/auth/views/pages/select_languages/language_list_item.dart @@ -55,9 +55,9 @@ class LanguageListItem extends StatelessWidget { ), ), if (isSelected) - Assets.images.icons.iconBlockCheckboxOn.icon() + Assets.svg.iconBlockCheckboxOn.icon() else - Assets.images.icons.iconBlockCheckboxOff.icon(), + Assets.svg.iconBlockCheckboxOff.icon(), ], ), ), diff --git a/lib/app/features/auth/views/pages/sign_up_passkey/sign_up_passkey.dart b/lib/app/features/auth/views/pages/sign_up_passkey/sign_up_passkey.dart index fed6a13c3..722d8d147 100644 --- a/lib/app/features/auth/views/pages/sign_up_passkey/sign_up_passkey.dart +++ b/lib/app/features/auth/views/pages/sign_up_passkey/sign_up_passkey.dart @@ -20,7 +20,7 @@ class SignUpPasskeyPage extends StatelessWidget { body: KeyboardDismissOnTap( child: AuthScrollContainer( title: context.i18n.sign_up_passkey_title, - icon: Assets.images.icons.iconLoginPasskey.icon(size: 36.0.s), + icon: Assets.svg.iconLoginPasskey.icon(size: 36.0.s), mainAxisAlignment: MainAxisAlignment.start, children: [ ScreenSideOffset.large( @@ -30,17 +30,17 @@ class SignUpPasskeyPage extends StatelessWidget { SignUpListItem( title: context.i18n.sign_up_passkey_advantage_1_title, subtitle: context.i18n.sign_up_passkey_advantage_1_description, - icon: Assets.images.icons.iconLoginFingerprint.icon(), + icon: Assets.svg.iconLoginFingerprint.icon(), ), SignUpListItem( title: context.i18n.sign_up_passkey_advantage_2_title, subtitle: context.i18n.sign_up_passkey_advantage_2_description, - icon: Assets.images.icons.iconLoginDevice.icon(), + icon: Assets.svg.iconLoginDevice.icon(), ), SignUpListItem( title: context.i18n.sign_up_passkey_advantage_3_title, subtitle: context.i18n.sign_up_passkey_advantage_3_description, - icon: Assets.images.icons.iconLoginSafeacc.icon(), + icon: Assets.svg.iconLoginSafeacc.icon(), ), SizedBox(height: 18.0.s), const SignUpPasskeyForm(), diff --git a/lib/app/features/auth/views/pages/sign_up_password/password_input.dart b/lib/app/features/auth/views/pages/sign_up_password/password_input.dart index 2721dbf6d..fa098215d 100644 --- a/lib/app/features/auth/views/pages/sign_up_password/password_input.dart +++ b/lib/app/features/auth/views/pages/sign_up_password/password_input.dart @@ -15,7 +15,7 @@ class PasswordInput extends StatelessWidget { return TextInput( prefixIcon: TextInputIcons( hasRightDivider: true, - icons: [Assets.images.icons.iconPass.icon()], + icons: [Assets.svg.iconPass.icon()], ), labelText: context.i18n.common_password, controller: controller, diff --git a/lib/app/features/auth/views/pages/sign_up_password/sign_up_password.dart b/lib/app/features/auth/views/pages/sign_up_password/sign_up_password.dart index ddbd78c9f..3f3414591 100644 --- a/lib/app/features/auth/views/pages/sign_up_password/sign_up_password.dart +++ b/lib/app/features/auth/views/pages/sign_up_password/sign_up_password.dart @@ -38,7 +38,7 @@ class SignUpPasswordPage extends HookConsumerWidget { child: AuthScrollContainer( title: context.i18n.sign_up_password_title, description: context.i18n.sign_up_password_description, - icon: Assets.images.icons.iconLoginPassword.icon(size: 36.0.s), + icon: Assets.svg.iconLoginPassword.icon(size: 36.0.s), children: [ ScreenSideOffset.large( child: Form( @@ -49,17 +49,17 @@ class SignUpPasswordPage extends HookConsumerWidget { SignUpListItem( title: context.i18n.sign_up_password_disadvantage_1_title, subtitle: context.i18n.sign_up_password_disadvantage_1_description, - icon: Assets.images.icons.iconLoginHack.icon(), + icon: Assets.svg.iconLoginHack.icon(), ), SignUpListItem( title: context.i18n.sign_up_password_disadvantage_2_title, subtitle: context.i18n.sign_up_password_disadvantage_2_description, - icon: Assets.images.icons.iconLoginReused.icon(), + icon: Assets.svg.iconLoginReused.icon(), ), SignUpListItem( title: context.i18n.sign_up_password_disadvantage_3_title, subtitle: context.i18n.sign_up_password_disadvantage_3_description, - icon: Assets.images.icons.iconLoginManage.icon(), + icon: Assets.svg.iconLoginManage.icon(), ), SizedBox(height: 18.0.s), IdentityKeyNameInput( diff --git a/lib/app/features/auth/views/pages/sign_up_password/sign_up_password_button.dart b/lib/app/features/auth/views/pages/sign_up_password/sign_up_password_button.dart index 3264df63e..861dffe4e 100644 --- a/lib/app/features/auth/views/pages/sign_up_password/sign_up_password_button.dart +++ b/lib/app/features/auth/views/pages/sign_up_password/sign_up_password_button.dart @@ -23,7 +23,7 @@ class SignUpPasswordButton extends ConsumerWidget { disabled: authState is AuthenticationLoading, trailingIcon: authState is AuthenticationLoading ? const IceLoadingIndicator() - : Assets.images.icons.iconButtonNext.icon( + : Assets.svg.iconButtonNext.icon( color: context.theme.appColors.onPrimaryAccent, ), onPressed: onPressed, diff --git a/lib/app/features/auth/views/pages/sign_up_password/sign_up_password_checkbox.dart b/lib/app/features/auth/views/pages/sign_up_password/sign_up_password_checkbox.dart index e0952aa3f..8146b739e 100644 --- a/lib/app/features/auth/views/pages/sign_up_password/sign_up_password_checkbox.dart +++ b/lib/app/features/auth/views/pages/sign_up_password/sign_up_password_checkbox.dart @@ -42,8 +42,8 @@ class SignUpPasswordCheckbox extends HookWidget { IconButton( onPressed: onToggle, icon: selected - ? Assets.images.icons.iconCheckboxOn.icon(size: 20.0.s, color: color) - : Assets.images.icons.iconCheckboxOff.icon(size: 20.0.s, color: color), + ? Assets.svg.iconCheckboxOn.icon(size: 20.0.s, color: color) + : Assets.svg.iconCheckboxOff.icon(size: 20.0.s, color: color), ), Flexible( child: Text.rich( diff --git a/lib/app/features/auth/views/pages/turn_on_notifications/descriptions.dart b/lib/app/features/auth/views/pages/turn_on_notifications/descriptions.dart index 398a402a1..9f12abb54 100644 --- a/lib/app/features/auth/views/pages/turn_on_notifications/descriptions.dart +++ b/lib/app/features/auth/views/pages/turn_on_notifications/descriptions.dart @@ -23,21 +23,21 @@ class Descriptions extends StatelessWidget { children: [ DescriptionListItem( title: context.i18n.turn_notifications_receive, - icon: Assets.images.icons.iconButtonReceive.icon( + icon: Assets.svg.iconButtonReceive.icon( color: context.theme.appColors.primaryText, size: iconSide, ), ), DescriptionListItem( title: context.i18n.turn_notifications_stay_up, - icon: Assets.images.icons.iconFeedStories.icon( + icon: Assets.svg.iconFeedStories.icon( color: context.theme.appColors.primaryText, size: iconSide, ), ), DescriptionListItem( title: context.i18n.turn_notifications_chat, - icon: Assets.images.icons.iconChatOff.icon( + icon: Assets.svg.iconChatOff.icon( color: context.theme.appColors.primaryText, size: iconSide, ), diff --git a/lib/app/features/auth/views/pages/twofa_codes/twofa_codes_page.dart b/lib/app/features/auth/views/pages/twofa_codes/twofa_codes_page.dart index 35d0f868a..8d48f64eb 100644 --- a/lib/app/features/auth/views/pages/twofa_codes/twofa_codes_page.dart +++ b/lib/app/features/auth/views/pages/twofa_codes/twofa_codes_page.dart @@ -39,7 +39,7 @@ class TwoFaCodesPage extends HookWidget { body: AuthScrollContainer( title: context.i18n.two_fa_title, description: context.i18n.two_fa_desc, - icon: Assets.images.icons.iconWalletProtectFill.icon(size: 36.0.s), + icon: Assets.svg.iconWalletProtectFill.icon(size: 36.0.s), children: [ Column( children: [ diff --git a/lib/app/features/auth/views/pages/twofa_options/twofa_options_page.dart b/lib/app/features/auth/views/pages/twofa_options/twofa_options_page.dart index 8bf6c33ee..b7bd67f13 100644 --- a/lib/app/features/auth/views/pages/twofa_options/twofa_options_page.dart +++ b/lib/app/features/auth/views/pages/twofa_options/twofa_options_page.dart @@ -31,7 +31,7 @@ class TwoFaOptionsPage extends HookWidget { body: AuthScrollContainer( title: context.i18n.two_fa_title, description: context.i18n.two_fa_desc, - icon: Assets.images.icons.iconWalletProtect.icon(size: 36.0.s), + icon: Assets.svg.iconWalletProtect.icon(size: 36.0.s), children: [ Column( children: [ diff --git a/lib/app/features/auth/views/pages/twofa_options/twofa_options_selector_button.dart b/lib/app/features/auth/views/pages/twofa_options/twofa_options_selector_button.dart index 1128a47ae..f153e14ef 100644 --- a/lib/app/features/auth/views/pages/twofa_options/twofa_options_selector_button.dart +++ b/lib/app/features/auth/views/pages/twofa_options/twofa_options_selector_button.dart @@ -33,7 +33,7 @@ class TwoFaOptionsSelectorButton extends StatelessWidget { : context.theme.appColors.strokeElements, leadingIcon: ButtonIconFrame( color: context.theme.appColors.tertararyBackground, - icon: (state.value?.iconAsset ?? Assets.images.icons.iconSelect2).icon( + icon: (state.value?.iconAsset ?? Assets.svg.iconSelect2).icon( size: 20.0.s, color: context.theme.appColors.secondaryText, ), diff --git a/lib/app/features/auth/views/pages/twofa_success/twofa_success_page.dart b/lib/app/features/auth/views/pages/twofa_success/twofa_success_page.dart index a0786e3a9..710b37e2d 100644 --- a/lib/app/features/auth/views/pages/twofa_success/twofa_success_page.dart +++ b/lib/app/features/auth/views/pages/twofa_success/twofa_success_page.dart @@ -31,7 +31,7 @@ class TwoFaSuccessPage extends StatelessWidget { ], title: context.i18n.two_fa_title, description: context.i18n.two_fa_desc, - icon: Assets.images.icons.iconWalletProtect.icon(size: 36.0.s), + icon: Assets.svg.iconWalletProtect.icon(size: 36.0.s), children: [ Padding( padding: EdgeInsets.symmetric(horizontal: 38.0.s), @@ -39,7 +39,7 @@ class TwoFaSuccessPage extends StatelessWidget { children: [ SizedBox(height: 12.0.s), InfoCard( - iconAsset: Assets.images.icons.actionWalletSuccess2Fa, + iconAsset: Assets.svg.actionWalletSuccess2Fa, title: context.i18n.common_congratulations, description: context.i18n.two_fa_success_desc, ), diff --git a/lib/app/features/auth/views/pages/twofa_try_again/twofa_try_again_page.dart b/lib/app/features/auth/views/pages/twofa_try_again/twofa_try_again_page.dart index d4af79070..afb645056 100644 --- a/lib/app/features/auth/views/pages/twofa_try_again/twofa_try_again_page.dart +++ b/lib/app/features/auth/views/pages/twofa_try_again/twofa_try_again_page.dart @@ -26,7 +26,7 @@ class TwoFaTryAgainPage extends StatelessWidget { child: Column( children: [ InfoCard( - iconAsset: Assets.images.icons.actionWalletKeyserror, + iconAsset: Assets.svg.actionWalletKeyserror, title: context.i18n.two_fa_failure_title, description: context.i18n.two_fa_failure_desc, ), diff --git a/lib/app/features/dapps/views/components/categories_collection/categories_collection.dart b/lib/app/features/dapps/views/components/categories_collection/categories_collection.dart index dff659edf..d0cfea40a 100644 --- a/lib/app/features/dapps/views/components/categories_collection/categories_collection.dart +++ b/lib/app/features/dapps/views/components/categories_collection/categories_collection.dart @@ -20,13 +20,13 @@ enum DAppsCategory { Widget get icon { return switch (this) { - DAppsCategory.defi => Assets.images.categories.categoriesDefi, - DAppsCategory.marketplaces => Assets.images.categories.categoriesMarketplace, - DAppsCategory.nft => Assets.images.categories.categoriesNft, - DAppsCategory.games => Assets.images.categories.categoriesGames, - DAppsCategory.social => Assets.images.categories.categoriesSocial, - DAppsCategory.utilities => Assets.images.categories.categoriesUtilites, - DAppsCategory.other => Assets.images.categories.categoriesOther, + DAppsCategory.defi => Assets.svg.categoriesDefi, + DAppsCategory.marketplaces => Assets.svg.categoriesMarketplace, + DAppsCategory.nft => Assets.svg.categoriesNft, + DAppsCategory.games => Assets.svg.categoriesGames, + DAppsCategory.social => Assets.svg.categoriesSocial, + DAppsCategory.utilities => Assets.svg.categoriesUtilites, + DAppsCategory.other => Assets.svg.categoriesOther, } .icon(size: 50.0.s); } diff --git a/lib/app/features/dapps/views/components/favourite_icon/favorite_icon.dart b/lib/app/features/dapps/views/components/favourite_icon/favorite_icon.dart index 7fb348bce..67ad9a861 100644 --- a/lib/app/features/dapps/views/components/favourite_icon/favorite_icon.dart +++ b/lib/app/features/dapps/views/components/favourite_icon/favorite_icon.dart @@ -24,8 +24,7 @@ class FavouriteIcon extends StatelessWidget { @override Widget build(BuildContext context) { - final iconPath = - isFavourite ? Assets.images.icons.iconBookmarksOn : Assets.images.icons.iconBookmarks; + final iconPath = isFavourite ? Assets.svg.iconBookmarksOn : Assets.svg.iconBookmarks; return Button.icon( onPressed: () { diff --git a/lib/app/features/dapps/views/components/favourites/favourites.dart b/lib/app/features/dapps/views/components/favourites/favourites.dart index 0a21a62dc..15b8de001 100644 --- a/lib/app/features/dapps/views/components/favourites/favourites.dart +++ b/lib/app/features/dapps/views/components/favourites/favourites.dart @@ -69,7 +69,7 @@ class Favourites extends StatelessWidget { ], ), ), - Assets.images.icons.iconArrowRight.icon(size: 26.0.s), + Assets.svg.iconArrowRight.icon(size: 26.0.s), ], ), ), diff --git a/lib/app/features/dapps/views/components/grid_item/grid_item.dart b/lib/app/features/dapps/views/components/grid_item/grid_item.dart index 1065b97a1..566d1ec38 100644 --- a/lib/app/features/dapps/views/components/grid_item/grid_item.dart +++ b/lib/app/features/dapps/views/components/grid_item/grid_item.dart @@ -62,7 +62,7 @@ class GridItem extends HookWidget { size: 16.0.s, color: context.theme.appColors.onTertararyBackground, ), - child: Assets.images.icons.iconBadgeVerify.icon(size: 16.0.s), + child: Assets.svg.iconBadgeVerify.icon(size: 16.0.s), ), ), ], @@ -80,7 +80,7 @@ class GridItem extends HookWidget { size: 12.0.s, color: context.theme.appColors.onTertararyBackground, ), - child: Assets.images.icons.iconButtonIceStroke.icon(size: 12.0.s), + child: Assets.svg.iconButtonIceStroke.icon(size: 12.0.s), ), if (dAppData.value != null) Padding( diff --git a/lib/app/features/dapps/views/components/wallet_header/wallet_header.dart b/lib/app/features/dapps/views/components/wallet_header/wallet_header.dart index 37179a9d5..0c320bd8c 100644 --- a/lib/app/features/dapps/views/components/wallet_header/wallet_header.dart +++ b/lib/app/features/dapps/views/components/wallet_header/wallet_header.dart @@ -25,14 +25,14 @@ class WalletHeader extends ConsumerWidget { children: [ NavigationButton( onPressed: () {}, - icon: Assets.images.icons.iconFieldSearch.icon( + icon: Assets.svg.iconFieldSearch.icon( color: context.theme.appColors.primaryText, ), ), SizedBox(width: 12.0.s), NavigationButton( onPressed: () {}, - icon: Assets.images.icons.iconHeaderMenu.icon( + icon: Assets.svg.iconHeaderMenu.icon( color: context.theme.appColors.primaryText, ), ), diff --git a/lib/app/features/dapps/views/pages/dapp_details/dapp_details.dart b/lib/app/features/dapps/views/pages/dapp_details/dapp_details.dart index 62030f0dd..71879d38f 100644 --- a/lib/app/features/dapps/views/pages/dapp_details/dapp_details.dart +++ b/lib/app/features/dapps/views/pages/dapp_details/dapp_details.dart @@ -79,7 +79,7 @@ class DAppDetails extends ConsumerWidget { ), if (app.link != null) DappDetailsInfoBlock( - iconPath: Assets.images.icons.iconWalletLink, + iconPath: Assets.svg.iconWalletLink, value: InkWell( onTap: () async { if (app.link != null) { @@ -108,7 +108,7 @@ class DAppDetails extends ConsumerWidget { color: context.theme.appColors.primaryText, ), ), - iconPath: Assets.images.icons.iconButtonIceStroke, + iconPath: Assets.svg.iconButtonIceStroke, ), Row( children: [ @@ -126,7 +126,7 @@ class DAppDetails extends ConsumerWidget { color: context.theme.appColors.primaryText, ), ), - iconPath: Assets.images.icons.iconDappGames, + iconPath: Assets.svg.iconDappGames, ), ), SizedBox( @@ -146,7 +146,7 @@ class DAppDetails extends ConsumerWidget { color: context.theme.appColors.primaryText, ), ), - iconPath: Assets.images.icons.iconDappGames, + iconPath: Assets.svg.iconDappGames, ), ), ], diff --git a/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart b/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart index 032645602..9af404330 100644 --- a/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart +++ b/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart @@ -53,7 +53,7 @@ class DAppsList extends HookConsumerWidget { child: Container( child: apps.isEmpty ? EmptyList( - asset: Assets.images.misc.dappsEmpty, + asset: Assets.svg.walletIconWalletEmptyfavourites, title: context.i18n.dapps_favourites_empty_title, ) : ListView.builder( diff --git a/lib/app/features/feed/model/feed_category.dart b/lib/app/features/feed/model/feed_category.dart index b183a9b99..631046c7a 100644 --- a/lib/app/features/feed/model/feed_category.dart +++ b/lib/app/features/feed/model/feed_category.dart @@ -25,9 +25,9 @@ enum FeedCategory { final defaultColor = context.theme.appColors.secondaryBackground; final icon = switch (this) { - FeedCategory.feed => Assets.images.icons.iconProfileFeed, - FeedCategory.videos => Assets.images.icons.iconVideosTrading, - FeedCategory.articles => Assets.images.icons.iconFeedStories, + FeedCategory.feed => Assets.svg.iconProfileFeed, + FeedCategory.videos => Assets.svg.iconVideosTrading, + FeedCategory.articles => Assets.svg.iconFeedStories, }; return icon.icon(color: color ?? defaultColor); diff --git a/lib/app/features/feed/model/feed_filter.dart b/lib/app/features/feed/model/feed_filter.dart index c09279efb..81fd92296 100644 --- a/lib/app/features/feed/model/feed_filter.dart +++ b/lib/app/features/feed/model/feed_filter.dart @@ -10,8 +10,8 @@ enum FeedFilter { final defaultColor = context.theme.appColors.primaryText; final icon = switch (this) { - FeedFilter.forYou => Assets.images.icons.iconCategoriesForyou, - FeedFilter.following => Assets.images.icons.iconCategoriesFollowing, + FeedFilter.forYou => Assets.svg.iconCategoriesForyou, + FeedFilter.following => Assets.svg.iconCategoriesFollowing, }; return icon.icon( diff --git a/lib/app/features/feed/views/components/article/components/bookmark_button/bookmark_button.dart b/lib/app/features/feed/views/components/article/components/bookmark_button/bookmark_button.dart index 343dfd5e9..3b1b62929 100644 --- a/lib/app/features/feed/views/components/article/components/bookmark_button/bookmark_button.dart +++ b/lib/app/features/feed/views/components/article/components/bookmark_button/bookmark_button.dart @@ -16,7 +16,7 @@ class BookmarkButton extends ConsumerWidget { return IconButton( icon: SvgPicture.asset( - isBookmarked ? Assets.images.icons.iconBookmarks : Assets.images.icons.iconBookmarksOn, + isBookmarked ? Assets.svg.iconBookmarks : Assets.svg.iconBookmarksOn, ), onPressed: () { ref.read(bookmarkNotifierProvider.notifier).toggleBookmark(id); diff --git a/lib/app/features/feed/views/components/post/components/post_footer/post_footer.dart b/lib/app/features/feed/views/components/post/components/post_footer/post_footer.dart index 7eda95fa2..1595f09e6 100644 --- a/lib/app/features/feed/views/components/post/components/post_footer/post_footer.dart +++ b/lib/app/features/feed/views/components/post/components/post_footer/post_footer.dart @@ -62,10 +62,10 @@ class PostFooter extends HookConsumerWidget { void onIceStroke() => HapticFeedback.lightImpact(); final commentsActionIcon = PostActionButton( - icon: Assets.images.icons.iconBlockComment.icon( + icon: Assets.svg.iconBlockComment.icon( size: 14.0.s, ), - activeIcon: Assets.images.icons.iconBlockCommenton.icon( + activeIcon: Assets.svg.iconBlockCommenton.icon( size: 14.0.s, ), value: '121k', @@ -74,10 +74,10 @@ class PostFooter extends HookConsumerWidget { ); final repostsActionIcon = PostActionButton( - icon: Assets.images.icons.iconBlockRepost.icon( + icon: Assets.svg.iconBlockRepost.icon( size: 14.0.s, ), - activeIcon: Assets.images.icons.iconBlockRepost.icon( + activeIcon: Assets.svg.iconBlockRepost.icon( size: 14.0.s, color: activeColor, ), @@ -87,11 +87,11 @@ class PostFooter extends HookConsumerWidget { ); final likesActionIcon = PostActionButton( - icon: Assets.images.icons.iconVideoLikeOff.icon( + icon: Assets.svg.iconVideoLikeOff.icon( size: 18.0.s, color: context.theme.appColors.onTertararyBackground, ), - activeIcon: Assets.images.icons.iconVideoLikeOn.icon( + activeIcon: Assets.svg.iconVideoLikeOn.icon( size: 18.0.s, color: context.theme.appColors.attentionRed, ), @@ -101,7 +101,7 @@ class PostFooter extends HookConsumerWidget { ); final iceActionIcon = PostActionButton( - icon: Assets.images.icons.iconButtonIceStroke.icon( + icon: Assets.svg.iconButtonIceStroke.icon( size: 16.0.s, color: context.theme.appColors.onTertararyBackground, ), @@ -110,7 +110,7 @@ class PostFooter extends HookConsumerWidget { ); final shareActionIcon = PostActionButton( - icon: Assets.images.icons.iconBlockShare.icon( + icon: Assets.svg.iconBlockShare.icon( size: 14.0.s, ), activeColor: activeColor, diff --git a/lib/app/features/feed/views/components/post/components/post_menu/post_menu.dart b/lib/app/features/feed/views/components/post/components/post_menu/post_menu.dart index 597f63e86..7fc7284a8 100644 --- a/lib/app/features/feed/views/components/post/components/post_menu/post_menu.dart +++ b/lib/app/features/feed/views/components/post/components/post_menu/post_menu.dart @@ -22,7 +22,7 @@ class PostMenu extends StatelessWidget { OverlayMenuContainer( child: PostMenuItem( label: context.i18n.post_menu_not_interested, - icon: Assets.images.icons.iconNotinterested.icon(size: iconSize), + icon: Assets.svg.iconNotinterested.icon(size: iconSize), onPressed: closeMenu, ), ), @@ -32,17 +32,17 @@ class PostMenu extends StatelessWidget { children: [ PostMenuItem( label: context.i18n.post_menu_follow_nickname('nickname'), - icon: Assets.images.icons.iconFollowuser.icon(size: iconSize), + icon: Assets.svg.iconFollowuser.icon(size: iconSize), onPressed: closeMenu, ), PostMenuItem( label: context.i18n.post_menu_block_nickname('nickname'), - icon: Assets.images.icons.iconBlock.icon(size: iconSize), + icon: Assets.svg.iconBlock.icon(size: iconSize), onPressed: closeMenu, ), PostMenuItem( label: context.i18n.post_menu_report_post, - icon: Assets.images.icons.iconReport.icon(size: iconSize), + icon: Assets.svg.iconReport.icon(size: iconSize), onPressed: closeMenu, ), ], @@ -57,7 +57,7 @@ class PostMenu extends StatelessWidget { transform: Matrix4.translationValues(12.0.s, 0, 0), child: IconButton( onPressed: null, - icon: Assets.images.icons.iconMorePopup.icon( + icon: Assets.svg.iconMorePopup.icon( color: context.theme.appColors.onTertararyBackground, ), ), diff --git a/lib/app/features/feed/views/components/post_replies/expand_replies_button.dart b/lib/app/features/feed/views/components/post_replies/expand_replies_button.dart index 0bf5e7fb9..90df2879f 100644 --- a/lib/app/features/feed/views/components/post_replies/expand_replies_button.dart +++ b/lib/app/features/feed/views/components/post_replies/expand_replies_button.dart @@ -26,7 +26,7 @@ class ExpandRepliesButton extends StatelessWidget { SizedBox( width: 4.0.s, height: 16.0.s, - child: Assets.images.icons.iconMorePopup.icon(fit: BoxFit.none), + child: Assets.svg.iconMorePopup.icon(fit: BoxFit.none), ), SizedBox(width: 14.0.s), Text( diff --git a/lib/app/features/feed/views/components/post_replies/post_replies_action_bar.dart b/lib/app/features/feed/views/components/post_replies/post_replies_action_bar.dart index ef564c098..79d5ed541 100644 --- a/lib/app/features/feed/views/components/post_replies/post_replies_action_bar.dart +++ b/lib/app/features/feed/views/components/post_replies/post_replies_action_bar.dart @@ -22,17 +22,17 @@ class PostRepliesActionBar extends StatelessWidget { children: [ GestureDetector( onTap: () {}, - child: Assets.images.icons.iconGalleryOpen.icon(), + child: Assets.svg.iconGalleryOpen.icon(), ), SizedBox(width: 12.0.s), GestureDetector( onTap: () {}, - child: Assets.images.icons.iconCameraOpen.icon(), + child: Assets.svg.iconCameraOpen.icon(), ), SizedBox(width: 12.0.s), GestureDetector( onTap: () {}, - child: Assets.images.icons.iconFeedAddfile.icon(), + child: Assets.svg.iconFeedAddfile.icon(), ), const Spacer(), GestureDetector( @@ -45,7 +45,7 @@ class PostRepliesActionBar extends StatelessWidget { color: context.theme.appColors.primaryAccent, ), alignment: Alignment.center, - child: Assets.images.icons.iconFeedSendbutton.icon(size: 16.0.s), + child: Assets.svg.iconFeedSendbutton.icon(size: 16.0.s), ), ), ], diff --git a/lib/app/features/feed/views/pages/comment_post_modal/comment_post_modal.dart b/lib/app/features/feed/views/pages/comment_post_modal/comment_post_modal.dart index 8cd308003..aa01ecd54 100644 --- a/lib/app/features/feed/views/pages/comment_post_modal/comment_post_modal.dart +++ b/lib/app/features/feed/views/pages/comment_post_modal/comment_post_modal.dart @@ -38,8 +38,7 @@ class CommentPostModal extends ConsumerWidget { ), leading: IconButton( onPressed: context.pop, - icon: Assets.images.icons.iconSheetClose - .icon(color: context.theme.appColors.quaternaryText), + icon: Assets.svg.iconSheetClose.icon(color: context.theme.appColors.quaternaryText), ), ), Expanded( diff --git a/lib/app/features/feed/views/pages/feed_page/components/feed_controls/components/feed_filters/feed_filters_menu_item.dart b/lib/app/features/feed/views/pages/feed_page/components/feed_controls/components/feed_filters/feed_filters_menu_item.dart index 75b8af2a2..4f2d46bed 100644 --- a/lib/app/features/feed/views/pages/feed_page/components/feed_controls/components/feed_filters/feed_filters_menu_item.dart +++ b/lib/app/features/feed/views/pages/feed_page/components/feed_controls/components/feed_filters/feed_filters_menu_item.dart @@ -41,7 +41,7 @@ class FeedFiltersMenuItem extends ConsumerWidget { ), ), if (isSelected) - Assets.images.icons.iconDappCheck.icon( + Assets.svg.iconDappCheck.icon( color: colors.success, ), ], diff --git a/lib/app/features/feed/views/pages/feed_page/components/feed_controls/components/feed_navigation/feed_navigation.dart b/lib/app/features/feed/views/pages/feed_page/components/feed_controls/components/feed_navigation/feed_navigation.dart index 0a3381dca..0f7d84163 100644 --- a/lib/app/features/feed/views/pages/feed_page/components/feed_controls/components/feed_navigation/feed_navigation.dart +++ b/lib/app/features/feed/views/pages/feed_page/components/feed_controls/components/feed_navigation/feed_navigation.dart @@ -6,6 +6,7 @@ import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; import 'package:ice/app/features/feed/views/pages/feed_page/components/feed_controls/components/feed_filters/feed_filters_menu_button.dart'; +import 'package:ice/app/router/app_routes.dart'; import 'package:ice/app/router/components/navigation_button/navigation_button.dart'; import 'package:ice/generated/assets.gen.dart'; @@ -20,15 +21,17 @@ class FeedNavigation extends StatelessWidget { child: Row( children: [ Expanded( - child: SearchInput( - onTextChanged: (String st) {}, + child: GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => FeedSearchRoute().push(context), + child: IgnorePointer(child: SearchInput()), ), ), Padding( padding: EdgeInsets.only(left: 12.0.s), child: NavigationButton( onPressed: () => {}, - icon: Assets.images.icons.iconHomeNotification.icon( + icon: Assets.svg.iconHomeNotification.icon( color: context.theme.appColors.primaryText, ), ), diff --git a/lib/app/features/feed/views/pages/feed_page/components/stories/components/plus_icon.dart b/lib/app/features/feed/views/pages/feed_page/components/stories/components/plus_icon.dart index e90064d7c..469dfbf6e 100644 --- a/lib/app/features/feed/views/pages/feed_page/components/stories/components/plus_icon.dart +++ b/lib/app/features/feed/views/pages/feed_page/components/stories/components/plus_icon.dart @@ -29,7 +29,7 @@ class PlusIcon extends StatelessWidget { shape: BoxShape.circle, ), ), - Assets.images.icons.iconPlusCreatechannel.icon( + Assets.svg.iconPlusCreatechannel.icon( size: size, color: context.theme.appColors.secondaryBackground, ), diff --git a/lib/app/features/feed/views/pages/feed_page/components/trending_videos/components/trending_video_likes_button.dart b/lib/app/features/feed/views/pages/feed_page/components/trending_videos/components/trending_video_likes_button.dart index 1b92d102c..b9502332a 100644 --- a/lib/app/features/feed/views/pages/feed_page/components/trending_videos/components/trending_video_likes_button.dart +++ b/lib/app/features/feed/views/pages/feed_page/components/trending_videos/components/trending_video_likes_button.dart @@ -25,7 +25,7 @@ class TrendingVideoLikesButton extends StatelessWidget { onPressed: onPressed, child: Row( children: [ - Assets.images.icons.iconVideoLikeOn.icon( + Assets.svg.iconVideoLikeOn.icon( size: 14.0.s, color: context.theme.appColors.secondaryBackground, ), diff --git a/lib/app/features/feed/views/pages/feed_page/components/trending_videos/components/trending_video_menu_button.dart b/lib/app/features/feed/views/pages/feed_page/components/trending_videos/components/trending_video_menu_button.dart index 47e1b7196..5b687b84c 100644 --- a/lib/app/features/feed/views/pages/feed_page/components/trending_videos/components/trending_video_menu_button.dart +++ b/lib/app/features/feed/views/pages/feed_page/components/trending_videos/components/trending_video_menu_button.dart @@ -19,7 +19,7 @@ class TrendingVideoMenuButton extends StatelessWidget { width: 40.0.s, child: IconButton( onPressed: onPressed, - icon: Assets.images.icons.iconMorePopup.icon( + icon: Assets.svg.iconMorePopup.icon( size: 16.0.s, color: context.theme.appColors.secondaryBackground, ), diff --git a/lib/app/features/feed/views/pages/feed_page/components/trending_videos/components/video_icon.dart b/lib/app/features/feed/views/pages/feed_page/components/trending_videos/components/video_icon.dart index 9c9fc984e..cb56e378e 100644 --- a/lib/app/features/feed/views/pages/feed_page/components/trending_videos/components/video_icon.dart +++ b/lib/app/features/feed/views/pages/feed_page/components/trending_videos/components/video_icon.dart @@ -23,7 +23,7 @@ class VideosIcon extends StatelessWidget { ), child: Padding( padding: EdgeInsets.fromLTRB(2.0.s, 1.0.s, 0, 0), - child: Assets.images.icons.iconVideosTrading.icon( + child: Assets.svg.iconVideosTrading.icon( color: context.theme.appColors.secondaryBackground, size: 20.0.s, ), diff --git a/lib/app/features/feed/views/pages/feed_search_page/components/feed_search_navigation.dart b/lib/app/features/feed/views/pages/feed_search_page/components/feed_search_navigation.dart new file mode 100644 index 000000000..5d62c8f91 --- /dev/null +++ b/lib/app/features/feed/views/pages/feed_search_page/components/feed_search_navigation.dart @@ -0,0 +1,32 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_hooks/flutter_hooks.dart'; +import 'package:ice/app/components/inputs/search_input/search_input.dart'; +import 'package:ice/app/components/screen_offset/screen_side_offset.dart'; +import 'package:ice/app/features/feed/views/pages/feed_search_page/hooks/use_go_back_on_blur.dart'; +import 'package:ice/app/hooks/use_on_init.dart'; + +class FeedSearchNavigation extends HookWidget { + const FeedSearchNavigation({ + super.key, + }); + + @override + Widget build(BuildContext context) { + final focusNode = useFocusNode(); + useOnInit(focusNode.requestFocus); + useGoBackOnBlur(focusNode: focusNode); + + return ScreenSideOffset.small( + child: Row( + children: [ + Expanded( + child: SearchInput( + focusNode: focusNode, + onTextChanged: (String st) {}, + ), + ), + ], + ), + ); + } +} diff --git a/lib/app/features/feed/views/pages/feed_search_page/feed_search_page.dart b/lib/app/features/feed/views/pages/feed_search_page/feed_search_page.dart new file mode 100644 index 000000000..d2972807a --- /dev/null +++ b/lib/app/features/feed/views/pages/feed_search_page/feed_search_page.dart @@ -0,0 +1,38 @@ +import 'package:flutter/material.dart'; +import 'package:ice/app/components/screen_offset/screen_top_offset.dart'; +import 'package:ice/app/extensions/extensions.dart'; +import 'package:ice/app/features/feed/views/pages/feed_search_page/components/feed_search_navigation.dart'; +import 'package:ice/generated/assets.gen.dart'; + +class FeedSearchPage extends StatelessWidget { + const FeedSearchPage({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + body: ScreenTopOffset( + child: Column( + children: [ + FeedSearchNavigation(), + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + mainAxisSize: MainAxisSize.max, + children: [ + Assets.svg.walletIconWalletSearching.icon(size: 48.0.s), + SizedBox(height: 8.0.s), + Text( + context.i18n.feed_search_empty, + style: context.theme.appTextThemes.body2.copyWith( + color: context.theme.appColors.tertararyText, + ), + ) + ], + ), + ), + ], + ), + ), + ); + } +} diff --git a/lib/app/features/feed/views/pages/feed_search_page/hooks/use_go_back_on_blur.dart b/lib/app/features/feed/views/pages/feed_search_page/hooks/use_go_back_on_blur.dart new file mode 100644 index 000000000..a3192add0 --- /dev/null +++ b/lib/app/features/feed/views/pages/feed_search_page/hooks/use_go_back_on_blur.dart @@ -0,0 +1,23 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_hooks/flutter_hooks.dart'; +import 'package:go_router/go_router.dart'; + +void useGoBackOnBlur({required FocusNode focusNode, bool enabled = true}) { + final context = useContext(); + useEffect( + () { + if (enabled) { + void onFocusChange() { + if (!focusNode.hasFocus) { + context.pop(); + } + } + + focusNode.addListener(onFocusChange); + return () => focusNode.removeListener(onFocusChange); + } + return null; + }, + [focusNode, enabled], + ); +} diff --git a/lib/app/features/feed/views/pages/post_details_page/components/reply_input_field/reply_input_field.dart b/lib/app/features/feed/views/pages/post_details_page/components/reply_input_field/reply_input_field.dart index e1d796973..9f4772688 100644 --- a/lib/app/features/feed/views/pages/post_details_page/components/reply_input_field/reply_input_field.dart +++ b/lib/app/features/feed/views/pages/post_details_page/components/reply_input_field/reply_input_field.dart @@ -85,7 +85,7 @@ class ReplyInputField extends HookConsumerWidget { .push(context); textController.text = ref.read(replyDataNotifierProvider).text; }, - child: Assets.images.icons.iconReplysearchScale.icon(size: 20.0.s), + child: Assets.svg.iconReplysearchScale.icon(size: 20.0.s), ), ], ), diff --git a/lib/app/features/feed/views/pages/post_details_page/components/reply_sent_notification/reply_sent_notification.dart b/lib/app/features/feed/views/pages/post_details_page/components/reply_sent_notification/reply_sent_notification.dart index 3c9c92937..d85f2a321 100644 --- a/lib/app/features/feed/views/pages/post_details_page/components/reply_sent_notification/reply_sent_notification.dart +++ b/lib/app/features/feed/views/pages/post_details_page/components/reply_sent_notification/reply_sent_notification.dart @@ -21,7 +21,7 @@ class ReplySentNotification extends StatelessWidget { padding: EdgeInsets.symmetric(horizontal: 15.0.s), child: Row( children: [ - Assets.images.icons.iconBlockCheckboxOn.icon(color: colors.onPrimaryAccent), + Assets.svg.iconBlockCheckboxOn.icon(color: colors.onPrimaryAccent), SizedBox(width: 8.0.s), Text( context.i18n.post_reply_sent, diff --git a/lib/app/features/feed/views/pages/post_details_page/post_details_page.dart b/lib/app/features/feed/views/pages/post_details_page/post_details_page.dart index a23f34fb9..47d630179 100644 --- a/lib/app/features/feed/views/pages/post_details_page/post_details_page.dart +++ b/lib/app/features/feed/views/pages/post_details_page/post_details_page.dart @@ -47,7 +47,7 @@ class PostDetailsPage extends HookConsumerWidget { title: Text(context.i18n.post_page_title), actions: [ IconButton( - icon: Assets.images.icons.iconBookmarks.icon( + icon: Assets.svg.iconBookmarks.icon( size: NavigationAppBar.actionButtonSide, color: context.theme.appColors.primaryText, ), diff --git a/lib/app/features/feed/views/pages/post_reply_modal/post_reply_modal.dart b/lib/app/features/feed/views/pages/post_reply_modal/post_reply_modal.dart index 4aee7586a..a40628b14 100644 --- a/lib/app/features/feed/views/pages/post_reply_modal/post_reply_modal.dart +++ b/lib/app/features/feed/views/pages/post_reply_modal/post_reply_modal.dart @@ -131,7 +131,7 @@ class _DialogTitle extends StatelessWidget { ), leading: IconButton( onPressed: context.pop, - icon: Assets.images.icons.iconSheetClose.icon( + icon: Assets.svg.iconSheetClose.icon( color: context.theme.appColors.quaternaryText, size: 24.0.s, ), @@ -140,7 +140,7 @@ class _DialogTitle extends StatelessWidget { if (showCollapseButton) IconButton( onPressed: context.pop, - icon: Assets.images.icons.iconFeedScale.icon( + icon: Assets.svg.iconFeedScale.icon( color: context.theme.appColors.quaternaryText, size: 18.0.s, ), diff --git a/lib/app/features/feed/views/pages/repost_options_modal/repost_options_modal.dart b/lib/app/features/feed/views/pages/repost_options_modal/repost_options_modal.dart index 64c9d353b..951fcd8d4 100644 --- a/lib/app/features/feed/views/pages/repost_options_modal/repost_options_modal.dart +++ b/lib/app/features/feed/views/pages/repost_options_modal/repost_options_modal.dart @@ -32,7 +32,7 @@ class RepostOptionsModal extends StatelessWidget { type: ButtonType.secondary, mainAxisSize: MainAxisSize.max, onPressed: () {}, - leadingIcon: Assets.images.icons.iconFeedRepost.icon(size: 18.0.s), + leadingIcon: Assets.svg.iconFeedRepost.icon(size: 18.0.s), leadingIconOffset: 12.0.s, label: Text( context.i18n.feed_repost, @@ -47,7 +47,7 @@ class RepostOptionsModal extends StatelessWidget { onPressed: () { CommentPostModalRoute(postId: postId).pushReplacement(context); }, - leadingIcon: Assets.images.icons.iconFeedQuote.icon(size: 18.0.s), + leadingIcon: Assets.svg.iconFeedQuote.icon(size: 18.0.s), leadingIconOffset: 12.0.s, label: Text( context.i18n.feed_quote_post, diff --git a/lib/app/features/feed/views/pages/share_post_modal/components/share_options.dart b/lib/app/features/feed/views/pages/share_post_modal/components/share_options.dart index eacb3e41a..f0bc95d43 100644 --- a/lib/app/features/feed/views/pages/share_post_modal/components/share_options.dart +++ b/lib/app/features/feed/views/pages/share_post_modal/components/share_options.dart @@ -23,31 +23,31 @@ class ShareOptions extends StatelessWidget { children: [ _ShareOptionsMenuItem( buttonType: ButtonType.primary, - icon: Assets.images.icons.iconFeedStories.icon(size: iconSize), + icon: Assets.svg.iconFeedStories.icon(size: iconSize), label: context.i18n.feed_add_story, onPressed: () {}, ), _ShareOptionsMenuItem( buttonType: ButtonType.dropdown, - icon: Assets.images.icons.iconBlockCopy1.icon(size: iconSize, color: Colors.black), + icon: Assets.svg.iconBlockCopy1.icon(size: iconSize, color: Colors.black), label: context.i18n.feed_copy_link, onPressed: () {}, ), _ShareOptionsMenuItem( buttonType: ButtonType.dropdown, - icon: Assets.images.icons.iconBookmarks.icon(size: iconSize, color: Colors.black), + icon: Assets.svg.iconBookmarks.icon(size: iconSize, color: Colors.black), label: context.i18n.feed_bookmark, onPressed: () {}, ), _ShareOptionsMenuItem( buttonType: ButtonType.dropdown, - icon: Assets.images.icons.iconFeedWhatsapp.icon(size: iconSize), + icon: Assets.svg.iconFeedWhatsapp.icon(size: iconSize), label: context.i18n.feed_whatsapp, onPressed: () {}, ), _ShareOptionsMenuItem( buttonType: ButtonType.dropdown, - icon: Assets.images.icons.iconFeedMore.icon(size: iconSize), + icon: Assets.svg.iconFeedMore.icon(size: iconSize), label: context.i18n.feed_more, onPressed: () {}, ), diff --git a/lib/app/features/feed/views/pages/share_post_modal/components/share_send_button.dart b/lib/app/features/feed/views/pages/share_post_modal/components/share_send_button.dart index 5a065dd89..1bc9e650d 100644 --- a/lib/app/features/feed/views/pages/share_post_modal/components/share_send_button.dart +++ b/lib/app/features/feed/views/pages/share_post_modal/components/share_send_button.dart @@ -21,8 +21,8 @@ class ShareSendButton extends StatelessWidget { child: Button.compact( mainAxisSize: MainAxisSize.max, minimumSize: Size(56.0.s, 56.0.s), - trailingIcon: Assets.images.icons.iconButtonNext - .icon(color: context.theme.appColors.onPrimaryAccent), + trailingIcon: + Assets.svg.iconButtonNext.icon(color: context.theme.appColors.onPrimaryAccent), label: Text( context.i18n.feed_send, ), diff --git a/lib/app/features/feed/views/pages/share_post_modal/components/share_user_list.dart b/lib/app/features/feed/views/pages/share_post_modal/components/share_user_list.dart index b7eeddb77..af711af4b 100644 --- a/lib/app/features/feed/views/pages/share_post_modal/components/share_user_list.dart +++ b/lib/app/features/feed/views/pages/share_post_modal/components/share_user_list.dart @@ -44,8 +44,7 @@ class ShareUserList extends StatelessWidget { Widget _getCheckbox(BuildContext context, bool isSelected) { return isSelected - ? Assets.images.icons.iconBlockCheckboxOn.icon() - : Assets.images.icons.iconBlockCheckboxOff - .icon(color: context.theme.appColors.onTerararyFill); + ? Assets.svg.iconBlockCheckboxOn.icon() + : Assets.svg.iconBlockCheckboxOff.icon(color: context.theme.appColors.onTerararyFill); } } diff --git a/lib/app/features/protect_account/authenticator/data/model/authenticator_steps.dart b/lib/app/features/protect_account/authenticator/data/model/authenticator_steps.dart index d6b9db1f3..6bc1930e8 100644 --- a/lib/app/features/protect_account/authenticator/data/model/authenticator_steps.dart +++ b/lib/app/features/protect_account/authenticator/data/model/authenticator_steps.dart @@ -34,10 +34,10 @@ enum AuthenticatorSetupSteps { String get headerImageAsset { return switch (this) { - AuthenticatorSetupSteps.options => Assets.images.icons.icon2faAuthsetup, - AuthenticatorSetupSteps.instruction => Assets.images.icons.icon2faFollowinstuction, - AuthenticatorSetupSteps.confirmation => Assets.images.icons.iconLoginPassword, - AuthenticatorSetupSteps.success => Assets.images.icons.icon2faAuthsetup, + AuthenticatorSetupSteps.options => Assets.svg.icon2faAuthsetup, + AuthenticatorSetupSteps.instruction => Assets.svg.icon2faFollowinstuction, + AuthenticatorSetupSteps.confirmation => Assets.svg.iconLoginPassword, + AuthenticatorSetupSteps.success => Assets.svg.icon2faAuthsetup, }; } diff --git a/lib/app/features/protect_account/authenticator/data/model/authenticator_type.dart b/lib/app/features/protect_account/authenticator/data/model/authenticator_type.dart index 76f70c45f..9d7c13944 100644 --- a/lib/app/features/protect_account/authenticator/data/model/authenticator_type.dart +++ b/lib/app/features/protect_account/authenticator/data/model/authenticator_type.dart @@ -20,11 +20,11 @@ enum AutethenticatorType { String get iconAsset { return switch (this) { - AutethenticatorType.google => Assets.images.icons.icon2faGoogleauth, - AutethenticatorType.micsrosoft => Assets.images.icons.icon2famicrosoft, - AutethenticatorType.lastpass => Assets.images.icons.icon2faLastpass, - AutethenticatorType.authy => Assets.images.icons.icon2faAuthy, - AutethenticatorType.userLockPush => Assets.images.icons.icon2faUserlock, + AutethenticatorType.google => Assets.svg.icon2faGoogleauth, + AutethenticatorType.micsrosoft => Assets.svg.icon2famicrosoft, + AutethenticatorType.lastpass => Assets.svg.icon2faLastpass, + AutethenticatorType.authy => Assets.svg.icon2faAuthy, + AutethenticatorType.userLockPush => Assets.svg.icon2faUserlock, }; } } diff --git a/lib/app/features/protect_account/authenticator/views/components/copy_key_card.dart b/lib/app/features/protect_account/authenticator/views/components/copy_key_card.dart index 87f41807f..c8fc3ce68 100644 --- a/lib/app/features/protect_account/authenticator/views/components/copy_key_card.dart +++ b/lib/app/features/protect_account/authenticator/views/components/copy_key_card.dart @@ -22,7 +22,7 @@ class CopyKeyCard extends HookWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Assets.images.icons.iconFieldIdentitykey.icon( + Assets.svg.iconFieldIdentitykey.icon( size: 16.0.s, color: context.theme.appColors.onTertararyBackground, ), @@ -44,8 +44,8 @@ class CopyKeyCard extends HookWidget { Button( minimumSize: Size(148.0.s, 48.0.s), leadingIcon: isCopied.value - ? Assets.images.icons.iconBlockCheckGreen.icon() - : Assets.images.icons.iconBlockCopyBlue.icon(), + ? Assets.svg.iconBlockCheckGreen.icon() + : Assets.svg.iconBlockCopyBlue.icon(), borderColor: isCopied.value ? context.theme.appColors.success : context.theme.appColors.strokeElements, diff --git a/lib/app/features/protect_account/authenticator/views/pages/delete_authenticator/authenticator_delete_page.dart b/lib/app/features/protect_account/authenticator/views/pages/delete_authenticator/authenticator_delete_page.dart index 03c4e90db..9f93e17c7 100644 --- a/lib/app/features/protect_account/authenticator/views/pages/delete_authenticator/authenticator_delete_page.dart +++ b/lib/app/features/protect_account/authenticator/views/pages/delete_authenticator/authenticator_delete_page.dart @@ -38,7 +38,7 @@ class AuthenticatorDeletePage extends StatelessWidget { title: locale.authenticator_delete_title, description: locale.authenticator_delete_description, icon: AuthHeaderIcon( - icon: Assets.images.icons.iconWalletProtectFill.icon(size: 36.0.s), + icon: Assets.svg.iconWalletProtectFill.icon(size: 36.0.s), ), ), ), diff --git a/lib/app/features/protect_account/authenticator/views/pages/delete_authenticator/authenticator_delete_success.dart b/lib/app/features/protect_account/authenticator/views/pages/delete_authenticator/authenticator_delete_success.dart index 1a5904bcb..9ca7e76de 100644 --- a/lib/app/features/protect_account/authenticator/views/pages/delete_authenticator/authenticator_delete_success.dart +++ b/lib/app/features/protect_account/authenticator/views/pages/delete_authenticator/authenticator_delete_success.dart @@ -39,13 +39,13 @@ class AuthenticatorDeleteSuccessPage extends StatelessWidget { color: context.theme.appColors.secondaryText, ), icon: AuthHeaderIcon( - icon: Assets.images.icons.icon2faAuthsetup.icon(size: 36.0.s), + icon: Assets.svg.icon2faAuthsetup.icon(size: 36.0.s), ), ), Spacer(), ScreenSideOffset.medium( child: InfoCard( - iconAsset: Assets.images.icons.actionWalletGoogleauth, + iconAsset: Assets.svg.actionWalletGoogleauth, title: locale.common_congratulations, description: locale.authenticator_has_deleted, ), diff --git a/lib/app/features/protect_account/authenticator/views/pages/delete_authenticator/authenticator_initial_delete_page.dart b/lib/app/features/protect_account/authenticator/views/pages/delete_authenticator/authenticator_initial_delete_page.dart index 032ea1808..ceae1b739 100644 --- a/lib/app/features/protect_account/authenticator/views/pages/delete_authenticator/authenticator_initial_delete_page.dart +++ b/lib/app/features/protect_account/authenticator/views/pages/delete_authenticator/authenticator_initial_delete_page.dart @@ -34,7 +34,7 @@ class AuthenticatorInitialDeletePage extends StatelessWidget { color: context.theme.appColors.secondaryText, ), icon: AuthHeaderIcon( - icon: Assets.images.icons.icon2faAuthsetup.icon(size: 36.0.s), + icon: Assets.svg.icon2faAuthsetup.icon(size: 36.0.s), ), ), SizedBox(height: 42.0.s), @@ -46,7 +46,7 @@ class AuthenticatorInitialDeletePage extends StatelessWidget { ), child: Column( children: [ - Assets.images.icons.actionWalletGoogleauth.icon(size: 80.0.s), + Assets.svg.actionWalletGoogleauth.icon(size: 80.0.s), SizedBox(height: 20.0.s), Text( locale.authenticator_is_linked_to_account, diff --git a/lib/app/features/protect_account/authenticator/views/pages/setup_authenticator/authenticator_code_confirm_page.dart b/lib/app/features/protect_account/authenticator/views/pages/setup_authenticator/authenticator_code_confirm_page.dart index 783322442..f8b69015c 100644 --- a/lib/app/features/protect_account/authenticator/views/pages/setup_authenticator/authenticator_code_confirm_page.dart +++ b/lib/app/features/protect_account/authenticator/views/pages/setup_authenticator/authenticator_code_confirm_page.dart @@ -33,7 +33,7 @@ class AuthenticatorCodeConfirmPage extends HookWidget { labelText: context.i18n.two_fa_auth, prefixIcon: TextInputIcons( hasRightDivider: true, - icons: [Assets.images.icons.iconRecoveryCode.icon()], + icons: [Assets.svg.iconRecoveryCode.icon()], ), validator: (value) => value?.isEmpty == true ? '' : null, textInputAction: TextInputAction.done, diff --git a/lib/app/features/protect_account/authenticator/views/pages/setup_authenticator/authenticator_success_page.dart b/lib/app/features/protect_account/authenticator/views/pages/setup_authenticator/authenticator_success_page.dart index c662d4984..592c0aa36 100644 --- a/lib/app/features/protect_account/authenticator/views/pages/setup_authenticator/authenticator_success_page.dart +++ b/lib/app/features/protect_account/authenticator/views/pages/setup_authenticator/authenticator_success_page.dart @@ -14,7 +14,7 @@ class AuthenticatorSuccessPage extends StatelessWidget { children: [ ScreenSideOffset.medium( child: InfoCard( - iconAsset: Assets.images.icons.actionWalletGoogleauth, + iconAsset: Assets.svg.actionWalletGoogleauth, title: context.i18n.recovery_keys_successfully_protected_title, description: context.i18n.authenticator_protected_description, ), diff --git a/lib/app/features/protect_account/backup/data/models/recovery_keys.dart b/lib/app/features/protect_account/backup/data/models/recovery_keys.dart index 5a6a849a8..798b0833d 100644 --- a/lib/app/features/protect_account/backup/data/models/recovery_keys.dart +++ b/lib/app/features/protect_account/backup/data/models/recovery_keys.dart @@ -17,9 +17,9 @@ enum RecoveryKeys { String get iconAsset { return switch (this) { - RecoveryKeys.identityKeyName => Assets.images.icons.iconIdentitykey, - RecoveryKeys.recoveryKeyId => Assets.images.icons.iconChannelPrivate, - RecoveryKeys.recoveryCode => Assets.images.icons.iconCode4, + RecoveryKeys.identityKeyName => Assets.svg.iconIdentitykey, + RecoveryKeys.recoveryKeyId => Assets.svg.iconChannelPrivate, + RecoveryKeys.recoveryCode => Assets.svg.iconCode4, }; } } diff --git a/lib/app/features/protect_account/backup/views/components/backup_option.dart b/lib/app/features/protect_account/backup/views/components/backup_option.dart index 1358eb981..a8b2a68dc 100644 --- a/lib/app/features/protect_account/backup/views/components/backup_option.dart +++ b/lib/app/features/protect_account/backup/views/components/backup_option.dart @@ -32,7 +32,7 @@ class BackupOption extends StatelessWidget { ), leading: icon, trailing: isOptionEnabled - ? Assets.images.icons.iconDappCheck.icon( + ? Assets.svg.iconDappCheck.icon( color: context.theme.appColors.success, ) : null, diff --git a/lib/app/features/protect_account/backup/views/components/errors/recovery_keys_error_alert.dart b/lib/app/features/protect_account/backup/views/components/errors/recovery_keys_error_alert.dart index a0229c1ec..5301016a1 100644 --- a/lib/app/features/protect_account/backup/views/components/errors/recovery_keys_error_alert.dart +++ b/lib/app/features/protect_account/backup/views/components/errors/recovery_keys_error_alert.dart @@ -11,7 +11,7 @@ class RecoveryKeysErrorAlert extends StatelessWidget { return SimpleModalSheet.alert( title: context.i18n.error_recovery_keys_title, description: context.i18n.error_recovery_keys_description, - iconAsset: Assets.images.icons.actionWalletKeyserror, + iconAsset: Assets.svg.actionWalletKeyserror, buttonText: context.i18n.button_try_again, onPressed: () {}, ); diff --git a/lib/app/features/protect_account/backup/views/components/errors/screenshot_security_alert.dart b/lib/app/features/protect_account/backup/views/components/errors/screenshot_security_alert.dart index 7bf85e399..a009bc99a 100644 --- a/lib/app/features/protect_account/backup/views/components/errors/screenshot_security_alert.dart +++ b/lib/app/features/protect_account/backup/views/components/errors/screenshot_security_alert.dart @@ -11,7 +11,7 @@ class ScreenshotSecurityAlert extends StatelessWidget { return SimpleModalSheet.alert( title: context.i18n.error_screenshots_arent_secure_title, description: context.i18n.error_screenshots_arent_secure_description, - iconAsset: Assets.images.icons.actionWalletScreenshot, + iconAsset: Assets.svg.actionWalletScreenshot, buttonText: context.i18n.button_continue, onPressed: () {}, ); diff --git a/lib/app/features/protect_account/backup/views/components/errors/secure_account_error_alert.dart b/lib/app/features/protect_account/backup/views/components/errors/secure_account_error_alert.dart index 54912d3fa..99ec83578 100644 --- a/lib/app/features/protect_account/backup/views/components/errors/secure_account_error_alert.dart +++ b/lib/app/features/protect_account/backup/views/components/errors/secure_account_error_alert.dart @@ -36,7 +36,7 @@ class SecureAccountErrorAlert extends StatelessWidget { child: Column( children: [ InfoCard( - iconAsset: Assets.images.icons.actionWalletAutherror, + iconAsset: Assets.svg.actionWalletAutherror, title: locale.two_fa_failure_authenticator_title, description: locale.two_fa_failure_authenticator_description, ), diff --git a/lib/app/features/protect_account/backup/views/components/recovery_key_input.dart b/lib/app/features/protect_account/backup/views/components/recovery_key_input.dart index 9157011ff..d0d42139d 100644 --- a/lib/app/features/protect_account/backup/views/components/recovery_key_input.dart +++ b/lib/app/features/protect_account/backup/views/components/recovery_key_input.dart @@ -47,7 +47,7 @@ class RecoveryKeyInput extends HookWidget { ), suffixIcon: isValid.value ? TextInputIcons( - icons: [Assets.images.icons.iconBlockCheckboxOn.icon()], + icons: [Assets.svg.iconBlockCheckboxOn.icon()], ) : null, validator: validate, diff --git a/lib/app/features/protect_account/backup/views/pages/backup_options_page.dart b/lib/app/features/protect_account/backup/views/pages/backup_options_page.dart index e94594bb6..9e55dfca1 100644 --- a/lib/app/features/protect_account/backup/views/pages/backup_options_page.dart +++ b/lib/app/features/protect_account/backup/views/pages/backup_options_page.dart @@ -59,7 +59,7 @@ class BackupOptionsPage extends StatelessWidget { BackupOption( title: locale.backup_option_with_google_drive_title, subtitle: locale.backup_option_with_google_drive_description, - icon: Assets.images.identity.walletLoginCloud.icon( + icon: Assets.svg.walletLoginCloud.icon( size: 48.0.s, ), isOptionEnabled: true, @@ -69,7 +69,7 @@ class BackupOptionsPage extends StatelessWidget { BackupOption( title: locale.backup_option_with_recovery_keys_title, subtitle: locale.backup_option_with_recovery_keys_description, - icon: Assets.images.identity.walletLoginRecovery.icon( + icon: Assets.svg.walletLoginRecovery.icon( size: 48.0.s, ), onTap: () => BackupRecoveryKeysRoute().push(context), diff --git a/lib/app/features/protect_account/backup/views/pages/backup_recovery_keys_modal.dart b/lib/app/features/protect_account/backup/views/pages/backup_recovery_keys_modal.dart index 7a8ba7f25..497aa74b6 100644 --- a/lib/app/features/protect_account/backup/views/pages/backup_recovery_keys_modal.dart +++ b/lib/app/features/protect_account/backup/views/pages/backup_recovery_keys_modal.dart @@ -12,7 +12,7 @@ class BackupRecoveryKeysModal extends StatelessWidget { return SimpleModalSheet.info( title: context.i18n.secure_your_recovery_keys_title, description: context.i18n.secure_your_recovery_keys_description, - iconAsset: Assets.images.icons.actionWalletLock, + iconAsset: Assets.svg.actionWalletLock, buttonText: context.i18n.button_lets_start, onPressed: () => RecoveryKeysSaveRoute().push(context), ); diff --git a/lib/app/features/protect_account/backup/views/pages/recovery_keys_save_page.dart b/lib/app/features/protect_account/backup/views/pages/recovery_keys_save_page.dart index 5231a051d..d6cb4f76f 100644 --- a/lib/app/features/protect_account/backup/views/pages/recovery_keys_save_page.dart +++ b/lib/app/features/protect_account/backup/views/pages/recovery_keys_save_page.dart @@ -43,7 +43,7 @@ class RecoveryKeysSavePage extends StatelessWidget { color: context.theme.appColors.secondaryText, ), icon: AuthHeaderIcon( - icon: Assets.images.icons.iconLoginRestorekey.icon( + icon: Assets.svg.iconLoginRestorekey.icon( size: 36.0.s, ), ), @@ -54,19 +54,19 @@ class RecoveryKeysSavePage extends StatelessWidget { children: [ RecoveryKeyOption( title: locale.common_identity_key_name, - iconAsset: Assets.images.icons.iconIdentitykey, + iconAsset: Assets.svg.iconIdentitykey, subtitle: '838402-28385-432', ), SizedBox(height: 12.0.s), RecoveryKeyOption( title: locale.restore_identity_creds_recovery_key, - iconAsset: Assets.images.icons.iconChannelPrivate, + iconAsset: Assets.svg.iconChannelPrivate, subtitle: '08402934823044809485', ), SizedBox(height: 12.0.s), RecoveryKeyOption( title: locale.restore_identity_creds_recovery_code, - iconAsset: Assets.images.icons.iconCode4, + iconAsset: Assets.svg.iconCode4, subtitle: '0405904949596000', ), SizedBox(height: 20.0.s), @@ -78,7 +78,7 @@ class RecoveryKeysSavePage extends StatelessWidget { borderRadius: BorderRadius.all( Radius.circular(16.0.s), ), - leading: Assets.images.icons.iconReport.icon( + leading: Assets.svg.iconReport.icon( size: 20.0.s, color: context.theme.appColors.attentionRed, ), diff --git a/lib/app/features/protect_account/backup/views/pages/recovery_keys_success_page.dart b/lib/app/features/protect_account/backup/views/pages/recovery_keys_success_page.dart index 41395656d..8aa7ee0e6 100644 --- a/lib/app/features/protect_account/backup/views/pages/recovery_keys_success_page.dart +++ b/lib/app/features/protect_account/backup/views/pages/recovery_keys_success_page.dart @@ -32,7 +32,7 @@ class RecoveryKeysSuccessPage extends StatelessWidget { ) ], title: locale.backup_option_with_recovery_keys_title, - icon: Assets.images.icons.iconLoginRestorekey.icon(size: 36.0.s), + icon: Assets.svg.iconLoginRestorekey.icon(size: 36.0.s), children: [ Padding( padding: EdgeInsets.symmetric(horizontal: 38.0.s), @@ -40,7 +40,7 @@ class RecoveryKeysSuccessPage extends StatelessWidget { children: [ SizedBox(height: 12.0.s), InfoCard( - iconAsset: Assets.images.icons.actionWalletSecureaccsuccess, + iconAsset: Assets.svg.actionWalletSecureaccsuccess, title: locale.recovery_keys_successfully_protected_title, description: locale.recovery_keys_successfully_protected_description, ), diff --git a/lib/app/features/protect_account/components/secure_account_option.dart b/lib/app/features/protect_account/components/secure_account_option.dart index f36282135..36b07d686 100644 --- a/lib/app/features/protect_account/components/secure_account_option.dart +++ b/lib/app/features/protect_account/components/secure_account_option.dart @@ -35,10 +35,10 @@ class SecureAccountOption extends StatelessWidget { icon: icon, ), trailing: isEnabled - ? Assets.images.icons.iconDappCheck.icon( + ? Assets.svg.iconDappCheck.icon( color: context.theme.appColors.success, ) - : Assets.images.icons.iconArrowRight.icon(), + : Assets.svg.iconArrowRight.icon(), onTap: onTap, ); } diff --git a/lib/app/features/protect_account/email/views/pages/setup_email/email_setup_page.dart b/lib/app/features/protect_account/email/views/pages/setup_email/email_setup_page.dart index 36ca8ba05..80fdf9a99 100644 --- a/lib/app/features/protect_account/email/views/pages/setup_email/email_setup_page.dart +++ b/lib/app/features/protect_account/email/views/pages/setup_email/email_setup_page.dart @@ -42,7 +42,7 @@ class EmailSetupPage extends StatelessWidget { color: context.theme.appColors.secondaryText, ), icon: AuthHeaderIcon( - icon: Assets.images.icons.icon2faEmailauth.icon(size: 36.0.s), + icon: Assets.svg.icon2faEmailauth.icon(size: 36.0.s), ), ), Expanded( diff --git a/lib/app/features/protect_account/email/views/pages/setup_email/email_setup_success_page.dart b/lib/app/features/protect_account/email/views/pages/setup_email/email_setup_success_page.dart index 9d79b9a7b..33a4ffd95 100644 --- a/lib/app/features/protect_account/email/views/pages/setup_email/email_setup_success_page.dart +++ b/lib/app/features/protect_account/email/views/pages/setup_email/email_setup_success_page.dart @@ -18,7 +18,7 @@ class EmailSetupSuccessPage extends StatelessWidget { Spacer(), ScreenSideOffset.medium( child: InfoCard( - iconAsset: Assets.images.icons.actionWalletConfirmemail, + iconAsset: Assets.svg.actionWalletConfirmemail, title: locale.common_successfully, description: locale.email_success_description, ), diff --git a/lib/app/features/protect_account/phone/views/components/countries/country_code_input.dart b/lib/app/features/protect_account/phone/views/components/countries/country_code_input.dart index e9c25a1f0..10c247098 100644 --- a/lib/app/features/protect_account/phone/views/components/countries/country_code_input.dart +++ b/lib/app/features/protect_account/phone/views/components/countries/country_code_input.dart @@ -25,7 +25,7 @@ class CountryCodeInput extends StatelessWidget { style: TextStyle(fontSize: 24.0.s), ), SizedBox(width: 8.0.s), - Assets.images.icons.iconLoginDropdown.icon( + Assets.svg.iconLoginDropdown.icon( color: context.theme.appColors.secondaryText, size: 15.0.s, ), diff --git a/lib/app/features/protect_account/phone/views/pages/setup_phone/phone_setup_confirm_page.dart b/lib/app/features/protect_account/phone/views/pages/setup_phone/phone_setup_confirm_page.dart index 65bc2bb69..47e69cd75 100644 --- a/lib/app/features/protect_account/phone/views/pages/setup_phone/phone_setup_confirm_page.dart +++ b/lib/app/features/protect_account/phone/views/pages/setup_phone/phone_setup_confirm_page.dart @@ -48,7 +48,7 @@ class PhoneSetupConfirmPage extends HookConsumerWidget { child: TextInput( prefixIcon: TextInputIcons( hasRightDivider: true, - icons: [Assets.images.icons.iconFieldPhone.icon()], + icons: [Assets.svg.iconFieldPhone.icon()], ), labelText: locale.two_fa_sms, controller: phoneController, diff --git a/lib/app/features/protect_account/phone/views/pages/setup_phone/phone_setup_page.dart b/lib/app/features/protect_account/phone/views/pages/setup_phone/phone_setup_page.dart index 993664d22..b8536637a 100644 --- a/lib/app/features/protect_account/phone/views/pages/setup_phone/phone_setup_page.dart +++ b/lib/app/features/protect_account/phone/views/pages/setup_phone/phone_setup_page.dart @@ -42,7 +42,7 @@ class PhoneSetupPage extends StatelessWidget { color: context.theme.appColors.secondaryText, ), icon: AuthHeaderIcon( - icon: Assets.images.icons.icon2faEmailauth.icon(size: 36.0.s), + icon: Assets.svg.icon2faEmailauth.icon(size: 36.0.s), ), ), Expanded( diff --git a/lib/app/features/protect_account/phone/views/pages/setup_phone/phone_setup_success_page.dart b/lib/app/features/protect_account/phone/views/pages/setup_phone/phone_setup_success_page.dart index 405e85184..10f924a92 100644 --- a/lib/app/features/protect_account/phone/views/pages/setup_phone/phone_setup_success_page.dart +++ b/lib/app/features/protect_account/phone/views/pages/setup_phone/phone_setup_success_page.dart @@ -18,7 +18,7 @@ class PhoneSetupSuccessPage extends StatelessWidget { Spacer(), ScreenSideOffset.medium( child: InfoCard( - iconAsset: Assets.images.icons.actionWalletConfirmphone, + iconAsset: Assets.svg.actionWalletConfirmphone, title: locale.common_successfully, description: locale.phone_success_description, ), diff --git a/lib/app/features/protect_account/secure_account/views/pages/secure_account_modal.dart b/lib/app/features/protect_account/secure_account/views/pages/secure_account_modal.dart index 0baf93760..84f0c416d 100644 --- a/lib/app/features/protect_account/secure_account/views/pages/secure_account_modal.dart +++ b/lib/app/features/protect_account/secure_account/views/pages/secure_account_modal.dart @@ -35,14 +35,14 @@ class SecureAccountModal extends StatelessWidget { child: Column( children: [ InfoCard( - iconAsset: Assets.images.icons.actionWalletSecureaccount, + iconAsset: Assets.svg.actionWalletSecureaccount, title: locale.protect_account_title_secure_account, description: locale.protect_account_description_secure_account, ), SizedBox(height: 32.0.s), Button( mainAxisSize: MainAxisSize.max, - leadingIcon: Assets.images.icons.iconWalletProtectAccount.icon( + leadingIcon: Assets.svg.iconWalletProtectAccount.icon( color: context.theme.appColors.onPrimaryAccent, ), label: Text(locale.protect_account_button), diff --git a/lib/app/features/protect_account/secure_account/views/pages/secure_account_options_page.dart b/lib/app/features/protect_account/secure_account/views/pages/secure_account_options_page.dart index 44cf0e735..f89e617e9 100644 --- a/lib/app/features/protect_account/secure_account/views/pages/secure_account_options_page.dart +++ b/lib/app/features/protect_account/secure_account/views/pages/secure_account_options_page.dart @@ -43,7 +43,7 @@ class SecureAccountOptionsPage extends ConsumerWidget { Padding( padding: EdgeInsets.symmetric(horizontal: 24.0.s), child: InfoCard( - iconAsset: Assets.images.icons.actionWalletSecureaccount, + iconAsset: Assets.svg.actionWalletSecureaccount, title: locale.protect_account_title_secure_account, description: locale.protect_account_description_secure_account_2fa, ), @@ -51,7 +51,7 @@ class SecureAccountOptionsPage extends ConsumerWidget { SizedBox(height: 32.0.s), SecureAccountOption( title: locale.two_fa_option_backup, - icon: Assets.images.icons.iconProtectwalletIcloud.icon( + icon: Assets.svg.iconProtectwalletIcloud.icon( color: context.theme.appColors.primaryAccent, ), onTap: () => BackupOptionsRoute().push(context), @@ -60,7 +60,7 @@ class SecureAccountOptionsPage extends ConsumerWidget { SizedBox(height: 12.0.s), SecureAccountOption( title: locale.two_fa_option_email, - icon: Assets.images.icons.iconFieldEmail.icon( + icon: Assets.svg.iconFieldEmail.icon( color: context.theme.appColors.primaryAccent, ), onTap: () => EmailSetupRoute(step: EmailSetupSteps.input).push(context), @@ -69,7 +69,7 @@ class SecureAccountOptionsPage extends ConsumerWidget { SizedBox(height: 12.0.s), SecureAccountOption( title: locale.two_fa_option_authenticator, - icon: Assets.images.icons.iconLoginAuthcode.icon( + icon: Assets.svg.iconLoginAuthcode.icon( color: context.theme.appColors.primaryAccent, ), isEnabled: securityController.isAuthenticatorEnabled, @@ -81,7 +81,7 @@ class SecureAccountOptionsPage extends ConsumerWidget { SizedBox(height: 12.0.s), SecureAccountOption( title: locale.two_fa_option_phone, - icon: Assets.images.icons.iconFieldPhone.icon( + icon: Assets.svg.iconFieldPhone.icon( color: context.theme.appColors.primaryAccent, ), onTap: () => PhoneSetupRoute(step: PhoneSetupSteps.input).push(context), diff --git a/lib/app/features/user/model/nft_layout_type.dart b/lib/app/features/user/model/nft_layout_type.dart index 8b9ec194e..d538ab807 100644 --- a/lib/app/features/user/model/nft_layout_type.dart +++ b/lib/app/features/user/model/nft_layout_type.dart @@ -6,8 +6,8 @@ enum NftLayoutType { String get iconAsset { return switch (this) { - NftLayoutType.grid => Assets.images.icons.iconBlockGrid, - NftLayoutType.list => Assets.images.icons.iconBlockList, + NftLayoutType.grid => Assets.svg.iconBlockGrid, + NftLayoutType.list => Assets.svg.iconBlockList, }; } } diff --git a/lib/app/features/user/model/nft_sorting_type.dart b/lib/app/features/user/model/nft_sorting_type.dart index 011516a16..a50f7c1b3 100644 --- a/lib/app/features/user/model/nft_sorting_type.dart +++ b/lib/app/features/user/model/nft_sorting_type.dart @@ -15,8 +15,8 @@ enum NftSortingType { String get iconAsset { return switch (this) { - NftSortingType.asc => Assets.images.icons.iconButtonDown, - NftSortingType.desc => Assets.images.icons.iconButtonUp, + NftSortingType.asc => Assets.svg.iconButtonDown, + NftSortingType.desc => Assets.svg.iconButtonUp, }; } } diff --git a/lib/app/features/user/pages/pull_right_menu_page/components/footer/footer.dart b/lib/app/features/user/pages/pull_right_menu_page/components/footer/footer.dart index e0950956a..19dde6aad 100644 --- a/lib/app/features/user/pages/pull_right_menu_page/components/footer/footer.dart +++ b/lib/app/features/user/pages/pull_right_menu_page/components/footer/footer.dart @@ -21,12 +21,12 @@ class Footer extends StatelessWidget { children: [ FooterAction( onPressed: () {}, - icon: Assets.images.icons.iconProfileSettings.icon(), + icon: Assets.svg.iconProfileSettings.icon(), label: context.i18n.profile_privacy, ), FooterAction( onPressed: () {}, - icon: Assets.images.icons.iconProfileHelp.icon(), + icon: Assets.svg.iconProfileHelp.icon(), label: context.i18n.profile_help, ), ], diff --git a/lib/app/features/user/pages/pull_right_menu_page/components/header/header.dart b/lib/app/features/user/pages/pull_right_menu_page/components/header/header.dart index ca782fd5f..2a7eaedff 100644 --- a/lib/app/features/user/pages/pull_right_menu_page/components/header/header.dart +++ b/lib/app/features/user/pages/pull_right_menu_page/components/header/header.dart @@ -22,19 +22,19 @@ class Header extends StatelessWidget { onPressed: () { FeedRoute().go(context); }, - assetName: Assets.images.icons.iconChatBack, + assetName: Assets.svg.iconChatBack, ), const Spacer(), HeaderAction( onPressed: () {}, - assetName: Assets.images.icons.iconChatDarkmode, + assetName: Assets.svg.iconChatDarkmode, ), SizedBox(width: 12.0.s), HeaderAction( onPressed: () { SwitchAccountRoute().go(context); }, - assetName: Assets.images.icons.iconSwitchProfile, + assetName: Assets.svg.iconSwitchProfile, ), ], ), diff --git a/lib/app/features/user/pages/pull_right_menu_page/components/links_list/links_list.dart b/lib/app/features/user/pages/pull_right_menu_page/components/links_list/links_list.dart index 3ac9ba8ec..d319bc7fa 100644 --- a/lib/app/features/user/pages/pull_right_menu_page/components/links_list/links_list.dart +++ b/lib/app/features/user/pages/pull_right_menu_page/components/links_list/links_list.dart @@ -24,35 +24,35 @@ class LinksList extends StatelessWidget { separator: HorizontalSeparator(), children: [ LinksListTile( - iconAssetName: Assets.images.icons.iconProfileUser, + iconAssetName: Assets.svg.iconProfileUser, iconTintColor: context.theme.appColors.orangePeel, title: context.i18n.profile_profile, subtitle: context.i18n.profile_profile_desc, onTap: () {}, ), LinksListTile( - iconAssetName: Assets.images.icons.iconProfileFeed, + iconAssetName: Assets.svg.iconProfileFeed, iconTintColor: context.theme.appColors.purple, title: context.i18n.general_feed, subtitle: context.i18n.profile_feed_desc, onTap: () {}, ), LinksListTile( - iconAssetName: Assets.images.icons.iconVideosTrading, + iconAssetName: Assets.svg.iconVideosTrading, iconTintColor: context.theme.appColors.raspberry, title: context.i18n.general_videos, subtitle: context.i18n.profile_videos_desc, onTap: () {}, ), LinksListTile( - iconAssetName: Assets.images.icons.iconFeedStories, + iconAssetName: Assets.svg.iconFeedStories, iconTintColor: context.theme.appColors.success, title: context.i18n.general_articles, subtitle: context.i18n.profile_articles_desc, onTap: () {}, ), LinksListTile( - iconAssetName: Assets.images.icons.iconBookmarks, + iconAssetName: Assets.svg.iconBookmarks, iconTintColor: context.theme.appColors.primaryAccent, title: context.i18n.profile_bookmarks, subtitle: context.i18n.profile_bookmarks_desc, diff --git a/lib/app/features/user/pages/pull_right_menu_page/components/links_list/links_list_tile.dart b/lib/app/features/user/pages/pull_right_menu_page/components/links_list/links_list_tile.dart index 7f93b64c4..40f244559 100644 --- a/lib/app/features/user/pages/pull_right_menu_page/components/links_list/links_list_tile.dart +++ b/lib/app/features/user/pages/pull_right_menu_page/components/links_list/links_list_tile.dart @@ -41,7 +41,7 @@ class LinksListTile extends StatelessWidget { style: context.theme.appTextThemes.caption3 .copyWith(color: context.theme.appColors.tertararyText), ), - trailing: Assets.images.icons.iconArrowRight.icon( + trailing: Assets.svg.iconArrowRight.icon( color: context.theme.appColors.primaryText, ), contentPadding: EdgeInsets.symmetric(vertical: 12.0.s), diff --git a/lib/app/features/user/pages/pull_right_menu_page/components/profile_info/components/profile_details/profile_details.dart b/lib/app/features/user/pages/pull_right_menu_page/components/profile_info/components/profile_details/profile_details.dart index ecb63c681..9d3f1215a 100644 --- a/lib/app/features/user/pages/pull_right_menu_page/components/profile_info/components/profile_details/profile_details.dart +++ b/lib/app/features/user/pages/pull_right_menu_page/components/profile_info/components/profile_details/profile_details.dart @@ -39,7 +39,7 @@ class ProfileDetails extends ConsumerWidget { ), if (userData.isVerified ?? false) ...[ SizedBox(width: 6.0.s), - Assets.images.icons.iconBadgeVerify.icon(size: verifiedIconSize), + Assets.svg.iconBadgeVerify.icon(size: verifiedIconSize), ], ], ), diff --git a/lib/app/features/user/pages/switch_account_modal/components/accounts_list/account_tile.dart b/lib/app/features/user/pages/switch_account_modal/components/accounts_list/account_tile.dart index 3b17e56de..18fb729ca 100644 --- a/lib/app/features/user/pages/switch_account_modal/components/accounts_list/account_tile.dart +++ b/lib/app/features/user/pages/switch_account_modal/components/accounts_list/account_tile.dart @@ -42,8 +42,7 @@ class AccountsTile extends ConsumerWidget { profilePicture: userData.profilePicture, verifiedBadge: userData.isVerified ?? false, trailing: isActiveUser == true - ? Assets.images.icons.iconBlockCheckboxOn - .icon(color: context.theme.appColors.onPrimaryAccent) + ? Assets.svg.iconBlockCheckboxOn.icon(color: context.theme.appColors.onPrimaryAccent) : null, contentPadding: EdgeInsets.symmetric(horizontal: 16.0.s), backgroundColor: context.theme.appColors.tertararyBackground, diff --git a/lib/app/features/user/pages/switch_account_modal/components/action_button/action_button.dart b/lib/app/features/user/pages/switch_account_modal/components/action_button/action_button.dart index 63fb1c5e1..ea86497d5 100644 --- a/lib/app/features/user/pages/switch_account_modal/components/action_button/action_button.dart +++ b/lib/app/features/user/pages/switch_account_modal/components/action_button/action_button.dart @@ -34,7 +34,7 @@ class ActionButton extends StatelessWidget { icon: icon, ), title: Text(label, style: context.theme.appTextThemes.body), - trailing: Assets.images.icons.iconArrowRight.icon(), + trailing: Assets.svg.iconArrowRight.icon(), backgroundColor: context.theme.appColors.tertararyBackground, ); } diff --git a/lib/app/features/user/pages/switch_account_modal/switch_account_modal.dart b/lib/app/features/user/pages/switch_account_modal/switch_account_modal.dart index 725496af3..6d4b5f714 100644 --- a/lib/app/features/user/pages/switch_account_modal/switch_account_modal.dart +++ b/lib/app/features/user/pages/switch_account_modal/switch_account_modal.dart @@ -36,14 +36,14 @@ class SwitchAccountModal extends ConsumerWidget { ], ), ActionButton( - icon: Assets.images.icons.iconChannelType.icon(), + icon: Assets.svg.iconChannelType.icon(), label: context.i18n.profile_create_new_account, onTap: () {}, ), const AccountsList(), SizedBox(height: 16.0.s), ActionButton( - icon: Assets.images.icons.iconMenuLogout.icon(size: 24.0.s), + icon: Assets.svg.iconMenuLogout.icon(size: 24.0.s), label: context.i18n.profile_log_out( prefixUsername( username: activeUser.nickname, diff --git a/lib/app/features/wallet/components/arrival_time/arrival_time_indicator.dart b/lib/app/features/wallet/components/arrival_time/arrival_time_indicator.dart index 84a7b0ce4..26e22a305 100644 --- a/lib/app/features/wallet/components/arrival_time/arrival_time_indicator.dart +++ b/lib/app/features/wallet/components/arrival_time/arrival_time_indicator.dart @@ -34,7 +34,7 @@ class ArrivalTimeIndicator extends ConsumerWidget { ), child: Row( children: [ - Assets.images.icons.iconBlockTime.icon( + Assets.svg.iconBlockTime.icon( size: 12.0.s, ), SizedBox(width: 5.0.s), diff --git a/lib/app/features/wallet/components/network_fee/network_fee.dart b/lib/app/features/wallet/components/network_fee/network_fee.dart index 88e7e323e..a59e7727e 100644 --- a/lib/app/features/wallet/components/network_fee/network_fee.dart +++ b/lib/app/features/wallet/components/network_fee/network_fee.dart @@ -28,7 +28,7 @@ class NetworkFee extends StatelessWidget { context.theme.appColors.tertararyText, BlendMode.srcIn, ), - child: Assets.images.icons.iconBlockInformation.icon(size: 16.0.s), + child: Assets.svg.iconBlockInformation.icon(size: 16.0.s), ), ), ), diff --git a/lib/app/features/wallet/components/timeline/timeline_item.dart b/lib/app/features/wallet/components/timeline/timeline_item.dart index 6f3fd69aa..8c3832cad 100644 --- a/lib/app/features/wallet/components/timeline/timeline_item.dart +++ b/lib/app/features/wallet/components/timeline/timeline_item.dart @@ -31,9 +31,7 @@ class TimelineItem extends StatelessWidget { children: [ Center( child: SvgPicture.asset( - data.isDone - ? Assets.images.icons.iconStepsCheckActive - : Assets.images.icons.iconStepsCheckInactive, + data.isDone ? Assets.svg.iconStepsCheckActive : Assets.svg.iconStepsCheckInactive, width: 16.0.s, height: 16.0.s, ), diff --git a/lib/app/features/wallet/model/feed_type.dart b/lib/app/features/wallet/model/feed_type.dart index 5898a1b33..3e94e896c 100644 --- a/lib/app/features/wallet/model/feed_type.dart +++ b/lib/app/features/wallet/model/feed_type.dart @@ -38,10 +38,10 @@ enum FeedType { String get iconAsset { return switch (this) { - FeedType.post => Assets.images.icons.iconFeedPost, - FeedType.story => Assets.images.icons.iconFeedStory, - FeedType.video => Assets.images.icons.iconVideosTrading, - FeedType.article => Assets.images.icons.iconFeedStories, + FeedType.post => Assets.svg.iconFeedPost, + FeedType.story => Assets.svg.iconFeedStory, + FeedType.video => Assets.svg.iconVideosTrading, + FeedType.article => Assets.svg.iconFeedStories, }; } } diff --git a/lib/app/features/wallet/model/transaction_type.dart b/lib/app/features/wallet/model/transaction_type.dart index 8004c3e8d..10b3f7f3c 100644 --- a/lib/app/features/wallet/model/transaction_type.dart +++ b/lib/app/features/wallet/model/transaction_type.dart @@ -15,8 +15,8 @@ enum TransactionType { String get iconAsset { return switch (this) { - TransactionType.send => Assets.images.icons.iconButtonSend, - TransactionType.receive => Assets.images.icons.iconButtonReceive, + TransactionType.send => Assets.svg.iconButtonSend, + TransactionType.receive => Assets.svg.iconButtonReceive, }; } diff --git a/lib/app/features/wallet/views/pages/coins_flow/coin_details/components/balance/balance.dart b/lib/app/features/wallet/views/pages/coins_flow/coin_details/components/balance/balance.dart index e165d338c..c202e55d0 100644 --- a/lib/app/features/wallet/views/pages/coins_flow/coin_details/components/balance/balance.dart +++ b/lib/app/features/wallet/views/pages/coins_flow/coin_details/components/balance/balance.dart @@ -48,7 +48,7 @@ class Balance extends ConsumerWidget { SizedBox( width: 4.0.s, ), - Assets.images.icons.iconArrowSelect.icon(size: 12.0.s), + Assets.svg.iconArrowSelect.icon(size: 12.0.s), ], ), Text( diff --git a/lib/app/features/wallet/views/pages/coins_flow/coin_details/components/empty_state/empty_state.dart b/lib/app/features/wallet/views/pages/coins_flow/coin_details/components/empty_state/empty_state.dart index 56e7a6540..32fe4bffd 100644 --- a/lib/app/features/wallet/views/pages/coins_flow/coin_details/components/empty_state/empty_state.dart +++ b/lib/app/features/wallet/views/pages/coins_flow/coin_details/components/empty_state/empty_state.dart @@ -16,7 +16,7 @@ class EmptyState extends ConsumerWidget { hasScrollBody: false, child: ScreenSideOffset.small( child: EmptyList( - asset: Assets.images.misc.emptyHistory, + asset: Assets.svg.walletIconWalletEmptyhistory, title: context.i18n.core_empty_transactions_history, ), ), diff --git a/lib/app/features/wallet/views/pages/coins_flow/coin_receive_modal/components/coin_address_tile/coin_address_tile.dart b/lib/app/features/wallet/views/pages/coins_flow/coin_receive_modal/components/coin_address_tile/coin_address_tile.dart index 4a0816ee0..db78dfa43 100644 --- a/lib/app/features/wallet/views/pages/coins_flow/coin_receive_modal/components/coin_address_tile/coin_address_tile.dart +++ b/lib/app/features/wallet/views/pages/coins_flow/coin_receive_modal/components/coin_address_tile/coin_address_tile.dart @@ -60,7 +60,7 @@ class CoinAddressTile extends HookConsumerWidget { SizedBox( width: 6.0.s, ), - Assets.images.icons.iconBlockInformation.icon(size: 20.0.s), + Assets.svg.iconBlockInformation.icon(size: 20.0.s), ], ), SizedBox( @@ -79,7 +79,7 @@ class CoinAddressTile extends HookConsumerWidget { clipBehavior: Clip.none, children: [ NavigationButton( - icon: Assets.images.icons.iconBlockCopyBlue.icon( + icon: Assets.svg.iconBlockCopyBlue.icon( color: context.theme.appColors.primaryText, ), size: buttonSize, @@ -109,7 +109,7 @@ class CoinAddressTile extends HookConsumerWidget { ), NavigationButton( size: buttonSize, - icon: Assets.images.icons.iconButtonQrcode.icon( + icon: Assets.svg.iconButtonQrcode.icon( color: context.theme.appColors.primaryText, ), onPressed: () {}, diff --git a/lib/app/features/wallet/views/pages/coins_flow/receive_coins/components/receive_info_card.dart b/lib/app/features/wallet/views/pages/coins_flow/receive_coins/components/receive_info_card.dart index a8d630941..e4b941f2a 100644 --- a/lib/app/features/wallet/views/pages/coins_flow/receive_coins/components/receive_info_card.dart +++ b/lib/app/features/wallet/views/pages/coins_flow/receive_coins/components/receive_info_card.dart @@ -82,8 +82,8 @@ class ReceiveInfoCard extends HookConsumerWidget { Button( minimumSize: Size(148.0.s, 48.0.s), leadingIcon: isCopied.value - ? Assets.images.icons.iconBlockCheckGreen.icon() - : Assets.images.icons.iconBlockCopyBlue.icon(), + ? Assets.svg.iconBlockCheckGreen.icon() + : Assets.svg.iconBlockCopyBlue.icon(), borderColor: isCopied.value ? context.theme.appColors.success : context.theme.appColors.strokeElements, diff --git a/lib/app/features/wallet/views/pages/coins_flow/receive_coins/components/share_address_view.dart b/lib/app/features/wallet/views/pages/coins_flow/receive_coins/components/share_address_view.dart index c88221760..93ec72c84 100644 --- a/lib/app/features/wallet/views/pages/coins_flow/receive_coins/components/share_address_view.dart +++ b/lib/app/features/wallet/views/pages/coins_flow/receive_coins/components/share_address_view.dart @@ -45,7 +45,7 @@ class ShareAddressView extends StatelessWidget { Button.compact( mainAxisSize: MainAxisSize.max, minimumSize: Size(56.0.s, 56.0.s), - leadingIcon: Assets.images.icons.iconButtonSend.icon(), + leadingIcon: Assets.svg.iconButtonSend.icon(), label: Text( context.i18n.wallet_share, ), diff --git a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/address_input_field.dart b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/address_input_field.dart index 0d0c0aeb0..2b5c70119 100644 --- a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/address_input_field.dart +++ b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/address_input_field.dart @@ -29,7 +29,7 @@ class AddressInputField extends StatelessWidget { suffixIcon: TextInputIcons( icons: [ IconButton( - icon: Assets.images.icons.iconContactList.icon(), + icon: Assets.svg.iconContactList.icon(), onPressed: onOpenContactList, ), IconButton( @@ -38,7 +38,7 @@ class AddressInputField extends StatelessWidget { context.theme.appColors.primaryAccent, BlendMode.srcIn, ), - child: Assets.images.icons.iconHeaderScan1.icon(), + child: Assets.svg.iconHeaderScan1.icon(), ), onPressed: onScanPressed, ), diff --git a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/buttons/coin_button.dart b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/buttons/coin_button.dart index 75b5edf2b..435d965a7 100644 --- a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/buttons/coin_button.dart +++ b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/buttons/coin_button.dart @@ -65,7 +65,7 @@ class CoinButton extends StatelessWidget { onTap: onTap, child: Padding( padding: EdgeInsets.all(8.0.s), - child: Assets.images.icons.iconArrowDown.icon(), + child: Assets.svg.iconArrowDown.icon(), ), ), ], diff --git a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/buttons/contact_button.dart b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/buttons/contact_button.dart index 468eb5dee..233922f71 100644 --- a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/buttons/contact_button.dart +++ b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/buttons/contact_button.dart @@ -43,7 +43,7 @@ class ContactButton extends ConsumerWidget { timeago: contact.lastSeen, trailing: IconButton( onPressed: onClearTap, - icon: Assets.images.icons.iconSheetClose.icon( + icon: Assets.svg.iconSheetClose.icon( size: 16.0.s, color: colors.primaryText, ), diff --git a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/buttons/network_button.dart b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/buttons/network_button.dart index 7258eb4bb..d244fc5ef 100644 --- a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/buttons/network_button.dart +++ b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/buttons/network_button.dart @@ -59,7 +59,7 @@ class NetworkButton extends StatelessWidget { onTap: onTap, trailing: Padding( padding: EdgeInsets.all(8.0.s), - child: Assets.images.icons.iconArrowDown.icon(), + child: Assets.svg.iconArrowDown.icon(), ), ), ); diff --git a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/confirmation/confirmation_sheet.dart b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/confirmation/confirmation_sheet.dart index f1ada3dbb..0f12c4526 100644 --- a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/confirmation/confirmation_sheet.dart +++ b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/confirmation/confirmation_sheet.dart @@ -92,7 +92,7 @@ class ConfirmationSheet extends ConsumerWidget { title: Text(locale.wallet_arrival_time), value: '${formData.arrivalTime} ' '${locale.wallet_arrival_time_minutes}', - icon: Assets.images.icons.iconBlockTime.icon( + icon: Assets.svg.iconBlockTime.icon( size: 16.0.s, ), ), @@ -100,7 +100,7 @@ class ConfirmationSheet extends ConsumerWidget { ListItem.textWithIcon( title: Text(locale.wallet_network_fee), value: '1.00 USDT', - icon: Assets.images.icons.iconBlockCoins.icon( + icon: Assets.svg.iconBlockCoins.icon( size: 16.0.s, ), ), diff --git a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/confirmation/transaction_result_sheet.dart b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/confirmation/transaction_result_sheet.dart index 70590b749..5354a342d 100644 --- a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/confirmation/transaction_result_sheet.dart +++ b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/confirmation/transaction_result_sheet.dart @@ -27,7 +27,7 @@ class TransactionResultSheet extends ConsumerWidget { final colors = context.theme.appColors; final textTheme = context.theme.appTextThemes; final locale = context.i18n; - final icons = Assets.images.icons; + final icons = Assets.svg; return SheetContent( body: ScreenSideOffset.small( diff --git a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/send_coins_form.dart b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/send_coins_form.dart index d4e8c1cd9..e0566ebcf 100644 --- a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/send_coins_form.dart +++ b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/send_coins_form.dart @@ -142,7 +142,7 @@ class SendCoinsForm extends HookConsumerWidget { colors.primaryBackground, BlendMode.srcIn, ), - child: Assets.images.icons.iconButtonNext.icon(), + child: Assets.svg.iconButtonNext.icon(), ), onPressed: () { CoinsSendFormConfirmationRoute().push(context); diff --git a/lib/app/features/wallet/views/pages/contact_modal_page/components/contact_item_avatar.dart b/lib/app/features/wallet/views/pages/contact_modal_page/components/contact_item_avatar.dart index 69eb79e99..4d4bba2b5 100644 --- a/lib/app/features/wallet/views/pages/contact_modal_page/components/contact_item_avatar.dart +++ b/lib/app/features/wallet/views/pages/contact_modal_page/components/contact_item_avatar.dart @@ -44,7 +44,7 @@ class ContactItemAvatar extends StatelessWidget { position: DecorationPosition.foreground, child: ClipRRect( borderRadius: BorderRadius.circular(iceLogoBorderRadius), - child: Assets.images.icons.iconBadgeIcelogo.icon( + child: Assets.svg.iconBadgeIcelogo.icon( size: iceLogoSize, ), ), diff --git a/lib/app/features/wallet/views/pages/contact_modal_page/components/contact_item_name.dart b/lib/app/features/wallet/views/pages/contact_modal_page/components/contact_item_name.dart index 6e6951b1b..8fbbe7a7b 100644 --- a/lib/app/features/wallet/views/pages/contact_modal_page/components/contact_item_name.dart +++ b/lib/app/features/wallet/views/pages/contact_modal_page/components/contact_item_name.dart @@ -22,7 +22,7 @@ class ContactItemName extends StatelessWidget { ), if (contactData.isVerified ?? false) ...[ SizedBox(width: 4.0.s), - Assets.images.icons.iconBadgeVerify.icon(size: 16.0.s), + Assets.svg.iconBadgeVerify.icon(size: 16.0.s), ], ], ); diff --git a/lib/app/features/wallet/views/pages/contact_modal_page/contact_modal_page.dart b/lib/app/features/wallet/views/pages/contact_modal_page/contact_modal_page.dart index 1c3478614..03a657bff 100644 --- a/lib/app/features/wallet/views/pages/contact_modal_page/contact_modal_page.dart +++ b/lib/app/features/wallet/views/pages/contact_modal_page/contact_modal_page.dart @@ -41,7 +41,7 @@ class ContactPage extends ConsumerWidget { size: 32.0.s, type: ButtonType.dropdown, onPressed: () {}, - icon: Assets.images.icons.iconButtonHistory.icon(), + icon: Assets.svg.iconButtonHistory.icon(), ), ), ], @@ -61,7 +61,7 @@ class ContactPage extends ConsumerWidget { child: Button.compact( mainAxisSize: MainAxisSize.max, minimumSize: Size(56.0.s, 56.0.s), - leadingIcon: Assets.images.icons.iconButtonInvite + leadingIcon: Assets.svg.iconButtonInvite .icon(color: context.theme.appColors.onPrimaryAccent), label: Text( context.i18n.wallet_invite_friends, diff --git a/lib/app/features/wallet/views/pages/manage_coins/components/empty_state/empty_state.dart b/lib/app/features/wallet/views/pages/manage_coins/components/empty_state/empty_state.dart index df0322650..25daf2171 100644 --- a/lib/app/features/wallet/views/pages/manage_coins/components/empty_state/empty_state.dart +++ b/lib/app/features/wallet/views/pages/manage_coins/components/empty_state/empty_state.dart @@ -16,7 +16,7 @@ class EmptyState extends ConsumerWidget { hasScrollBody: false, child: ScreenSideOffset.small( child: EmptyList( - asset: Assets.images.misc.emptySearch, + asset: Assets.svg.walletIconWalletEmptysearch, title: context.i18n.core_empty_search, ), ), diff --git a/lib/app/features/wallet/views/pages/manage_coins/components/manage_coin_item/manage_coin_item.dart b/lib/app/features/wallet/views/pages/manage_coins/components/manage_coin_item/manage_coin_item.dart index 81e0090c8..2b9925842 100644 --- a/lib/app/features/wallet/views/pages/manage_coins/components/manage_coin_item/manage_coin_item.dart +++ b/lib/app/features/wallet/views/pages/manage_coins/components/manage_coin_item/manage_coin_item.dart @@ -20,8 +20,8 @@ class ManageCoinItem extends HookConsumerWidget { Widget _getCheckbox() { return manageCoinData.isSelected - ? Assets.images.icons.iconBlockCheckboxOn.icon() - : Assets.images.icons.iconBlockCheckboxOff.icon(); + ? Assets.svg.iconBlockCheckboxOn.icon() + : Assets.svg.iconBlockCheckboxOff.icon(); } @override diff --git a/lib/app/features/wallet/views/pages/nft_details/nft_details_page.dart b/lib/app/features/wallet/views/pages/nft_details/nft_details_page.dart index 48c529633..e67e2e14f 100644 --- a/lib/app/features/wallet/views/pages/nft_details/nft_details_page.dart +++ b/lib/app/features/wallet/views/pages/nft_details/nft_details_page.dart @@ -82,7 +82,7 @@ class NftDetailsPage extends ConsumerWidget { Button( mainAxisSize: MainAxisSize.max, minimumSize: Size(56.0.s, 56.0.s), - leadingIcon: Assets.images.icons.iconButtonSend + leadingIcon: Assets.svg.iconButtonSend .icon(color: context.theme.appColors.onPrimaryAccent), label: Text( context.i18n.feed_send, diff --git a/lib/app/features/wallet/views/pages/request_contacts_access_modal/request_contacts_access_modal.dart b/lib/app/features/wallet/views/pages/request_contacts_access_modal/request_contacts_access_modal.dart index f63ae017d..a07001c7f 100644 --- a/lib/app/features/wallet/views/pages/request_contacts_access_modal/request_contacts_access_modal.dart +++ b/lib/app/features/wallet/views/pages/request_contacts_access_modal/request_contacts_access_modal.dart @@ -53,8 +53,8 @@ class RequestContactAccessModal extends ConsumerWidget { ), Button( mainAxisSize: MainAxisSize.max, - leadingIcon: Assets.images.icons.iconButtonInvite - .icon(color: context.theme.appColors.onPrimaryAccent), + leadingIcon: + Assets.svg.iconButtonInvite.icon(color: context.theme.appColors.onPrimaryAccent), label: Text( context.i18n.contacts_allow_pop_up_action, ), diff --git a/lib/app/features/wallet/views/pages/send_nft_confirm/send_nft_confirm.dart b/lib/app/features/wallet/views/pages/send_nft_confirm/send_nft_confirm.dart index 5c9b70454..5ef8a05c3 100644 --- a/lib/app/features/wallet/views/pages/send_nft_confirm/send_nft_confirm.dart +++ b/lib/app/features/wallet/views/pages/send_nft_confirm/send_nft_confirm.dart @@ -78,7 +78,7 @@ class SendNftConfirmPage extends ConsumerWidget { title: Text(locale.wallet_arrival_time), value: '${formData.arrivalTime} ' '${locale.wallet_arrival_time_minutes}', - icon: Assets.images.icons.iconBlockTime.icon( + icon: Assets.svg.iconBlockTime.icon( size: 16.0.s, ), ), @@ -86,7 +86,7 @@ class SendNftConfirmPage extends ConsumerWidget { ListItem.textWithIcon( title: Text(locale.wallet_network_fee), value: '1.00 USDT', - icon: Assets.images.icons.iconBlockCoins.icon( + icon: Assets.svg.iconBlockCoins.icon( size: 16.0.s, ), ), diff --git a/lib/app/features/wallet/views/pages/send_nft_form/send_nft_form.dart b/lib/app/features/wallet/views/pages/send_nft_form/send_nft_form.dart index 420970ba5..8ed9ee954 100644 --- a/lib/app/features/wallet/views/pages/send_nft_form/send_nft_form.dart +++ b/lib/app/features/wallet/views/pages/send_nft_form/send_nft_form.dart @@ -106,7 +106,7 @@ class SendNftForm extends ConsumerWidget { colors.primaryBackground, BlendMode.srcIn, ), - child: Assets.images.icons.iconButtonNext.icon(), + child: Assets.svg.iconButtonNext.icon(), ), onPressed: () { SendNftConfirmRoute().push(context); diff --git a/lib/app/features/wallet/views/pages/transaction_details/transaction_details.dart b/lib/app/features/wallet/views/pages/transaction_details/transaction_details.dart index a9d494352..d9885971d 100644 --- a/lib/app/features/wallet/views/pages/transaction_details/transaction_details.dart +++ b/lib/app/features/wallet/views/pages/transaction_details/transaction_details.dart @@ -107,7 +107,7 @@ class TransactionDetailsPage extends ConsumerWidget { title: Text(locale.wallet_arrival_time), value: '${formData.arrivalTime} ' '${locale.wallet_arrival_time_minutes}', - icon: Assets.images.icons.iconBlockTime.icon( + icon: Assets.svg.iconBlockTime.icon( size: 16.0.s, ), ), @@ -115,7 +115,7 @@ class TransactionDetailsPage extends ConsumerWidget { ListItem.textWithIcon( title: Text(locale.wallet_network_fee), value: '1.00 USDT', - icon: Assets.images.icons.iconBlockCoins.icon( + icon: Assets.svg.iconBlockCoins.icon( size: 16.0.s, ), ), diff --git a/lib/app/features/wallet/views/pages/transaction_details/transaction_details_actions.dart b/lib/app/features/wallet/views/pages/transaction_details/transaction_details_actions.dart index 54be2fa95..a84d90243 100644 --- a/lib/app/features/wallet/views/pages/transaction_details/transaction_details_actions.dart +++ b/lib/app/features/wallet/views/pages/transaction_details/transaction_details_actions.dart @@ -24,7 +24,7 @@ class TransactionDetailsActions extends StatelessWidget { context.i18n.transaction_details_view_on_explorer, ), mainAxisSize: MainAxisSize.max, - leadingIcon: Assets.images.icons.iconButtonInternet.icon(), + leadingIcon: Assets.svg.iconButtonInternet.icon(), onPressed: onViewOnExplorer, backgroundColor: context.theme.appColors.tertararyBackground, borderColor: context.theme.appColors.onTerararyFill, @@ -34,7 +34,7 @@ class TransactionDetailsActions extends StatelessWidget { width: 12.0.s, ), Button.icon( - icon: Assets.images.icons.iconButtonShare.icon(), + icon: Assets.svg.iconButtonShare.icon(), type: ButtonType.outlined, onPressed: onShare, backgroundColor: context.theme.appColors.tertararyBackground, diff --git a/lib/app/features/wallet/views/pages/wallet_page/components/balance/balance.dart b/lib/app/features/wallet/views/pages/wallet_page/components/balance/balance.dart index c87c17098..dca6d32e2 100644 --- a/lib/app/features/wallet/views/pages/wallet_page/components/balance/balance.dart +++ b/lib/app/features/wallet/views/pages/wallet_page/components/balance/balance.dart @@ -24,8 +24,7 @@ class Balance extends ConsumerWidget { final walletBalance = ref.watch(currentWalletDataProvider).balance; final isBalanceVisible = ref.watch(isBalanceVisibleSelectorProvider); - final iconAsset = - isBalanceVisible ? Assets.images.icons.iconBlockEyeOn : Assets.images.icons.iconBlockEyeOff; + final iconAsset = isBalanceVisible ? Assets.svg.iconBlockEyeOn : Assets.svg.iconBlockEyeOff; final hitSlop = 5.0.s; return ScreenSideOffset.small( child: Column( diff --git a/lib/app/features/wallet/views/pages/wallet_page/components/balance/balance_actions.dart b/lib/app/features/wallet/views/pages/wallet_page/components/balance/balance_actions.dart index e98f8e440..8d83e6502 100644 --- a/lib/app/features/wallet/views/pages/wallet_page/components/balance/balance_actions.dart +++ b/lib/app/features/wallet/views/pages/wallet_page/components/balance/balance_actions.dart @@ -22,7 +22,7 @@ class BalanceActions extends StatelessWidget { children: [ Expanded( child: Button.compact( - leadingIcon: Assets.images.icons.iconButtonSend.icon(), + leadingIcon: Assets.svg.iconButtonSend.icon(), label: Text( context.i18n.wallet_send, ), @@ -35,7 +35,7 @@ class BalanceActions extends StatelessWidget { Expanded( child: Button.compact( type: ButtonType.outlined, - leadingIcon: Assets.images.icons.iconButtonReceive.icon(), + leadingIcon: Assets.svg.iconButtonReceive.icon(), label: Text( context.i18n.wallet_receive, ), diff --git a/lib/app/features/wallet/views/pages/wallet_page/components/contacts/contacts_list_item.dart b/lib/app/features/wallet/views/pages/wallet_page/components/contacts/contacts_list_item.dart index 5571dc597..f378d12f0 100644 --- a/lib/app/features/wallet/views/pages/wallet_page/components/contacts/contacts_list_item.dart +++ b/lib/app/features/wallet/views/pages/wallet_page/components/contacts/contacts_list_item.dart @@ -65,7 +65,7 @@ class ContactsListItem extends StatelessWidget { position: DecorationPosition.foreground, child: ClipRRect( borderRadius: BorderRadius.circular(iceLogoBorderRadius), - child: Assets.images.icons.iconBadgeIcelogo.icon( + child: Assets.svg.iconBadgeIcelogo.icon( size: iceLogoSize, ), ), diff --git a/lib/app/features/wallet/views/pages/wallet_page/components/empty_state/empty_state.dart b/lib/app/features/wallet/views/pages/wallet_page/components/empty_state/empty_state.dart index 4200cffcf..26f44c424 100644 --- a/lib/app/features/wallet/views/pages/wallet_page/components/empty_state/empty_state.dart +++ b/lib/app/features/wallet/views/pages/wallet_page/components/empty_state/empty_state.dart @@ -27,7 +27,7 @@ class EmptyState extends ConsumerWidget { final toShowNoResults = searchValue.isNotEmpty == true; - final asset = toShowNoResults ? Assets.images.misc.emptySearch : tabType.emptyListAsset; + final asset = toShowNoResults ? Assets.svg.walletIconWalletEmptysearch : tabType.emptyListAsset; final title = toShowNoResults ? context.i18n.core_empty_search : tabType.getEmptyListTitle(context); diff --git a/lib/app/features/wallet/views/pages/wallet_page/components/header/header.dart b/lib/app/features/wallet/views/pages/wallet_page/components/header/header.dart index c621b849a..fde43cf11 100644 --- a/lib/app/features/wallet/views/pages/wallet_page/components/header/header.dart +++ b/lib/app/features/wallet/views/pages/wallet_page/components/header/header.dart @@ -23,14 +23,14 @@ class Header extends StatelessWidget { children: [ NavigationButton( onPressed: () {}, - icon: Assets.images.icons.iconHeaderCopy.icon( + icon: Assets.svg.iconHeaderCopy.icon( color: context.theme.appColors.primaryText, ), ), SizedBox(width: 12.0.s), NavigationButton( onPressed: () => ScanWalletRoute().push(context), - icon: Assets.images.icons.iconHeaderScan1.icon( + icon: Assets.svg.iconHeaderScan1.icon( color: context.theme.appColors.primaryText, ), ), diff --git a/lib/app/features/wallet/views/pages/wallet_page/components/nfts/nfts_header_sort_action.dart b/lib/app/features/wallet/views/pages/wallet_page/components/nfts/nfts_header_sort_action.dart index 3141f21e8..b0153cf5f 100644 --- a/lib/app/features/wallet/views/pages/wallet_page/components/nfts/nfts_header_sort_action.dart +++ b/lib/app/features/wallet/views/pages/wallet_page/components/nfts/nfts_header_sort_action.dart @@ -36,7 +36,7 @@ class NftHeaderSortAction extends ConsumerWidget { SizedBox( width: 5.0.s, ), - Assets.images.icons.iconArrowDown.icon(size: 20.0.s, color: color), + Assets.svg.iconArrowDown.icon(size: 20.0.s, color: color), ], ), ), diff --git a/lib/app/features/wallet/views/pages/wallet_page/components/search_bar/search_bar.dart b/lib/app/features/wallet/views/pages/wallet_page/components/search_bar/search_bar.dart index 85039e43b..7ffbea879 100644 --- a/lib/app/features/wallet/views/pages/wallet_page/components/search_bar/search_bar.dart +++ b/lib/app/features/wallet/views/pages/wallet_page/components/search_bar/search_bar.dart @@ -36,7 +36,6 @@ class WalletSearchBar extends HookConsumerWidget { return Padding( padding: padding, child: SearchInput( - defaultValue: '', loading: isLoading, onTextChanged: (String newValue) { ref.read(searchQueryProvider.notifier).update(query: newValue); diff --git a/lib/app/features/wallet/views/pages/wallet_page/components/tabs/tabs_header.dart b/lib/app/features/wallet/views/pages/wallet_page/components/tabs/tabs_header.dart index e6486d8cd..5d330106c 100644 --- a/lib/app/features/wallet/views/pages/wallet_page/components/tabs/tabs_header.dart +++ b/lib/app/features/wallet/views/pages/wallet_page/components/tabs/tabs_header.dart @@ -55,7 +55,7 @@ class WalletTabsHeader extends ConsumerWidget { }, child: Padding( padding: EdgeInsets.all(UiConstants.hitSlop), - child: Assets.images.icons.iconFieldSearch.icon( + child: Assets.svg.iconFieldSearch.icon( color: context.theme.appColors.tertararyText, size: 20.0.s, ), diff --git a/lib/app/features/wallet/views/pages/wallet_page/components/tabs/tabs_header_hide_action.dart b/lib/app/features/wallet/views/pages/wallet_page/components/tabs/tabs_header_hide_action.dart index 715b18dd8..cbcc69b25 100644 --- a/lib/app/features/wallet/views/pages/wallet_page/components/tabs/tabs_header_hide_action.dart +++ b/lib/app/features/wallet/views/pages/wallet_page/components/tabs/tabs_header_hide_action.dart @@ -21,9 +21,8 @@ class WalletTabsHeaderHideAction extends ConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { final isZeroValueAssetsVisible = ref.watch(isZeroValueAssetsVisibleSelectorProvider); final actionColor = context.theme.appColors.tertararyText; - final asset = isZeroValueAssetsVisible - ? Assets.images.icons.iconCheckboxOff - : Assets.images.icons.iconBlockCheckboxOnblue; + final asset = + isZeroValueAssetsVisible ? Assets.svg.iconCheckboxOff : Assets.svg.iconBlockCheckboxOnblue; return TextButton( onPressed: () { diff --git a/lib/app/features/wallet/views/pages/wallet_page/tab_type.dart b/lib/app/features/wallet/views/pages/wallet_page/tab_type.dart index 61b433b8e..7cad6b9a9 100644 --- a/lib/app/features/wallet/views/pages/wallet_page/tab_type.dart +++ b/lib/app/features/wallet/views/pages/wallet_page/tab_type.dart @@ -14,17 +14,17 @@ enum WalletTabType { }; } - AssetGenImage get emptyListAsset { + String get emptyListAsset { return switch (this) { - WalletTabType.coins => Assets.images.misc.emptyCoins, - WalletTabType.nfts => Assets.images.misc.emptyNft, + WalletTabType.coins => Assets.svg.walletIconWalletEmptycoins, + WalletTabType.nfts => Assets.svg.categoriesNft, }; } String get bottomActionAsset { return switch (this) { - WalletTabType.coins => Assets.images.icons.iconButtonManagecoin, - WalletTabType.nfts => Assets.images.icons.iconButtonWalletnft, + WalletTabType.coins => Assets.svg.iconButtonManagecoin, + WalletTabType.nfts => Assets.svg.iconButtonWalletnft, }; } diff --git a/lib/app/features/wallets/pages/delete_wallet_modal/delete_wallet_modal.dart b/lib/app/features/wallets/pages/delete_wallet_modal/delete_wallet_modal.dart index 9ac775711..12ee4280d 100644 --- a/lib/app/features/wallets/pages/delete_wallet_modal/delete_wallet_modal.dart +++ b/lib/app/features/wallets/pages/delete_wallet_modal/delete_wallet_modal.dart @@ -30,7 +30,7 @@ class DeleteWalletModal extends ConsumerWidget { children: [ Padding( padding: EdgeInsets.only(top: 31.0.s, bottom: 4.0.s), - child: Assets.images.misc.actionDeletewallet.icon(size: 80.0.s), + child: Assets.svg.actionWalletDelete.icon(size: 80.0.s), ), Text( context.i18n.wallet_delete_q, diff --git a/lib/app/features/wallets/pages/edit_wallet_modal/edit_wallet_modal.dart b/lib/app/features/wallets/pages/edit_wallet_modal/edit_wallet_modal.dart index 256d3e1bb..d718568b4 100644 --- a/lib/app/features/wallets/pages/edit_wallet_modal/edit_wallet_modal.dart +++ b/lib/app/features/wallets/pages/edit_wallet_modal/edit_wallet_modal.dart @@ -76,7 +76,7 @@ class EditWalletModal extends HookConsumerWidget { onPressed: () { DeleteWalletRoute(walletId: walletId).replace(context); }, - leadingIcon: Assets.images.icons.iconBlockDelete + leadingIcon: Assets.svg.iconBlockDelete .icon(color: context.theme.appColors.onPrimaryAccent), label: Text(context.i18n.wallet_delete), mainAxisSize: MainAxisSize.max, diff --git a/lib/app/features/wallets/pages/manage_wallets_modal/components/manage_wallets_list/manage_wallet_tile.dart b/lib/app/features/wallets/pages/manage_wallets_modal/components/manage_wallets_list/manage_wallet_tile.dart index e948a9903..2868faed4 100644 --- a/lib/app/features/wallets/pages/manage_wallets_modal/components/manage_wallets_list/manage_wallet_tile.dart +++ b/lib/app/features/wallets/pages/manage_wallets_modal/components/manage_wallets_list/manage_wallet_tile.dart @@ -42,7 +42,7 @@ class ManageWalletTile extends ConsumerWidget { color: context.theme.appColors.tertararyText, ), ), - trailing: Assets.images.icons.iconArrowRight.icon(), + trailing: Assets.svg.iconArrowRight.icon(), contentPadding: EdgeInsets.only( left: 16.0.s, top: 11.0.s, diff --git a/lib/app/features/wallets/pages/manage_wallets_modal/manage_wallets_modal.dart b/lib/app/features/wallets/pages/manage_wallets_modal/manage_wallets_modal.dart index 742a55da7..45b7bac22 100644 --- a/lib/app/features/wallets/pages/manage_wallets_modal/manage_wallets_modal.dart +++ b/lib/app/features/wallets/pages/manage_wallets_modal/manage_wallets_modal.dart @@ -31,7 +31,7 @@ class ManageWalletsModal extends StatelessWidget { ), ScreenSideOffset.small( child: Button( - leadingIcon: Assets.images.icons.iconButtonAddstroke + leadingIcon: Assets.svg.iconButtonAddstroke .icon(color: context.theme.appColors.onPrimaryAccent), onPressed: () { CreateWalletRoute().push(context); diff --git a/lib/app/features/wallets/pages/wallets_modal/components/wallets_list/wallet_tile.dart b/lib/app/features/wallets/pages/wallets_modal/components/wallets_list/wallet_tile.dart index bbdd8b6cd..395c1c496 100644 --- a/lib/app/features/wallets/pages/wallets_modal/components/wallets_list/wallet_tile.dart +++ b/lib/app/features/wallets/pages/wallets_modal/components/wallets_list/wallet_tile.dart @@ -50,8 +50,7 @@ class WalletTile extends ConsumerWidget { ), ), trailing: isSelected == true - ? Assets.images.icons.iconCheckboxOn - .icon(color: context.theme.appColors.onPrimaryAccent) + ? Assets.svg.iconCheckboxOn.icon(color: context.theme.appColors.onPrimaryAccent) : null, contentPadding: EdgeInsets.symmetric(horizontal: 16.0.s, vertical: 11.0.s), backgroundColor: context.theme.appColors.tertararyBackground, diff --git a/lib/app/features/wallets/pages/wallets_modal/wallets_modal.dart b/lib/app/features/wallets/pages/wallets_modal/wallets_modal.dart index a66fe3ac3..d09468ae5 100644 --- a/lib/app/features/wallets/pages/wallets_modal/wallets_modal.dart +++ b/lib/app/features/wallets/pages/wallets_modal/wallets_modal.dart @@ -35,7 +35,7 @@ class WalletsModal extends StatelessWidget { right: ScreenSideOffset.defaultSmallMargin, ), child: Button( - leadingIcon: Assets.images.icons.iconButtonManageWallet.icon(), + leadingIcon: Assets.svg.iconButtonManageWallet.icon(), onPressed: () { ManageWalletsRoute().push(context); }, diff --git a/lib/app/router/app_routes.dart b/lib/app/router/app_routes.dart index d22377ae7..999731b18 100644 --- a/lib/app/router/app_routes.dart +++ b/lib/app/router/app_routes.dart @@ -29,6 +29,7 @@ import 'package:ice/app/features/dapps/views/pages/dapps_main_modal/dapps_main_m import 'package:ice/app/features/feed/views/pages/comment_post_modal/comment_post_modal.dart'; import 'package:ice/app/features/feed/views/pages/feed_main_modal/feed_main_modal_page.dart'; import 'package:ice/app/features/feed/views/pages/feed_page/feed_page.dart'; +import 'package:ice/app/features/feed/views/pages/feed_search_page/feed_search_page.dart'; import 'package:ice/app/features/feed/views/pages/post_details_page/post_details_page.dart'; import 'package:ice/app/features/feed/views/pages/post_reply_modal/post_reply_modal.dart'; import 'package:ice/app/features/feed/views/pages/repost_options_modal/repost_options_modal.dart'; diff --git a/lib/app/router/base_route_data.dart b/lib/app/router/base_route_data.dart index c0bd69624..30ac78717 100644 --- a/lib/app/router/base_route_data.dart +++ b/lib/app/router/base_route_data.dart @@ -9,6 +9,7 @@ enum IceRouteType { single, bottomSheet, slideFromLeft, + fade, mainModalSheet, } @@ -27,22 +28,9 @@ abstract class BaseRouteData extends GoRouteData { IceRouteType.single => CupertinoPage(child: child), IceRouteType.bottomSheet => FadeTransitionSheetPage(child: child, state: state), IceRouteType.slideFromLeft => SlideFromLeftTransitionPage(child: child, state: state), - IceRouteType.mainModalSheet => ModalSheetPage( - swipeDismissible: true, - barrierColor: context.theme.appColors.backgroundSheet, - key: state.pageKey, - // DraggableSheet does not work with scrollable widgets. - // If you want to use a scrollable widget as its content, - // use ScrollableSheet instead. - // See example in smooth_sheets package. - child: DraggableSheet( - controller: DefaultSheetController.of(context), - child: MainModalContent( - state: state, - child: child, - ), - ), - ), + IceRouteType.fade => FadeTransitionPage(child: child, state: state), + IceRouteType.mainModalSheet => + MainModalSheetPage(child: child, state: state, context: context), }; } } @@ -73,6 +61,21 @@ class FadeTransitionSheetPage extends ScrollableNavigationSheetPage { ); } +class FadeTransitionPage extends CustomTransitionPage { + FadeTransitionPage({ + required super.child, + required GoRouterState state, + }) : super( + key: state.pageKey, + transitionsBuilder: (context, animation, secondaryAnimation, child) { + return FadeTransition( + opacity: animation, + child: child, + ); + }, + ); +} + class SlideFromLeftTransitionPage extends CustomTransitionPage { SlideFromLeftTransitionPage({ required super.child, @@ -92,3 +95,26 @@ class SlideFromLeftTransitionPage extends CustomTransitionPage { }, ); } + +class MainModalSheetPage extends ModalSheetPage { + MainModalSheetPage({ + required Widget child, + required GoRouterState state, + required BuildContext context, + }) : super( + swipeDismissible: true, + barrierColor: context.theme.appColors.backgroundSheet, + key: state.pageKey, + // DraggableSheet does not work with scrollable widgets. + // If you want to use a scrollable widget as its content, + // use ScrollableSheet instead. + // See example in smooth_sheets package. + child: DraggableSheet( + controller: DefaultSheetController.of(context), + child: MainModalContent( + state: state, + child: child, + ), + ), + ); +} diff --git a/lib/app/router/components/navigation_app_bar/navigation_back_button.dart b/lib/app/router/components/navigation_app_bar/navigation_back_button.dart index 40dcb97fd..b940c68a5 100644 --- a/lib/app/router/components/navigation_app_bar/navigation_back_button.dart +++ b/lib/app/router/components/navigation_app_bar/navigation_back_button.dart @@ -31,7 +31,7 @@ class NavigationBackButton extends HookWidget { padding: EdgeInsets.zero, onPressed: () => hideKeyboardOnBack ? hideKeyboardAndCallOnce(callback: onPress) : onPress(), - icon: Assets.images.icons.iconBackArrow.icon( + icon: Assets.svg.iconBackArrow.icon( size: iconSize, ), ), diff --git a/lib/app/router/components/navigation_app_bar/navigation_close_button.dart b/lib/app/router/components/navigation_app_bar/navigation_close_button.dart index b1ebf68fb..97065dd6a 100644 --- a/lib/app/router/components/navigation_app_bar/navigation_close_button.dart +++ b/lib/app/router/components/navigation_app_bar/navigation_close_button.dart @@ -17,7 +17,7 @@ class NavigationCloseButton extends StatelessWidget { return TextButton( child: Padding( padding: EdgeInsets.all(UiConstants.hitSlop), - child: Assets.images.icons.iconSheetClose.icon( + child: Assets.svg.iconSheetClose.icon( color: context.theme.appColors.tertararyText, ), ), diff --git a/lib/app/router/components/navigation_app_bar/widgetbook.dart b/lib/app/router/components/navigation_app_bar/widgetbook.dart index bf724653b..9a9e45404 100644 --- a/lib/app/router/components/navigation_app_bar/widgetbook.dart +++ b/lib/app/router/components/navigation_app_bar/widgetbook.dart @@ -25,7 +25,7 @@ Widget regularNavigationAppBarUseCase(BuildContext context) { showBackButton: false, actions: [ IconButton( - icon: Assets.images.icons.iconSheetClose.icon( + icon: Assets.svg.iconSheetClose.icon( size: NavigationAppBar.actionButtonSide, color: context.theme.appColors.primaryText, ), @@ -37,7 +37,7 @@ Widget regularNavigationAppBarUseCase(BuildContext context) { title: Text('Some title'), actions: [ IconButton( - icon: Assets.images.icons.iconChannelAdmin.icon( + icon: Assets.svg.iconChannelAdmin.icon( size: NavigationAppBar.actionButtonSide, color: context.theme.appColors.primaryText, ), @@ -49,14 +49,14 @@ Widget regularNavigationAppBarUseCase(BuildContext context) { title: Text('Some title'), actions: [ IconButton( - icon: Assets.images.icons.iconChannelAdmin.icon( + icon: Assets.svg.iconChannelAdmin.icon( size: NavigationAppBar.actionButtonSide, color: context.theme.appColors.primaryText, ), onPressed: () {}, ), IconButton( - icon: Assets.images.icons.iconMorePopup.icon( + icon: Assets.svg.iconMorePopup.icon( size: NavigationAppBar.actionButtonSide, color: context.theme.appColors.primaryText, ), @@ -68,7 +68,7 @@ Widget regularNavigationAppBarUseCase(BuildContext context) { title: Text('Some very very long title'), actions: [ IconButton( - icon: Assets.images.icons.iconMorePopup.icon( + icon: Assets.svg.iconMorePopup.icon( size: NavigationAppBar.actionButtonSide, color: context.theme.appColors.primaryText, ), diff --git a/lib/app/router/feed_routes.dart b/lib/app/router/feed_routes.dart index 172e8fe57..383f5da42 100644 --- a/lib/app/router/feed_routes.dart +++ b/lib/app/router/feed_routes.dart @@ -3,6 +3,7 @@ part of 'app_routes.dart'; class FeedRoutes { static const routes = >[ TypedGoRoute(path: 'post/:postId'), + TypedGoRoute(path: 'feed-search'), TypedShellRoute( routes: [ TypedGoRoute(path: 'post-repost-options/:postId'), @@ -67,3 +68,11 @@ class SharePostModalRoute extends BaseRouteData { final String postId; } + +class FeedSearchRoute extends BaseRouteData { + FeedSearchRoute() + : super( + child: FeedSearchPage(), + type: IceRouteType.fade, + ); +} diff --git a/lib/app/router/main_tabs/components/tab_item.dart b/lib/app/router/main_tabs/components/tab_item.dart index ac3232c8e..0a7e35092 100644 --- a/lib/app/router/main_tabs/components/tab_item.dart +++ b/lib/app/router/main_tabs/components/tab_item.dart @@ -11,11 +11,11 @@ enum TabItem { const TabItem(); String get icon => switch (this) { - TabItem.feed => Assets.images.icons.iconHomeOff, - TabItem.chat => Assets.images.icons.iconChatOff, + TabItem.feed => Assets.svg.iconHomeOff, + TabItem.chat => Assets.svg.iconChatOff, TabItem.main => Assets.images.logo.logoButton, - TabItem.dapps => Assets.images.icons.iconDappOff, - TabItem.wallet => Assets.images.icons.iconsWalletOff + TabItem.dapps => Assets.svg.iconDappOff, + TabItem.wallet => Assets.svg.iconsWalletOff }; int get navigationIndex => index > TabItem.main.index ? index - 1 : index; diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 01564b956..0806491cc 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -217,6 +217,7 @@ "feed_send": "Send", "feed_modal_article_description": "Share your wisdom", "feed_share_via": "Share via message", + "feed_search_empty": "Search here for users, hashtags, channels...", "turn_notifications_title": "Turn on notifications", "turn_notifications_description": "Receive notifications when you transfer and receive funds", "turn_notifications_receive": "Receive notifications when your sending or receiving assets", diff --git a/pubspec.lock b/pubspec.lock index d9c6896b9..283d86a2c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1955,10 +1955,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.2.4" watcher: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index dcb343822..8a9a791ed 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -99,16 +99,13 @@ flutter: - lib/app/templates/basic.json - assets/videos/ - assets/lottie/ + - assets/svg/ - assets/images/ - - assets/images/icons/ - assets/images/wallet/ - - assets/images/categories/ - assets/images/bg/ - assets/images/logo/ - - assets/images/misc/ - assets/images/qr_code/ - assets/images/notifications/ - - assets/images/identity/ flutter_gen: output: lib/generated/