From e739b4a3590d9f8cf364fb209b1fede53a5c9942 Mon Sep 17 00:00:00 2001 From: yenda Date: Mon, 28 Jan 2019 17:42:19 +0100 Subject: [PATCH] [fix] use icons from design components Signed-off-by: yenda --- resources/extensions/kyber.edn | 12 +- resources/icons/QR.svg | 3 - resources/icons/add_contact.svg | 5 - resources/icons/add_wallet.svg | 3 - resources/icons/address.svg | 3 - resources/icons/angle_arrow_left.svg | 3 - resources/icons/angle_arrow_right.svg | 3 - resources/icons/arrow_left.svg | 3 - resources/icons/arrow_right.svg | 3 - resources/icons/attach.svg | 3 - resources/icons/back.svg | 3 - resources/icons/bottom/chats_active.svg | 6 - resources/icons/bottom/chats_gray.svg | 3 - resources/icons/bottom/contacts_gray.svg | 3 - resources/icons/bottom/discover_active.svg | 6 - resources/icons/bottom/discover_gray.svg | 3 - resources/icons/bottom/home_blue.svg | 7 - resources/icons/bottom/home_gray.svg | 6 - resources/icons/bottom/profile_blue.svg | 6 - resources/icons/bottom/profile_gray.svg | 3 - resources/icons/bottom/wallet_active.svg | 6 - resources/icons/bottom/wallet_gray.svg | 3 - resources/icons/browse.svg | 6 - resources/icons/camera.svg | 6 - resources/icons/chats.svg | 3 - resources/icons/check.svg | 3 - resources/icons/clock.svg | 3 - resources/icons/close.svg | 3 - resources/icons/contacts.svg | 3 - resources/icons/copy_from.svg | 7 - resources/icons/delete.svg | 3 - resources/icons/desktop.svg | 3 - resources/icons/dots.svg | 7 - resources/icons/dots_horizontal.svg | 3 - resources/icons/dots_vertical.svg | 3 - resources/icons/down.svg | 3 - resources/icons/dropdown_up.svg | 3 - resources/icons/exclamation_mark.svg | 6 - resources/icons/filter.svg | 7 - resources/icons/flash_active.svg | 4 - resources/icons/flash_inactive.svg | 3 - resources/icons/forward.svg | 3 - resources/icons/fullscreen.svg | 3 - resources/icons/grab.svg | 3 - resources/icons/group_chat.svg | 3 - resources/icons/hamburger.svg | 3 - resources/icons/hardwallet.svg | 3 - resources/icons/hidden.svg | 7 - resources/icons/in_contacts.svg | 5 - resources/icons/info.svg | 5 - resources/icons/input_commands.svg | 3 - resources/icons/input_send.svg | 3 - resources/icons/list_page.svg | 3 - resources/icons/lock.svg | 3 - resources/icons/lock_opened.svg | 5 - resources/icons/logout.svg | 4 - resources/icons/mailserver.svg | 3 - resources/icons/main/add_contact.svg | 4 + resources/icons/main/address.svg | 4 + resources/icons/main/advanced_settings.svg | 4 + resources/icons/main/arrow_left.svg | 3 + resources/icons/main/arrow_right.svg | 3 + resources/icons/main/arrow_up.svg | 3 + resources/icons/main/back.svg | 3 + resources/icons/main/backspace.svg | 3 + resources/icons/main/browser.svg | 3 + resources/icons/main/browser_home.svg | 4 + resources/icons/main/camera.svg | 3 + resources/icons/main/change.svg | 4 + resources/icons/main/check.svg | 3 + resources/icons/main/close.svg | 3 + resources/icons/main/commands.svg | 4 + resources/icons/main/copy.svg | 4 + resources/icons/{ => main}/dapp.svg | 6 +- resources/icons/main/delete.svg | 3 + resources/icons/main/desktop.svg | 3 + resources/icons/main/dropdown.svg | 3 + resources/icons/main/dropdown_up.svg | 3 + resources/icons/main/edit.svg | 4 + resources/icons/main/filter.svg | 3 + resources/icons/main/flash_active.svg | 3 + resources/icons/main/flash_inactive.svg | 3 + resources/icons/main/help.svg | 5 + resources/icons/main/history.svg | 3 + resources/icons/main/home.svg | 4 + resources/icons/main/info.svg | 5 + resources/icons/main/keycard.svg | 7 + resources/icons/main/language.svg | 4 + resources/icons/main/link.svg | 4 + resources/icons/main/logout.svg | 4 + resources/icons/main/mailserver.svg | 3 + resources/icons/main/make_admin.svg | 4 + resources/icons/main/max.svg | 4 + resources/icons/main/mobile.svg | 3 + resources/icons/main/more.svg | 5 + resources/icons/main/network.svg | 3 + resources/icons/main/next.svg | 3 + resources/icons/main/notification.svg | 4 + resources/icons/main/password.svg | 3 + resources/icons/main/paste.svg | 4 + resources/icons/main/photo.svg | 4 + resources/icons/main/private_chat.svg | 3 + resources/icons/main/profile.svg | 3 + resources/icons/main/public_chat.svg | 3 + resources/icons/main/qr.svg | 3 + resources/icons/main/receive.svg | 3 + resources/icons/main/refresh.svg | 3 + resources/icons/main/remove_contact.svg | 4 + resources/icons/main/reply.svg | 3 + resources/icons/main/search.svg | 3 + resources/icons/main/security.svg | 4 + resources/icons/main/settings.svg | 4 + resources/icons/main/stickers.svg | 4 + resources/icons/main/text.svg | 3 + resources/icons/main/tribute_to_talk.svg | 5 + resources/icons/main/two_arrows.svg | 4 + resources/icons/main/user_profile.svg | 3 + resources/icons/main/username.svg | 3 + resources/icons/main/wallet.svg | 3 + resources/icons/main/warning.svg | 5 + resources/icons/mic.svg | 3 - resources/icons/mobile.svg | 4 - resources/icons/network.svg | 6 - resources/icons/newchat.svg | 3 - resources/icons/nfc.svg | 3 - resources/icons/ok.svg | 3 - resources/icons/open.svg | 4 - resources/icons/password.svg | 3 - resources/icons/public.svg | 3 - resources/icons/public_chat.svg | 3 - resources/icons/refresh.svg | 3 - resources/icons/settings.svg | 3 - resources/icons/share.svg | 5 - resources/icons/speaker.svg | 3 - resources/icons/speaker_off.svg | 3 - resources/icons/stickers.svg | 3 - resources/icons/stickers/recent.svg | 3 + .../icons/{ => stickers}/stickers_big.svg | 0 resources/icons/tiny/tiny_arrow_down.svg | 3 + resources/icons/tiny/tiny_check.svg | 3 + .../{link.svg => tiny/tiny_external.svg} | 5 +- resources/icons/tiny/tiny_lock.svg | 3 + resources/icons/tiny/tiny_lock_broken.svg | 3 + resources/icons/tiny/tiny_new_contact.svg | 3 + resources/icons/tiny/tiny_public.svg | 3 + .../icons/{reply.svg => tiny/tiny_reply.svg} | 0 resources/icons/tiny/tiny_settings.svg | 3 + resources/icons/tiny/tribute_to_talk.svg | 3 + resources/icons/tiny_check.svg | 3 - resources/icons/tooltip-triangle.svg | 4 +- resources/icons/transaction_history.svg | 8 - resources/icons/up.svg | 3 - resources/icons/warning.svg | 3 - resources/icons/wifi.svg | 7 - src/status_im/browser/permissions.cljs | 4 +- .../chat/commands/impl/transactions.cljs | 2 +- .../ui/components/common/common.cljs | 12 +- .../ui/components/contact/contact.cljs | 4 +- src/status_im/ui/components/desktop/tabs.cljs | 16 +- .../ui/components/desktop/views.cljs | 6 +- .../ui/components/icons/vector_icons.cljs | 367 +++++++++--------- src/status_im/ui/components/list/views.cljs | 6 +- .../ui/components/list_item/views.cljs | 6 +- .../ui/components/toolbar/actions.cljs | 16 +- src/status_im/ui/components/toolbar/view.cljs | 2 +- .../ui/components/tooltip/views.cljs | 2 +- src/status_im/ui/screens/accounts/views.cljs | 6 +- .../ui/screens/add_new/new_chat/views.cljs | 2 +- .../screens/add_new/new_public_chat/view.cljs | 2 +- .../ui/screens/add_new/open_dapp/views.cljs | 2 +- src/status_im/ui/screens/add_new/views.cljs | 8 +- .../edit_bootnode/views.cljs | 2 +- .../ui/screens/browser/permissions/views.cljs | 4 +- .../screens/browser/site_blocked/views.cljs | 2 +- src/status_im/ui/screens/browser/views.cljs | 14 +- .../ui/screens/chat/input/input.cljs | 8 +- .../ui/screens/chat/input/send_button.cljs | 4 +- .../ui/screens/chat/message/message.cljs | 8 +- .../ui/screens/chat/message/options.cljs | 4 +- .../ui/screens/chat/stickers/views.cljs | 10 +- src/status_im/ui/screens/chat/views.cljs | 8 +- .../ui/screens/currency_settings/views.cljs | 2 +- .../ui/screens/dapps_permissions/views.cljs | 4 +- .../ui/screens/desktop/main/chat/views.cljs | 16 +- .../screens/desktop/main/tabs/home/views.cljs | 6 +- .../desktop/main/tabs/profile/views.cljs | 10 +- .../ui/screens/extensions/add/views.cljs | 2 +- .../ui/screens/extensions/views.cljs | 4 +- .../ui/screens/fleet_settings/views.cljs | 2 +- .../authentication_method/views.cljs | 6 +- .../ui/screens/hardwallet/components.cljs | 4 +- .../ui/screens/hardwallet/connect/views.cljs | 4 +- .../ui/screens/hardwallet/pin/views.cljs | 4 +- .../ui/screens/hardwallet/settings/views.cljs | 6 +- .../ui/screens/hardwallet/success/views.cljs | 8 +- .../ui/screens/home/views/inner_item.cljs | 4 +- .../ui/screens/log_level_settings/views.cljs | 2 +- src/status_im/ui/screens/main_tabs/views.cljs | 16 +- .../ui/screens/network_settings/views.cljs | 2 +- .../edit_mailserver/views.cljs | 2 +- .../offline_messaging_settings/views.cljs | 2 +- src/status_im/ui/screens/pairing/views.cljs | 10 +- .../ui/screens/profile/components/views.cljs | 2 +- .../ui/screens/profile/contact/views.cljs | 2 +- .../ui/screens/profile/group_chat/views.cljs | 6 +- .../screens/profile/photo_capture/views.cljs | 2 +- .../ui/screens/profile/seed/views.cljs | 2 +- .../ui/screens/profile/user/views.cljs | 4 +- src/status_im/ui/screens/stickers/views.cljs | 2 +- .../wallet/choose_recipient/views.cljs | 4 +- .../collectibles/cryptokitties/views.cljs | 4 +- .../collectibles/cryptostrikers/views.cljs | 2 +- .../wallet/collectibles/etheremon/views.cljs | 2 +- .../wallet/collectibles/kudos/views.cljs | 4 +- .../wallet/collectibles/superrare/views.cljs | 2 +- .../ui/screens/wallet/components/views.cljs | 4 +- .../ui/screens/wallet/main/views.cljs | 12 +- .../ui/screens/wallet/onboarding/views.cljs | 2 +- .../ui/screens/wallet/request/views.cljs | 2 +- .../ui/screens/wallet/send/views.cljs | 6 +- .../ui/screens/wallet/settings/views.cljs | 2 +- .../wallet/transaction_sent/views.cljs | 2 +- .../ui/screens/wallet/transactions/views.cljs | 12 +- 223 files changed, 626 insertions(+), 674 deletions(-) delete mode 100644 resources/icons/QR.svg delete mode 100644 resources/icons/add_contact.svg delete mode 100644 resources/icons/add_wallet.svg delete mode 100644 resources/icons/address.svg delete mode 100755 resources/icons/angle_arrow_left.svg delete mode 100755 resources/icons/angle_arrow_right.svg delete mode 100644 resources/icons/arrow_left.svg delete mode 100644 resources/icons/arrow_right.svg delete mode 100644 resources/icons/attach.svg delete mode 100644 resources/icons/back.svg delete mode 100644 resources/icons/bottom/chats_active.svg delete mode 100644 resources/icons/bottom/chats_gray.svg delete mode 100644 resources/icons/bottom/contacts_gray.svg delete mode 100644 resources/icons/bottom/discover_active.svg delete mode 100644 resources/icons/bottom/discover_gray.svg delete mode 100644 resources/icons/bottom/home_blue.svg delete mode 100644 resources/icons/bottom/home_gray.svg delete mode 100644 resources/icons/bottom/profile_blue.svg delete mode 100644 resources/icons/bottom/profile_gray.svg delete mode 100644 resources/icons/bottom/wallet_active.svg delete mode 100644 resources/icons/bottom/wallet_gray.svg delete mode 100644 resources/icons/browse.svg delete mode 100644 resources/icons/camera.svg delete mode 100644 resources/icons/chats.svg delete mode 100644 resources/icons/check.svg delete mode 100644 resources/icons/clock.svg delete mode 100644 resources/icons/close.svg delete mode 100644 resources/icons/contacts.svg delete mode 100644 resources/icons/copy_from.svg delete mode 100644 resources/icons/delete.svg delete mode 100644 resources/icons/desktop.svg delete mode 100644 resources/icons/dots.svg delete mode 100644 resources/icons/dots_horizontal.svg delete mode 100644 resources/icons/dots_vertical.svg delete mode 100644 resources/icons/down.svg delete mode 100644 resources/icons/dropdown_up.svg delete mode 100644 resources/icons/exclamation_mark.svg delete mode 100644 resources/icons/filter.svg delete mode 100644 resources/icons/flash_active.svg delete mode 100644 resources/icons/flash_inactive.svg delete mode 100644 resources/icons/forward.svg delete mode 100644 resources/icons/fullscreen.svg delete mode 100644 resources/icons/grab.svg delete mode 100644 resources/icons/group_chat.svg delete mode 100644 resources/icons/hamburger.svg delete mode 100644 resources/icons/hardwallet.svg delete mode 100644 resources/icons/hidden.svg delete mode 100644 resources/icons/in_contacts.svg delete mode 100644 resources/icons/info.svg delete mode 100644 resources/icons/input_commands.svg delete mode 100644 resources/icons/input_send.svg delete mode 100755 resources/icons/list_page.svg delete mode 100644 resources/icons/lock.svg delete mode 100644 resources/icons/lock_opened.svg delete mode 100755 resources/icons/logout.svg delete mode 100644 resources/icons/mailserver.svg create mode 100644 resources/icons/main/add_contact.svg create mode 100644 resources/icons/main/address.svg create mode 100644 resources/icons/main/advanced_settings.svg create mode 100644 resources/icons/main/arrow_left.svg create mode 100644 resources/icons/main/arrow_right.svg create mode 100644 resources/icons/main/arrow_up.svg create mode 100644 resources/icons/main/back.svg create mode 100644 resources/icons/main/backspace.svg create mode 100644 resources/icons/main/browser.svg create mode 100644 resources/icons/main/browser_home.svg create mode 100644 resources/icons/main/camera.svg create mode 100644 resources/icons/main/change.svg create mode 100644 resources/icons/main/check.svg create mode 100644 resources/icons/main/close.svg create mode 100644 resources/icons/main/commands.svg create mode 100644 resources/icons/main/copy.svg rename resources/icons/{ => main}/dapp.svg (91%) mode change 100755 => 100644 create mode 100644 resources/icons/main/delete.svg create mode 100644 resources/icons/main/desktop.svg create mode 100644 resources/icons/main/dropdown.svg create mode 100644 resources/icons/main/dropdown_up.svg create mode 100644 resources/icons/main/edit.svg create mode 100644 resources/icons/main/filter.svg create mode 100644 resources/icons/main/flash_active.svg create mode 100644 resources/icons/main/flash_inactive.svg create mode 100644 resources/icons/main/help.svg create mode 100644 resources/icons/main/history.svg create mode 100644 resources/icons/main/home.svg create mode 100644 resources/icons/main/info.svg create mode 100644 resources/icons/main/keycard.svg create mode 100644 resources/icons/main/language.svg create mode 100644 resources/icons/main/link.svg create mode 100644 resources/icons/main/logout.svg create mode 100644 resources/icons/main/mailserver.svg create mode 100644 resources/icons/main/make_admin.svg create mode 100644 resources/icons/main/max.svg create mode 100644 resources/icons/main/mobile.svg create mode 100644 resources/icons/main/more.svg create mode 100644 resources/icons/main/network.svg create mode 100644 resources/icons/main/next.svg create mode 100644 resources/icons/main/notification.svg create mode 100644 resources/icons/main/password.svg create mode 100644 resources/icons/main/paste.svg create mode 100644 resources/icons/main/photo.svg create mode 100644 resources/icons/main/private_chat.svg create mode 100644 resources/icons/main/profile.svg create mode 100644 resources/icons/main/public_chat.svg create mode 100644 resources/icons/main/qr.svg create mode 100644 resources/icons/main/receive.svg create mode 100644 resources/icons/main/refresh.svg create mode 100644 resources/icons/main/remove_contact.svg create mode 100644 resources/icons/main/reply.svg create mode 100644 resources/icons/main/search.svg create mode 100644 resources/icons/main/security.svg create mode 100644 resources/icons/main/settings.svg create mode 100644 resources/icons/main/stickers.svg create mode 100644 resources/icons/main/text.svg create mode 100644 resources/icons/main/tribute_to_talk.svg create mode 100644 resources/icons/main/two_arrows.svg create mode 100644 resources/icons/main/user_profile.svg create mode 100644 resources/icons/main/username.svg create mode 100644 resources/icons/main/wallet.svg create mode 100644 resources/icons/main/warning.svg delete mode 100644 resources/icons/mic.svg delete mode 100644 resources/icons/mobile.svg delete mode 100644 resources/icons/network.svg delete mode 100644 resources/icons/newchat.svg delete mode 100644 resources/icons/nfc.svg delete mode 100644 resources/icons/ok.svg delete mode 100644 resources/icons/open.svg delete mode 100755 resources/icons/password.svg delete mode 100644 resources/icons/public.svg delete mode 100644 resources/icons/public_chat.svg delete mode 100644 resources/icons/refresh.svg delete mode 100644 resources/icons/settings.svg delete mode 100644 resources/icons/share.svg delete mode 100644 resources/icons/speaker.svg delete mode 100644 resources/icons/speaker_off.svg delete mode 100644 resources/icons/stickers.svg create mode 100644 resources/icons/stickers/recent.svg rename resources/icons/{ => stickers}/stickers_big.svg (100%) create mode 100644 resources/icons/tiny/tiny_arrow_down.svg create mode 100644 resources/icons/tiny/tiny_check.svg rename resources/icons/{link.svg => tiny/tiny_external.svg} (93%) create mode 100644 resources/icons/tiny/tiny_lock.svg create mode 100644 resources/icons/tiny/tiny_lock_broken.svg create mode 100644 resources/icons/tiny/tiny_new_contact.svg create mode 100644 resources/icons/tiny/tiny_public.svg rename resources/icons/{reply.svg => tiny/tiny_reply.svg} (100%) create mode 100644 resources/icons/tiny/tiny_settings.svg create mode 100644 resources/icons/tiny/tribute_to_talk.svg delete mode 100644 resources/icons/tiny_check.svg delete mode 100644 resources/icons/transaction_history.svg delete mode 100644 resources/icons/up.svg delete mode 100644 resources/icons/warning.svg delete mode 100644 resources/icons/wifi.svg diff --git a/resources/extensions/kyber.edn b/resources/extensions/kyber.edn index d6006af53a..8f8634ee03 100644 --- a/resources/extensions/kyber.edn +++ b/resources/extensions/kyber.edn @@ -92,14 +92,14 @@ [view {:style {:flex-direction :row :margin-vertical 14 :align-items :center}} [view {:style {:flex 1}}] [text {:style {:color color :font-size 15 :margin-right 5}} "Sign to confirm"] - [icon {:key :icons/forward :color color}]]) + [icon {:key :main-icons/next :color color}]]) views/transaction-failed-panel (let [{} properties] [view {:style {:flex 1 :background-color "#4360df"}} [view {:style {:flex 1 :justify-content :center :align-items :center}} [view {:style {:background-color :white :width 56 :height 56 :border-radius 28 :align-items :center :justify-content :center}} - [icon {:key :icons/ok :color "#4360df"}]] + [icon {:key :main-icons/check :color "#4360df"}]] [text {:style {:color :white :font-size 17 :margin-top 16}} "Transaction Failed"] [text {:style {:color "rgba(255,255,255,0.6)" :font-size 15 :margin-top 8}} "Sorry :("] [view {:style {:height 1 :background-color :white :opacity 0.2}}] @@ -112,7 +112,7 @@ [view {:style {:flex 1 :background-color "#4360df"}} [view {:style {:flex 1 :justify-content :center :align-items :center :margin-top 200}} [view {:style {:background-color :white :width 56 :height 56 :border-radius 28 :align-items :center :justify-content :center}} - [icon {:key :icons/ok :color "#4360df"}]] + [icon {:key :main-icons/check :color "#4360df"}]] [text {:style {:color :white :font-size 17 :margin-top 16}} "Transaction Pending"] [text {:style {:color "rgba(255,255,255,0.6)" :font-size 15 :margin-top 8 :margin-horizontal 40}} "Your transaction is pending confirmation on the blockchain. You can check its status in your transaction history."] @@ -126,7 +126,7 @@ [view {:style {:flex 1 :background-color "#4360df"}} [view {:style {:flex 1 :justify-content :center :align-items :center}} [view {:style {:background-color :white :width 56 :height 56 :border-radius 28 :align-items :center :justify-content :center}} - [icon {:key :icons/ok :color "#4360df"}]] + [icon {:key :main-icons/check :color "#4360df"}]] [text {:style {:color :white :font-size 17 :margin-top 16}} "Transaction Confirmed"] [view {:style {:height 1 :background-color :white :opacity 0.2}}] [touchable-opacity {:on-press [store/put {:key "completed?" :value false}]} @@ -185,7 +185,7 @@ [text {:style {:margin-left 16 :color :white :font-size 15 :opacity 0.6}} src-symbol]] [text {:style {:margin-left 16 :color :white :font-size 15 :opacity 0.6}} "Available: ${balance}"]] [text {:style {:flex 1 :color :white :margin-left 12}} "Select token"]) - [icon {:key :icons/forward :color :white}]]] + [icon {:key :main-icons/next :color :white}]]] [text {:style {:color :white :font-size 15 :margin-top 28}} "Amount"] [view {:style {:flex-direction :row :margin-top 8 :border-radius 8 :height 52 :background-color "rgba(255,255,255,0.1)" :align-items :center :padding-horizontal 14 :margin-bottom 32}} @@ -206,7 +206,7 @@ [text {:style {:margin-left 16 :color :white :font-size 15}} tokenname2] [text {:style {:margin-left 16 :color :white :font-size 15 :opacity 0.6}} dest-symbol]] [text {:style {:flex 1 :color :white :margin-left 12}} "Select token"]) - [icon {:key :icons/forward :color :white}]]] + [icon {:key :main-icons/next :color :white}]]] [text {:style {:color :white :opacity 0.6 :font-size 15 :margin-top 28}} "Amount to receive"] [view {:style {:flex-direction :row :margin-top 8 :border-radius 8 :height 52 :border-color "rgba(255,255,255,0.1)" :border-width 1 :align-items :center :padding-horizontal 14}} diff --git a/resources/icons/QR.svg b/resources/icons/QR.svg deleted file mode 100644 index 90999f3bb3..0000000000 --- a/resources/icons/QR.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/add_contact.svg b/resources/icons/add_contact.svg deleted file mode 100644 index f530bf3a6d..0000000000 --- a/resources/icons/add_contact.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/resources/icons/add_wallet.svg b/resources/icons/add_wallet.svg deleted file mode 100644 index e169f6933e..0000000000 --- a/resources/icons/add_wallet.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/address.svg b/resources/icons/address.svg deleted file mode 100644 index 7c5d9a95be..0000000000 --- a/resources/icons/address.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/angle_arrow_left.svg b/resources/icons/angle_arrow_left.svg deleted file mode 100755 index 7bf9d0b787..0000000000 --- a/resources/icons/angle_arrow_left.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/angle_arrow_right.svg b/resources/icons/angle_arrow_right.svg deleted file mode 100755 index 468ed6435e..0000000000 --- a/resources/icons/angle_arrow_right.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/arrow_left.svg b/resources/icons/arrow_left.svg deleted file mode 100644 index 809d322949..0000000000 --- a/resources/icons/arrow_left.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/arrow_right.svg b/resources/icons/arrow_right.svg deleted file mode 100644 index 04c94c0083..0000000000 --- a/resources/icons/arrow_right.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/attach.svg b/resources/icons/attach.svg deleted file mode 100644 index c9a9d87d83..0000000000 --- a/resources/icons/attach.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/back.svg b/resources/icons/back.svg deleted file mode 100644 index 163aa80a04..0000000000 --- a/resources/icons/back.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/bottom/chats_active.svg b/resources/icons/bottom/chats_active.svg deleted file mode 100644 index c9c992778e..0000000000 --- a/resources/icons/bottom/chats_active.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/icons/bottom/chats_gray.svg b/resources/icons/bottom/chats_gray.svg deleted file mode 100644 index 5df8c98c39..0000000000 --- a/resources/icons/bottom/chats_gray.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/bottom/contacts_gray.svg b/resources/icons/bottom/contacts_gray.svg deleted file mode 100644 index caceaff91a..0000000000 --- a/resources/icons/bottom/contacts_gray.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/bottom/discover_active.svg b/resources/icons/bottom/discover_active.svg deleted file mode 100644 index b1a0059295..0000000000 --- a/resources/icons/bottom/discover_active.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/icons/bottom/discover_gray.svg b/resources/icons/bottom/discover_gray.svg deleted file mode 100644 index 2c97c31867..0000000000 --- a/resources/icons/bottom/discover_gray.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/bottom/home_blue.svg b/resources/icons/bottom/home_blue.svg deleted file mode 100644 index c3dc3985ad..0000000000 --- a/resources/icons/bottom/home_blue.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/resources/icons/bottom/home_gray.svg b/resources/icons/bottom/home_gray.svg deleted file mode 100644 index 49da5ae7f0..0000000000 --- a/resources/icons/bottom/home_gray.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/resources/icons/bottom/profile_blue.svg b/resources/icons/bottom/profile_blue.svg deleted file mode 100644 index c8d58c86af..0000000000 --- a/resources/icons/bottom/profile_blue.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/icons/bottom/profile_gray.svg b/resources/icons/bottom/profile_gray.svg deleted file mode 100644 index ed5bc01e96..0000000000 --- a/resources/icons/bottom/profile_gray.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/bottom/wallet_active.svg b/resources/icons/bottom/wallet_active.svg deleted file mode 100644 index 65797b73da..0000000000 --- a/resources/icons/bottom/wallet_active.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/icons/bottom/wallet_gray.svg b/resources/icons/bottom/wallet_gray.svg deleted file mode 100644 index 06e9df5126..0000000000 --- a/resources/icons/bottom/wallet_gray.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/browse.svg b/resources/icons/browse.svg deleted file mode 100644 index ddc0c9793a..0000000000 --- a/resources/icons/browse.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/icons/camera.svg b/resources/icons/camera.svg deleted file mode 100644 index 8b13a02422..0000000000 --- a/resources/icons/camera.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/icons/chats.svg b/resources/icons/chats.svg deleted file mode 100644 index 131296ad7e..0000000000 --- a/resources/icons/chats.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/check.svg b/resources/icons/check.svg deleted file mode 100644 index 95a7a925ba..0000000000 --- a/resources/icons/check.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/clock.svg b/resources/icons/clock.svg deleted file mode 100644 index 41da8c8f61..0000000000 --- a/resources/icons/clock.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/close.svg b/resources/icons/close.svg deleted file mode 100644 index f3a8a38bea..0000000000 --- a/resources/icons/close.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/contacts.svg b/resources/icons/contacts.svg deleted file mode 100644 index 74ba703212..0000000000 --- a/resources/icons/contacts.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/copy_from.svg b/resources/icons/copy_from.svg deleted file mode 100644 index 7f8e9f618e..0000000000 --- a/resources/icons/copy_from.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/resources/icons/delete.svg b/resources/icons/delete.svg deleted file mode 100644 index bb1e5c5d14..0000000000 --- a/resources/icons/delete.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/desktop.svg b/resources/icons/desktop.svg deleted file mode 100644 index 865a48abf7..0000000000 --- a/resources/icons/desktop.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/dots.svg b/resources/icons/dots.svg deleted file mode 100644 index 5b245e6ad2..0000000000 --- a/resources/icons/dots.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/icons/dots_horizontal.svg b/resources/icons/dots_horizontal.svg deleted file mode 100644 index d7f90d5e9c..0000000000 --- a/resources/icons/dots_horizontal.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/dots_vertical.svg b/resources/icons/dots_vertical.svg deleted file mode 100644 index eff62106e0..0000000000 --- a/resources/icons/dots_vertical.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/down.svg b/resources/icons/down.svg deleted file mode 100644 index 9ad7430a6d..0000000000 --- a/resources/icons/down.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/resources/icons/dropdown_up.svg b/resources/icons/dropdown_up.svg deleted file mode 100644 index 44432b5d9d..0000000000 --- a/resources/icons/dropdown_up.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/exclamation_mark.svg b/resources/icons/exclamation_mark.svg deleted file mode 100644 index 47919eff22..0000000000 --- a/resources/icons/exclamation_mark.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/resources/icons/filter.svg b/resources/icons/filter.svg deleted file mode 100644 index e9ea2c45d7..0000000000 --- a/resources/icons/filter.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/resources/icons/flash_active.svg b/resources/icons/flash_active.svg deleted file mode 100644 index f1efce88b0..0000000000 --- a/resources/icons/flash_active.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/icons/flash_inactive.svg b/resources/icons/flash_inactive.svg deleted file mode 100644 index 8bf77893e0..0000000000 --- a/resources/icons/flash_inactive.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/forward.svg b/resources/icons/forward.svg deleted file mode 100644 index 0ad3144ae4..0000000000 --- a/resources/icons/forward.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/fullscreen.svg b/resources/icons/fullscreen.svg deleted file mode 100644 index 6726e8607a..0000000000 --- a/resources/icons/fullscreen.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/grab.svg b/resources/icons/grab.svg deleted file mode 100644 index 014533ba29..0000000000 --- a/resources/icons/grab.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/group_chat.svg b/resources/icons/group_chat.svg deleted file mode 100644 index b794cd71aa..0000000000 --- a/resources/icons/group_chat.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/hamburger.svg b/resources/icons/hamburger.svg deleted file mode 100644 index 2c8715e517..0000000000 --- a/resources/icons/hamburger.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/hardwallet.svg b/resources/icons/hardwallet.svg deleted file mode 100644 index de2a85083d..0000000000 --- a/resources/icons/hardwallet.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/hidden.svg b/resources/icons/hidden.svg deleted file mode 100644 index e666c9f0a5..0000000000 --- a/resources/icons/hidden.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/icons/in_contacts.svg b/resources/icons/in_contacts.svg deleted file mode 100644 index 31d6a0d409..0000000000 --- a/resources/icons/in_contacts.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/resources/icons/info.svg b/resources/icons/info.svg deleted file mode 100644 index a4d929e3b2..0000000000 --- a/resources/icons/info.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/resources/icons/input_commands.svg b/resources/icons/input_commands.svg deleted file mode 100644 index 7188dbdfe8..0000000000 --- a/resources/icons/input_commands.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/input_send.svg b/resources/icons/input_send.svg deleted file mode 100644 index 309b13351f..0000000000 --- a/resources/icons/input_send.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/list_page.svg b/resources/icons/list_page.svg deleted file mode 100755 index 4451d9842e..0000000000 --- a/resources/icons/list_page.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/lock.svg b/resources/icons/lock.svg deleted file mode 100644 index 291cf61c6e..0000000000 --- a/resources/icons/lock.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/lock_opened.svg b/resources/icons/lock_opened.svg deleted file mode 100644 index 43eb95435b..0000000000 --- a/resources/icons/lock_opened.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/resources/icons/logout.svg b/resources/icons/logout.svg deleted file mode 100755 index 28806e8456..0000000000 --- a/resources/icons/logout.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/icons/mailserver.svg b/resources/icons/mailserver.svg deleted file mode 100644 index 77315a07ee..0000000000 --- a/resources/icons/mailserver.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/main/add_contact.svg b/resources/icons/main/add_contact.svg new file mode 100644 index 0000000000..c7746afb46 --- /dev/null +++ b/resources/icons/main/add_contact.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/address.svg b/resources/icons/main/address.svg new file mode 100644 index 0000000000..c91f66a9c2 --- /dev/null +++ b/resources/icons/main/address.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/advanced_settings.svg b/resources/icons/main/advanced_settings.svg new file mode 100644 index 0000000000..0bd25df99f --- /dev/null +++ b/resources/icons/main/advanced_settings.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/arrow_left.svg b/resources/icons/main/arrow_left.svg new file mode 100644 index 0000000000..9733ba6bde --- /dev/null +++ b/resources/icons/main/arrow_left.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/arrow_right.svg b/resources/icons/main/arrow_right.svg new file mode 100644 index 0000000000..19f33db6ca --- /dev/null +++ b/resources/icons/main/arrow_right.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/arrow_up.svg b/resources/icons/main/arrow_up.svg new file mode 100644 index 0000000000..4ea427a891 --- /dev/null +++ b/resources/icons/main/arrow_up.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/back.svg b/resources/icons/main/back.svg new file mode 100644 index 0000000000..5d2e1a934e --- /dev/null +++ b/resources/icons/main/back.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/backspace.svg b/resources/icons/main/backspace.svg new file mode 100644 index 0000000000..036b2c8f2c --- /dev/null +++ b/resources/icons/main/backspace.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/browser.svg b/resources/icons/main/browser.svg new file mode 100644 index 0000000000..ae4e99dc77 --- /dev/null +++ b/resources/icons/main/browser.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/browser_home.svg b/resources/icons/main/browser_home.svg new file mode 100644 index 0000000000..7c26722b2e --- /dev/null +++ b/resources/icons/main/browser_home.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/camera.svg b/resources/icons/main/camera.svg new file mode 100644 index 0000000000..01c47994ae --- /dev/null +++ b/resources/icons/main/camera.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/change.svg b/resources/icons/main/change.svg new file mode 100644 index 0000000000..a3bfbbedc0 --- /dev/null +++ b/resources/icons/main/change.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/check.svg b/resources/icons/main/check.svg new file mode 100644 index 0000000000..62b6036709 --- /dev/null +++ b/resources/icons/main/check.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/close.svg b/resources/icons/main/close.svg new file mode 100644 index 0000000000..26cae722b9 --- /dev/null +++ b/resources/icons/main/close.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/commands.svg b/resources/icons/main/commands.svg new file mode 100644 index 0000000000..45a89004b7 --- /dev/null +++ b/resources/icons/main/commands.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/copy.svg b/resources/icons/main/copy.svg new file mode 100644 index 0000000000..0bcc337843 --- /dev/null +++ b/resources/icons/main/copy.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/dapp.svg b/resources/icons/main/dapp.svg old mode 100755 new mode 100644 similarity index 91% rename from resources/icons/dapp.svg rename to resources/icons/main/dapp.svg index 981a044b0b..10cef63f93 --- a/resources/icons/dapp.svg +++ b/resources/icons/main/dapp.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/resources/icons/main/delete.svg b/resources/icons/main/delete.svg new file mode 100644 index 0000000000..d112f5133b --- /dev/null +++ b/resources/icons/main/delete.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/desktop.svg b/resources/icons/main/desktop.svg new file mode 100644 index 0000000000..9bf509ed5b --- /dev/null +++ b/resources/icons/main/desktop.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/dropdown.svg b/resources/icons/main/dropdown.svg new file mode 100644 index 0000000000..bc9493d10d --- /dev/null +++ b/resources/icons/main/dropdown.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/dropdown_up.svg b/resources/icons/main/dropdown_up.svg new file mode 100644 index 0000000000..059ac4e3ce --- /dev/null +++ b/resources/icons/main/dropdown_up.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/edit.svg b/resources/icons/main/edit.svg new file mode 100644 index 0000000000..81c6f98875 --- /dev/null +++ b/resources/icons/main/edit.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/filter.svg b/resources/icons/main/filter.svg new file mode 100644 index 0000000000..0bae6ca562 --- /dev/null +++ b/resources/icons/main/filter.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/flash_active.svg b/resources/icons/main/flash_active.svg new file mode 100644 index 0000000000..3d7e83ad85 --- /dev/null +++ b/resources/icons/main/flash_active.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/flash_inactive.svg b/resources/icons/main/flash_inactive.svg new file mode 100644 index 0000000000..07fb2890b3 --- /dev/null +++ b/resources/icons/main/flash_inactive.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/help.svg b/resources/icons/main/help.svg new file mode 100644 index 0000000000..445a86564c --- /dev/null +++ b/resources/icons/main/help.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/icons/main/history.svg b/resources/icons/main/history.svg new file mode 100644 index 0000000000..c00cb2d5a9 --- /dev/null +++ b/resources/icons/main/history.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/home.svg b/resources/icons/main/home.svg new file mode 100644 index 0000000000..48d67e75a9 --- /dev/null +++ b/resources/icons/main/home.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/info.svg b/resources/icons/main/info.svg new file mode 100644 index 0000000000..35d69f2d96 --- /dev/null +++ b/resources/icons/main/info.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/icons/main/keycard.svg b/resources/icons/main/keycard.svg new file mode 100644 index 0000000000..58d9676bf0 --- /dev/null +++ b/resources/icons/main/keycard.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/icons/main/language.svg b/resources/icons/main/language.svg new file mode 100644 index 0000000000..075e596a00 --- /dev/null +++ b/resources/icons/main/language.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/link.svg b/resources/icons/main/link.svg new file mode 100644 index 0000000000..ecd501627f --- /dev/null +++ b/resources/icons/main/link.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/logout.svg b/resources/icons/main/logout.svg new file mode 100644 index 0000000000..95fe83aa75 --- /dev/null +++ b/resources/icons/main/logout.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/mailserver.svg b/resources/icons/main/mailserver.svg new file mode 100644 index 0000000000..121c32a605 --- /dev/null +++ b/resources/icons/main/mailserver.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/make_admin.svg b/resources/icons/main/make_admin.svg new file mode 100644 index 0000000000..21dcf666c2 --- /dev/null +++ b/resources/icons/main/make_admin.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/max.svg b/resources/icons/main/max.svg new file mode 100644 index 0000000000..a9f3943143 --- /dev/null +++ b/resources/icons/main/max.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/mobile.svg b/resources/icons/main/mobile.svg new file mode 100644 index 0000000000..f9e05cd242 --- /dev/null +++ b/resources/icons/main/mobile.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/more.svg b/resources/icons/main/more.svg new file mode 100644 index 0000000000..02ebbcb6f0 --- /dev/null +++ b/resources/icons/main/more.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/icons/main/network.svg b/resources/icons/main/network.svg new file mode 100644 index 0000000000..184b879453 --- /dev/null +++ b/resources/icons/main/network.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/next.svg b/resources/icons/main/next.svg new file mode 100644 index 0000000000..57763b4d2f --- /dev/null +++ b/resources/icons/main/next.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/notification.svg b/resources/icons/main/notification.svg new file mode 100644 index 0000000000..f8e5969ce7 --- /dev/null +++ b/resources/icons/main/notification.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/password.svg b/resources/icons/main/password.svg new file mode 100644 index 0000000000..d146184741 --- /dev/null +++ b/resources/icons/main/password.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/paste.svg b/resources/icons/main/paste.svg new file mode 100644 index 0000000000..c3aec18714 --- /dev/null +++ b/resources/icons/main/paste.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/photo.svg b/resources/icons/main/photo.svg new file mode 100644 index 0000000000..4f5038a671 --- /dev/null +++ b/resources/icons/main/photo.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/private_chat.svg b/resources/icons/main/private_chat.svg new file mode 100644 index 0000000000..5ab68abf59 --- /dev/null +++ b/resources/icons/main/private_chat.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/profile.svg b/resources/icons/main/profile.svg new file mode 100644 index 0000000000..028d94c943 --- /dev/null +++ b/resources/icons/main/profile.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/public_chat.svg b/resources/icons/main/public_chat.svg new file mode 100644 index 0000000000..b9069737f9 --- /dev/null +++ b/resources/icons/main/public_chat.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/qr.svg b/resources/icons/main/qr.svg new file mode 100644 index 0000000000..0a6720b053 --- /dev/null +++ b/resources/icons/main/qr.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/receive.svg b/resources/icons/main/receive.svg new file mode 100644 index 0000000000..03c415b8f5 --- /dev/null +++ b/resources/icons/main/receive.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/refresh.svg b/resources/icons/main/refresh.svg new file mode 100644 index 0000000000..2356b1b92b --- /dev/null +++ b/resources/icons/main/refresh.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/remove_contact.svg b/resources/icons/main/remove_contact.svg new file mode 100644 index 0000000000..8f4a46af13 --- /dev/null +++ b/resources/icons/main/remove_contact.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/reply.svg b/resources/icons/main/reply.svg new file mode 100644 index 0000000000..99e06ae55e --- /dev/null +++ b/resources/icons/main/reply.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/search.svg b/resources/icons/main/search.svg new file mode 100644 index 0000000000..0510c866cb --- /dev/null +++ b/resources/icons/main/search.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/security.svg b/resources/icons/main/security.svg new file mode 100644 index 0000000000..075e596a00 --- /dev/null +++ b/resources/icons/main/security.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/settings.svg b/resources/icons/main/settings.svg new file mode 100644 index 0000000000..81bc39f616 --- /dev/null +++ b/resources/icons/main/settings.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/stickers.svg b/resources/icons/main/stickers.svg new file mode 100644 index 0000000000..19a98009fd --- /dev/null +++ b/resources/icons/main/stickers.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/text.svg b/resources/icons/main/text.svg new file mode 100644 index 0000000000..6a965f6d69 --- /dev/null +++ b/resources/icons/main/text.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/tribute_to_talk.svg b/resources/icons/main/tribute_to_talk.svg new file mode 100644 index 0000000000..673bba0636 --- /dev/null +++ b/resources/icons/main/tribute_to_talk.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/icons/main/two_arrows.svg b/resources/icons/main/two_arrows.svg new file mode 100644 index 0000000000..8ce7771792 --- /dev/null +++ b/resources/icons/main/two_arrows.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/icons/main/user_profile.svg b/resources/icons/main/user_profile.svg new file mode 100644 index 0000000000..756d9ae13a --- /dev/null +++ b/resources/icons/main/user_profile.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/username.svg b/resources/icons/main/username.svg new file mode 100644 index 0000000000..7bdc3b5134 --- /dev/null +++ b/resources/icons/main/username.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/wallet.svg b/resources/icons/main/wallet.svg new file mode 100644 index 0000000000..8d7acef0ff --- /dev/null +++ b/resources/icons/main/wallet.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/main/warning.svg b/resources/icons/main/warning.svg new file mode 100644 index 0000000000..e0b736e111 --- /dev/null +++ b/resources/icons/main/warning.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/icons/mic.svg b/resources/icons/mic.svg deleted file mode 100644 index a190cce21b..0000000000 --- a/resources/icons/mic.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/mobile.svg b/resources/icons/mobile.svg deleted file mode 100644 index af01106d41..0000000000 --- a/resources/icons/mobile.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/icons/network.svg b/resources/icons/network.svg deleted file mode 100644 index 78a2d00832..0000000000 --- a/resources/icons/network.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/icons/newchat.svg b/resources/icons/newchat.svg deleted file mode 100644 index 6872c7b4de..0000000000 --- a/resources/icons/newchat.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/nfc.svg b/resources/icons/nfc.svg deleted file mode 100644 index e7aa268676..0000000000 --- a/resources/icons/nfc.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/ok.svg b/resources/icons/ok.svg deleted file mode 100644 index 4bde42159e..0000000000 --- a/resources/icons/ok.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/open.svg b/resources/icons/open.svg deleted file mode 100644 index 1c8534f51d..0000000000 --- a/resources/icons/open.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/resources/icons/password.svg b/resources/icons/password.svg deleted file mode 100755 index 9df699266a..0000000000 --- a/resources/icons/password.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/public.svg b/resources/icons/public.svg deleted file mode 100644 index 83c65dc28a..0000000000 --- a/resources/icons/public.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/public_chat.svg b/resources/icons/public_chat.svg deleted file mode 100644 index 21ea618444..0000000000 --- a/resources/icons/public_chat.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/refresh.svg b/resources/icons/refresh.svg deleted file mode 100644 index 7539be9a0a..0000000000 --- a/resources/icons/refresh.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/settings.svg b/resources/icons/settings.svg deleted file mode 100644 index 9d3ca2205c..0000000000 --- a/resources/icons/settings.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/share.svg b/resources/icons/share.svg deleted file mode 100644 index cc7819f680..0000000000 --- a/resources/icons/share.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/resources/icons/speaker.svg b/resources/icons/speaker.svg deleted file mode 100644 index 54072264fa..0000000000 --- a/resources/icons/speaker.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/speaker_off.svg b/resources/icons/speaker_off.svg deleted file mode 100644 index 16dd2e405f..0000000000 --- a/resources/icons/speaker_off.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/stickers.svg b/resources/icons/stickers.svg deleted file mode 100644 index 3dc70ca074..0000000000 --- a/resources/icons/stickers.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/stickers/recent.svg b/resources/icons/stickers/recent.svg new file mode 100644 index 0000000000..ed59857c9d --- /dev/null +++ b/resources/icons/stickers/recent.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/stickers_big.svg b/resources/icons/stickers/stickers_big.svg similarity index 100% rename from resources/icons/stickers_big.svg rename to resources/icons/stickers/stickers_big.svg diff --git a/resources/icons/tiny/tiny_arrow_down.svg b/resources/icons/tiny/tiny_arrow_down.svg new file mode 100644 index 0000000000..489cef5126 --- /dev/null +++ b/resources/icons/tiny/tiny_arrow_down.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/tiny/tiny_check.svg b/resources/icons/tiny/tiny_check.svg new file mode 100644 index 0000000000..558a015a14 --- /dev/null +++ b/resources/icons/tiny/tiny_check.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/link.svg b/resources/icons/tiny/tiny_external.svg similarity index 93% rename from resources/icons/link.svg rename to resources/icons/tiny/tiny_external.svg index 1fc9fe234e..eb5c6328c0 100644 --- a/resources/icons/link.svg +++ b/resources/icons/tiny/tiny_external.svg @@ -1,5 +1,4 @@ - - + + - diff --git a/resources/icons/tiny/tiny_lock.svg b/resources/icons/tiny/tiny_lock.svg new file mode 100644 index 0000000000..21d0250653 --- /dev/null +++ b/resources/icons/tiny/tiny_lock.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/tiny/tiny_lock_broken.svg b/resources/icons/tiny/tiny_lock_broken.svg new file mode 100644 index 0000000000..95b22c8331 --- /dev/null +++ b/resources/icons/tiny/tiny_lock_broken.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/tiny/tiny_new_contact.svg b/resources/icons/tiny/tiny_new_contact.svg new file mode 100644 index 0000000000..ea30ac119e --- /dev/null +++ b/resources/icons/tiny/tiny_new_contact.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/tiny/tiny_public.svg b/resources/icons/tiny/tiny_public.svg new file mode 100644 index 0000000000..fd000fea7d --- /dev/null +++ b/resources/icons/tiny/tiny_public.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/reply.svg b/resources/icons/tiny/tiny_reply.svg similarity index 100% rename from resources/icons/reply.svg rename to resources/icons/tiny/tiny_reply.svg diff --git a/resources/icons/tiny/tiny_settings.svg b/resources/icons/tiny/tiny_settings.svg new file mode 100644 index 0000000000..7415e9766e --- /dev/null +++ b/resources/icons/tiny/tiny_settings.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/tiny/tribute_to_talk.svg b/resources/icons/tiny/tribute_to_talk.svg new file mode 100644 index 0000000000..3686220ca8 --- /dev/null +++ b/resources/icons/tiny/tribute_to_talk.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/icons/tiny_check.svg b/resources/icons/tiny_check.svg deleted file mode 100644 index d9b790ba7b..0000000000 --- a/resources/icons/tiny_check.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/tooltip-triangle.svg b/resources/icons/tooltip-triangle.svg index f19a119bec..31f85a7360 100644 --- a/resources/icons/tooltip-triangle.svg +++ b/resources/icons/tooltip-triangle.svg @@ -1,3 +1,3 @@ - - \ No newline at end of file + + diff --git a/resources/icons/transaction_history.svg b/resources/icons/transaction_history.svg deleted file mode 100644 index 8c703ec72b..0000000000 --- a/resources/icons/transaction_history.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/resources/icons/up.svg b/resources/icons/up.svg deleted file mode 100644 index 90b2386d7c..0000000000 --- a/resources/icons/up.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/resources/icons/warning.svg b/resources/icons/warning.svg deleted file mode 100644 index 027f170834..0000000000 --- a/resources/icons/warning.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/icons/wifi.svg b/resources/icons/wifi.svg deleted file mode 100644 index 3987ae8061..0000000000 --- a/resources/icons/wifi.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/status_im/browser/permissions.cljs b/src/status_im/browser/permissions.cljs index f60f1e5af5..3542f3ce81 100644 --- a/src/status_im/browser/permissions.cljs +++ b/src/status_im/browser/permissions.cljs @@ -18,10 +18,10 @@ :allowed? true} constants/dapp-permission-contact-code {:title (i18n/label :t/wants-to-access-profile) :description (i18n/label :t/your-contact-code) - :icon :icons/profile-active} + :icon :main-icons/profile} constants/dapp-permission-web3 {:title (i18n/label :t/dapp-would-like-to-connect-wallet) :description (i18n/label :t/allowing-authorizes-this-dapp) - :icon :icons/wallet-active}}) + :icon :main-icons/wallet}}) (fx/defn permission-yield-control [{:keys [db] :as cofx} dapp-name permission message-id params] diff --git a/src/status_im/chat/commands/impl/transactions.cljs b/src/status_im/chat/commands/impl/transactions.cljs index 31242d4474..b77d41fbee 100644 --- a/src/status_im/chat/commands/impl/transactions.cljs +++ b/src/status_im/chat/commands/impl/transactions.cljs @@ -183,7 +183,7 @@ [react/touchable-highlight {:on-press #(when tx-exists? (re-frame/dispatch [:show-transaction-details tx-hash]))} [react/view transactions-styles/command-send-status-container - [vector-icons/icon (if confirmed? :icons/check :icons/dots) + [vector-icons/icon (if confirmed? :main-icons/check :main-icons/more) {:color (if outgoing colors/blue-light colors/blue) :container-style (transactions-styles/command-send-status-icon outgoing)}] [react/view diff --git a/src/status_im/ui/components/common/common.cljs b/src/status_im/ui/components/common/common.cljs index 70c8b40031..23f4d48e2c 100644 --- a/src/status_im/ui/components/common/common.cljs +++ b/src/status_im/ui/components/common/common.cljs @@ -51,7 +51,7 @@ [react/view [react/view styles/network-container [react/view styles/network-icon - [vector-icons/icon :icons/network {:color :white}]] + [vector-icons/icon :main-icons/network {:color :white}]] [react/text {:style (styles/network-text text-color)} (cond (ethereum/testnet? network-id) (i18n/label :t/testnet-text {:testnet (get-in ethereum/chains [(ethereum/chain-id->chain-keyword network-id) :name] "Unknown")}) @@ -79,14 +79,14 @@ [react/touchable-highlight {:on-press on-press :disabled disabled?} [react/view (styles/bottom-button disabled?) (when back? - [icons/icon :icons/back {:color colors/blue - :container-style {:align-self :baseline}}]) - [react/text {:style styles/bottom-button-label + [icons/icon :main-icons/back {:color colors/blue + :container-style {:align-self :baseline}}]) + [react/text {:style styles/bottom-button-label :accessibility-label accessibility-label - :uppercase? uppercase?} + :uppercase? uppercase?} (or label (i18n/label :t/next))] (when forward? - [icons/icon :icons/forward {:color colors/blue}])]]) + [icons/icon :main-icons/next {:color colors/blue}])]]) (defn button [{:keys [on-press label background? uppercase? button-style label-style] :or {background? true uppercase? true}}] [react/touchable-highlight {:on-press on-press} diff --git a/src/status_im/ui/components/contact/contact.cljs b/src/status_im/ui/components/contact/contact.cljs index e570895e1a..b7b28c0441 100644 --- a/src/status_im/ui/components/contact/contact.cljs +++ b/src/status_im/ui/components/contact/contact.cljs @@ -47,7 +47,7 @@ [contact-inner-view {:contact contact :info info :style style :props inner-props}] (when show-forward? [react/view styles/forward-btn - [vector-icons/icon :icons/forward]]) + [vector-icons/icon :main-icons/next]]) (when (and extended? (not (empty? extend-options))) (if platform/desktop? (desktop-extended-options extend-options) @@ -56,7 +56,7 @@ :title extend-title}) :accessibility-label :menu-option} [react/view styles/more-btn - [vector-icons/icon :icons/options {:accessibility-label :options}]]]]))]]) + [vector-icons/icon :main-icons/more {:accessibility-label :options}]]]]))]]) (views/defview toggle-contact-view [{:keys [public-key] :as contact} selected-key on-toggle-handler disabled?] (views/letsubs [checked [selected-key public-key]] diff --git a/src/status_im/ui/components/desktop/tabs.cljs b/src/status_im/ui/components/desktop/tabs.cljs index 4585988483..4b470b2409 100644 --- a/src/status_im/ui/components/desktop/tabs.cljs +++ b/src/status_im/ui/components/desktop/tabs.cljs @@ -13,25 +13,21 @@ (def tabs-list-data [{:view-id :home :content {:title "Home" - :icon-inactive :icons/home - :icon-active :icons/home-active} + :icon :main-icons/home} :count-subscription :chats/unread-messages-number} #_{:view-id :wallet :content {:title "Wallet" - :icon-inactive :icons/wallet - :icon-active :icons/wallet-active}} + :icon :main-icons/wallet}} {:view-id :profile :content {:title "Profile" - :icon-inactive :icons/profile - :icon-active :icons/profile-active} + :icon :main-icons/user-profile} :count-subscription :get-profile-unread-messages-number}]) -(defn- tab-content [{:keys [title icon-active icon-inactive]}] +(defn- tab-content [{:keys [title icon]}] (fn [active? cnt] [react/view {:style tabs.styles/tab-container} - (let [icon (if active? icon-active icon-inactive)] - [react/view - [icons/icon icon {:style {:tint-color (if active? colors/blue colors/black)}}]]) + [react/view + [icons/icon icon {:style {:tint-color (if active? colors/blue colors/black)}}]] [react/view [react/text {:style (tabs.styles/tab-title active?)} title]]])) diff --git a/src/status_im/ui/components/desktop/views.cljs b/src/status_im/ui/components/desktop/views.cljs index ebd2e47de4..ce5283ba0c 100644 --- a/src/status_im/ui/components/desktop/views.cljs +++ b/src/status_im/ui/components/desktop/views.cljs @@ -12,7 +12,7 @@ [react/touchable-highlight {:style checkbox.styles/wrapper :on-press #(do (when on-value-change (on-value-change (not checked?))))} [react/view {:style (checkbox.styles/icon-check-container checked?)} (when checked? - [icons/icon :icons/ok {:style checkbox.styles/check-icon}])]]) + [icons/icon :main-icons/check {:style checkbox.styles/check-icon}])]]) ;; TODO copy-pate with minimum modifications of status-react components @@ -82,5 +82,5 @@ [react/view {:style {:position :absolute :left 32 :top 32 :z-index 1000}} [react/touchable-highlight {:on-press on-press} [react/view {:style {:flex-direction :row :align-items :center}} - [icons/icon :icons/back {:color :white}] - [react/text {:style {:margin-left 16 :font-size 15 :color :white}} "Back"]]]]) \ No newline at end of file + [icons/icon :main-icons/back {:color :white}] + [react/text {:style {:margin-left 16 :font-size 15 :color :white}} "Back"]]]]) diff --git a/src/status_im/ui/components/icons/vector_icons.cljs b/src/status_im/ui/components/icons/vector_icons.cljs index 09a47b6955..ab2452dc75 100644 --- a/src/status_im/ui/components/icons/vector_icons.cljs +++ b/src/status_im/ui/components/icons/vector_icons.cljs @@ -30,179 +30,196 @@ (def icons (if platform/desktop? - {:main-icons/add (js/require "./resources/icons/main/add.svg") - :main-icons/cancel (js/require "./resources/icons/main/cancel.svg") - :main-icons/group-chat (js/require "./resources/icons/main/group_chat.svg") - :main-icons/in-contacts (js/require "./resources/icons/main/in_contacts.svg") - :main-icons/message (js/require "./resources/icons/main/message.svg") - :main-icons/send (js/require "./resources/icons/main/send.svg") - :main-icons/share (js/require "./resources/icons/main/share.svg") - :tiny-icons/tiny-group (js/require "./resources/icons/tiny/tiny_group.svg") - :icons/discover (js/require "./resources/icons/bottom/discover_gray.svg") - - :icons/home (js/require "./resources/icons/bottom/home_gray.svg") - :icons/home-active (js/require "./resources/icons/bottom/home_blue.svg") - :icons/profile (js/require "./resources/icons/bottom/profile_gray.svg") - :icons/profile-active (js/require "./resources/icons/bottom/profile_blue.svg") - :icons/wallet (js/require "./resources/icons/bottom/wallet_gray.svg") - :icons/wallet-active (js/require "./resources/icons/bottom/wallet_active.svg") - :icons/speaker (js/require "./resources/icons/speaker.svg") - :icons/speaker-off (js/require "./resources/icons/speaker_off.svg") - :icons/transaction-history (js/require "./resources/icons/transaction_history.svg") - :icons/add-contact (js/require "./resources/icons/add_contact.svg") - :icons/add-wallet (js/require "./resources/icons/add_wallet.svg") - :icons/address (js/require "./resources/icons/address.svg") - :icons/arrow-left (js/require "./resources/icons/arrow_left.svg") - :icons/arrow-right (js/require "./resources/icons/arrow_right.svg") - :icons/flash-active (js/require "./resources/icons/flash_active.svg") - :icons/flash-inactive (js/require "./resources/icons/flash_inactive.svg") - :icons/attach (js/require "./resources/icons/attach.svg") - :icons/browse (js/require "./resources/icons/browse.svg") - :icons/close (js/require "./resources/icons/close.svg") - :icons/copy-from (js/require "./resources/icons/copy_from.svg") - :icons/delete (js/require "./resources/icons/delete.svg") - :icons/desktop (js/require "./resources/icons/desktop.svg") - :icons/dots-horizontal (js/require "./resources/icons/dots_horizontal.svg") - :icons/dots-vertical (js/require "./resources/icons/dots_vertical.svg") - :icons/exclamation-mark (js/require "./resources/icons/exclamation_mark.svg") - :icons/filter (js/require "./resources/icons/filter.svg") - :icons/fullscreen (js/require "./resources/icons/fullscreen.svg") - :icons/chats (js/require "./resources/icons/chats.svg") - :icons/hamburger (js/require "./resources/icons/hamburger.svg") - :icons/hidden (js/require "./resources/icons/hidden.svg") - :icons/lock (js/require "./resources/icons/lock.svg") - :icons/mic (js/require "./resources/icons/mic.svg") - :icons/mobile (js/require "./resources/icons/mobile.svg") - :icons/ok (js/require "./resources/icons/ok.svg") - :icons/public (js/require "./resources/icons/public.svg") - :icons/public-chat (js/require "./resources/icons/public_chat.svg") - :icons/qr (js/require "./resources/icons/QR.svg") - :icons/input-commands (js/require "./resources/icons/input_commands.svg") - :icons/input-send (js/require "./resources/icons/input_send.svg") - :icons/back (js/require "./resources/icons/back.svg") - :icons/forward (js/require "./resources/icons/forward.svg") - :icons/dropdown-up (js/require "./resources/icons/dropdown_up.svg") - :icons/up (js/require "./resources/icons/up.svg") - :icons/down (js/require "./resources/icons/down.svg") - :icons/grab (js/require "./resources/icons/grab.svg") - :icons/tooltip-triangle (js/require "./resources/icons/tooltip-triangle.svg") - :icons/open (js/require "./resources/icons/open.svg") - :icons/network (js/require "./resources/icons/network.svg") - :icons/mailserver (js/require "./resources/icons/mailserver.svg") - :icons/log-level (js/require "./resources/icons/mailserver.svg") - :icons/fleet (js/require "./resources/icons/mailserver.svg") - :icons/refresh (js/require "./resources/icons/refresh.svg") - :icons/newchat (js/require "./resources/icons/newchat.svg") - :icons/logo (js/require "./resources/icons/logo.svg") - :icons/logout (js/require "./resources/icons/logout.svg") - :icons/camera (js/require "./resources/icons/camera.svg") - :icons/check (js/require "./resources/icons/check.svg") - :icons/dots (js/require "./resources/icons/dots.svg") - :icons/warning (js/require "./resources/icons/warning.svg") - :icons/info (js/require "./resources/icons/info.svg") - :icons/link (js/require "./resources/icons/link.svg") - :icons/hardwallet (js/require "./resources/icons/hardwallet.svg") - :icons/password (js/require "./resources/icons/password.svg") - :icons/nfc (js/require "./resources/icons/nfc.svg") - :icons/reply (js/require "./resources/icons/reply.svg") - :icons/indicator-big (js/require "./resources/icons/indicator-big.svg") - :icons/indicator-middle (js/require "./resources/icons/indicator-middle.svg") - :icons/indicator-small (js/require "./resources/icons/indicator-small.svg") - :icons/stickers (js/require "./resources/icons/stickers.svg") - :icons/dapp (js/require "./resources/icons/dapp.svg")} - {:main-icons/add (components.svg/slurp-svg "./resources/icons/main/add.svg") - :main-icons/cancel (components.svg/slurp-svg "./resources/icons/main/cancel.svg") - :main-icons/group-chat (components.svg/slurp-svg "./resources/icons/main/group_chat.svg") - :main-icons/in-contacts (components.svg/slurp-svg "./resources/icons/main/in_contacts.svg") - :main-icons/message (components.svg/slurp-svg "./resources/icons/main/message.svg") - :main-icons/send (components.svg/slurp-svg "./resources/icons/main/send.svg") - :main-icons/share (components.svg/slurp-svg "./resources/icons/main/share.svg") - :tiny-icons/tiny-group (components.svg/slurp-svg "./resources/icons/tiny/tiny_group.svg") - :icons/discover (components.svg/slurp-svg "./resources/icons/bottom/discover_gray.svg") - :icons/contacts (components.svg/slurp-svg "./resources/icons/bottom/contacts_gray.svg") - :icons/home (components.svg/slurp-svg "./resources/icons/bottom/home_gray.svg") - :icons/home-active (components.svg/slurp-svg "./resources/icons/bottom/home_blue.svg") - :icons/profile (components.svg/slurp-svg "./resources/icons/bottom/profile_gray.svg") - :icons/profile-active (components.svg/slurp-svg "./resources/icons/bottom/profile_blue.svg") - :icons/wallet (components.svg/slurp-svg "./resources/icons/bottom/wallet_gray.svg") - :icons/wallet-active (components.svg/slurp-svg "./resources/icons/bottom/wallet_active.svg") - :icons/speaker (components.svg/slurp-svg "./resources/icons/speaker.svg") - :icons/speaker-off (components.svg/slurp-svg "./resources/icons/speaker_off.svg") - :icons/transaction-history (components.svg/slurp-svg "./resources/icons/transaction_history.svg") - :icons/add-contact (components.svg/slurp-svg "./resources/icons/add_contact.svg") - :icons/add-wallet (components.svg/slurp-svg "./resources/icons/add_wallet.svg") - :icons/address (components.svg/slurp-svg "./resources/icons/address.svg") - :icons/arrow-left (components.svg/slurp-svg "./resources/icons/arrow_left.svg") - :icons/angle-arrow-left (components.svg/slurp-svg "./resources/icons/angle_arrow_left.svg") - :icons/arrow-right (components.svg/slurp-svg "./resources/icons/arrow_right.svg") - :icons/angle-arrow-right (components.svg/slurp-svg "./resources/icons/angle_arrow_right.svg") - :icons/list-page (components.svg/slurp-svg "./resources/icons/list_page.svg") - :icons/flash-active (components.svg/slurp-svg "./resources/icons/flash_active.svg") - :icons/flash-inactive (components.svg/slurp-svg "./resources/icons/flash_inactive.svg") - :icons/attach (components.svg/slurp-svg "./resources/icons/attach.svg") - :icons/browse (components.svg/slurp-svg "./resources/icons/browse.svg") - :icons/close (components.svg/slurp-svg "./resources/icons/close.svg") - :icons/copy-from (components.svg/slurp-svg "./resources/icons/copy_from.svg") - :icons/delete (components.svg/slurp-svg "./resources/icons/delete.svg") - :icons/desktop (components.svg/slurp-svg "./resources/icons/desktop.svg") - :icons/dots-horizontal (components.svg/slurp-svg "./resources/icons/dots_horizontal.svg") - :icons/dots-vertical (components.svg/slurp-svg "./resources/icons/dots_vertical.svg") - :icons/exclamation-mark (components.svg/slurp-svg "./resources/icons/exclamation_mark.svg") - :icons/filter (components.svg/slurp-svg "./resources/icons/filter.svg") - :icons/fullscreen (components.svg/slurp-svg "./resources/icons/fullscreen.svg") - :icons/chats (components.svg/slurp-svg "./resources/icons/chats.svg") - :icons/hamburger (components.svg/slurp-svg "./resources/icons/hamburger.svg") - :icons/hidden (components.svg/slurp-svg "./resources/icons/hidden.svg") - :icons/lock (components.svg/slurp-svg "./resources/icons/lock.svg") - :icons/lock-opened (components.svg/slurp-svg "./resources/icons/lock_opened.svg") - :icons/mic (components.svg/slurp-svg "./resources/icons/mic.svg") - :icons/mobile (components.svg/slurp-svg "./resources/icons/mobile.svg") - :icons/ok (components.svg/slurp-svg "./resources/icons/ok.svg") - :icons/public (components.svg/slurp-svg "./resources/icons/public.svg") - :icons/public-chat (components.svg/slurp-svg "./resources/icons/public_chat.svg") - :icons/qr (components.svg/slurp-svg "./resources/icons/QR.svg") - :icons/input-commands (components.svg/slurp-svg "./resources/icons/input_commands.svg") - :icons/input-send (components.svg/slurp-svg "./resources/icons/input_send.svg") - :icons/back (components.svg/slurp-svg "./resources/icons/back.svg") - :icons/forward (components.svg/slurp-svg "./resources/icons/forward.svg") - :icons/dropdown-up (components.svg/slurp-svg "./resources/icons/dropdown_up.svg") - :icons/up (components.svg/slurp-svg "./resources/icons/up.svg") - :icons/down (components.svg/slurp-svg "./resources/icons/down.svg") - :icons/grab (components.svg/slurp-svg "./resources/icons/grab.svg") - :icons/tooltip-triangle (components.svg/slurp-svg "./resources/icons/tooltip-triangle.svg") - :icons/open (components.svg/slurp-svg "./resources/icons/open.svg") - :icons/network (components.svg/slurp-svg "./resources/icons/network.svg") - :icons/mailserver (components.svg/slurp-svg "./resources/icons/mailserver.svg") - :icons/log-level (components.svg/slurp-svg "./resources/icons/mailserver.svg") - :icons/fleet (components.svg/slurp-svg "./resources/icons/mailserver.svg") - :icons/refresh (components.svg/slurp-svg "./resources/icons/refresh.svg") - :icons/newchat (components.svg/slurp-svg "./resources/icons/newchat.svg") - :icons/logo (components.svg/slurp-svg "./resources/icons/logo.svg") - :icons/logout (components.svg/slurp-svg "./resources/icons/logout.svg") - :icons/camera (components.svg/slurp-svg "./resources/icons/camera.svg") - :icons/check (components.svg/slurp-svg "./resources/icons/check.svg") - :icons/tiny-check (components.svg/slurp-svg "./resources/icons/tiny_check.svg") - :icons/dots (components.svg/slurp-svg "./resources/icons/dots.svg") - :icons/warning (components.svg/slurp-svg "./resources/icons/warning.svg") - :icons/settings (components.svg/slurp-svg "./resources/icons/settings.svg") - :icons/info (components.svg/slurp-svg "./resources/icons/info.svg") - :icons/link (components.svg/slurp-svg "./resources/icons/link.svg") - :icons/hardwallet (components.svg/slurp-svg "./resources/icons/hardwallet.svg") - :icons/password (components.svg/slurp-svg "./resources/icons/password.svg") - :icons/nfc (components.svg/slurp-svg "./resources/icons/nfc.svg") - :icons/reply (components.svg/slurp-svg "./resources/icons/reply.svg") - :icons/indicator-big (components.svg/slurp-svg "./resources/icons/indicator-big.svg") - :icons/indicator-middle (components.svg/slurp-svg "./resources/icons/indicator-middle.svg") - :icons/indicator-small (components.svg/slurp-svg "./resources/icons/indicator-small.svg") - :icons/stickers (components.svg/slurp-svg "./resources/icons/stickers.svg") - :icons/stickers-big (components.svg/slurp-svg "./resources/icons/stickers_big.svg") - :icons/clock (components.svg/slurp-svg "./resources/icons/clock.svg") - :icons/dapp (components.svg/slurp-svg "./resources/icons/dapp.svg")})) - -(defn normalize-property-name [n] - (if (= n :icons/options) - (if platform/ios? :icons/dots-horizontal :icons/dots-vertical) - n)) + {;; Main icons + :main-icons/add (js/require "./resources/icons/main/add.svg") + :main-icons/add-contact (js/require "./resources/icons/main/add_contact.svg") + :main-icons/address (js/require "./resources/icons/main/address.svg") + :main-icons/advanced-settings (js/require "./resources/icons/main/advanced_settings.svg") + :main-icons/arrow-left (js/require "./resources/icons/main/arrow_left.svg") + :main-icons/arrow-right (js/require "./resources/icons/main/arrow_right.svg") + :main-icons/arrow-up (js/require "./resources/icons/main/arrow_up.svg") + :main-icons/back (js/require "./resources/icons/main/back.svg") + :main-icons/backspace (js/require "./resources/icons/main/backspace.svg") + :main-icons/browser (js/require "./resources/icons/main/browser.svg") + :main-icons/browser-home (js/require "./resources/icons/main/browser_home.svg") + :main-icons/camera (js/require "./resources/icons/main/camera.svg") + :main-icons/cancel (js/require "./resources/icons/main/cancel.svg") + :main-icons/change (js/require "./resources/icons/main/change.svg") + :main-icons/check (js/require "./resources/icons/main/check.svg") + :main-icons/close (js/require "./resources/icons/main/close.svg") + :main-icons/commands (js/require "./resources/icons/main/commands.svg") + :main-icons/copy (js/require "./resources/icons/main/copy.svg") + :main-icons/dapp (js/require "./resources/icons/main/dapp.svg") + :main-icons/delete (js/require "./resources/icons/main/delete.svg") + :main-icons/desktop (js/require "./resources/icons/main/desktop.svg") + :main-icons/dropdown (js/require "./resources/icons/main/dropdown.svg") + :main-icons/dropdown-up (js/require "./resources/icons/main/dropdown_up.svg") + :main-icons/edit (js/require "./resources/icons/main/edit.svg") + :main-icons/filter (js/require "./resources/icons/main/filter.svg") + :main-icons/flash-active (js/require "./resources/icons/main/flash_active.svg") + :main-icons/flash-inactive (js/require "./resources/icons/main/flash_inactive.svg") + :main-icons/fleet (js/require "./resources/icons/main/mailserver.svg") + :main-icons/group-chat (js/require "./resources/icons/main/group_chat.svg") + :main-icons/help (js/require "./resources/icons/main/help.svg") + :main-icons/history (js/require "./resources/icons/main/history.svg") + :main-icons/home (js/require "./resources/icons/main/home.svg") + :main-icons/in-contacts (js/require "./resources/icons/main/in_contacts.svg") + :main-icons/info (js/require "./resources/icons/main/info.svg") + :main-icons/keycard (js/require "./resources/icons/main/keycard.svg") + :main-icons/language (js/require "./resources/icons/main/language.svg") + :main-icons/link (js/require "./resources/icons/main/link.svg") + :main-icons/log-level (js/require "./resources/icons/main/mailserver.svg") + :main-icons/logout (js/require "./resources/icons/main/logout.svg") + :main-icons/mailserver (js/require "./resources/icons/main/mailserver.svg") + :main-icons/make_admin (js/require "./resources/icons/main/make_admin.svg") + :main-icons/max (js/require "./resources/icons/main/max.svg") + :main-icons/message (js/require "./resources/icons/main/message.svg") + :main-icons/mobile (js/require "./resources/icons/main/mobile.svg") + :main-icons/more (js/require "./resources/icons/main/more.svg") + :main-icons/network (js/require "./resources/icons/main/network.svg") + :main-icons/next (js/require "./resources/icons/main/next.svg") + :main-icons/notification (js/require "./resources/icons/main/notification.svg") + :main-icons/paste (js/require "./resources/icons/main/paste.svg") + :main-icons/password (js/require "./resources/icons/main/password.svg") + :main-icons/photo (js/require "./resources/icons/main/photo.svg") + :main-icons/private-chat (js/require "./resources/icons/main/private_chat.svg") + :main-icons/profile (js/require "./resources/icons/main/profile.svg") + :main-icons/public-chat (js/require "./resources/icons/main/public_chat.svg") + :main-icons/qr (js/require "./resources/icons/main/qr.svg") + :main-icons/receive (js/require "./resources/icons/main/receive.svg") + :main-icons/refresh (js/require "./resources/icons/main/refresh.svg") + :main-icons/remove-contact (js/require "./resources/icons/main/remove_contact.svg") + :main-icons/reply (js/require "./resources/icons/main/reply.svg") + :main-icons/search (js/require "./resources/icons/main/search.svg") + :main-icons/security (js/require "./resources/icons/main/security.svg") + :main-icons/send (js/require "./resources/icons/main/send.svg") + :main-icons/settings (js/require "./resources/icons/main/settings.svg") + :main-icons/share (js/require "./resources/icons/main/share.svg") + :main-icons/stickers (js/require "./resources/icons/main/stickers.svg") + :main-icons/text (js/require "./resources/icons/main/text.svg") + :main-icons/tribute-to-talk (js/require "./resources/icons/main/tribute_to_talk.svg") + :main-icons/two-arrows (js/require "./resources/icons/main/two_arrows.svg") + :main-icons/user-profile (js/require "./resources/icons/main/user_profile.svg") + :main-icons/username (js/require "./resources/icons/main/username.svg") + :main-icons/wallet (js/require "./resources/icons/main/wallet.svg") + :main-icons/warning (js/require "./resources/icons/main/warning.svg") + :main-icons/wnode (js/require "./resources/icons/main/mailserver.svg") + ;; Tiny icons + :tiny-icons/tiny-arrow-down (js/require "./resources/icons/tiny/tiny_arrow_down.svg") + :tiny-icons/tiny-check (js/require "./resources/icons/tiny/tiny_check.svg") + :tiny-icons/tiny-external (js/require "./resources/icons/tiny/tiny_external.svg") + :tiny-icons/tiny-group (js/require "./resources/icons/tiny/tiny_group.svg") + :tiny-icons/tiny-lock (js/require "./resources/icons/tiny/tiny_lock.svg") + :tiny-icons/tiny-lock-broken (js/require "./resources/icons/tiny/tiny_lock_broken.svg") + :tiny-icons/tiny-new-contact (js/require "./resources/icons/tiny/tiny_new_contact.svg") + :tiny-icons/tiny-public (js/require "./resources/icons/tiny/tiny_public.svg") + :tiny-icons/tiny-reply (js/require "./resources/icons/tiny/tiny_reply.svg") + :tiny-icons/tiny-settings (js/require "./resources/icons/tiny/tiny_settings.svg") + :tiny-icons/tribute-to-talk (js/require "./resources/icons/tiny/tribute_to_talk.svg") + ;; Stickers icons + :sticker-icons/stickers-big (js/require "./resources/icons/stickers/stickers_big.svg") + :sticker-icons/recent (js/require "./resources/icons/stickers/recent.svg") + ;; Old icons + :icons/tooltip-triangle (js/require "./resources/icons/tooltip-triangle.svg") + :icons/logo (js/require "./resources/icons/logo.svg") + :icons/indicator-big (js/require "./resources/icons/indicator-big.svg") + :icons/indicator-middle (js/require "./resources/icons/indicator-middle.svg") + :icons/indicator-small (js/require "./resources/icons/indicator-small.svg")} + {;; Main icons + :main-icons/add (components.svg/slurp-svg "./resources/icons/main/add.svg") + :main-icons/add-contact (components.svg/slurp-svg "./resources/icons/main/add_contact.svg") + :main-icons/address (components.svg/slurp-svg "./resources/icons/main/address.svg") + :main-icons/advanced-settings (components.svg/slurp-svg "./resources/icons/main/advanced_settings.svg") + :main-icons/arrow-left (components.svg/slurp-svg "./resources/icons/main/arrow_left.svg") + :main-icons/arrow-right (components.svg/slurp-svg "./resources/icons/main/arrow_right.svg") + :main-icons/arrow-up (components.svg/slurp-svg "./resources/icons/main/arrow_up.svg") + :main-icons/back (components.svg/slurp-svg "./resources/icons/main/back.svg") + :main-icons/backspace (components.svg/slurp-svg "./resources/icons/main/backspace.svg") + :main-icons/browser (components.svg/slurp-svg "./resources/icons/main/browser.svg") + :main-icons/browser-home (components.svg/slurp-svg "./resources/icons/main/browser_home.svg") + :main-icons/camera (components.svg/slurp-svg "./resources/icons/main/camera.svg") + :main-icons/cancel (components.svg/slurp-svg "./resources/icons/main/cancel.svg") + :main-icons/change (components.svg/slurp-svg "./resources/icons/main/change.svg") + :main-icons/check (components.svg/slurp-svg "./resources/icons/main/check.svg") + :main-icons/close (components.svg/slurp-svg "./resources/icons/main/close.svg") + :main-icons/commands (components.svg/slurp-svg "./resources/icons/main/commands.svg") + :main-icons/copy (components.svg/slurp-svg "./resources/icons/main/copy.svg") + :main-icons/dapp (components.svg/slurp-svg "./resources/icons/main/dapp.svg") + :main-icons/delete (components.svg/slurp-svg "./resources/icons/main/delete.svg") + :main-icons/desktop (components.svg/slurp-svg "./resources/icons/main/desktop.svg") + :main-icons/dropdown (components.svg/slurp-svg "./resources/icons/main/dropdown.svg") + :main-icons/dropdown-up (components.svg/slurp-svg "./resources/icons/main/dropdown_up.svg") + :main-icons/edit (components.svg/slurp-svg "./resources/icons/main/edit.svg") + :main-icons/filter (components.svg/slurp-svg "./resources/icons/main/filter.svg") + :main-icons/flash-active (components.svg/slurp-svg "./resources/icons/main/flash_active.svg") + :main-icons/flash-inactive (components.svg/slurp-svg "./resources/icons/main/flash_inactive.svg") + :main-icons/fleet (components.svg/slurp-svg "./resources/icons/main/mailserver.svg") + :main-icons/group-chat (components.svg/slurp-svg "./resources/icons/main/group_chat.svg") + :main-icons/help (components.svg/slurp-svg "./resources/icons/main/help.svg") + :main-icons/history (components.svg/slurp-svg "./resources/icons/main/history.svg") + :main-icons/home (components.svg/slurp-svg "./resources/icons/main/home.svg") + :main-icons/in-contacts (components.svg/slurp-svg "./resources/icons/main/in_contacts.svg") + :main-icons/info (components.svg/slurp-svg "./resources/icons/main/info.svg") + :main-icons/keycard (components.svg/slurp-svg "./resources/icons/main/keycard.svg") + :main-icons/language (components.svg/slurp-svg "./resources/icons/main/language.svg") + :main-icons/link (components.svg/slurp-svg "./resources/icons/main/link.svg") + :main-icons/log-level (components.svg/slurp-svg "./resources/icons/main/mailserver.svg") + :main-icons/logout (components.svg/slurp-svg "./resources/icons/main/logout.svg") + :main-icons/mailserver (components.svg/slurp-svg "./resources/icons/main/mailserver.svg") + :main-icons/make-admin (components.svg/slurp-svg "./resources/icons/main/make_admin.svg") + :main-icons/max (components.svg/slurp-svg "./resources/icons/main/max.svg") + :main-icons/message (components.svg/slurp-svg "./resources/icons/main/message.svg") + :main-icons/mobile (components.svg/slurp-svg "./resources/icons/main/mobile.svg") + :main-icons/more (components.svg/slurp-svg "./resources/icons/main/more.svg") + :main-icons/network (components.svg/slurp-svg "./resources/icons/main/network.svg") + :main-icons/next (components.svg/slurp-svg "./resources/icons/main/next.svg") + :main-icons/notification (components.svg/slurp-svg "./resources/icons/main/notification.svg") + :main-icons/password (components.svg/slurp-svg "./resources/icons/main/password.svg") + :main-icons/paste (components.svg/slurp-svg "./resources/icons/main/paste.svg") + :main-icons/photo (components.svg/slurp-svg "./resources/icons/main/photo.svg") + :main-icons/private-chat (components.svg/slurp-svg "./resources/icons/main/private_chat.svg") + :main-icons/profile (components.svg/slurp-svg "./resources/icons/main/profile.svg") + :main-icons/public-chat (components.svg/slurp-svg "./resources/icons/main/public_chat.svg") + :main-icons/qr (components.svg/slurp-svg "./resources/icons/main/qr.svg") + :main-icons/receive (components.svg/slurp-svg "./resources/icons/main/receive.svg") + :main-icons/refresh (components.svg/slurp-svg "./resources/icons/main/refresh.svg") + :main-icons/remove_contact (components.svg/slurp-svg "./resources/icons/main/remove_contact.svg") + :main-icons/reply (components.svg/slurp-svg "./resources/icons/main/reply.svg") + :main-icons/search (components.svg/slurp-svg "./resources/icons/main/search.svg") + :main-icons/security (components.svg/slurp-svg "./resources/icons/main/security.svg") + :main-icons/send (components.svg/slurp-svg "./resources/icons/main/send.svg") + :main-icons/settings (components.svg/slurp-svg "./resources/icons/main/settings.svg") + :main-icons/share (components.svg/slurp-svg "./resources/icons/main/share.svg") + :main-icons/stickers (components.svg/slurp-svg "./resources/icons/main/stickers.svg") + :main-icons/text (components.svg/slurp-svg "./resources/icons/main/text.svg") + :main-icons/tribute-to-talk (components.svg/slurp-svg "./resources/icons/main/tribute_to_talk.svg") + :main-icons/two-arrows (components.svg/slurp-svg "./resources/icons/main/two_arrows.svg") + :main-icons/user-profile (components.svg/slurp-svg "./resources/icons/main/user_profile.svg") + :main-icons/username (components.svg/slurp-svg "./resources/icons/main/username.svg") + :main-icons/wallet (components.svg/slurp-svg "./resources/icons/main/wallet.svg") + :main-icons/warning (components.svg/slurp-svg "./resources/icons/main/warning.svg") + :main-icons/wnode (components.svg/slurp-svg "./resources/icons/main/mailserver.svg") + ;; Tiny icons + :tiny-icons/tiny-arrow-down (components.svg/slurp-svg "./resources/icons/tiny/tiny_arrow_down.svg") + :tiny-icons/tiny-check (components.svg/slurp-svg "./resources/icons/tiny/tiny_check.svg") + :tiny-icons/tiny-external (components.svg/slurp-svg "./resources/icons/tiny/tiny_external.svg") + :tiny-icons/tiny-group (components.svg/slurp-svg "./resources/icons/tiny/tiny_group.svg") + :tiny-icons/tiny-new-contact (components.svg/slurp-svg "./resources/icons/tiny/tiny_new_contact.svg") + :tiny-icons/tiny-lock (components.svg/slurp-svg "./resources/icons/tiny/tiny_lock.svg") + :tiny-icons/tiny-lock-broken (components.svg/slurp-svg "./resources/icons/tiny/tiny_lock_broken.svg") + :tiny-icons/tiny-public (components.svg/slurp-svg "./resources/icons/tiny/tiny_public.svg") + :tiny-icons/tiny-reply (components.svg/slurp-svg "./resources/icons/tiny/tiny_reply.svg") + :tiny-icons/tiny-settings (components.svg/slurp-svg "./resources/icons/tiny/tiny_settings.svg") + :tiny-icons/tribute-to-talk (components.svg/slurp-svg "./resources/icons/tiny/tribute_to_talk.svg") + ;; Stickers icons + :stickers-icons/stickers-big (components.svg/slurp-svg "./resources/icons/stickers/stickers_big.svg") + :stickers-icons/recent (components.svg/slurp-svg "./resources/icons/stickers/recent.svg") + ;; Old icons + :icons/tooltip-triangle (components.svg/slurp-svg "./resources/icons/tooltip-triangle.svg") + :icons/logo (components.svg/slurp-svg "./resources/icons/logo.svg") + :icons/indicator-big (components.svg/slurp-svg "./resources/icons/indicator-big.svg") + :icons/indicator-middle (components.svg/slurp-svg "./resources/icons/indicator-middle.svg") + :icons/indicator-small (components.svg/slurp-svg "./resources/icons/indicator-small.svg")})) (defn- match-color [color] (cond @@ -230,7 +247,7 @@ color-style {:tint-color (match-color color)}] [react/view {:style container-style :accessibility-label accessibility-label} - [react/image {:source (get icons (normalize-property-name name)) + [react/image {:source (get icons name) :style (merge icon-style color-style style)}]])) (defn mobile-icon @@ -239,7 +256,7 @@ ^{:key name} [react/animated-view {:style container-style :accessibility-label accessibility-label} - (if-let [icon-fn (get icons (normalize-property-name name))] + (if-let [icon-fn (get icons name)] (let [icon-vec (icon-fn (match-color color))] (if width (update icon-vec 1 assoc :width width :height height) diff --git a/src/status_im/ui/components/list/views.cljs b/src/status_im/ui/components/list/views.cljs index 999ad7b5b9..cce50c7765 100644 --- a/src/status_im/ui/components/list/views.cljs +++ b/src/status_im/ui/components/list/views.cljs @@ -99,7 +99,7 @@ [touchable-item handler item])) (def item-icon-forward - [item-icon {:icon :icons/forward + [item-icon {:icon :main-icons/next :style {:width 12} :icon-opts {:color colors/white}}]) @@ -133,7 +133,7 @@ :uppercase? true} (str accessory-value)]) (when-not hide-chevron? - [vector-icons/icon :icons/forward {:color (colors/alpha colors/gray 0.4)}])]]) + [vector-icons/icon :main-icons/next {:color (colors/alpha colors/gray 0.4)}])]]) (defn- wrap-render-fn [f] (fn [data] @@ -269,4 +269,4 @@ [react/touchable-highlight {:style styles/delete-icon-highlight :on-press on-delete} [react/view {:style styles/delete-icon-container} - [vector-icons/icon :icons/delete {:color colors/red}]]]]]))) + [vector-icons/icon :main-icons/delete {:color colors/red}]]]]]))) diff --git a/src/status_im/ui/components/list_item/views.cljs b/src/status_im/ui/components/list_item/views.cljs index 0497020721..ad04b16bc4 100644 --- a/src/status_im/ui/components/list_item/views.cljs +++ b/src/status_im/ui/components/list_item/views.cljs @@ -39,8 +39,8 @@ [react/text {:style styles/accessory-text} accessory] (= :chevron accessory) - [icons/icon :icons/forward {:color colors/gray-transparent-40}] + [icons/icon :main-icons/next {:color colors/gray-transparent-40}] (= :check accessory) - [icons/icon :icons/ok {:color colors/gray}] + [icons/icon :main-icons/check {:color colors/gray}] :else accessory) - {:key accessory}))]])) \ No newline at end of file + {:key accessory}))]])) diff --git a/src/status_im/ui/components/toolbar/actions.cljs b/src/status_im/ui/components/toolbar/actions.cljs index afd293af49..7e6b0e732b 100644 --- a/src/status_im/ui/components/toolbar/actions.cljs +++ b/src/status_im/ui/components/toolbar/actions.cljs @@ -8,11 +8,11 @@ :handler handler}) (defn opts [options] - {:icon :icons/options + {:icon :main-icons/more :options options}) (defn back [handler] - {:icon :icons/back + {:icon :main-icons/back :handler handler :accessibility-label :back-button}) @@ -27,28 +27,24 @@ (back home-handler)) (defn back-white [handler] - {:icon :icons/back + {:icon :main-icons/back :icon-opts {:color :white} :handler handler :accessibility-label :back-button}) (defn close [handler] - {:icon :icons/close + {:icon :main-icons/close :handler handler}) (def default-close (close default-handler)) (defn close-white [handler] - {:icon :icons/close + {:icon :main-icons/close :icon-opts {:color :white} :handler handler}) (defn list-white [handler] - {:icon :icons/transaction-history + {:icon :main-icons/two-arrows :icon-opts {:color :white} :handler handler}) - -(defn add-wallet [handler] - {:icon :icons/add-wallet - :handler handler}) diff --git a/src/status_im/ui/components/toolbar/view.cljs b/src/status_im/ui/components/toolbar/view.cljs index 74459c39d2..596d20ba12 100644 --- a/src/status_im/ui/components/toolbar/view.cljs +++ b/src/status_im/ui/components/toolbar/view.cljs @@ -69,7 +69,7 @@ [nav-text props (i18n/label :t/done)]] [react/view - [nav-button (merge props {:icon (or icon :icons/close)})]])) + [nav-button (merge props {:icon (or icon :main-icons/close)})]])) ;; Content diff --git a/src/status_im/ui/components/tooltip/views.cljs b/src/status_im/ui/components/tooltip/views.cljs index 1cb1df9518..7aa39a9074 100644 --- a/src/status_im/ui/components/tooltip/views.cljs +++ b/src/status_im/ui/components/tooltip/views.cljs @@ -31,4 +31,4 @@ [react/text {:style styles/bottom-tooltip-text} label] [react/touchable-highlight {:on-press on-close :style styles/close-icon} - [vector-icons/icon :icons/close {:color colors/white}]]]]])) + [vector-icons/icon :main-icons/close {:color colors/white}]]]]])) diff --git a/src/status_im/ui/screens/accounts/views.cljs b/src/status_im/ui/screens/accounts/views.cljs index a402aeb61e..5aada26645 100644 --- a/src/status_im/ui/screens/accounts/views.cljs +++ b/src/status_im/ui/screens/accounts/views.cljs @@ -24,14 +24,14 @@ :numberOfLines 1} name] (when keycard-instance-uid - [icons/icon :icons/hardwallet {:color colors/blue - :container-style {:margin-left 7}}])] + [icons/icon :main-icons/keycard {:color colors/blue + :container-style {:margin-left 7}}])] [react/text {:style styles/account-badge-pub-key-text :ellipsize-mode :middle :numberOfLines 1} public-key]] [react/view {:flex 1}] - [icons/icon :icons/forward {:color (colors/alpha colors/black 0.4)}]]]) + [icons/icon :main-icons/next {:color (colors/alpha colors/black 0.4)}]]]) (defview accounts [] (letsubs [accounts [:accounts/accounts]] diff --git a/src/status_im/ui/screens/add_new/new_chat/views.cljs b/src/status_im/ui/screens/add_new/new_chat/views.cljs index 83a440724b..ffa24e4584 100644 --- a/src/status_im/ui/screens/add_new/new_chat/views.cljs +++ b/src/status_im/ui/screens/add_new/new_chat/views.cljs @@ -39,7 +39,7 @@ :style add-new.styles/button-container :accessibility-label :scan-contact-code-button} [react/view - [vector-icons/icon :icons/qr {:color colors/blue}]]]] + [vector-icons/icon :main-icons/qr {:color colors/blue}]]]] [react/text {:style styles/error-message} error-message] (when (seq contacts) diff --git a/src/status_im/ui/screens/add_new/new_public_chat/view.cljs b/src/status_im/ui/screens/add_new/new_public_chat/view.cljs index 84763ba089..181b655070 100644 --- a/src/status_im/ui/screens/add_new/new_public_chat/view.cljs +++ b/src/status_im/ui/screens/add_new/new_public_chat/view.cljs @@ -53,7 +53,7 @@ [public-chat-icon topic] [list/item-primary-only topic] - [list/item-icon {:icon :icons/forward + [list/item-icon {:icon :main-icons/next :icon-opts {:color :gray}}]]]]) (def default-public-chats (types/json->clj (slurp "resources/default_public_chats.json"))) diff --git a/src/status_im/ui/screens/add_new/open_dapp/views.cljs b/src/status_im/ui/screens/add_new/open_dapp/views.cljs index d89e76d5fd..1530e07cb6 100644 --- a/src/status_im/ui/screens/add_new/open_dapp/views.cljs +++ b/src/status_im/ui/screens/add_new/open_dapp/views.cljs @@ -57,7 +57,7 @@ (i18n/label :t/dapp)]] [react/view {:margin-top 24} [action-button/action-button {:label (i18n/label :t/open) - :icon :icons/address + :icon :main-icons/address :icon-opts {:color colors/blue} :accessibility-label :open-dapp-button :on-press #(re-frame/dispatch [:browser.ui/open-dapp-button-pressed dapp-url])}] diff --git a/src/status_im/ui/screens/add_new/views.cljs b/src/status_im/ui/screens/add_new/views.cljs index 3c91649c0c..d2af73a930 100644 --- a/src/status_im/ui/screens/add_new/views.cljs +++ b/src/status_im/ui/screens/add_new/views.cljs @@ -18,7 +18,7 @@ [action-button/action-button {:label (i18n/label :t/start-new-chat) :accessibility-label :start-1-1-chat-button - :icon :icons/newchat + :icon :main-icons/add-contact :icon-opts {:color colors/blue} :on-press #(re-frame/dispatch [:navigate-to :new-chat])}] [action-button/action-separator] @@ -32,14 +32,14 @@ [action-button/action-button {:label (i18n/label :t/new-public-group-chat) :accessibility-label :join-public-chat-button - :icon :icons/public + :icon :main-icons/public-chat :icon-opts {:color colors/blue} :on-press #(re-frame/dispatch [:navigate-to :new-public-chat])}] [action-button/action-separator] [action-button/action-button {:label (i18n/label :t/open-dapp) :accessibility-label :open-dapp-button - :icon :icons/address + :icon :main-icons/address :icon-opts {:color colors/blue} :on-press #(re-frame/dispatch [:navigate-to :open-dapp])}] [action-button/action-separator] @@ -53,7 +53,7 @@ [action-button/action-button {:label (i18n/label :t/scan-qr) :accessibility-label :scan-qr-code-button - :icon :icons/qr + :icon :main-icons/qr :icon-opts {:color colors/blue} :on-press #(re-frame/dispatch [:qr-scanner.ui/scan-qr-code-pressed {:toolbar-title (i18n/label :t/scan-qr)} diff --git a/src/status_im/ui/screens/bootnodes_settings/edit_bootnode/views.cljs b/src/status_im/ui/screens/bootnodes_settings/edit_bootnode/views.cljs index 43b5d6c505..588c8c25d1 100644 --- a/src/status_im/ui/screens/bootnodes_settings/edit_bootnode/views.cljs +++ b/src/status_im/ui/screens/bootnodes_settings/edit_bootnode/views.cljs @@ -29,7 +29,7 @@ :bootnodes.callback/qr-code-scanned]) :style styles/qr-code} [react/view - [vector-icons/icon :icons/qr {:color colors/blue}]]]) + [vector-icons/icon :main-icons/qr {:color colors/blue}]]]) (views/defview edit-bootnode [] (views/letsubs [manage-bootnode [:get-manage-bootnode] diff --git a/src/status_im/ui/screens/browser/permissions/views.cljs b/src/status_im/ui/screens/browser/permissions/views.cljs index 8549806bbb..b408e2d267 100644 --- a/src/status_im/ui/screens/browser/permissions/views.cljs +++ b/src/status_im/ui/screens/browser/permissions/views.cljs @@ -80,13 +80,13 @@ (if dapp? [chat-icon.screen/dapp-icon-permission dapp 48] [react/view styles/permissions-panel-dapp-icon-container - [icons/icon :icons/dapp {:color colors/gray}]]) + [icons/icon :main-icons/dapp {:color colors/gray}]]) [react/view {:margin-left 3 :margin-right 3} [react/view styles/dot]] [react/view {:margin-right 3} [react/view styles/dot]] [react/view styles/permissions-panel-ok-icon-container - [icons/icon :icons/ok styles/permissions-panel-ok-ico]] + [icons/icon :main-icons/check styles/permissions-panel-ok-ico]] [react/view {:margin-left 3 :margin-right 3} [react/view styles/dot]] [react/view {:margin-right 3} diff --git a/src/status_im/ui/screens/browser/site_blocked/views.cljs b/src/status_im/ui/screens/browser/site_blocked/views.cljs index 89d352852b..62afc1c193 100644 --- a/src/status_im/ui/screens/browser/site_blocked/views.cljs +++ b/src/status_im/ui/screens/browser/site_blocked/views.cljs @@ -18,7 +18,7 @@ :bounces false :content-container-style styles/container} [react/view styles/container-root-view - [vector-icons/icon :icons/info {:color colors/red}] + [vector-icons/icon :main-icons/info {:color colors/red}] [react/text {:style styles/title-text} (i18n/label :t/browsing-site-blocked-title)] [react/text {:style styles/description-text} diff --git a/src/status_im/ui/screens/browser/views.cljs b/src/status_im/ui/screens/browser/views.cljs index 1182a4d8f0..362d8084d4 100644 --- a/src/status_im/ui/screens/browser/views.cljs +++ b/src/status_im/ui/screens/browser/views.cljs @@ -35,8 +35,8 @@ [react/view (styles/toolbar-content false) [react/touchable-highlight {:on-press #(re-frame/dispatch [:browser.ui/lock-pressed secure?])} (if secure? - [icons/icon :icons/lock {:color colors/green}] - [icons/icon :icons/lock-opened])] + [icons/icon :tiny-icons/tiny-lock {:color colors/green}] + [icons/icon :tiny-icons/tiny-lock-broken])] (if url-editing? [react/text-input {:on-change-text #(reset! url-text %) :on-blur #(re-frame/dispatch [:browser.ui/url-input-blured]) @@ -63,7 +63,7 @@ (when error? (re-frame/dispatch [:browser.ui/remove-browser-pressed browser-id]))))] [toolbar-content url url-original browser url-editing?] - [toolbar.view/actions [{:icon :icons/options + [toolbar.view/actions [{:icon :main-icons/more :icon-opts {:color :black :accessibility-label :chat-menu-button} :handler #(on-options name browser-id)}]]]) @@ -89,20 +89,20 @@ :style (when-not can-go-back? styles/disabled-button) :accessibility-label :previous-page-button} [react/view - [icons/icon :icons/arrow-left]]] + [icons/icon :main-icons/arrow-left]]] [react/touchable-highlight {:on-press #(re-frame/dispatch [:browser.ui/next-page-button-pressed]) :disabled (not can-go-forward?) :style (when-not can-go-forward? styles/disabled-button) :accessibility-label :next-page-button} [react/view - [icons/icon :icons/arrow-right]]] + [icons/icon :main-icons/arrow-right]]] [react/touchable-highlight {:on-press #(re-frame/dispatch [:browser.ui/open-modal-chat-button-pressed (http/url-host url)]) :accessibility-label :modal-chat-button} - [icons/icon :icons/chats]] + [icons/icon :main-icons/message]] [react/touchable-highlight {:on-press #(.reload @webview) :accessibility-label :refresh-page-button} - [icons/icon :icons/refresh]]]) + [icons/icon :main-icons/refresh]]]) ;; should-component-update is called only when component's props are changed, ;; that's why it can't be used in `browser`, because `url` comes from subs diff --git a/src/status_im/ui/screens/chat/input/input.cljs b/src/status_im/ui/screens/chat/input/input.cljs index c75f8e12b3..ff40cc8092 100644 --- a/src/status_im/ui/screens/chat/input/input.cljs +++ b/src/status_im/ui/screens/chat/input/input.cljs @@ -105,8 +105,8 @@ {:on-press #(re-frame/dispatch [:chat.ui/set-command-prefix]) :accessibility-label :chat-commands-button} [react/view - [vector-icons/icon :icons/input-commands {:container-style style/input-commands-icon - :color :dark}]]]))) + [vector-icons/icon :main-icons/commands {:container-style style/input-commands-icon + :color :dark}]]]))) (defview reply-message [from message-text] (letsubs [username [:contacts/contact-name-by-identity from] @@ -127,8 +127,8 @@ :on-press #(re-frame/dispatch [:chat.ui/cancel-message-reply]) :accessibility-label :cancel-message-reply} [react/view {:style style/cancel-reply-container} - [vector-icons/icon :icons/close {:container-style style/cancel-reply-icon - :color colors/white}]]]]))) + [vector-icons/icon :main-icons/close {:container-style style/cancel-reply-icon + :color colors/white}]]]]))) (defview input-container [] (letsubs [margin [:chats/input-margin] diff --git a/src/status_im/ui/screens/chat/input/send_button.cljs b/src/status_im/ui/screens/chat/input/send_button.cljs index b4b49a325a..12773b9c53 100644 --- a/src/status_im/ui/screens/chat/input/send_button.cljs +++ b/src/status_im/ui/screens/chat/input/send_button.cljs @@ -38,5 +38,5 @@ [react/animated-view {:style (style/send-message-container spin) :accessibility-label :send-message-button} - [vi/icon :icons/input-send {:container-style style/send-message-icon - :color :white}]])]))) + [vi/icon :main-icons/arrow-up {:container-style style/send-message-icon + :color :white}]])]))) diff --git a/src/status_im/ui/screens/chat/message/message.cljs b/src/status_im/ui/screens/chat/message/message.cljs index 1c98bf5eb9..3e34d25cc5 100644 --- a/src/status_im/ui/screens/chat/message/message.cljs +++ b/src/status_im/ui/screens/chat/message/message.cljs @@ -24,7 +24,7 @@ [react/touchable-highlight {:on-press #(re-frame/dispatch [:extensions.ui/install-extension-button-pressed extension-id])} [react/view style/extension-container - [icons/icon :icons/info {:color (if outgoing colors/white colors/gray)}] + [icons/icon :main-icons/info {:color (if outgoing colors/white colors/gray)}] [react/text {:style (style/extension-text outgoing)} (i18n/label :to-see-this-message)] [react/text {:style (style/extension-install outgoing)} @@ -70,7 +70,7 @@ (letsubs [username [:contacts/contact-name-by-identity from]] [react/view {:style (style/quoted-message-container outgoing)} [react/view {:style style/quoted-message-author-container} - [vector-icons/icon :icons/reply {:color (if outgoing colors/wild-blue-yonder colors/gray)}] + [vector-icons/icon :main-icons/reply {:color (if outgoing colors/wild-blue-yonder colors/gray)}] [react/text {:style (style/quoted-message-author outgoing)} (chat.utils/format-reply-author from username current-public-key)]] [react/text {:style (style/quoted-message-text outgoing) @@ -210,7 +210,7 @@ :not-sent-click :not-sent-tap))] [react/view style/not-sent-icon - [vector-icons/icon :icons/warning {:color colors/red}]]]]) + [vector-icons/icon :main-icons/warning {:color colors/red}]]]]) (defview command-status [{{:keys [network]} :params}] (letsubs [current-network [:network-name]] @@ -219,7 +219,7 @@ [react/text {:style style/not-sent-text} (i18n/label :network-mismatch)] [react/view style/not-sent-icon - [vector-icons/icon :icons/warning {:color colors/red}]]]))) + [vector-icons/icon :main-icons/warning {:color colors/red}]]]))) (defn message-delivery-status [{:keys [chat-id message-id current-public-key user-statuses content last-outgoing? outgoing message-type] :as message}] diff --git a/src/status_im/ui/screens/chat/message/options.cljs b/src/status_im/ui/screens/chat/message/options.cljs index 4239c6693f..57ad23b1b7 100644 --- a/src/status_im/ui/screens/chat/message/options.cljs +++ b/src/status_im/ui/screens/chat/message/options.cljs @@ -26,12 +26,12 @@ [react/view options.styles/title [react/i18n-text {:style options.styles/title-text :key :message-not-sent}]] [action-item {:label :resend-message - :icon :icons/refresh + :icon :main-icons/refresh :on-press #(do (close-message-options-fn) (re-frame/dispatch [:chat.ui/resend-message chat-id message-id]))}] [action-item {:label :delete-message - :icon :icons/delete + :icon :main-icons/delete :style {:color colors/red} :on-press #(do (close-message-options-fn) diff --git a/src/status_im/ui/screens/chat/stickers/views.cljs b/src/status_im/ui/screens/chat/stickers/views.cljs index e3fc503eba..2d8f7d225c 100644 --- a/src/status_im/ui/screens/chat/stickers/views.cljs +++ b/src/status_im/ui/screens/chat/stickers/views.cljs @@ -12,12 +12,12 @@ {:on-press (fn [_] (re-frame/dispatch [:chat.ui/set-chat-ui-props {:show-stickers? (not show-stickers?)}]) (react/dismiss-keyboard!))} - [vector-icons/icon :icons/stickers {:container-style {:margin 14 :margin-right 6} - :color (if show-stickers? colors/blue colors/gray)}]]) + [vector-icons/icon :main-icons/stickers {:container-style {:margin 14 :margin-right 6} + :color (if show-stickers? colors/blue colors/gray)}]]) (defn- no-stickers-yet-panel [] [react/view {:style {:flex 1 :align-items :center :justify-content :center}} - [vector-icons/icon :icons/stickers-big {:color colors/gray}] + [vector-icons/icon :stickers-icons/stickers-big {:color colors/gray}] [react/text {:style {:margin-top 8 :font-size 17}} (i18n/label :t/you-dont-have-stickers)] [react/touchable-highlight {:on-press #(do (re-frame/dispatch [:stickers/load-packs]) @@ -44,7 +44,7 @@ (if (seq stickers) [stickers-panel (map #(hash-map :uri %) stickers)] [react/view {:style {:flex 1 :align-items :center :justify-content :center}} - [vector-icons/icon :icons/stickers-big {:color colors/gray}] + [vector-icons/icon :stickers-icons/stickers-big {:color colors/gray}] [react/text {:style {:margin-top 8 :font-size 17}} (i18n/label :t/recently-used-stickers)]]))) (def icon-size 28) @@ -79,7 +79,7 @@ [vector-icons/icon :main-icons/add {:width 20 :height 20 :color colors/white}]] [react/view {:width 4}] [pack-icon {:id :recent :selected? (or (= :recent selected-pack) (and (nil? selected-pack) (seq installed-packs)))} - [vector-icons/icon :icons/clock]] + [vector-icons/icon :stickers-icons/recent]] ;; TODO make scrollable (for [{:keys [id thumbnail]} installed-packs] ^{:key id} diff --git a/src/status_im/ui/screens/chat/views.cljs b/src/status_im/ui/screens/chat/views.cljs index 35f42bf4da..cd5195fa79 100644 --- a/src/status_im/ui/screens/chat/views.cljs +++ b/src/status_im/ui/screens/chat/views.cljs @@ -45,8 +45,8 @@ [react/touchable-highlight {:on-press #(re-frame/dispatch [:contact.ui/close-contact-pressed contact-identity]) :accessibility-label :add-to-contacts-close-button} - [vector-icons/icon :icons/close {:color colors/black - :container-style style/add-contact-close-icon}]]]))) + [vector-icons/icon :main-icons/close {:color colors/black + :container-style style/add-contact-close-icon}]]]))) (defn- on-options [chat-id chat-name group-chat? public?] (list-selection/show {:title chat-name @@ -64,7 +64,7 @@ (toolbar/nav-back-count {:home? true})) [toolbar-content/toolbar-content-view] (when-not modal? - [toolbar/actions [{:icon :icons/options + [toolbar/actions [{:icon :main-icons/more :icon-opts {:color :black :accessibility-label :chat-menu-button} :handler #(on-options chat-id name group-chat public?)}]])] @@ -113,7 +113,7 @@ (not (:dapp? contact)))] [react/view style/empty-chat-container (when one-to-one - [vector-icons/icon :icons/lock]) + [vector-icons/icon :tiny-icons/tiny-lock]) [react/text {:style style/empty-chat-text} (if one-to-one [react/text style/empty-chat-container-one-to-one diff --git a/src/status_im/ui/screens/currency_settings/views.cljs b/src/status_im/ui/screens/currency_settings/views.cljs index 321379ca05..72ef10ce46 100644 --- a/src/status_im/ui/screens/currency_settings/views.cljs +++ b/src/status_im/ui/screens/currency_settings/views.cljs @@ -21,7 +21,7 @@ [react/text {:style styles/currency-name-text} (str display-name " (" code ")")] (when selected? - [vector-icons/icon :icons/ok {:color :active}])]]))) + [vector-icons/icon :main-icons/check {:color :active}])]]))) (views/defview currency-settings [] (views/letsubs [currency-id [:wallet.settings/currency]] diff --git a/src/status_im/ui/screens/dapps_permissions/views.cljs b/src/status_im/ui/screens/dapps_permissions/views.cljs index 67ad9671ef..90e5690d59 100644 --- a/src/status_im/ui/screens/dapps_permissions/views.cljs +++ b/src/status_im/ui/screens/dapps_permissions/views.cljs @@ -15,7 +15,7 @@ (defn d-icon [] [react/view styles/icon-container - [icons/icon :icons/dapp {:color colors/gray}]]) + [icons/icon :main-icons/dapp {:color colors/gray}]]) (defn prepare-items [dapps] (fn [{:keys [dapp permissions]}] @@ -58,4 +58,4 @@ :render-fn list-item/list-item}] [react/view {:padding-vertical 16} [components.common/red-button {:label (i18n/label :t/revoke-access) - :on-press #(re-frame/dispatch [:dapps/revoke-access dapp])}]]])) \ No newline at end of file + :on-press #(re-frame/dispatch [:dapps/revoke-access dapp])}]]])) diff --git a/src/status_im/ui/screens/desktop/main/chat/views.cljs b/src/status_im/ui/screens/desktop/main/chat/views.cljs index b15acc5ec8..314841a844 100644 --- a/src/status_im/ui/screens/desktop/main/chat/views.cljs +++ b/src/status_im/ui/screens/desktop/main/chat/views.cljs @@ -58,7 +58,7 @@ [react/touchable-highlight {:on-press #(show-desktop-menu (get-chat-menu-items group-chat public? chat-id))} - [vector-icons/icon :icons/dots-horizontal + [vector-icons/icon :main-icons/more {:style {:tint-color colors/black :width 24 :height 24}}]]])) @@ -88,10 +88,10 @@ (views/letsubs [username [:contacts/contact-name-by-identity from]] [react/view {:style styles/quoted-message-container} [react/view {:style styles/quoted-message-author-container} - [icons/icon :icons/reply {:style (styles/reply-icon outgoing) - :width 16 - :height 16 - :container-style (when outgoing {:opacity 0.4})}] + [icons/icon :main-icons/reply {:style (styles/reply-icon outgoing) + :width 16 + :height 16 + :container-style (when outgoing {:opacity 0.4})}] [react/text {:style (message.style/quoted-message-author outgoing)} (chat-utils/format-reply-author from username current-public-key)]] [react/text {:style (message.style/quoted-message-text outgoing) @@ -263,7 +263,7 @@ (.focus @inp-ref) (re-frame/dispatch [:chat.ui/send-current-message])))} [react/view {:style (styles/send-icon inactive?)} - [icons/icon :icons/arrow-left {:style (styles/send-icon-arrow inactive?)}]]]))) + [icons/icon :main-icons/arrow-left {:style (styles/send-icon-arrow inactive?)}]]]))) (views/defview reply-message [from message-text] (views/letsubs [username [:contacts/contact-name-by-identity from] @@ -292,7 +292,7 @@ :on-press #(re-frame/dispatch [:chat.ui/cancel-message-reply]) :accessibility-label :cancel-message-reply} [react/view {} - [icons/icon :icons/close {:style styles/reply-close-icon}]]]]))) + [icons/icon :main-icons/close {:style styles/reply-close-icon}]]]]))) (views/defview chat-text-input [chat-id input-text] (views/letsubs [inp-ref (atom nil) @@ -373,7 +373,7 @@ [react/view {:style styles/chat-profile-row} [react/view {:style styles/chat-profile-icon-container :accessibility-label :send-message-link} - [vector-icons/icon :icons/chats {:style (styles/chat-profile-icon colors/blue)}]] + [vector-icons/icon :main-icons/message {:style (styles/chat-profile-icon colors/blue)}]] [react/text {:style (styles/contact-card-text colors/blue)} (i18n/label :t/send-message)]]] [react/text {:style styles/chat-profile-contact-code} (i18n/label :t/contact-code)] diff --git a/src/status_im/ui/screens/desktop/main/tabs/home/views.cljs b/src/status_im/ui/screens/desktop/main/tabs/home/views.cljs index 2db80bd2a4..7ae3aa2db5 100644 --- a/src/status_im/ui/screens/desktop/main/tabs/home/views.cljs +++ b/src/status_im/ui/screens/desktop/main/tabs/home/views.cljs @@ -49,7 +49,7 @@ (when (and group-chat (not public?)) [icons/icon :tiny-icons/tiny-group]) (when public? - [icons/icon :icons/public-chat]) + [icons/icon :tiny-icons/tiny-public]) [react/text {:ellipsize-mode :tail :number-of-lines 1 :style (styles/chat-name current?)} @@ -118,7 +118,7 @@ [action-button/action-button {:label (i18n/label :t/start-new-chat) :accessibility-label :start-1-1-chat-button - :icon :icons/newchat + :icon :main-icons/add-contact :icon-opts {:color colors/blue} :on-press #(do (re-frame/dispatch [:set-in [:desktop :popup] nil]) @@ -134,7 +134,7 @@ [action-button/action-button {:label (i18n/label :t/new-public-group-chat) :accessibility-label :join-public-chat-button - :icon :icons/public + :icon :main-icons/public-chat :icon-opts {:color colors/blue} :on-press #(do (re-frame/dispatch [:set-in [:desktop :popup] nil]) diff --git a/src/status_im/ui/screens/desktop/main/tabs/profile/views.cljs b/src/status_im/ui/screens/desktop/main/tabs/profile/views.cljs index daa5dbca2c..596cd660ae 100644 --- a/src/status_im/ui/screens/desktop/main/tabs/profile/views.cljs +++ b/src/status_im/ui/screens/desktop/main/tabs/profile/views.cljs @@ -49,7 +49,7 @@ (views/letsubs [] [react/view {:style (styles/tooltip-container opacity)} [react/view {:style styles/tooltip-icon-text} - [vector-icons/icon :icons/check + [vector-icons/icon :main-icons/check {:style styles/check-icon}] [react/text {:style {:font-size 14 :color colors/green}} (i18n/label :sharing-copied-to-clipboard)]] @@ -220,7 +220,7 @@ (i18n/label :share-contact-code)]] [react/view {:style styles/share-contact-icon-container :accessibility-label :share-my-contact-code-button} - [vector-icons/icon :icons/qr {:style {:tint-color colors/blue}}]]]]) + [vector-icons/icon :main-icons/qr {:style {:tint-color colors/blue}}]]]]) (defn help-item [help-open?] [react/touchable-highlight {:style (styles/adv-settings-row help-open?) @@ -229,7 +229,7 @@ [react/text {:style (styles/adv-settings-row-text colors/black) :font (if help-open? :medium :default)} (i18n/label :t/help-center)] - [vector-icons/icon :icons/forward {:style {:tint-color colors/gray}}]]]) + [vector-icons/icon :main-icons/next {:style {:tint-color colors/gray}}]]]) (defn advanced-settings-item [adv-settings-open?] [react/touchable-highlight {:style (styles/adv-settings-row adv-settings-open?) @@ -240,7 +240,7 @@ [react/text {:style (styles/adv-settings-row-text colors/black) :font (if adv-settings-open? :medium :default)} (i18n/label :t/advanced-settings)] - [vector-icons/icon :icons/forward {:style {:tint-color colors/gray}}]]]) + [vector-icons/icon :main-icons/next {:style {:tint-color colors/gray}}]]]) (views/defview profile [{:keys [seed-backed-up? mnemonic] :as user}] (views/letsubs [current-view-id [:get :view-id] @@ -273,7 +273,7 @@ [react/view {:style styles/adv-settings} [react/text {:style (styles/profile-row-text colors/black)} (i18n/label :t/devices)] - [vector-icons/icon :icons/forward {:style {:tint-color colors/gray}}]]] + [vector-icons/icon :main-icons/next {:style {:tint-color colors/gray}}]]] (when show-backup-seed? [react/touchable-highlight {:style (styles/profile-row backup-recovery-phrase-open?) :on-press #(re-frame/dispatch [:navigate-to :backup-recovery-phrase])} diff --git a/src/status_im/ui/screens/extensions/add/views.cljs b/src/status_im/ui/screens/extensions/add/views.cljs index ee86d4d575..1f4fd6e2b5 100644 --- a/src/status_im/ui/screens/extensions/add/views.cljs +++ b/src/status_im/ui/screens/extensions/add/views.cljs @@ -93,7 +93,7 @@ :extensions.callback/qr-code-scanned]) :style styles/qr-code} [react/view - [vector-icons/icon :icons/qr {:color colors/blue}]]]) + [vector-icons/icon :main-icons/qr {:color colors/blue}]]]) (views/defview edit-extension [] (views/letsubs [manage-extension [:get-manage-extension]] diff --git a/src/status_im/ui/screens/extensions/views.cljs b/src/status_im/ui/screens/extensions/views.cljs index 9c466c6c09..814978eb32 100644 --- a/src/status_im/ui/screens/extensions/views.cljs +++ b/src/status_im/ui/screens/extensions/views.cljs @@ -12,7 +12,7 @@ (def mailserver-icon [react/view (styles/mailserver-icon true) - [vector-icons/icon :icons/mailserver {:color :white}]]) + [vector-icons/icon :main-icons/mailserver {:color :white}]]) (defn- render-extension [{:keys [name url active?]}] [list/deletable-list-item {:type :extensions @@ -68,4 +68,4 @@ :render-fn (render-selection-item render on-select) :content-container-style {:justify-content :center} :empty-component [react/text {:style styles/empty-list} - "No items"]}]]])) \ No newline at end of file + "No items"]}]]])) diff --git a/src/status_im/ui/screens/fleet_settings/views.cljs b/src/status_im/ui/screens/fleet_settings/views.cljs index 0d19842ad8..9bdef766f5 100644 --- a/src/status_im/ui/screens/fleet_settings/views.cljs +++ b/src/status_im/ui/screens/fleet_settings/views.cljs @@ -15,7 +15,7 @@ [react/view (if platform/desktop? {:style (styles/fleet-icon-container current?)} (styles/fleet-icon-container current?)) - [vector-icons/icon :icons/fleet + [vector-icons/icon :main-icons/fleet (if platform/desktop? {:style (styles/fleet-icon current?)} (styles/fleet-icon current?))]]) diff --git a/src/status_im/ui/screens/hardwallet/authentication_method/views.cljs b/src/status_im/ui/screens/hardwallet/authentication_method/views.cljs index 4c4595c22f..02421c8757 100644 --- a/src/status_im/ui/screens/hardwallet/authentication_method/views.cljs +++ b/src/status_im/ui/screens/hardwallet/authentication_method/views.cljs @@ -20,7 +20,7 @@ [react/text {:style styles/choose-authentication-method-row-text :number-of-lines 1} title]] - [vector-icons/icon :icons/forward {:color colors/gray}]]]) + [vector-icons/icon :main-icons/next {:color colors/gray}]]]) (defn hardwallet-authentication-method [] [react/view styles/container @@ -39,8 +39,8 @@ (i18n/label :t/choose-authentication-method)]] [react/view styles/authentication-methods [authentication-method-row {:title (i18n/label :t/keycard) - :icon :icons/hardwallet + :icon :main-icons/keycard :on-press #(re-frame/dispatch [:hardwallet.ui/status-hardwallet-option-pressed])}] [authentication-method-row {:title (i18n/label :t/password) - :icon :icons/password + :icon :main-icons/password :on-press #(re-frame/dispatch [:hardwallet.ui/password-option-pressed])}]]]]) diff --git a/src/status_im/ui/screens/hardwallet/components.cljs b/src/status_im/ui/screens/hardwallet/components.cljs index 72c147f633..2e1bdc75b5 100644 --- a/src/status_im/ui/screens/hardwallet/components.cljs +++ b/src/status_im/ui/screens/hardwallet/components.cljs @@ -81,7 +81,7 @@ (defn maintain-card [step] (let [modal-visible? (reagent/atom false) animation-value (animation/create-value 0) - ;TODO(dmitryn): make animation smoother + ;TODO(dmitryn): make animation smoother interpolate-fn (fn [output-range] (animation/interpolate animation-value {:inputRange [0 0.25 0.5 0.75 1] @@ -101,7 +101,7 @@ (re-frame/dispatch [:hardwallet.ui/get-application-info]) (reset! modal-visible? true))} [react/view styles/hardwallet-icon-container - [vector-icons/icon :icons/hardwallet {:color colors/blue}] + [vector-icons/icon :main-icons/keycard {:color colors/blue}] [vector-icons/icon :icons/indicator-small {:color colors/blue :container-style (styles/hardwallet-icon-indicator-small-container (interpolate-fn [0 0.5 1 0.5 0]))}] diff --git a/src/status_im/ui/screens/hardwallet/connect/views.cljs b/src/status_im/ui/screens/hardwallet/connect/views.cljs index c58adf205c..2bc7d22c97 100644 --- a/src/status_im/ui/screens/hardwallet/connect/views.cljs +++ b/src/status_im/ui/screens/hardwallet/connect/views.cljs @@ -58,5 +58,5 @@ [react/view styles/product-info-container [react/text {:style styles/product-info-text} (i18n/label :t/product-information)] - [vector-icons/icon :icons/link {:color colors/blue - :container-style styles/external-link-icon}]]]]]])) + [vector-icons/icon :main-icons/link {:color colors/blue + :container-style styles/external-link-icon}]]]]]])) diff --git a/src/status_im/ui/screens/hardwallet/pin/views.cljs b/src/status_im/ui/screens/hardwallet/pin/views.cljs index 9a17fcd424..38efaf00c5 100644 --- a/src/status_im/ui/screens/hardwallet/pin/views.cljs +++ b/src/status_im/ui/screens/hardwallet/pin/views.cljs @@ -38,7 +38,7 @@ {:on-press #(when enabled? (re-frame/dispatch [:hardwallet.ui/pin-numpad-delete-button-pressed step]))} [react/view styles/numpad-delete-button - [vector-icons/icon :icons/back {:color colors/blue}]]]]]) + [vector-icons/icon :main-icons/back {:color colors/blue}]]]]]) (defn pin-indicator [pressed?] [react/view (styles/pin-indicator pressed?)]) @@ -137,4 +137,4 @@ :t/new-pin-description) :step step :status status - :error-label error-label}])])) \ No newline at end of file + :error-label error-label}])])) diff --git a/src/status_im/ui/screens/hardwallet/settings/views.cljs b/src/status_im/ui/screens/hardwallet/settings/views.cljs index ed94eed0a0..9442b4d029 100644 --- a/src/status_im/ui/screens/hardwallet/settings/views.cljs +++ b/src/status_im/ui/screens/hardwallet/settings/views.cljs @@ -119,7 +119,7 @@ (if (zero? puk-retry-counter) [card-blocked] [react/view - [action-row {:icon :icons/info + [action-row {:icon :main-icons/info :label :t/help-capitalized :on-press #(.openURL react/linking "https://hardwallet.status.im")}] (when pairing @@ -127,12 +127,12 @@ [action-row {:icon :main-icons/add :label :t/change-pin :on-press #(re-frame/dispatch [:keycard-settings.ui/change-pin-pressed])}] - [action-row {:icon :icons/close + [action-row {:icon :main-icons/close :label :t/unpair-card :on-press #(re-frame/dispatch [:keycard-settings.ui/unpair-card-pressed])}]])])] [react/view {:margin-bottom 20 :margin-left 16} - [action-row {:icon :icons/logout + [action-row {:icon :main-icons/logout :color-theme :red :label :t/reset-card :on-press #(re-frame/dispatch [:keycard-settings.ui/reset-card-pressed])}]]]])) diff --git a/src/status_im/ui/screens/hardwallet/success/views.cljs b/src/status_im/ui/screens/hardwallet/success/views.cljs index ec75f413b3..e44de39e14 100644 --- a/src/status_im/ui/screens/hardwallet/success/views.cljs +++ b/src/status_im/ui/screens/hardwallet/success/views.cljs @@ -28,9 +28,9 @@ [react/view styles/hardwallet-card-image-container [react/view styles/icon-check-container [react/view styles/icon-check-inner-container - [vector-icons/icon :icons/check {:color colors/green - :width 30 - :height 30}]]]] + [vector-icons/icon :main-icons/check {:color colors/green + :width 30 + :height 30}]]]] [react/view styles/complete-text-container [activity-indicator processing?] [react/text {:style styles/complete-text} @@ -43,4 +43,4 @@ (re-frame/dispatch [:hardwallet.ui/success-button-pressed]))} [react/view styles/bottom-action-container [react/text {:style styles/bottom-action-text} - (i18n/label :t/okay)]]]]]]])) \ No newline at end of file + (i18n/label :t/okay)]]]]]]])) diff --git a/src/status_im/ui/screens/home/views/inner_item.cljs b/src/status_im/ui/screens/home/views/inner_item.cljs index 5c501d0637..183642d901 100644 --- a/src/status_im/ui/screens/home/views/inner_item.cljs +++ b/src/status_im/ui/screens/home/views/inner_item.cljs @@ -80,7 +80,7 @@ [react/view styles/name-view (when public-group? [react/view styles/public-group-icon-container - [vector-icons/icon :icons/public-chat {:color colors/gray}]]) + [vector-icons/icon :tiny-icons/tiny-public {:color colors/gray}]]) (when private-group? [react/view styles/private-group-icon-container [vector-icons/icon :tiny-icons/tiny-group {:color colors/gray}]]) @@ -119,7 +119,7 @@ (if dapp [chat-icon.screen/dapp-icon-browser dapp 40] [react/view styles/browser-icon-container - [vector-icons/icon :icons/discover {:color colors/gray}]])] + [vector-icons/icon :main-icons/browser {:color colors/gray}]])] [react/view styles/chat-info-container [react/view styles/item-upper-container [react/view styles/name-view diff --git a/src/status_im/ui/screens/log_level_settings/views.cljs b/src/status_im/ui/screens/log_level_settings/views.cljs index 0c0b0e4103..c498b082e8 100644 --- a/src/status_im/ui/screens/log_level_settings/views.cljs +++ b/src/status_im/ui/screens/log_level_settings/views.cljs @@ -14,7 +14,7 @@ [react/view (if platform/desktop? {:style (styles/log-level-icon-container current?)} (styles/log-level-icon-container current?)) - [vector-icons/icon :icons/log-level + [vector-icons/icon :main-icons/log-level (if platform/desktop? {:style (styles/log-level-icon current?)} (styles/log-level-icon current?))]]) diff --git a/src/status_im/ui/screens/main_tabs/views.cljs b/src/status_im/ui/screens/main_tabs/views.cljs index ba6afb5bb3..d0ff0e5406 100644 --- a/src/status_im/ui/screens/main_tabs/views.cljs +++ b/src/status_im/ui/screens/main_tabs/views.cljs @@ -15,29 +15,25 @@ (def tabs-list-data [{:view-id :home :content {:title (i18n/label :t/home) - :icon-inactive :icons/home - :icon-active :icons/home-active} + :icon :main-icons/home} :count-subscription :chats/unread-messages-number :accessibility-label :home-tab-button} {:view-id :wallet :content {:title (i18n/label :t/wallet) - :icon-inactive :icons/wallet - :icon-active :icons/wallet-active} + :icon :main-icons/wallet} :count-subscription :get-wallet-unread-messages-number :accessibility-label :wallet-tab-button} {:view-id :my-profile :content {:title (i18n/label :t/profile) - :icon-inactive :icons/profile - :icon-active :icons/profile-active} + :icon :main-icons/profile} :count-subscription :get-profile-unread-messages-number :accessibility-label :profile-tab-button}]) -(defn- tab-content [{:keys [title icon-active icon-inactive]}] +(defn- tab-content [{:keys [title icon]}] (fn [active? count] [react/view {:style styles/tab-container} - (let [icon (if active? icon-active icon-inactive)] - [react/view - [vector-icons/icon icon (styles/tab-icon active?)]]) + [react/view + [vector-icons/icon icon (styles/tab-icon active?)]] [react/view [react/text {:style (styles/tab-title active?)} title]] diff --git a/src/status_im/ui/screens/network_settings/views.cljs b/src/status_im/ui/screens/network_settings/views.cljs index 66f051c08b..8df3421510 100644 --- a/src/status_im/ui/screens/network_settings/views.cljs +++ b/src/status_im/ui/screens/network_settings/views.cljs @@ -14,7 +14,7 @@ (defn- network-icon [connected? size] [react/view (styles/network-icon connected? size) - [vector-icons/icon :icons/network {:color (if connected? :white :gray)}]]) + [vector-icons/icon :main-icons/network {:color (if connected? :white :gray)}]]) (defn network-badge [& [{:keys [name connected?]}]] [react/view styles/network-badge diff --git a/src/status_im/ui/screens/offline_messaging_settings/edit_mailserver/views.cljs b/src/status_im/ui/screens/offline_messaging_settings/edit_mailserver/views.cljs index 1ce4f3a88b..87bd6a3a1a 100644 --- a/src/status_im/ui/screens/offline_messaging_settings/edit_mailserver/views.cljs +++ b/src/status_im/ui/screens/offline_messaging_settings/edit_mailserver/views.cljs @@ -39,7 +39,7 @@ :mailserver.callback/qr-code-scanned]) :style styles/qr-code} [react/view - [vector-icons/icon :icons/qr {:color colors/blue}]]]) + [vector-icons/icon :main-icons/qr {:color colors/blue}]]]) (views/defview edit-mailserver [] (views/letsubs [mailserver [:mailserver.edit/mailserver] diff --git a/src/status_im/ui/screens/offline_messaging_settings/views.cljs b/src/status_im/ui/screens/offline_messaging_settings/views.cljs index 543ca94958..7c0a891e43 100644 --- a/src/status_im/ui/screens/offline_messaging_settings/views.cljs +++ b/src/status_im/ui/screens/offline_messaging_settings/views.cljs @@ -16,7 +16,7 @@ [react/view (if platform/desktop? {:style (styles/mailserver-icon-container connected?)} (styles/mailserver-icon-container connected?)) - [vector-icons/icon :icons/mailserver + [vector-icons/icon :main-icons/mailserver (if platform/desktop? {:style (styles/mailserver-icon connected?)} (styles/mailserver-icon connected?))]]) diff --git a/src/status_im/ui/screens/pairing/views.cljs b/src/status_im/ui/screens/pairing/views.cljs index 6ac8e9e3e1..ff101aa6d1 100644 --- a/src/status_im/ui/screens/pairing/views.cljs +++ b/src/status_im/ui/screens/pairing/views.cljs @@ -87,7 +87,7 @@ [react/view {:style styles/pair-this-device-actions} [react/view [react/view (styles/pairing-button true) - [icons/icon :icons/wnode (icon-style (styles/pairing-button-icon true))]]] + [icons/icon :main-icons/wnode (icon-style (styles/pairing-button-icon true))]]] [react/view {:style styles/pairing-actions-text} [react/view [react/text {:style styles/pair-this-device-title} @@ -99,8 +99,8 @@ [react/view {:style styles/installation-item} [react/view {:style (styles/pairing-button true)} [icons/icon (if utils.platform/desktop? - :icons/desktop - :icons/mobile) + :main-icons/desktop + :main-icons/mobile) (icon-style (styles/pairing-button-icon true))]] [react/view {:style styles/pairing-actions-text} [react/view @@ -123,8 +123,8 @@ [react/view {:style (styles/pairing-button enabled?)} [icons/icon (if (= "desktop" device-type) - :icons/desktop - :icons/mobile) + :main-icons/desktop + :main-icons/mobile) (icon-style (styles/pairing-button-icon enabled?))]] [react/view {:style styles/pairing-actions-text} [react/view diff --git a/src/status_im/ui/screens/profile/components/views.cljs b/src/status_im/ui/screens/profile/components/views.cljs index bd59fb4577..6a478d50aa 100644 --- a/src/status_im/ui/screens/profile/components/views.cljs +++ b/src/status_im/ui/screens/profile/components/views.cljs @@ -103,7 +103,7 @@ (if icon-content icon-content (when (and active? (not hide-arrow?)) - [vector-icons/icon :icons/forward {:color colors/gray}]))]]) + [vector-icons/icon :main-icons/next {:color colors/gray}]))]]) (defn settings-switch-item [{:keys [label-kw value action-fn active?] diff --git a/src/status_im/ui/screens/profile/contact/views.cljs b/src/status_im/ui/screens/profile/contact/views.cljs index fc1c01a7fc..cf9d9ced17 100644 --- a/src/status_im/ui/screens/profile/contact/views.cljs +++ b/src/status_im/ui/screens/profile/contact/views.cljs @@ -19,7 +19,7 @@ (defn actions [{:keys [pending? public-key]}] (concat (if (or (nil? pending?) pending?) [{:label (i18n/label :t/add-to-contacts) - :icon :icons/add-contact + :icon :main-icons/add-contact :action #(re-frame/dispatch [:contact.ui/add-to-contact-pressed public-key]) :accessibility-label :add-to-contacts-button}] [{:label (i18n/label :t/in-contacts) diff --git a/src/status_im/ui/screens/profile/group_chat/views.cljs b/src/status_im/ui/screens/profile/group_chat/views.cljs index 14e83ac4a8..b55e359a7e 100644 --- a/src/status_im/ui/screens/profile/group_chat/views.cljs +++ b/src/status_im/ui/screens/profile/group_chat/views.cljs @@ -34,7 +34,7 @@ nil [toolbar/content-title ""] [toolbar/default-done {:handler #(re-frame/dispatch [:group-chats.ui/save-pressed]) - :icon :icons/ok + :icon :main-icons/check :icon-opts {:color colors/blue :accessibility-label :done-button}}]]) @@ -45,11 +45,11 @@ :icon :main-icons/add :action #(re-frame/dispatch [:navigate-to :add-participants-toggle-list])}]) [{:label (i18n/label :t/clear-history) - :icon :icons/close + :icon :main-icons/close :action #(re-frame/dispatch [:chat.ui/clear-history-pressed]) :accessibility-label :clear-history-button} {:label (i18n/label :t/delete-chat) - :icon :icons/arrow-left + :icon :main-icons/arrow-left :action #(re-frame/dispatch [:group-chats.ui/remove-chat-pressed chat-id]) :accessibility-label :delete-chat-button}])) diff --git a/src/status_im/ui/screens/profile/photo_capture/views.cljs b/src/status_im/ui/screens/profile/photo_capture/views.cljs index 18b35deb81..1833504941 100644 --- a/src/status_im/ui/screens/profile/photo_capture/views.cljs +++ b/src/status_im/ui/screens/profile/photo_capture/views.cljs @@ -43,4 +43,4 @@ (.then image-captured) (.catch #(log/debug "Error capturing image: " %)))))} [react/view - [icons/icon :icons/camera {:color :white}]]]]]])) + [icons/icon :main-icons/camera {:color :white}]]]]]])) diff --git a/src/status_im/ui/screens/profile/seed/views.cljs b/src/status_im/ui/screens/profile/seed/views.cljs index 88db7f007c..cf86ad841b 100644 --- a/src/status_im/ui/screens/profile/seed/views.cljs +++ b/src/status_im/ui/screens/profile/seed/views.cljs @@ -127,7 +127,7 @@ [react/view {:style styles/finish-container} [react/view {:style styles/finish-logo-container} [react/view {:style (components.common.styles/logo-container 80 true)} - [icons/icon :icons/ok styles/ok-icon]]] + [icons/icon :main-icons/check styles/ok-icon]]] [react/text {:style styles/finish-label} (i18n/label :t/you-are-all-set)] [react/text {:style styles/finish-description} diff --git a/src/status_im/ui/screens/profile/user/views.cljs b/src/status_im/ui/screens/profile/user/views.cljs index e14c61182f..f1c5b086b7 100644 --- a/src/status_im/ui/screens/profile/user/views.cljs +++ b/src/status_im/ui/screens/profile/user/views.cljs @@ -46,7 +46,7 @@ nil [toolbar/content-title ""] [toolbar/default-done {:handler #(re-frame/dispatch [:my-profile/save-profile]) - :icon :icons/ok + :icon :main-icons/check :icon-opts {:color colors/blue} :accessibility-label :done-button}]])})) @@ -231,7 +231,7 @@ [react/view {:style styles/advanced-button-row} [react/text {:style styles/advanced-button-label} (i18n/label :t/wallet-advanced)] - [icons/icon (if advanced? :icons/up :icons/down) {:color colors/blue}]]]]] + [icons/icon (if advanced? :main-icons/dropdown-up :main-icons/dropdown) {:color colors/blue}]]]]] (when advanced? [advanced-settings params on-show])])) diff --git a/src/status_im/ui/screens/stickers/views.cljs b/src/status_im/ui/screens/stickers/views.cljs index 4f6a67035f..00b509b6b0 100644 --- a/src/status_im/ui/screens/stickers/views.cljs +++ b/src/status_im/ui/screens/stickers/views.cljs @@ -19,7 +19,7 @@ (defn- installed-icon [] [react/view styles/installed-icon - [icons/icon :icons/ok {:color colors/white :height 20 :width 20}]]) + [icons/icon :main-icons/check {:color colors/white :height 20 :width 20}]]) (defview price-badge [price id] (letsubs [balance [:balance]] diff --git a/src/status_im/ui/screens/wallet/choose_recipient/views.cljs b/src/status_im/ui/screens/wallet/choose_recipient/views.cljs index 5c21aef3ed..60ad86255c 100644 --- a/src/status_im/ui/screens/wallet/choose_recipient/views.cljs +++ b/src/status_im/ui/screens/wallet/choose_recipient/views.cljs @@ -18,8 +18,8 @@ [toolbar/content-title {:color :white} (i18n/label :t/wallet-choose-recipient)] [toolbar/actions [{:icon (if (= :on camera-flashlight) - :icons/flash-active - :icons/flash-inactive) + :main-icons/flash-active + :main-icons/flash-inactive) :icon-opts {:color :white} :handler #(re-frame/dispatch [:wallet/toggle-flashlight])}]]]) diff --git a/src/status_im/ui/screens/wallet/collectibles/cryptokitties/views.cljs b/src/status_im/ui/screens/wallet/collectibles/cryptokitties/views.cljs index 638d941fa9..2725226669 100644 --- a/src/status_im/ui/screens/wallet/collectibles/cryptokitties/views.cljs +++ b/src/status_im/ui/screens/wallet/collectibles/cryptokitties/views.cljs @@ -21,8 +21,8 @@ bio]]] [action-button/action-button {:label (i18n/label :t/view-cryptokitties) - :icon :icons/address + :icon :main-icons/address :icon-opts {:color colors/blue} :accessibility-label :open-collectible-button :on-press #(re-frame/dispatch [:open-collectible-in-browser - (str "https://www.cryptokitties.co/kitty/" id)])}]]) \ No newline at end of file + (str "https://www.cryptokitties.co/kitty/" id)])}]]) diff --git a/src/status_im/ui/screens/wallet/collectibles/cryptostrikers/views.cljs b/src/status_im/ui/screens/wallet/collectibles/cryptostrikers/views.cljs index 158b404828..95a978b927 100644 --- a/src/status_im/ui/screens/wallet/collectibles/cryptostrikers/views.cljs +++ b/src/status_im/ui/screens/wallet/collectibles/cryptostrikers/views.cljs @@ -21,7 +21,7 @@ description]]] [action-button/action-button {:label (i18n/label :t/view-cryptostrikers) - :icon :icons/address + :icon :main-icons/address :icon-opts {:color colors/blue} :accessibility-label :open-collectible-button :on-press #(re-frame/dispatch [:open-collectible-in-browser external_url])}]]) diff --git a/src/status_im/ui/screens/wallet/collectibles/etheremon/views.cljs b/src/status_im/ui/screens/wallet/collectibles/etheremon/views.cljs index 3742b626bc..9314cd9209 100644 --- a/src/status_im/ui/screens/wallet/collectibles/etheremon/views.cljs +++ b/src/status_im/ui/screens/wallet/collectibles/etheremon/views.cljs @@ -20,7 +20,7 @@ user_defined_name]]] [action-button/action-button {:label (i18n/label :t/view-etheremon) - :icon :icons/address + :icon :main-icons/address :icon-opts {:color colors/blue} :accessibility-label :open-collectible-button :on-press #(re-frame/dispatch [:open-collectible-in-browser diff --git a/src/status_im/ui/screens/wallet/collectibles/kudos/views.cljs b/src/status_im/ui/screens/wallet/collectibles/kudos/views.cljs index d035a0b1a1..d22edf6c6b 100644 --- a/src/status_im/ui/screens/wallet/collectibles/kudos/views.cljs +++ b/src/status_im/ui/screens/wallet/collectibles/kudos/views.cljs @@ -21,7 +21,7 @@ description]]] [action-button/action-button {:label (i18n/label :t/view-gitcoin) - :icon :icons/address + :icon :main-icons/address :icon-opts {:color colors/blue} :accessibility-label :open-collectible-button - :on-press #(re-frame/dispatch [:open-collectible-in-browser external_url])}]]) \ No newline at end of file + :on-press #(re-frame/dispatch [:open-collectible-in-browser external_url])}]]) diff --git a/src/status_im/ui/screens/wallet/collectibles/superrare/views.cljs b/src/status_im/ui/screens/wallet/collectibles/superrare/views.cljs index bee9c5b454..5731283afb 100644 --- a/src/status_im/ui/screens/wallet/collectibles/superrare/views.cljs +++ b/src/status_im/ui/screens/wallet/collectibles/superrare/views.cljs @@ -20,7 +20,7 @@ description]]] [action-button/action-button {:label (i18n/label :t/view-superrare) - :icon :icons/address + :icon :main-icons/address :icon-opts {:color colors/blue} :accessibility-label :open-collectible-button :on-press #(re-frame/dispatch [:open-collectible-in-browser diff --git a/src/status_im/ui/screens/wallet/components/views.cljs b/src/status_im/ui/screens/wallet/components/views.cljs index 3a6384eb23..9d806ae292 100644 --- a/src/status_im/ui/screens/wallet/components/views.cljs +++ b/src/status_im/ui/screens/wallet/components/views.cljs @@ -74,7 +74,7 @@ [react/view {:flex 1} content]]) -(defn cartouche [{:keys [disabled? on-press icon icon-opts] :or {icon :icons/forward} :as m} header content] +(defn cartouche [{:keys [disabled? on-press icon icon-opts] :or {icon :main-icons/next} :as m} header content] [react/view {:style styles/cartouche-container} [react/text {:style styles/cartouche-header} header] @@ -266,7 +266,7 @@ (defn recipient-selector [{:keys [name address disabled? contact-only? request? modal?]}] [cartouche {:on-press #(on-choose-recipient contact-only?) :disabled? disabled? - :icon :icons/dots-horizontal + :icon :main-icons/more :icon-opts {:accessibility-label :choose-contact-button}} (i18n/label :t/wallet-choose-recipient) [react/view {:accessibility-label :choose-recipient-button} diff --git a/src/status_im/ui/screens/wallet/main/views.cljs b/src/status_im/ui/screens/wallet/main/views.cljs index 657cedbf62..0f343c6e4a 100644 --- a/src/status_im/ui/screens/wallet/main/views.cljs +++ b/src/status_im/ui/screens/wallet/main/views.cljs @@ -30,7 +30,7 @@ [toolbar/nav-button (action/close-white action/default-handler)] [toolbar/content-wrapper] [toolbar/actions - [{:icon (if modal-history? :icons/wallet :icons/transaction-history) + [{:icon (if modal-history? :main-icons/wallet :main-icons/two-arrows) :icon-opts {:color :white :accessibility-label (if modal-history? :wallet-modal-button :transaction-history-button)} :handler #(re-frame/dispatch [:set-in [:wallet :modal-history?] (not modal-history?)])}]]]]) @@ -60,20 +60,20 @@ :key :wallet-backup-recovery-title}] [react/i18n-text {:style styles/backup-seed-phrase-description :key :wallet-backup-recovery-description}]] - [vector-icons/icon :icons/forward {:color :white}]]]]) + [vector-icons/icon :main-icons/next {:color :white}]]]]) (def actions [{:label (i18n/label :t/wallet-send) :accessibility-label :send-transaction-button - :icon :icons/angle-arrow-right + :icon :main-icons/send :action #(re-frame/dispatch [:navigate-to :wallet-send-transaction])} {:label (i18n/label :t/wallet-deposit) :accessibility-label :receive-transaction-button - :icon :icons/angle-arrow-left + :icon :main-icons/receive :action #(re-frame/dispatch [:navigate-to :wallet-request-transaction])} {:label (i18n/label :t/transaction-history) :accessibility-label :transaction-history-button - :icon :icons/list-page + :icon :main-icons/history :action #(re-frame/dispatch [:navigate-to :transactions-history])}]) (defn- render-asset [currency] @@ -98,7 +98,7 @@ (or @asset-value "...")]]]))) (def item-icon-forward - [list/item-icon {:icon :icons/forward + [list/item-icon {:icon :main-icons/next :style {:width 12} :icon-opts {:color :gray}}]) diff --git a/src/status_im/ui/screens/wallet/onboarding/views.cljs b/src/status_im/ui/screens/wallet/onboarding/views.cljs index 22e905ecf0..81f739a8ff 100644 --- a/src/status_im/ui/screens/wallet/onboarding/views.cljs +++ b/src/status_im/ui/screens/wallet/onboarding/views.cljs @@ -36,7 +36,7 @@ :width 34 :zIndex 1 :background-color colors/blue}} - [vector-icons/icon :icons/info {:color colors/white}]] + [vector-icons/icon :main-icons/info {:color colors/white}]] [react/view {:style {:border-color "rgba(255,255,255,0.6)" :border-width 1 diff --git a/src/status_im/ui/screens/wallet/request/views.cljs b/src/status_im/ui/screens/wallet/request/views.cljs index 772e463bc7..8c5aaeadc9 100644 --- a/src/status_im/ui/screens/wallet/request/views.cljs +++ b/src/status_im/ui/screens/wallet/request/views.cljs @@ -63,7 +63,7 @@ :text-style {:padding-horizontal 0} :accessibility-label :sent-request-button} (i18n/label :t/send-request) - [vector-icons/icon :icons/forward {:color :white}]]]]]))) + [vector-icons/icon :main-icons/next {:color :white}]]]]]))) ;; Main screen diff --git a/src/status_im/ui/screens/wallet/send/views.cljs b/src/status_im/ui/screens/wallet/send/views.cljs index 95f247cbc3..f6c7a31d31 100644 --- a/src/status_im/ui/screens/wallet/send/views.cljs +++ b/src/status_im/ui/screens/wallet/send/views.cljs @@ -62,7 +62,7 @@ [react/i18n-text {:style (merge wallet.components.styles/label styles/advanced-label) :key :wallet-advanced}] - [vector-icons/icon (if advanced? :icons/up :icons/down) {:color :white}]]]] + [vector-icons/icon (if advanced? :main-icons/dropdown-up :main-icons/dropdown) {:color :white}]]]] (when advanced? [advanced-cartouche native-currency transaction])]) @@ -115,7 +115,7 @@ (= :offline network-status)) :accessibility-label :sign-transaction-button} (i18n/label sign-label) - [vector-icons/icon :icons/forward {:color colors/white}]]])) + [vector-icons/icon :main-icons/next {:color colors/white}]]])) ;; "Sign Transaction >" button (defn- sign-transaction-button [amount-error to amount sufficient-funds? sufficient-gas? modal? online?] @@ -136,7 +136,7 @@ :text-style {:color :white} :accessibility-label :sign-transaction-button} (i18n/label :t/transactions-sign-transaction) - [vector-icons/icon :icons/forward {:color (if sign-enabled? colors/white colors/white-light-transparent)}]]])) + [vector-icons/icon :main-icons/next {:color (if sign-enabled? colors/white colors/white-light-transparent)}]]])) (defn- render-send-transaction-view [{:keys [modal? transaction scroll advanced? network all-tokens amount-input network-status]}] (let [{:keys [amount amount-text amount-error asset-error show-password-input? to to-name sufficient-funds? diff --git a/src/status_im/ui/screens/wallet/settings/views.cljs b/src/status_im/ui/screens/wallet/settings/views.cljs index fcc8b16734..541e7da99a 100644 --- a/src/status_im/ui/screens/wallet/settings/views.cljs +++ b/src/status_im/ui/screens/wallet/settings/views.cljs @@ -77,7 +77,7 @@ nil [toolbar/content-wrapper] [toolbar/actions - [{:icon :icons/options + [{:icon :main-icons/more :icon-opts {:color colors/white :accessibility-label :options-menu-button} :options (into [{:label (i18n/label :t/wallet-manage-assets) diff --git a/src/status_im/ui/screens/wallet/transaction_sent/views.cljs b/src/status_im/ui/screens/wallet/transaction_sent/views.cljs index 14e8de8a96..09af1b5ad6 100644 --- a/src/status_im/ui/screens/wallet/transaction_sent/views.cljs +++ b/src/status_im/ui/screens/wallet/transaction_sent/views.cljs @@ -27,7 +27,7 @@ :shadow-color "rgba(43, 59, 71, 0.12)" :align-items :center :justify-content :center} - [vi/icon :icons/tiny-check {:color colors/blue}]]]) + [vi/icon :tiny-icons/tiny-check {:color colors/blue}]]]) (defn- transaction-sent-message [] [react/view {:align-items :center} diff --git a/src/status_im/ui/screens/wallet/transactions/views.cljs b/src/status_im/ui/screens/wallet/transactions/views.cljs index 7ae5fa8c05..f6948e71b2 100644 --- a/src/status_im/ui/screens/wallet/transactions/views.cljs +++ b/src/status_im/ui/screens/wallet/transactions/views.cljs @@ -18,7 +18,7 @@ (defn history-action [filter?] (cond-> - {:icon :icons/filter + {:icon :main-icons/filter :icon-opts {:accessibility-label :filters-button} :handler #(re-frame/dispatch [:navigate-to :wallet-transactions-filter])} filter? (assoc-in [:icon-opts :overlay-style] styles/corner-dot))) @@ -44,10 +44,10 @@ (defn- transaction-type->icon [k] (case k - :inbound (transaction-icon :icons/arrow-left (colors/alpha colors/green 0.2) colors/green) - :outbound (transaction-icon :icons/arrow-right (colors/alpha colors/blue 0.1) colors/blue) - :failed (transaction-icon :icons/exclamation-mark colors/gray-light colors/red) - (:postponed :pending) (transaction-icon :icons/arrow-right colors/gray-light colors/gray) + :inbound (transaction-icon :main-icons/arrow-left (colors/alpha colors/green 0.2) colors/green) + :outbound (transaction-icon :main-icons/arrow-right (colors/alpha colors/blue 0.1) colors/blue) + :failed (transaction-icon :main-icons/warning colors/gray-light colors/red) + (:postponed :pending) (transaction-icon :main-icons/arrow-right colors/gray-light colors/gray) (throw (str "Unknown transaction type: " k)))) (defn render-transaction [{:keys [hash from-contact to-contact to from type value time-formatted symbol]} @@ -88,7 +88,7 @@ :accessibility-label address-accessibility-label} address]]] (when-not hide-details? - [list/item-icon {:icon :icons/forward + [list/item-icon {:icon :main-icons/next :style {:margin-top 10} :icon-opts (merge styles/forward {:accessibility-label :show-transaction-button})}])]]]))