From b52c925d260e45fb4a12d97d2f67e8a416ee7fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= Date: Fri, 21 Nov 2025 19:31:42 +0100 Subject: [PATCH] Theme: update png/svg/emoji calls --- storybook/pages/AirdropTokensSelectorPage.qml | 12 ++--- storybook/pages/BannerCardPage.qml | 2 +- storybook/pages/CollectibleDetailViewPage.qml | 2 +- storybook/pages/ColumnHeaderPanelPage.qml | 2 +- storybook/pages/CommunityInfoEditor.qml | 10 ++-- .../pages/ExportControlNodePopupPage.qml | 2 +- .../pages/ImportControlNodePopupPage.qml | 2 +- .../pages/InlineNetworksComboBoxPage.qml | 8 +-- storybook/pages/IntroPanelPage.qml | 2 +- storybook/pages/JoinCommunityViewPage.qml | 2 +- storybook/pages/LinkPreviewCardPage.qml | 6 +-- .../pages/NetworkSelectItemDelegatePage.qml | 2 +- storybook/pages/NotificationAvatarPage.qml | 2 +- storybook/pages/NotificationCardPage.qml | 2 +- storybook/pages/ProfileDialogViewPage.qml | 2 +- storybook/pages/SendSignModalPage.qml | 2 +- storybook/pages/SimpleSendModalPage.qml | 2 +- storybook/pages/StatusFlowSelectorPage.qml | 2 +- storybook/pages/StatusGroupBoxPage.qml | 2 +- storybook/pages/StatusItemSelectorPage.qml | 4 +- storybook/pages/SwapApproveCapModalPage.qml | 2 +- storybook/pages/SwapSignModalPage.qml | 2 +- storybook/pages/TokenPanelPage.qml | 8 +-- storybook/pages/TransactionDelegatePage.qml | 4 +- .../tests/tst_NetworkSelectItemDelegate.qml | 12 ++--- .../tests/tst_NetworkSelectorView.qml | 2 +- .../qmlTests/tests/tst_SendSignModal.qml | 2 +- .../tests/tst_SwapApproveCapModal.qml | 4 +- storybook/qmlTests/tests/tst_SwapModal.qml | 4 +- .../qmlTests/tests/tst_SwapSignModal.qml | 2 +- storybook/src/Models/ModelsData.qml | 50 +++++++++---------- .../src/Models/WalletTransactionsModel.qml | 24 ++++----- .../StatusQ/Components/StatusFlowSelector.qml | 2 +- .../StatusQ/Components/StatusItemSelector.qml | 2 +- .../StatusQ/Components/StatusUserImage.qml | 2 +- .../StatusMessageEmojiReactions.qml | 2 +- .../ActivityCenter/controls/ReplyBadge.qml | 2 +- .../views/ActivityNotificationNewsMessage.qml | 2 +- .../Browser/controls/BookmarkButton.qml | 2 +- .../Browser/controls/FaviconImage.qml | 2 +- .../Browser/popups/BrowserConnectionModal.qml | 4 +- .../Browser/views/BrowserWebEngineView.qml | 2 +- .../Chat/panels/ChatRequestMessagePanel.qml | 2 +- .../AppLayouts/Chat/panels/EmptyChatPanel.qml | 2 +- .../Chat/popups/PaymentRequestModal.qml | 4 +- ui/app/AppLayouts/Chat/stores/RootStore.qml | 4 +- .../controls/AirdropRecipientsSelector.qml | 2 +- .../controls/AirdropTokensSelector.qml | 2 +- .../controls/ListDropdownContent.qml | 2 +- .../Communities/controls/Options.qml | 2 +- .../helpers/PermissionsHelpers.qml | 2 +- .../panels/AirdropsSettingsPanel.qml | 2 +- .../AppLayouts/Communities/panels/FeesBox.qml | 2 +- .../Communities/panels/TokenInfoPanel.qml | 2 +- .../Communities/panels/WelcomeBannerPanel.qml | 2 +- .../Communities/popups/HoldingsDropdown.qml | 4 +- .../Communities/views/EditAirdropView.qml | 4 +- .../views/EditCommunityTokenView.qml | 2 +- .../Communities/views/EditPermissionView.qml | 6 +-- .../views/HoldingsSelectionModel.qml | 2 +- .../Communities/views/MintedTokensView.qml | 2 +- .../Communities/views/PermissionsView.qml | 2 +- .../Onboarding/KeycardFactoryResetFlow.qml | 6 +-- .../Onboarding/UnblockWithPukFlow.qml | 2 +- .../Onboarding/components/NewsCarousel.qml | 2 +- .../pages/BackupSeedphraseIntro.qml | 2 +- .../pages/BackupSeedphraseKeepOrDelete.qml | 2 +- .../pages/CreateKeycardProfilePage.qml | 4 +- .../Onboarding/pages/CreateProfilePage.qml | 6 +-- .../Onboarding/pages/EnableBiometricsPage.qml | 2 +- .../pages/HelpUsImproveStatusPage.qml | 2 +- .../pages/ImportLocalBackupPage.qml | 2 +- .../pages/KeycardAddKeyPairPage.qml | 4 +- .../Onboarding/pages/KeycardCreatePinPage.qml | 6 +-- .../Onboarding/pages/KeycardEmptyPage.qml | 2 +- .../Onboarding/pages/KeycardEnterPinPage.qml | 10 ++-- .../Onboarding/pages/KeycardEnterPukPage.qml | 4 +- .../Onboarding/pages/KeycardErrorPage.qml | 2 +- .../Onboarding/pages/KeycardIntroPage.qml | 18 +++---- .../Onboarding/pages/KeycardLostPage.qml | 2 +- .../Onboarding/pages/KeycardNotEmptyPage.qml | 2 +- .../Onboarding/pages/LoginScreen.qml | 2 +- .../Onboarding/pages/NewAccountLoginPage.qml | 6 +-- .../Onboarding/pages/SyncProgressPage.qml | 8 +-- .../Onboarding/pages/WelcomePage.qml | 2 +- .../controls/WalletNetworkDelegate.qml | 2 +- .../popups/ProfileShowcaseInfoPopup.qml | 2 +- .../Profile/popups/SearchEngineModal.qml | 2 +- .../DeactivateNetworkPopup.qml | 2 +- ui/app/AppLayouts/Profile/views/AboutView.qml | 2 +- .../Profile/views/AppearanceView.qml | 6 +-- .../Profile/views/CommunitiesView.qml | 2 +- .../Profile/views/EnsSearchView.qml | 2 +- .../views/EnsTermsAndConditionsView.qml | 2 +- .../Profile/views/EnsWelcomeView.qml | 2 +- .../AppLayouts/Profile/views/WalletView.qml | 2 +- .../Profile/views/keycard/MainView.qml | 2 +- ui/app/AppLayouts/Wallet/WalletUtils.qml | 8 +-- .../adaptors/CollectiblesSelectionAdaptor.qml | 2 +- .../controls/CollectibleDetailsHeader.qml | 2 +- .../Wallet/controls/CollectiblesHeader.qml | 2 +- .../Wallet/controls/NetworkFilter.qml | 6 +-- .../Wallet/panels/ActivityFilterPanel.qml | 8 +-- .../Wallet/panels/BuyReceiveBanner.qml | 4 +- .../Wallet/panels/WalletAccountHeader.qml | 2 +- .../Wallet/popups/dapps/DAppsWorkflow.qml | 6 +-- .../ActivityStatusFilterSubMenu.qml | 8 +-- .../popups/simpleSend/SendSignModal.qml | 4 +- .../popups/swap/SwapApproveCapModal.qml | 4 +- .../Wallet/popups/swap/SwapModal.qml | 6 +-- .../Wallet/popups/swap/SwapSignModal.qml | 4 +- ui/app/AppLayouts/Wallet/stores/RootStore.qml | 4 +- .../Wallet/views/AssetsDetailView.qml | 2 +- .../Wallet/views/LoadingGraphView.qml | 2 +- .../Wallet/views/NetworkSelectorView.qml | 2 +- .../views/TokenSelectorAssetDelegate.qml | 2 +- .../TokenSelectorCollectibleDelegate.qml | 2 +- ui/app/AppLayouts/stores/RootStore.qml | 2 +- ui/app/mainui/Handlers/SendModalHandler.qml | 2 +- ui/app/mainui/SplashScreen.qml | 2 +- ui/app/mainui/StatusTrayIcon.qml | 4 +- ui/app/mainui/ToastsManager.qml | 2 +- ui/imports/shared/LoadingAnimation.qml | 2 +- .../shared/controls/AssetsDetailsHeader.qml | 2 +- .../shared/controls/TransactionDelegate.qml | 6 +-- .../shared/controls/WalletAccountListItem.qml | 2 +- .../chat/PaymentRequestMiniCardDelegate.qml | 2 +- .../shared/controls/chat/ProfileHeader.qml | 2 +- .../controls/chat/VerificationLabel.qml | 4 +- .../delegates/PaymentRequestCardDelegate.qml | 2 +- ui/imports/shared/panels/ImageLoader.qml | 2 +- .../shared/panels/NoImageUploadedPanel.qml | 2 +- .../shared/panels/PrivacyWallCarousel.qml | 2 +- ui/imports/shared/panels/RoundedIcon.qml | 2 +- .../shared/popups/BlockchainExplorersMenu.qml | 2 +- ui/imports/shared/popups/DownloadPage.qml | 2 +- .../shared/popups/EnableBiometricsPopup.qml | 2 +- .../shared/popups/IntroduceYourselfPopup.qml | 2 +- ui/imports/shared/popups/NewsMessagePopup.qml | 2 +- .../states/ConfirmAddingNewMasterKey.qml | 2 +- .../popups/keycard/helpers/KeycardImage.qml | 2 +- .../popups/keycard/states/EnterPassword.qml | 8 +-- .../popups/keycard/states/KeycardInit.qml | 26 +++++----- .../popups/keycard/states/KeycardPin.qml | 14 +++--- .../popups/keycard/states/KeycardPuk.qml | 12 ++--- .../send/views/NetworkCardsComponent.qml | 4 +- .../walletconnect/DAppSignRequestModal.qml | 4 +- .../walletconnect/panels/IntentionPanel.qml | 2 +- .../status/StatusChatImageValidator.qml | 2 +- .../status/StatusChatInputImageArea.qml | 2 +- .../status/StatusChatInputReplyArea.qml | 2 +- .../StatusGifPopup/ConfirmationPopup.qml | 2 +- .../StatusStickerPackIconWithIndicator.qml | 2 +- .../shared/status/StatusStickersPopup.qml | 2 +- .../shared/views/chat/LinksMessageView.qml | 2 +- ui/imports/shared/views/chat/MessageView.qml | 2 +- .../ProfileShowcaseCollectiblesView.qml | 2 +- ui/imports/utils/Constants.qml | 16 +++--- 158 files changed, 313 insertions(+), 313 deletions(-) diff --git a/storybook/pages/AirdropTokensSelectorPage.qml b/storybook/pages/AirdropTokensSelectorPage.qml index 0ed97ed6fe..6f59839162 100644 --- a/storybook/pages/AirdropTokensSelectorPage.qml +++ b/storybook/pages/AirdropTokensSelectorPage.qml @@ -13,22 +13,22 @@ ColumnLayout { { tokenText: "2 MCT", networkText: "Ethereum", - tokenImage: Theme.png("tokens/SNT"), - networkImage: Theme.svg("network/Network=Ethereum"), + tokenImage: Assets.png("tokens/SNT"), + networkImage: Assets.svg("network/Network=Ethereum"), valid: true }, { tokenText: "64 DAI", networkText: "Optimism", - tokenImage: Theme.png("tokens/DAI"), - networkImage: Theme.svg("network/Network=Optimism"), + tokenImage: Assets.png("tokens/DAI"), + networkImage: Assets.svg("network/Network=Optimism"), valid: false }, { tokenText: "0.125 ETH", networkText: "Arbitrum", - tokenImage: Theme.png("tokens/ETH"), - networkImage: Theme.svg("network/Network=Arbitrum"), + tokenImage: Assets.png("tokens/ETH"), + networkImage: Assets.svg("network/Network=Arbitrum"), valid: true } ] diff --git a/storybook/pages/BannerCardPage.qml b/storybook/pages/BannerCardPage.qml index 22c4c9da50..f6542731b7 100644 --- a/storybook/pages/BannerCardPage.qml +++ b/storybook/pages/BannerCardPage.qml @@ -16,7 +16,7 @@ SplitView { anchors.centerIn: parent title: titleField.text subTitle: subTitleField.text - image: Theme.png("wallet/wallet-green") + image: Assets.png("wallet/wallet-green") closeEnabled: closeEnabled.checked onClicked: { print("BannerCard clicked") diff --git a/storybook/pages/CollectibleDetailViewPage.qml b/storybook/pages/CollectibleDetailViewPage.qml index f260db38e4..fcfb760718 100644 --- a/storybook/pages/CollectibleDetailViewPage.qml +++ b/storybook/pages/CollectibleDetailViewPage.qml @@ -108,7 +108,7 @@ SplitView { } return { name : "Mock Community", - image : Theme.png("tokens/UNI"), + image : Assets.png("tokens/UNI"), color : "orchid" } } diff --git a/storybook/pages/ColumnHeaderPanelPage.qml b/storybook/pages/ColumnHeaderPanelPage.qml index 0ebbde6881..9352892be5 100644 --- a/storybook/pages/ColumnHeaderPanelPage.qml +++ b/storybook/pages/ColumnHeaderPanelPage.qml @@ -18,7 +18,7 @@ SplitView { property int membersCount: 184 property bool amISectionAdmin: false property color color: "orchid" - property url image: Theme.png("tokens/UNI") + property url image: Assets.png("tokens/UNI") property bool openCreateChat: false } diff --git a/storybook/pages/CommunityInfoEditor.qml b/storybook/pages/CommunityInfoEditor.qml index 4c76932c47..15e194f027 100644 --- a/storybook/pages/CommunityInfoEditor.qml +++ b/storybook/pages/CommunityInfoEditor.qml @@ -16,9 +16,9 @@ ColumnLayout { property bool amISectionAdmin: true property bool isCommunityEditable: true property color color: "orchid" - property url image: Theme.png("tokens/UNI") + property url image: Assets.png("tokens/UNI") property bool colorVisible: false - property url banner: ctrlCommunityBanner.checked ? Theme.png("settings/communities@2x") : "" + property url banner: ctrlCommunityBanner.checked ? Assets.png("settings/communities@2x") : "" property bool adminControlsEnabled: true ColumnLayout { @@ -94,15 +94,15 @@ ColumnLayout { RadioButton { checked: true text: qsTr("UNI") - onCheckedChanged: if(checked) root.image = Theme.png("tokens/UNI") + onCheckedChanged: if(checked) root.image = Assets.png("tokens/UNI") } RadioButton { text: qsTr("SOCKS") - onCheckedChanged: if(checked) root.image = Theme.png("tokens/SOCKS") + onCheckedChanged: if(checked) root.image = Assets.png("tokens/SOCKS") } RadioButton { text: qsTr("Status") - onCheckedChanged: if(checked) root.image = Theme.png("tokens/SNT") + onCheckedChanged: if(checked) root.image = Assets.png("tokens/SNT") } } diff --git a/storybook/pages/ExportControlNodePopupPage.qml b/storybook/pages/ExportControlNodePopupPage.qml index 7c996ef186..bc0d0f6db2 100644 --- a/storybook/pages/ExportControlNodePopupPage.qml +++ b/storybook/pages/ExportControlNodePopupPage.qml @@ -91,7 +91,7 @@ SplitView { property string id: "1" property string name: "Socks" property var members: { "count": 5 } - property string image: Theme.png("tokens/UNI") + property string image: Assets.png("tokens/UNI") property string color: "orchid" } devicesStore: ProfileStores.DevicesStore { diff --git a/storybook/pages/ImportControlNodePopupPage.qml b/storybook/pages/ImportControlNodePopupPage.qml index fa0fa59f1b..e1626d7c51 100644 --- a/storybook/pages/ImportControlNodePopupPage.qml +++ b/storybook/pages/ImportControlNodePopupPage.qml @@ -51,7 +51,7 @@ SplitView { property string id: "1" property string name: "Socks" property var members: { "count": 5 } - property string image: Theme.png("tokens/UNI") + property string image: Assets.png("tokens/UNI") property string color: "orchid" } } diff --git a/storybook/pages/InlineNetworksComboBoxPage.qml b/storybook/pages/InlineNetworksComboBoxPage.qml index 8c65c23bc4..2e8a3985a6 100644 --- a/storybook/pages/InlineNetworksComboBoxPage.qml +++ b/storybook/pages/InlineNetworksComboBoxPage.qml @@ -15,28 +15,28 @@ Item { readonly property var modelData: [ { name: "Optimism", - icon: Theme.svg(ModelsData.networks.optimism), + icon: Assets.svg(ModelsData.networks.optimism), amount: "300", multiplierIndex: 0, infiniteAmount: false }, { name: "Arbitrum", - icon: Theme.svg(ModelsData.networks.arbitrum), + icon: Assets.svg(ModelsData.networks.arbitrum), amount: "400000", multiplierIndex: 3, infiniteAmount: false }, { name: "Hermez", - icon: Theme.svg(ModelsData.networks.hermez), + icon: Assets.svg(ModelsData.networks.hermez), amount: "0", multiplierIndex: 0, infiniteAmount: true }, { name: "Ethereum", - icon: Theme.svg(ModelsData.networks.ethereum), + icon: Assets.svg(ModelsData.networks.ethereum), amount: "12" + "0".repeat(18), multiplierIndex: 18, infiniteAmount: false diff --git a/storybook/pages/IntroPanelPage.qml b/storybook/pages/IntroPanelPage.qml index be8634283d..46f1de7eb5 100644 --- a/storybook/pages/IntroPanelPage.qml +++ b/storybook/pages/IntroPanelPage.qml @@ -34,7 +34,7 @@ SplitView { anchors.margins: 50 anchors.fill: parent - image: Theme.png("community/airdrops8_1") + image: Assets.png("community/airdrops8_1") title: radioButtonsGroup.text subtitle: radioButtonsGroup.text diff --git a/storybook/pages/JoinCommunityViewPage.qml b/storybook/pages/JoinCommunityViewPage.qml index e3d31c697f..04a77772fb 100644 --- a/storybook/pages/JoinCommunityViewPage.qml +++ b/storybook/pages/JoinCommunityViewPage.qml @@ -54,7 +54,7 @@ Nemo enim 😋 ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, // Blur background: property int membersCount: 184 property bool amISectionAdmin: false - property url image: Theme.png("tokens/UNI") + property url image: Assets.png("tokens/UNI") property var communityItemsModel: model1 property string chatDateTimeText: "Dec 31, 2020" property string listUsersText: "simon, Mark Cuban " diff --git a/storybook/pages/LinkPreviewCardPage.qml b/storybook/pages/LinkPreviewCardPage.qml index 543771a1b5..8e898a6b6a 100644 --- a/storybook/pages/LinkPreviewCardPage.qml +++ b/storybook/pages/LinkPreviewCardPage.qml @@ -15,7 +15,7 @@ SplitView { id: root property string ytBannerQuality: "hqdefault" - property string image: Theme.png("tokens/SOCKS") + property string image: Assets.png("tokens/SOCKS") property string banner: rawImageCheck.checked ? rawImageCheck.rawImageData : "https://img.youtube.com/vi/yHN1M7vcPKU/%1.jpg".arg(root.ytBannerQuality) property bool globalUtilsReady: false @@ -275,8 +275,8 @@ SplitView { RadioButton { text: qsTr("QRC asset: SOCKS") - checked: root.image === Theme.png("tokens/SOCKS") - onToggled: root.image = Theme.png("tokens/SOCKS") + checked: root.image === Assets.png("tokens/SOCKS") + onToggled: root.image = Assets.png("tokens/SOCKS") } ColumnLayout { diff --git a/storybook/pages/NetworkSelectItemDelegatePage.qml b/storybook/pages/NetworkSelectItemDelegatePage.qml index e6aeabda7f..2fad080907 100644 --- a/storybook/pages/NetworkSelectItemDelegatePage.qml +++ b/storybook/pages/NetworkSelectItemDelegatePage.qml @@ -26,7 +26,7 @@ SplitView { NetworkSelectItemDelegate { id: delegate title: "Ethereum" - iconUrl: Theme.svg("network/Network=Ethereum") + iconUrl: Assets.svg("network/Network=Ethereum") showIndicator: true multiSelection: true checkState: checkStateSelector.checkState diff --git a/storybook/pages/NotificationAvatarPage.qml b/storybook/pages/NotificationAvatarPage.qml index 46b828e103..a8f1b8fa3d 100644 --- a/storybook/pages/NotificationAvatarPage.qml +++ b/storybook/pages/NotificationAvatarPage.qml @@ -30,7 +30,7 @@ SplitView { Tracer { visible: avatarEditor.showImplicitSizeArea } - avatarSource: avatarEditor.changeAvatarImage ? "https://i.pravatar.cc/128?img=5" : Theme.png("status-logo-icon") + avatarSource: avatarEditor.changeAvatarImage ? "https://i.pravatar.cc/128?img=5" : Assets.png("status-logo-icon") badgeIconName: root.badgeIconName density: avatarEditor.density circular: avatarEditor.isRoundedAvatar diff --git a/storybook/pages/NotificationCardPage.qml b/storybook/pages/NotificationCardPage.qml index db1996a602..7d7a0c39c8 100644 --- a/storybook/pages/NotificationCardPage.qml +++ b/storybook/pages/NotificationCardPage.qml @@ -56,7 +56,7 @@ SplitView { selected: selectedCheck.checked // Avatar related - avatarSource: avatarEditor.changeAvatarImage ? "https://i.pravatar.cc/128?img=5" : Theme.png("status-logo-icon") + avatarSource: avatarEditor.changeAvatarImage ? "https://i.pravatar.cc/128?img=5" : Assets.png("status-logo-icon") badgeIconName: avatarEditor.changeBadgeIcon ? "action-mention" : "action-reply" isCircularAvatar: avatarEditor.isRoundedAvatar diff --git a/storybook/pages/ProfileDialogViewPage.qml b/storybook/pages/ProfileDialogViewPage.qml index 50f665ab7e..c08482677f 100644 --- a/storybook/pages/ProfileDialogViewPage.qml +++ b/storybook/pages/ProfileDialogViewPage.qml @@ -155,7 +155,7 @@ SplitView { isContact: ctrlIsContact.checked contactRequestState: ctrlContactRequestState.currentValue - largeImage: userImageCheckBox.checked ? Theme.png("status-logo") : "" + largeImage: userImageCheckBox.checked ? Assets.png("status-logo") : "" onlineStatus: onlineStatusComboBox.currentValue diff --git a/storybook/pages/SendSignModalPage.qml b/storybook/pages/SendSignModalPage.qml index 4bc420b280..f4a0c7099a 100644 --- a/storybook/pages/SendSignModalPage.qml +++ b/storybook/pages/SendSignModalPage.qml @@ -147,7 +147,7 @@ SplitView { networkShortName: priv.selectedNetwork.shortName networkName: priv.selectedNetwork.chainName - networkIconPath: Theme.svg(priv.selectedNetwork.iconUrl) + networkIconPath: Assets.svg(priv.selectedNetwork.iconUrl) networkBlockExplorerUrl: priv.selectedNetwork.blockExplorerURL networkChainId: priv.selectedNetwork.chainId diff --git a/storybook/pages/SimpleSendModalPage.qml b/storybook/pages/SimpleSendModalPage.qml index d618e2ebbf..06ddc1db64 100644 --- a/storybook/pages/SimpleSendModalPage.qml +++ b/storybook/pages/SimpleSendModalPage.qml @@ -674,7 +674,7 @@ SplitView { icon: { const iconUrl = ModelUtils.getByKey(NetworksModel.flatNetworks, "chainId", model.chainId, "iconUrl") if(!!iconUrl) - return Theme.svg(iconUrl) + return Assets.svg(iconUrl) else return "" } } diff --git a/storybook/pages/StatusFlowSelectorPage.qml b/storybook/pages/StatusFlowSelectorPage.qml index c42155bfde..ae6e620bb9 100644 --- a/storybook/pages/StatusFlowSelectorPage.qml +++ b/storybook/pages/StatusFlowSelectorPage.qml @@ -13,7 +13,7 @@ ColumnLayout { Layout.fillWidth: true Layout.margins: 100 - icon: Theme.png("tokens/SNT") + icon: Assets.png("tokens/SNT") title: "Item Selector Title" placeholderText: "Example: Empty items" diff --git a/storybook/pages/StatusGroupBoxPage.qml b/storybook/pages/StatusGroupBoxPage.qml index 6b54f3e8eb..e5602d7fad 100644 --- a/storybook/pages/StatusGroupBoxPage.qml +++ b/storybook/pages/StatusGroupBoxPage.qml @@ -43,7 +43,7 @@ SplitView { anchors.centerIn: parent title: titleTextEdit.text - icon: Theme.png("tokens/SNT") + icon: Assets.png("tokens/SNT") iconSize: iconSizeSlider.value label.enabled: labelEnabledCheckBox.checked diff --git a/storybook/pages/StatusItemSelectorPage.qml b/storybook/pages/StatusItemSelectorPage.qml index 463aa3a4dd..da10050915 100644 --- a/storybook/pages/StatusItemSelectorPage.qml +++ b/storybook/pages/StatusItemSelectorPage.qml @@ -17,7 +17,7 @@ ColumnLayout { Layout.fillWidth: true Layout.margins: 50 - icon: Theme.png("tokens/SNT") + icon: Assets.png("tokens/SNT") title: "Item Selector Title" placeholderText: "Example: Empty items" @@ -47,7 +47,7 @@ ColumnLayout { onClicked: { model.append({ text: input.text, - imageSource: Theme.png("tokens/SNT"), + imageSource: Assets.png("tokens/SNT"), isIcon: false, operator: model.count > 0 ? OperatorsUtils.Operators.Or : OperatorsUtils.Operators.None diff --git a/storybook/pages/SwapApproveCapModalPage.qml b/storybook/pages/SwapApproveCapModalPage.qml index aeb9a86fb9..4d42fc64c4 100644 --- a/storybook/pages/SwapApproveCapModalPage.qml +++ b/storybook/pages/SwapApproveCapModalPage.qml @@ -92,7 +92,7 @@ SplitView { networkShortName: priv.selectedNetwork.shortName networkName: priv.selectedNetwork.chainName - networkIconPath: Theme.svg(priv.selectedNetwork.iconUrl) + networkIconPath: Assets.svg(priv.selectedNetwork.iconUrl) networkBlockExplorerUrl: priv.selectedNetwork.blockExplorerURL networkChainId: priv.selectedNetwork.chainId diff --git a/storybook/pages/SwapSignModalPage.qml b/storybook/pages/SwapSignModalPage.qml index c3d12c3101..36baf5cbb6 100644 --- a/storybook/pages/SwapSignModalPage.qml +++ b/storybook/pages/SwapSignModalPage.qml @@ -95,7 +95,7 @@ SplitView { networkShortName: priv.selectedNetwork.shortName networkName: priv.selectedNetwork.chainName - networkIconPath: Theme.svg(priv.selectedNetwork.iconUrl) + networkIconPath: Assets.svg(priv.selectedNetwork.iconUrl) networkBlockExplorerUrl: priv.selectedNetwork.blockExplorerURL networkChainId: priv.selectedNetwork.chainId diff --git a/storybook/pages/TokenPanelPage.qml b/storybook/pages/TokenPanelPage.qml index 02cb82f586..1f013d33d8 100644 --- a/storybook/pages/TokenPanelPage.qml +++ b/storybook/pages/TokenPanelPage.qml @@ -23,7 +23,7 @@ SplitView { readonly property var modelData: [ { name: "Optimism", - icon: Theme.svg(ModelsData.networks.optimism), + icon: Assets.svg(ModelsData.networks.optimism), amount: "300", multiplierIndex: 0, infiniteAmount: false, @@ -31,7 +31,7 @@ SplitView { }, { name: "Arbitrum", - icon: Theme.svg(ModelsData.networks.arbitrum), + icon: Assets.svg(ModelsData.networks.arbitrum), amount: "400000", multiplierIndex: 3, infiniteAmount: false, @@ -39,7 +39,7 @@ SplitView { }, { name: "Hermez", - icon: Theme.svg(ModelsData.networks.hermez), + icon: Assets.svg(ModelsData.networks.hermez), amount: "0", multiplierIndex: 0, infiniteAmount: true, @@ -47,7 +47,7 @@ SplitView { }, { name: "Ethereum", - icon: Theme.svg(ModelsData.networks.ethereum), + icon: Assets.svg(ModelsData.networks.ethereum), amount: "12" + "0".repeat(18), multiplierIndex: 18, infiniteAmount: false, diff --git a/storybook/pages/TransactionDelegatePage.qml b/storybook/pages/TransactionDelegatePage.qml index 0abd8660c9..e0b08f502f 100644 --- a/storybook/pages/TransactionDelegatePage.qml +++ b/storybook/pages/TransactionDelegatePage.qml @@ -36,13 +36,13 @@ SplitView { readonly property bool isNFT: ctrlIsNft.checked readonly property bool isCommunityAssetViaAirdrop: isCommunityAssetViaAirdrop.checked readonly property string communityName: "Doodles" - readonly property string communityImageUrl: Theme.png("collectibles/HappyMeow") + readonly property string communityImageUrl: Assets.png("collectibles/HappyMeow") readonly property string tokenID: "4981676894159712808201908443964193325271219637660871887967796332739046670337" readonly property string tokenAddress: "0xdeadbeef" readonly property string tokenInAddress: "0xdeadbeef-in" readonly property string tokenOutAddress: "0xdeadbeef-out" readonly property string nftName: "Happy Meow NFT" - readonly property string nftImageUrl: Theme.png("collectibles/HappyMeow") + readonly property string nftImageUrl: Assets.png("collectibles/HappyMeow") readonly property int chainId: 1 readonly property int chainIdIn: 1 readonly property int chainIdOut: 2 diff --git a/storybook/qmlTests/tests/tst_NetworkSelectItemDelegate.qml b/storybook/qmlTests/tests/tst_NetworkSelectItemDelegate.qml index 05cc6c0bee..3dbe141855 100644 --- a/storybook/qmlTests/tests/tst_NetworkSelectItemDelegate.qml +++ b/storybook/qmlTests/tests/tst_NetworkSelectItemDelegate.qml @@ -18,7 +18,7 @@ Item { NetworkSelectItemDelegate { anchors.centerIn: parent title: "Ethereum" - iconUrl: Theme.svg("network/Network=Ethereum") + iconUrl: Assets.svg("network/Network=Ethereum") onToggled: root.onToggledHandler() } } @@ -68,11 +68,11 @@ Item { function test_icon() { verify(!!controlUnderTest) - compare(controlUnderTest.iconUrl, Theme.svg("network/Network=Ethereum")) - compare(findChild(controlUnderTest, "statusRoundImage").image.source, Theme.svg("network/Network=Ethereum")) - controlUnderTest.iconUrl = Theme.svg("network/Network=Polygon") - compare(controlUnderTest.iconUrl, Theme.svg("network/Network=Polygon")) - compare(findChild(controlUnderTest, "statusRoundImage").image.source, Theme.svg("network/Network=Polygon")) + compare(controlUnderTest.iconUrl, Assets.svg("network/Network=Ethereum")) + compare(findChild(controlUnderTest, "statusRoundImage").image.source, Assets.svg("network/Network=Ethereum")) + controlUnderTest.iconUrl = Assets.svg("network/Network=Polygon") + compare(controlUnderTest.iconUrl, Assets.svg("network/Network=Polygon")) + compare(findChild(controlUnderTest, "statusRoundImage").image.source, Assets.svg("network/Network=Polygon")) } function test_indicatorConfig() { diff --git a/storybook/qmlTests/tests/tst_NetworkSelectorView.qml b/storybook/qmlTests/tests/tst_NetworkSelectorView.qml index be76454979..5511a1042a 100644 --- a/storybook/qmlTests/tests/tst_NetworkSelectorView.qml +++ b/storybook/qmlTests/tests/tst_NetworkSelectorView.qml @@ -86,7 +86,7 @@ Item { verify(!!delegate) compare(delegate.title, model.chainName) - compare(delegate.iconUrl, Theme.svg(model.iconUrl)) + compare(delegate.iconUrl, Assets.svg(model.iconUrl)) compare(delegate.showIndicator, controlUnderTest.showIndicator) compare(delegate.multiSelection, controlUnderTest.multiSelection) compare(delegate.checkState, controlUnderTest.selection.includes(model.chainId) ? Qt.Checked : Qt.Unchecked) diff --git a/storybook/qmlTests/tests/tst_SendSignModal.qml b/storybook/qmlTests/tests/tst_SendSignModal.qml index a489777ba3..2b521b261a 100644 --- a/storybook/qmlTests/tests/tst_SendSignModal.qml +++ b/storybook/qmlTests/tests/tst_SendSignModal.qml @@ -43,7 +43,7 @@ Item { networkShortName: Constants.networkShortChainNames.mainnet networkName: "Mainnet" - networkIconPath: Theme.svg("network/Network=Ethereum") + networkIconPath: Assets.svg("network/Network=Ethereum") networkBlockExplorerUrl: "https://etherscan.io/" networkChainId: 1 diff --git a/storybook/qmlTests/tests/tst_SwapApproveCapModal.qml b/storybook/qmlTests/tests/tst_SwapApproveCapModal.qml index e2030728a7..516b8dbf67 100644 --- a/storybook/qmlTests/tests/tst_SwapApproveCapModal.qml +++ b/storybook/qmlTests/tests/tst_SwapApproveCapModal.qml @@ -36,7 +36,7 @@ Item { networkShortName: Constants.networkShortChainNames.mainnet networkName: "Mainnet" - networkIconPath: Theme.svg("network/Network=Ethereum") + networkIconPath: Assets.svg("network/Network=Ethereum") networkBlockExplorerUrl: "https://etherscan.io/" networkChainId: 1 @@ -161,7 +161,7 @@ Item { compare(smartContractBox.caption, qsTr("Via smart contract")) compare(smartContractBox.primaryText, controlUnderTest.serviceProviderName) compare(smartContractBox.secondaryText, SQUtils.Utils.elideAndFormatWalletAddress(controlUnderTest.serviceProviderContractAddress)) - compare(smartContractBox.icon, Theme.png("swap/paraswap")) + compare(smartContractBox.icon, Assets.png("swap/paraswap")) } function test_networkInfo() { diff --git a/storybook/qmlTests/tests/tst_SwapModal.qml b/storybook/qmlTests/tests/tst_SwapModal.qml index e5366e223e..311524b7fd 100644 --- a/storybook/qmlTests/tests/tst_SwapModal.qml +++ b/storybook/qmlTests/tests/tst_SwapModal.qml @@ -306,7 +306,7 @@ Item { const balance = delegateUnderTest.model.accountBalance.balance - compare(inlineTagDelegate_0.asset.name, Theme.svg(delegateUnderTest.model.accountBalance.iconUrl)) + compare(inlineTagDelegate_0.asset.name, Assets.svg(delegateUnderTest.model.accountBalance.iconUrl)) compare(inlineTagDelegate_0.asset.color.toString().toUpperCase(), delegateUnderTest.model.accountBalance.chainColor.toString().toUpperCase()) compare(inlineTagDelegate_0.titleText.color, balance === "0" ? Theme.palette.baseColor1 : Theme.palette.directColor1) @@ -462,7 +462,7 @@ Item { const inlineTagDelegate_0 = findChild(accountDelegateUnderTest, "inlineTagDelegate_0") verify(!!inlineTagDelegate_0) - compare(inlineTagDelegate_0.asset.name, Theme.svg(networkModelItem.iconUrl)) + compare(inlineTagDelegate_0.asset.name, Assets.svg(networkModelItem.iconUrl)) compare(inlineTagDelegate_0.asset.color.toString().toUpperCase(), networkModelItem.chainColor.toString().toUpperCase()) let balancesModel = SQUtils.ModelUtils.getByKey(root.swapAdaptor.walletAssetsStore.baseGroupedAccountAssetModel, "tokensKey", root.swapFormData.fromTokensKey).balances diff --git a/storybook/qmlTests/tests/tst_SwapSignModal.qml b/storybook/qmlTests/tests/tst_SwapSignModal.qml index d6cd4ee2b3..277a33dce7 100644 --- a/storybook/qmlTests/tests/tst_SwapSignModal.qml +++ b/storybook/qmlTests/tests/tst_SwapSignModal.qml @@ -39,7 +39,7 @@ Item { networkShortName: Constants.networkShortChainNames.mainnet networkName: "Mainnet" - networkIconPath: Theme.svg("network/Network=Ethereum") + networkIconPath: Assets.svg("network/Network=Ethereum") networkBlockExplorerUrl: "https://etherscan.io/" networkChainId: 1 diff --git a/storybook/src/Models/ModelsData.qml b/storybook/src/Models/ModelsData.qml index 80c1494d66..b31aa743a8 100644 --- a/storybook/src/Models/ModelsData.qml +++ b/storybook/src/Models/ModelsData.qml @@ -39,31 +39,31 @@ QtObject { readonly property QtObject assets: QtObject { - readonly property string socks: Theme.png("tokens/SOCKS") - readonly property string zrx: Theme.png("tokens/ZRX") - readonly property string inch: Theme.png("tokens/CUSTOM-TOKEN") - readonly property string aave: Theme.png("tokens/CUSTOM-TOKEN") - readonly property string amp: Theme.png("tokens/CUSTOM-TOKEN") - readonly property string uni: Theme.png("tokens/UNI") - readonly property string eth: Theme.png("tokens/ETH") - readonly property string dai: Theme.png("tokens/DAI") - readonly property string snt: Theme.png("tokens/SNT") - readonly property string mana: Theme.png("tokens/aMANA") + readonly property string socks: Assets.png("tokens/SOCKS") + readonly property string zrx: Assets.png("tokens/ZRX") + readonly property string inch: Assets.png("tokens/CUSTOM-TOKEN") + readonly property string aave: Assets.png("tokens/CUSTOM-TOKEN") + readonly property string amp: Assets.png("tokens/CUSTOM-TOKEN") + readonly property string uni: Assets.png("tokens/UNI") + readonly property string eth: Assets.png("tokens/ETH") + readonly property string dai: Assets.png("tokens/DAI") + readonly property string snt: Assets.png("tokens/SNT") + readonly property string mana: Assets.png("tokens/aMANA") } readonly property QtObject collectibles: QtObject { readonly property string anniversary: "https://i2.seadn.io/ethereum/0x5150b29a431ece5eb0e62085535b8aac8df193be/ba8dedcf93676a6be4c0a5da9ba600c7.png?w=1000" - readonly property string cryptoKitties: Theme.png("collectibles/CryptoKitties") - readonly property string kitty1: Theme.png("collectibles/Furbeard") - readonly property string kitty1Big: Theme.png("collectibles/FurbeardBig") - readonly property string kitty2: Theme.png("collectibles/Magicat") - readonly property string kitty2Big: Theme.png("collectibles/MagicatBig") - readonly property string kitty3: Theme.png("collectibles/HappyMeow") - readonly property string kitty3Big: Theme.png("collectibles/HappyMeowBig") - readonly property string kitty4: Theme.png("collectibles/Furbeard") - readonly property string kitty4Big: Theme.png("collectibles/FurbeardBig") - readonly property string kitty5: Theme.png("collectibles/Magicat") - readonly property string kitty5Big: Theme.png("collectibles/MagicatBig") + readonly property string cryptoKitties: Assets.png("collectibles/CryptoKitties") + readonly property string kitty1: Assets.png("collectibles/Furbeard") + readonly property string kitty1Big: Assets.png("collectibles/FurbeardBig") + readonly property string kitty2: Assets.png("collectibles/Magicat") + readonly property string kitty2Big: Assets.png("collectibles/MagicatBig") + readonly property string kitty3: Assets.png("collectibles/HappyMeow") + readonly property string kitty3Big: Assets.png("collectibles/HappyMeowBig") + readonly property string kitty4: Assets.png("collectibles/Furbeard") + readonly property string kitty4Big: Assets.png("collectibles/FurbeardBig") + readonly property string kitty5: Assets.png("collectibles/Magicat") + readonly property string kitty5Big: Assets.png("collectibles/MagicatBig") readonly property string superRare: root.icons.superRare readonly property string custom: root.icons.status readonly property string doodles: root.icons.dribble @@ -89,10 +89,10 @@ QtObject { } readonly property QtObject onRampProviderImages: QtObject { - readonly property string latamex: Theme.png("onRampProviders/latamex") - readonly property string moonPay: Theme.png("onRampProviders/moonPay") - readonly property string ramp: Theme.png("onRampProviders/ramp") - readonly property string mercuryo: Theme.png("onRampProviders/mercuryo") + readonly property string latamex: Assets.png("onRampProviders/latamex") + readonly property string moonPay: Assets.png("onRampProviders/moonPay") + readonly property string ramp: Assets.png("onRampProviders/ramp") + readonly property string mercuryo: Assets.png("onRampProviders/mercuryo") } readonly property ListModel languagePickerModel: ListModel { diff --git a/storybook/src/Models/WalletTransactionsModel.qml b/storybook/src/Models/WalletTransactionsModel.qml index df21ba8a09..e469133fa8 100644 --- a/storybook/src/Models/WalletTransactionsModel.qml +++ b/storybook/src/Models/WalletTransactionsModel.qml @@ -25,13 +25,13 @@ ListModel { isNFT: false, isCommunityAssetViaAirdrop: false, communityName: "Doodles", - communityImageUrl: Theme.png("collectibles/HappyMeow"), + communityImageUrl: Assets.png("collectibles/HappyMeow"), tokenID: "4981676894159712808201908443964193325271219637660871887967796332739046670337", tokenAddress: "0xdeadbeef", tokenInAddress: "0xdeadbeef-00", tokenOutAddress: "0xdeadbeef-00", nftName: "Happy Meow NFT", - nftImageUrl: Theme.png("collectibles/HappyMeow"), + nftImageUrl: Assets.png("collectibles/HappyMeow"), chainId: "NETWORKID", chainIdIn: "NETWORKID-IN", chainIdOut: "NETWORKID-OUT" @@ -54,13 +54,13 @@ ListModel { isNFT: false, isCommunityAssetViaAirdrop: false, communityName: "Doodles", - communityImageUrl: Theme.png("collectibles/HappyMeow"), + communityImageUrl: Assets.png("collectibles/HappyMeow"), tokenID: "4981676894159712808201908443964193325271219637660871887967796332739046670337", tokenAddress: "0xdeadbeef", tokenInAddress: "0xdeadbeef-00", tokenOutAddress: "0xdeadbeef-00", nftName: "Happy Meow NFT", - nftImageUrl: Theme.png("collectibles/HappyMeow"), + nftImageUrl: Assets.png("collectibles/HappyMeow"), chainId: "NETWORKID", chainIdIn: "NETWORKID-IN", chainIdOut: "NETWORKID-OUT" @@ -83,13 +83,13 @@ ListModel { isNFT: false, isCommunityAssetViaAirdrop: false, communityName: "Doodles", - communityImageUrl: Theme.png("collectibles/HappyMeow"), + communityImageUrl: Assets.png("collectibles/HappyMeow"), tokenID: "4981676894159712808201908443964193325271219637660871887967796332739046670337", tokenAddress: "0xdeadbeef", tokenInAddress: "0xdeadbeef-00", tokenOutAddress: "0xdeadbeef-00", nftName: "Happy Meow NFT", - nftImageUrl: Theme.png("collectibles/HappyMeow"), + nftImageUrl: Assets.png("collectibles/HappyMeow"), chainId: "NETWORKID", chainIdIn: "NETWORKID-IN", chainIdOut: "NETWORKID-OUT" @@ -112,13 +112,13 @@ ListModel { isNFT: false, isCommunityAssetViaAirdrop: false, communityName: "Doodles", - communityImageUrl: Theme.png("collectibles/HappyMeow"), + communityImageUrl: Assets.png("collectibles/HappyMeow"), tokenID: "4981676894159712808201908443964193325271219637660871887967796332739046670337", tokenAddress: "0xdeadbeef", tokenInAddress: "0xdeadbeef-00", tokenOutAddress: "0xdeadbeef-00", nftName: "Happy Meow NFT", - nftImageUrl: Theme.png("collectibles/HappyMeow"), + nftImageUrl: Assets.png("collectibles/HappyMeow"), chainId: "NETWORKID", chainIdIn: "NETWORKID-IN", chainIdOut: "NETWORKID-OUT" @@ -141,13 +141,13 @@ ListModel { isNFT: false, isCommunityAssetViaAirdrop: false, communityName: "Doodles", - communityImageUrl: Theme.png("collectibles/HappyMeow"), + communityImageUrl: Assets.png("collectibles/HappyMeow"), tokenID: "4981676894159712808201908443964193325271219637660871887967796332739046670337", tokenAddress: "0xdeadbeef", tokenInAddress: "0xdeadbeef-00", tokenOutAddress: "0xdeadbeef-00", nftName: "Happy Meow NFT", - nftImageUrl: Theme.png("collectibles/HappyMeow"), + nftImageUrl: Assets.png("collectibles/HappyMeow"), chainId: "NETWORKID", chainIdIn: "NETWORKID-IN", chainIdOut: "NETWORKID-OUT" @@ -170,13 +170,13 @@ ListModel { isNFT: false, isCommunityAssetViaAirdrop: false, communityName: "Doodles", - communityImageUrl: Theme.png("collectibles/HappyMeow"), + communityImageUrl: Assets.png("collectibles/HappyMeow"), tokenID: "4981676894159712808201908443964193325271219637660871887967796332739046670337", tokenAddress: "0xdeadbeef", tokenInAddress: "0xdeadbeef-00", tokenOutAddress: "0xdeadbeef-00", nftName: "Happy Meow NFT", - nftImageUrl: Theme.png("collectibles/HappyMeow"), + nftImageUrl: Assets.png("collectibles/HappyMeow"), chainId: "NETWORKID", chainIdIn: "NETWORKID-IN", chainIdOut: "NETWORKID-OUT" diff --git a/ui/StatusQ/src/StatusQ/Components/StatusFlowSelector.qml b/ui/StatusQ/src/StatusQ/Components/StatusFlowSelector.qml index f0d8d531f9..4e78427f83 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusFlowSelector.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusFlowSelector.qml @@ -19,7 +19,7 @@ import StatusQ.Controls Example of how to use it: \qml StatusFlowSelector { - icon: Theme.svg("contact_verified") + icon: Assets.svg("contact_verified") title: qsTr("Who holds") placeholderItem.visible: listModel.count === 0 diff --git a/ui/StatusQ/src/StatusQ/Components/StatusItemSelector.qml b/ui/StatusQ/src/StatusQ/Components/StatusItemSelector.qml index fa0c3bb590..b39d6ca1a4 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusItemSelector.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusItemSelector.qml @@ -23,7 +23,7 @@ import StatusQ.Core.Utils Example of how to use it: \qml StatusItemSelector { - icon: Theme.svg("contact_verified") + icon: Assets.svg("contact_verified") title: qsTr("Who holds") defaultItemText: qsTr("Example: 10 SNT") andOperatorText: qsTr("and") diff --git a/ui/StatusQ/src/StatusQ/Components/StatusUserImage.qml b/ui/StatusQ/src/StatusQ/Components/StatusUserImage.qml index f653d4cb2d..7d8e5e8aea 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusUserImage.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusUserImage.qml @@ -62,7 +62,7 @@ Loader { badge.anchors.bottomMargin: badge.border.width/2 bridgeBadge.visible: root.isBridgedAccount - bridgeBadge.image.source: Theme.svg("discord-bridge") + bridgeBadge.image.source: Assets.svg("discord-bridge") Loader { anchors.fill: parent diff --git a/ui/StatusQ/src/StatusQ/Components/private/statusMessage/StatusMessageEmojiReactions.qml b/ui/StatusQ/src/StatusQ/Components/private/statusMessage/StatusMessageEmojiReactions.qml index 29e024bc89..85ed45664c 100644 --- a/ui/StatusQ/src/StatusQ/Components/private/statusMessage/StatusMessageEmojiReactions.qml +++ b/ui/StatusQ/src/StatusQ/Components/private/statusMessage/StatusMessageEmojiReactions.qml @@ -87,7 +87,7 @@ Flow { Layout.preferredWidth: d.iconSize Layout.preferredHeight: d.iconSize - icon: Theme.emoji(model.emoji) + icon: Assets.emoji(model.emoji) } StatusBaseText { diff --git a/ui/app/AppLayouts/ActivityCenter/controls/ReplyBadge.qml b/ui/app/AppLayouts/ActivityCenter/controls/ReplyBadge.qml index a7c63df741..7e732b3e08 100644 --- a/ui/app/AppLayouts/ActivityCenter/controls/ReplyBadge.qml +++ b/ui/app/AppLayouts/ActivityCenter/controls/ReplyBadge.qml @@ -34,7 +34,7 @@ Badge { spacing: 4 StatusIcon { - source: Theme.svg("reply-small-arrow") + source: Assets.svg("reply-small-arrow") Layout.preferredWidth: Theme.padding Layout.preferredHeight: Theme.padding } diff --git a/ui/app/AppLayouts/ActivityCenter/views/ActivityNotificationNewsMessage.qml b/ui/app/AppLayouts/ActivityCenter/views/ActivityNotificationNewsMessage.qml index ba4f720371..3e0c74d741 100644 --- a/ui/app/AppLayouts/ActivityCenter/views/ActivityNotificationNewsMessage.qml +++ b/ui/app/AppLayouts/ActivityCenter/views/ActivityNotificationNewsMessage.qml @@ -14,7 +14,7 @@ ActivityNotificationBase { signal readMoreClicked avatarComponent: SVGImage { - source: Theme.png("status-logo-icon") + source: Assets.png("status-logo-icon") Layout.preferredWidth: 40 Layout.preferredHeight: 40 Layout.alignment: Qt.AlignTop diff --git a/ui/app/AppLayouts/Browser/controls/BookmarkButton.qml b/ui/app/AppLayouts/Browser/controls/BookmarkButton.qml index 72628225cf..18bdb2b9df 100644 --- a/ui/app/AppLayouts/Browser/controls/BookmarkButton.qml +++ b/ui/app/AppLayouts/Browser/controls/BookmarkButton.qml @@ -26,7 +26,7 @@ Item { width: 48 height: 48 anchors.horizontalCenter: parent.horizontalCenter - source: !!root.source && !!root.source.toString() ? root.source : Theme.svg("compassActive") + source: !!root.source && !!root.source.toString() ? root.source : Assets.svg("compassActive") visible: root.source && root.source.toString() } diff --git a/ui/app/AppLayouts/Browser/controls/FaviconImage.qml b/ui/app/AppLayouts/Browser/controls/FaviconImage.qml index 64a7188535..d419204263 100644 --- a/ui/app/AppLayouts/Browser/controls/FaviconImage.qml +++ b/ui/app/AppLayouts/Browser/controls/FaviconImage.qml @@ -13,5 +13,5 @@ Image { height: 24 sourceSize: Qt.size(width, height) // TODO find a better default favicon - source: faviconImage.currentTab && !!faviconImage.currentTab.icon.toString() ? faviconImage.currentTab.icon : Theme.svg("compassActive") + source: faviconImage.currentTab && !!faviconImage.currentTab.icon.toString() ? faviconImage.currentTab.icon : Assets.svg("compassActive") } diff --git a/ui/app/AppLayouts/Browser/popups/BrowserConnectionModal.qml b/ui/app/AppLayouts/Browser/popups/BrowserConnectionModal.qml index 68d787a587..20e488917b 100644 --- a/ui/app/AppLayouts/Browser/popups/BrowserConnectionModal.qml +++ b/ui/app/AppLayouts/Browser/popups/BrowserConnectionModal.qml @@ -72,7 +72,7 @@ StatusModal { } RoundedIcon { - source: Theme.svg("check") + source: Assets.svg("check") iconColor: Theme.palette.primaryColor1 color: Theme.palette.secondaryBackground } @@ -82,7 +82,7 @@ StatusModal { } RoundedIcon { - source: Theme.svg("walletIcon") + source: Assets.svg("walletIcon") iconHeight: 18 iconWidth: 18 iconColor: accountSelector.currentAccount.iconColor || Theme.palette.primaryColor1 diff --git a/ui/app/AppLayouts/Browser/views/BrowserWebEngineView.qml b/ui/app/AppLayouts/Browser/views/BrowserWebEngineView.qml index 24ff010744..cf0d20e54c 100644 --- a/ui/app/AppLayouts/Browser/views/BrowserWebEngineView.qml +++ b/ui/app/AppLayouts/Browser/views/BrowserWebEngineView.qml @@ -156,7 +156,7 @@ WebEngineView { Image { id: emptyPageImage - source: Theme.png("browser/pepehand") + source: Assets.png("browser/pepehand") width: 294 height: 294 anchors.horizontalCenter: parent.horizontalCenter diff --git a/ui/app/AppLayouts/Chat/panels/ChatRequestMessagePanel.qml b/ui/app/AppLayouts/Chat/panels/ChatRequestMessagePanel.qml index a7677ab2e9..e06b709528 100644 --- a/ui/app/AppLayouts/Chat/panels/ChatRequestMessagePanel.qml +++ b/ui/app/AppLayouts/Chat/panels/ChatRequestMessagePanel.qml @@ -17,7 +17,7 @@ Item { Image { id: waveImg - source: Theme.png("chat/wave") + source: Assets.png("chat/wave") width: 80 height: 80 anchors.horizontalCenter: parent.horizontalCenter diff --git a/ui/app/AppLayouts/Chat/panels/EmptyChatPanel.qml b/ui/app/AppLayouts/Chat/panels/EmptyChatPanel.qml index cd8deb3416..be5587a525 100644 --- a/ui/app/AppLayouts/Chat/panels/EmptyChatPanel.qml +++ b/ui/app/AppLayouts/Chat/panels/EmptyChatPanel.qml @@ -34,7 +34,7 @@ ColumnLayout { remainingHeight / 2)) / 2 } - source: Theme.png("chat/chat@2x") + source: Assets.png("chat/chat@2x") } StatusBaseText { diff --git a/ui/app/AppLayouts/Chat/popups/PaymentRequestModal.qml b/ui/app/AppLayouts/Chat/popups/PaymentRequestModal.qml index f3e5e256dd..dfe162a783 100644 --- a/ui/app/AppLayouts/Chat/popups/PaymentRequestModal.qml +++ b/ui/app/AppLayouts/Chat/popups/PaymentRequestModal.qml @@ -237,7 +237,7 @@ StatusDialog { asset.height: 36 asset.width: 36 asset.isImage: true - asset.name: Theme.svg(network.iconUrl) + asset.name: Assets.svg(network.iconUrl) subTitle: qsTr("Only") leftPadding: 0 rightPadding: 0 @@ -254,7 +254,7 @@ StatusDialog { asset.height: 36 asset.width: 36 asset.isImage: true - asset.name: Theme.svg(model.iconUrl) + asset.name: Assets.svg(model.iconUrl) subTitle: qsTr("Only") onClicked: { diff --git a/ui/app/AppLayouts/Chat/stores/RootStore.qml b/ui/app/AppLayouts/Chat/stores/RootStore.qml index 746a2adb34..8c2b70c757 100644 --- a/ui/app/AppLayouts/Chat/stores/RootStore.qml +++ b/ui/app/AppLayouts/Chat/stores/RootStore.qml @@ -88,7 +88,7 @@ QtObject { proxyRoles: [ FastExpressionRole { function collectibleIcon(icon) { - return !!icon ? icon : Theme.png("tokens/DEFAULT-TOKEN") + return !!icon ? icon : Assets.png("tokens/DEFAULT-TOKEN") } name: "iconSource" expression: collectibleIcon(model.icon) @@ -101,7 +101,7 @@ QtObject { }, FastExpressionRole { function collectibleIcon(icon) { - return !!icon ? icon : Theme.png("tokens/DEFAULT-TOKEN") + return !!icon ? icon : Assets.png("tokens/DEFAULT-TOKEN") } name: "collectionImageUrl" expression: collectibleIcon(model.icon) diff --git a/ui/app/AppLayouts/Communities/controls/AirdropRecipientsSelector.qml b/ui/app/AppLayouts/Communities/controls/AirdropRecipientsSelector.qml index bf8a4a551d..47919023c5 100644 --- a/ui/app/AppLayouts/Communities/controls/AirdropRecipientsSelector.qml +++ b/ui/app/AppLayouts/Communities/controls/AirdropRecipientsSelector.qml @@ -35,7 +35,7 @@ StatusFlowSelector { !membersSelectorPanel.visible title: qsTr("To") - icon: Theme.svg("member") + icon: Assets.svg("member") flowSpacing: addressesSelectorPanel.visible || membersSelectorPanel.visible ? 12 : 6 diff --git a/ui/app/AppLayouts/Communities/controls/AirdropTokensSelector.qml b/ui/app/AppLayouts/Communities/controls/AirdropTokensSelector.qml index 5baeeabf9d..57a6a7a4f3 100644 --- a/ui/app/AppLayouts/Communities/controls/AirdropTokensSelector.qml +++ b/ui/app/AppLayouts/Communities/controls/AirdropTokensSelector.qml @@ -20,7 +20,7 @@ StatusFlowSelector { placeholderItem.visible: repeater.count === 0 title: qsTr("What") - icon: Theme.svg("token") + icon: Assets.svg("token") QtObject { id: d diff --git a/ui/app/AppLayouts/Communities/controls/ListDropdownContent.qml b/ui/app/AppLayouts/Communities/controls/ListDropdownContent.qml index b1c736da28..0cfeba7115 100644 --- a/ui/app/AppLayouts/Communities/controls/ListDropdownContent.qml +++ b/ui/app/AppLayouts/Communities/controls/ListDropdownContent.qml @@ -95,7 +95,7 @@ StatusListView { name: model.name shortName: model.shortName ?? "" - iconSource: model.iconSource ? model.iconSource : Theme.png("tokens/DEFAULT-TOKEN") + iconSource: model.iconSource ? model.iconSource : Assets.png("tokens/DEFAULT-TOKEN") showSubItemsIcon: !!model.subItems && model.subItems.count > 0 selected: root.checkedKeys.includes(model.key) amount: { diff --git a/ui/app/AppLayouts/Communities/controls/Options.qml b/ui/app/AppLayouts/Communities/controls/Options.qml index 276d535730..a2095ff249 100644 --- a/ui/app/AppLayouts/Communities/controls/Options.qml +++ b/ui/app/AppLayouts/Communities/controls/Options.qml @@ -101,7 +101,7 @@ ColumnLayout { Layout.bottomMargin: Theme.padding borderColor: Theme.palette.baseColor2 textColor: Theme.palette.directColor1 - icon: Theme.svg("token") + icon: Assets.svg("token") iconColor: Theme.palette.directColor1 iconAlignment: Qt.AlignVCenter isRowLayout: false diff --git a/ui/app/AppLayouts/Communities/helpers/PermissionsHelpers.qml b/ui/app/AppLayouts/Communities/helpers/PermissionsHelpers.qml index e8ab54d3b2..f55920c321 100644 --- a/ui/app/AppLayouts/Communities/helpers/PermissionsHelpers.qml +++ b/ui/app/AppLayouts/Communities/helpers/PermissionsHelpers.qml @@ -45,7 +45,7 @@ QtObject { function getTokenIconByKey(model, key) { const item = getTokenByKey(model, key) - const defaultIcon = Theme.png("tokens/DEFAULT-TOKEN") + const defaultIcon = Assets.png("tokens/DEFAULT-TOKEN") if (item) return item.iconSource ? item.iconSource : defaultIcon return defaultIcon diff --git a/ui/app/AppLayouts/Communities/panels/AirdropsSettingsPanel.qml b/ui/app/AppLayouts/Communities/panels/AirdropsSettingsPanel.qml index 9a7925a214..9a88af7f3b 100644 --- a/ui/app/AppLayouts/Communities/panels/AirdropsSettingsPanel.qml +++ b/ui/app/AppLayouts/Communities/panels/AirdropsSettingsPanel.qml @@ -96,7 +96,7 @@ StackView { preferredContentWidth: root.preferredContentWidth internalRightPadding: root.internalRightPadding - image: Theme.png("community/airdrops8_1") + image: Assets.png("community/airdrops8_1") title: qsTr("Airdrop community tokens") subtitle: qsTr("You can mint custom tokens and collectibles for your community") checkersModel: [ diff --git a/ui/app/AppLayouts/Communities/panels/FeesBox.qml b/ui/app/AppLayouts/Communities/panels/FeesBox.qml index e45a051f6f..0e8c122c84 100644 --- a/ui/app/AppLayouts/Communities/panels/FeesBox.qml +++ b/ui/app/AppLayouts/Communities/panels/FeesBox.qml @@ -10,7 +10,7 @@ StatusGroupBox { id: root title: qsTr("Fees") - icon: Theme.svg("gas") + icon: Assets.svg("gas") // expected roles: // diff --git a/ui/app/AppLayouts/Communities/panels/TokenInfoPanel.qml b/ui/app/AppLayouts/Communities/panels/TokenInfoPanel.qml index ddd72aef14..0a686e72c2 100644 --- a/ui/app/AppLayouts/Communities/panels/TokenInfoPanel.qml +++ b/ui/app/AppLayouts/Communities/panels/TokenInfoPanel.qml @@ -277,7 +277,7 @@ Control { height: 24 width: height - source: token.chainIcon ? Theme.svg(token.chainIcon) : undefined + source: token.chainIcon ? Assets.svg(token.chainIcon) : undefined } StatusBaseText { diff --git a/ui/app/AppLayouts/Communities/panels/WelcomeBannerPanel.qml b/ui/app/AppLayouts/Communities/panels/WelcomeBannerPanel.qml index ecdac081ad..a51102519c 100644 --- a/ui/app/AppLayouts/Communities/panels/WelcomeBannerPanel.qml +++ b/ui/app/AppLayouts/Communities/panels/WelcomeBannerPanel.qml @@ -40,7 +40,7 @@ Rectangle { anchors.top: parent.top anchors.topMargin: -6 anchors.horizontalCenter: parent.horizontalCenter - source: Theme.svg("chatEmptyHeader") + source: Assets.svg("chatEmptyHeader") width: 66 height: 50 } diff --git a/ui/app/AppLayouts/Communities/popups/HoldingsDropdown.qml b/ui/app/AppLayouts/Communities/popups/HoldingsDropdown.qml index bfd85f2ddc..6a0b209784 100644 --- a/ui/app/AppLayouts/Communities/popups/HoldingsDropdown.qml +++ b/ui/app/AppLayouts/Communities/popups/HoldingsDropdown.qml @@ -424,7 +424,7 @@ StatusDropdown { const chainName = asset.chainName ?? "" const chainIcon = asset.chainIcon - ? Theme.svg(asset.chainIcon) : "" + ? Assets.svg(asset.chainIcon) : "" if (!chainName) return @@ -500,7 +500,7 @@ StatusDropdown { const chainName = collectible.chainName ?? "" const chainIcon = collectible.chainIcon - ? Theme.svg(collectible.chainIcon) : "" + ? Assets.svg(collectible.chainIcon) : "" if (!chainName) return diff --git a/ui/app/AppLayouts/Communities/views/EditAirdropView.qml b/ui/app/AppLayouts/Communities/views/EditAirdropView.qml index 2f44689b12..8d033c2a44 100644 --- a/ui/app/AppLayouts/Communities/views/EditAirdropView.qml +++ b/ui/app/AppLayouts/Communities/views/EditAirdropView.qml @@ -178,7 +178,7 @@ StatusScrollView { tokenImage: modelItem.iconSource, networkId: modelItem.chainId, networkText: modelItem.chainName, - networkImage: Theme.svg(modelItem.chainIcon), + networkImage: Assets.svg(modelItem.chainIcon), remainingSupply: modelItem.remainingSupply, multiplierIndex: modelItem.multiplierIndex, infiniteSupply: modelItem.infiniteSupply, @@ -269,7 +269,7 @@ StatusScrollView { property int editedIndex: -1 Layout.fillWidth: true - icon: Theme.svg("token") + icon: Assets.svg("token") title: qsTr("What") placeholderText: qsTr("Example: 1 SOCK") addButton.visible: model.count < d.maxAirdropTokens diff --git a/ui/app/AppLayouts/Communities/views/EditCommunityTokenView.qml b/ui/app/AppLayouts/Communities/views/EditCommunityTokenView.qml index 6ef5d52f87..79e9a92e6c 100644 --- a/ui/app/AppLayouts/Communities/views/EditCommunityTokenView.qml +++ b/ui/app/AppLayouts/Communities/views/EditCommunityTokenView.qml @@ -272,7 +272,7 @@ StatusScrollView { asset.height: 24 asset.width: asset.height asset.isImage: true - asset.name: Theme.svg(token.chainIcon) + asset.name: Assets.svg(token.chainIcon) active: true visible: active } diff --git a/ui/app/AppLayouts/Communities/views/EditPermissionView.qml b/ui/app/AppLayouts/Communities/views/EditPermissionView.qml index 1e19811944..52f40e1270 100644 --- a/ui/app/AppLayouts/Communities/views/EditPermissionView.qml +++ b/ui/app/AppLayouts/Communities/views/EditPermissionView.qml @@ -198,7 +198,7 @@ StatusScrollView { Layout.maximumWidth: root.preferredContentWidth Layout.rightMargin: root.internalRightPadding - icon: Theme.svg("contact_verified") + icon: Assets.svg("contact_verified") title: qsTr("Who holds") placeholderText: qsTr("Example: 10 SNT") tagLeftPadding: 2 @@ -398,7 +398,7 @@ StatusScrollView { title: qsTr("Is allowed to") placeholderText: qsTr("Example: View and post") - icon: Theme.svg("profile/security") + icon: Assets.svg("profile/security") readonly property bool empty: d.dirtyValues.permissionType === PermissionTypes.Type.None @@ -490,7 +490,7 @@ StatusScrollView { addButton.visible: editable itemsClickable: editable visible: root.showChannelSelector - icon: d.isCommunityPermission ? Theme.svg("communities") : Theme.svg("create-category") + icon: d.isCommunityPermission ? Assets.svg("communities") : Assets.svg("create-category") title: qsTr("In") placeholderText: qsTr("Example: `#general` channel") diff --git a/ui/app/AppLayouts/Communities/views/HoldingsSelectionModel.qml b/ui/app/AppLayouts/Communities/views/HoldingsSelectionModel.qml index 3fdf6732cd..d92f6978a1 100644 --- a/ui/app/AppLayouts/Communities/views/HoldingsSelectionModel.qml +++ b/ui/app/AppLayouts/Communities/views/HoldingsSelectionModel.qml @@ -68,7 +68,7 @@ SortFilterProxyModel { function getIcon(type, key) { if (type === Constants.TokenType.ENS) - return Theme.png("tokens/ENS") + return Assets.png("tokens/ENS") const model = type === Constants.TokenType.ERC20 ? assetsModel : collectiblesModel diff --git a/ui/app/AppLayouts/Communities/views/MintedTokensView.qml b/ui/app/AppLayouts/Communities/views/MintedTokensView.qml index c729716ca2..e8e69a00ca 100644 --- a/ui/app/AppLayouts/Communities/views/MintedTokensView.qml +++ b/ui/app/AppLayouts/Communities/views/MintedTokensView.qml @@ -122,7 +122,7 @@ StatusScrollView { objectName: "introPanel" - image: Theme.png("community/mint2_1") + image: Assets.png("community/mint2_1") title: qsTr("Community tokens") subtitle: qsTr("You can mint custom tokens and import tokens for your community") checkersModel: [ diff --git a/ui/app/AppLayouts/Communities/views/PermissionsView.qml b/ui/app/AppLayouts/Communities/views/PermissionsView.qml index c7ddac861d..c472169493 100644 --- a/ui/app/AppLayouts/Communities/views/PermissionsView.qml +++ b/ui/app/AppLayouts/Communities/views/PermissionsView.qml @@ -84,7 +84,7 @@ ColumnLayout { visible: (root.count === 0 && root.allowIntroPanel) - image: Theme.png("community/permissions2_3") + image: Assets.png("community/permissions2_3") title: qsTr("Permissions") subtitle: qsTr("You can manage your community by creating and issuing membership and access permissions") checkersModel: [ diff --git a/ui/app/AppLayouts/Onboarding/KeycardFactoryResetFlow.qml b/ui/app/AppLayouts/Onboarding/KeycardFactoryResetFlow.qml index 7ebf2364b3..6ca3ef7bda 100644 --- a/ui/app/AppLayouts/Onboarding/KeycardFactoryResetFlow.qml +++ b/ui/app/AppLayouts/Onboarding/KeycardFactoryResetFlow.qml @@ -25,7 +25,7 @@ OnboardingStackView { id: keycardResetAcks KeycardBasePage { - image.source: Theme.png("onboarding/keycard/reading") + image.source: Assets.png("onboarding/keycard/reading") title: qsTr("Factory reset Keycard") subtitle: "".arg(Theme.palette.dangerColor1) + qsTr("All data including the stored key pair and derived accounts will be removed from the Keycard") + @@ -63,8 +63,8 @@ OnboardingStackView { readonly property bool backAvailableHint: false readonly property bool resetting: root.keycardState === Onboarding.KeycardState.FactoryResetting - image.source: resetting ? Theme.png("onboarding/keycard/empty") - : Theme.png("onboarding/keycard/success") + image.source: resetting ? Assets.png("onboarding/keycard/empty") + : Assets.png("onboarding/keycard/success") title: resetting ? qsTr("Reseting Keycard") : qsTr("Keycard successfully factory reset") subtitle: resetting ? "" : qsTr("You can now use this Keycard like it's a brand-new, empty Keycard") infoText.text: resetting ? qsTr("Do not remove your Keycard or reader") : "" diff --git a/ui/app/AppLayouts/Onboarding/UnblockWithPukFlow.qml b/ui/app/AppLayouts/Onboarding/UnblockWithPukFlow.qml index 408d31f03e..51b6cb5902 100644 --- a/ui/app/AppLayouts/Onboarding/UnblockWithPukFlow.qml +++ b/ui/app/AppLayouts/Onboarding/UnblockWithPukFlow.qml @@ -88,7 +88,7 @@ OnboardingStackView { id: keycardUnblockedPage KeycardBasePage { - image.source: Theme.png("onboarding/keycard/success") + image.source: Assets.png("onboarding/keycard/success") title: qsTr("Your Keycard is already unblocked!") buttons: [ StatusButton { diff --git a/ui/app/AppLayouts/Onboarding/components/NewsCarousel.qml b/ui/app/AppLayouts/Onboarding/components/NewsCarousel.qml index 1ef30008f2..7577ae31be 100644 --- a/ui/app/AppLayouts/Onboarding/components/NewsCarousel.qml +++ b/ui/app/AppLayouts/Onboarding/components/NewsCarousel.qml @@ -36,7 +36,7 @@ Control { Layout.alignment: Qt.AlignHCenter fillMode: Image.PreserveAspectFit asynchronous: true - source: Theme.png(root.newsModel.get(pageIndicator.currentIndex).image) + source: Assets.png(root.newsModel.get(pageIndicator.currentIndex).image) } StatusBaseText { diff --git a/ui/app/AppLayouts/Onboarding/pages/BackupSeedphraseIntro.qml b/ui/app/AppLayouts/Onboarding/pages/BackupSeedphraseIntro.qml index 3e0b734862..183bed9701 100644 --- a/ui/app/AppLayouts/Onboarding/pages/BackupSeedphraseIntro.qml +++ b/ui/app/AppLayouts/Onboarding/pages/BackupSeedphraseIntro.qml @@ -23,7 +23,7 @@ OnboardingPage { Layout.preferredHeight: 260 Layout.alignment: Qt.AlignHCenter mipmap: true - source: Theme.png("onboarding/status_seedphrase") + source: Assets.png("onboarding/status_seedphrase") } StatusBaseText { diff --git a/ui/app/AppLayouts/Onboarding/pages/BackupSeedphraseKeepOrDelete.qml b/ui/app/AppLayouts/Onboarding/pages/BackupSeedphraseKeepOrDelete.qml index 7227700f36..4e49c6cc64 100644 --- a/ui/app/AppLayouts/Onboarding/pages/BackupSeedphraseKeepOrDelete.qml +++ b/ui/app/AppLayouts/Onboarding/pages/BackupSeedphraseKeepOrDelete.qml @@ -34,7 +34,7 @@ OnboardingPage { Layout.preferredHeight: 260 Layout.alignment: Qt.AlignHCenter mipmap: true - source: Theme.png("onboarding/status_seedphrase") + source: Assets.png("onboarding/status_seedphrase") } StatusCheckBox { diff --git a/ui/app/AppLayouts/Onboarding/pages/CreateKeycardProfilePage.qml b/ui/app/AppLayouts/Onboarding/pages/CreateKeycardProfilePage.qml index 7c2fc7d218..dd4285a5c8 100644 --- a/ui/app/AppLayouts/Onboarding/pages/CreateKeycardProfilePage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/CreateKeycardProfilePage.qml @@ -54,7 +54,7 @@ OnboardingPage { Layout.alignment: Qt.AlignHCenter Layout.preferredWidth: Math.min(252, parent.width) Layout.preferredHeight: Math.min(164, height) - source: Theme.png("onboarding/status_generate_keycard") + source: Assets.png("onboarding/status_generate_keycard") mipmap: true } StatusBaseText { @@ -93,7 +93,7 @@ OnboardingPage { Layout.fillWidth: true text: qsTr("Use an existing recovery phrase") subTitle: qsTr("To create your Keycard-stored profile ") - icon.source: Theme.png("onboarding/create_profile_seed") + icon.source: Assets.png("onboarding/create_profile_seed") onClicked: root.createKeycardProfileWithExistingSeedphrase() } } diff --git a/ui/app/AppLayouts/Onboarding/pages/CreateProfilePage.qml b/ui/app/AppLayouts/Onboarding/pages/CreateProfilePage.qml index ddfb6ae7b9..bb87d4ec01 100644 --- a/ui/app/AppLayouts/Onboarding/pages/CreateProfilePage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/CreateProfilePage.qml @@ -54,7 +54,7 @@ OnboardingPage { Layout.alignment: Qt.AlignHCenter Layout.preferredWidth: Math.min(164, parent.width) Layout.preferredHeight: Math.min(164, height) - source: Theme.png("onboarding/status_key") + source: Assets.png("onboarding/status_key") mipmap: true } StatusBaseText { @@ -94,7 +94,7 @@ OnboardingPage { Layout.fillWidth: true text: qsTr("Use a recovery phrase") subTitle: qsTr("If you already have an Ethereum wallet") - icon.source: Theme.png("onboarding/create_profile_seed") + icon.source: Assets.png("onboarding/create_profile_seed") onClicked: root.createProfileWithSeedphraseRequested() } Rectangle { @@ -110,7 +110,7 @@ OnboardingPage { Layout.fillWidth: true text: qsTr("Use an empty Keycard") subTitle: qsTr("Store your new profile keys on Keycard") - icon.source: Theme.png("onboarding/create_profile_keycard") + icon.source: Assets.png("onboarding/create_profile_keycard") onClicked: root.createProfileWithEmptyKeycardRequested() visible: root.isKeycardEnabled } diff --git a/ui/app/AppLayouts/Onboarding/pages/EnableBiometricsPage.qml b/ui/app/AppLayouts/Onboarding/pages/EnableBiometricsPage.qml index e2c3d98164..7d954b9585 100644 --- a/ui/app/AppLayouts/Onboarding/pages/EnableBiometricsPage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/EnableBiometricsPage.qml @@ -28,7 +28,7 @@ OnboardingPage { Layout.alignment: Qt.AlignHCenter mipmap: true smooth: false - source: Theme.png("onboarding/enable_biometrics") + source: Assets.png("onboarding/enable_biometrics") } StatusBaseText { diff --git a/ui/app/AppLayouts/Onboarding/pages/HelpUsImproveStatusPage.qml b/ui/app/AppLayouts/Onboarding/pages/HelpUsImproveStatusPage.qml index d0b63b61e9..ef6d47e665 100644 --- a/ui/app/AppLayouts/Onboarding/pages/HelpUsImproveStatusPage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/HelpUsImproveStatusPage.qml @@ -47,7 +47,7 @@ OnboardingPage { Layout.topMargin: Theme.bigPadding Layout.bottomMargin: Theme.bigPadding Layout.alignment: Qt.AlignHCenter - source: Theme.png("onboarding/status_totebag_artwork_1") + source: Assets.png("onboarding/status_totebag_artwork_1") } StatusButton { diff --git a/ui/app/AppLayouts/Onboarding/pages/ImportLocalBackupPage.qml b/ui/app/AppLayouts/Onboarding/pages/ImportLocalBackupPage.qml index aaed57377e..5563f07f7a 100644 --- a/ui/app/AppLayouts/Onboarding/pages/ImportLocalBackupPage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/ImportLocalBackupPage.qml @@ -30,7 +30,7 @@ OnboardingPage { Layout.preferredWidth: 325 Layout.preferredHeight: 325 Layout.alignment: Qt.AlignHCenter - source: Theme.png("onboarding/status_chat") + source: Assets.png("onboarding/status_chat") } StatusBaseText { diff --git a/ui/app/AppLayouts/Onboarding/pages/KeycardAddKeyPairPage.qml b/ui/app/AppLayouts/Onboarding/pages/KeycardAddKeyPairPage.qml index 2b1eaa876d..5e18a0fe5d 100644 --- a/ui/app/AppLayouts/Onboarding/pages/KeycardAddKeyPairPage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/KeycardAddKeyPairPage.qml @@ -26,7 +26,7 @@ OnboardingPage { } PropertyChanges { target: image - source: Theme.png("onboarding/status_keycard_adding_keypair_success") + source: Assets.png("onboarding/status_keycard_adding_keypair_success") } PropertyChanges { target: subImageText @@ -81,7 +81,7 @@ OnboardingPage { Layout.preferredHeight: Math.min(211, height) Layout.topMargin: Theme.bigPadding Layout.bottomMargin: Theme.bigPadding - source: Theme.png("onboarding/status_keycard_adding_keypair") + source: Assets.png("onboarding/status_keycard_adding_keypair") mipmap: true } diff --git a/ui/app/AppLayouts/Onboarding/pages/KeycardCreatePinPage.qml b/ui/app/AppLayouts/Onboarding/pages/KeycardCreatePinPage.qml index 5cf8cdc4ad..53e45a0b73 100644 --- a/ui/app/AppLayouts/Onboarding/pages/KeycardCreatePinPage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/KeycardCreatePinPage.qml @@ -17,7 +17,7 @@ KeycardBasePage { signal setPinRequested(string pin) - image.source: Theme.png("onboarding/keycard/reading") + image.source: Assets.png("onboarding/keycard/reading") buttons: [ StatusPinInput { @@ -112,7 +112,7 @@ KeycardBasePage { } PropertyChanges { target: root - image.source: Theme.png("onboarding/keycard/error") + image.source: Assets.png("onboarding/keycard/error") } }, State { @@ -153,7 +153,7 @@ KeycardBasePage { } PropertyChanges { target: root - image.source: Theme.png("onboarding/keycard/success") + image.source: Assets.png("onboarding/keycard/success") } } ] diff --git a/ui/app/AppLayouts/Onboarding/pages/KeycardEmptyPage.qml b/ui/app/AppLayouts/Onboarding/pages/KeycardEmptyPage.qml index 8a02925bbb..f29df25388 100644 --- a/ui/app/AppLayouts/Onboarding/pages/KeycardEmptyPage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/KeycardEmptyPage.qml @@ -11,7 +11,7 @@ KeycardBasePage { title: qsTr("Keycard is empty") subtitle: qsTr("There is no profile key pair on this Keycard") - image.source: Theme.png("onboarding/keycard/error") + image.source: Assets.png("onboarding/keycard/error") buttons: [ MaybeOutlineButton { diff --git a/ui/app/AppLayouts/Onboarding/pages/KeycardEnterPinPage.qml b/ui/app/AppLayouts/Onboarding/pages/KeycardEnterPinPage.qml index 9fc2e48bc9..1ba5a2ae6b 100644 --- a/ui/app/AppLayouts/Onboarding/pages/KeycardEnterPinPage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/KeycardEnterPinPage.qml @@ -51,7 +51,7 @@ KeycardBasePage { PropertyChanges { target: image - source: Theme.png("onboarding/keycard/reading") + source: Assets.png("onboarding/keycard/reading") } }, State { // entering, wrong pin @@ -75,7 +75,7 @@ KeycardBasePage { } PropertyChanges { target: image - source: Theme.png("onboarding/keycard/error") + source: Assets.png("onboarding/keycard/error") } }, State { // in progress @@ -97,7 +97,7 @@ KeycardBasePage { PropertyChanges { target: image - source: Theme.png("onboarding/keycard/reading") + source: Assets.png("onboarding/keycard/reading") } }, State { // success @@ -115,7 +115,7 @@ KeycardBasePage { PropertyChanges { target: image - source: Theme.png("onboarding/keycard/success") + source: Assets.png("onboarding/keycard/success") } }, State { // blocked @@ -133,7 +133,7 @@ KeycardBasePage { } PropertyChanges { target: image - source: Theme.png("onboarding/keycard/error") + source: Assets.png("onboarding/keycard/error") } PropertyChanges { target: btnUnblockWithSeedphrase diff --git a/ui/app/AppLayouts/Onboarding/pages/KeycardEnterPukPage.qml b/ui/app/AppLayouts/Onboarding/pages/KeycardEnterPukPage.qml index 9cd249bf77..e0ef68b4e6 100644 --- a/ui/app/AppLayouts/Onboarding/pages/KeycardEnterPukPage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/KeycardEnterPukPage.qml @@ -20,7 +20,7 @@ KeycardBasePage { signal keycardPukEntered(string puk) signal keycardFactoryResetRequested() - image.source: Theme.png("onboarding/keycard/reading") + image.source: Assets.png("onboarding/keycard/reading") QtObject { id: d @@ -82,7 +82,7 @@ KeycardBasePage { } PropertyChanges { target: image - source: Theme.png("onboarding/keycard/error") + source: Assets.png("onboarding/keycard/error") } PropertyChanges { target: btnFactoryReset diff --git a/ui/app/AppLayouts/Onboarding/pages/KeycardErrorPage.qml b/ui/app/AppLayouts/Onboarding/pages/KeycardErrorPage.qml index 910891e83f..18d37b4821 100644 --- a/ui/app/AppLayouts/Onboarding/pages/KeycardErrorPage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/KeycardErrorPage.qml @@ -12,7 +12,7 @@ KeycardBasePage { title: qsTr("Communication with Keycard lost") subtitle: qsTr("There seems to be an issue communicating with your Keycard. Reinsert the card or reader and try again.") - image.source: Theme.png("onboarding/keycard/error") + image.source: Assets.png("onboarding/keycard/error") buttons: [ MaybeOutlineButton { diff --git a/ui/app/AppLayouts/Onboarding/pages/KeycardIntroPage.qml b/ui/app/AppLayouts/Onboarding/pages/KeycardIntroPage.qml index c4ca381117..35c033563c 100644 --- a/ui/app/AppLayouts/Onboarding/pages/KeycardIntroPage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/KeycardIntroPage.qml @@ -48,7 +48,7 @@ KeycardBasePage { Layout.bottomMargin: -2 Layout.preferredWidth: 154 Layout.preferredHeight: 82 - source: Theme.png("onboarding/status_keycard_multiple") + source: Assets.png("onboarding/status_keycard_multiple") } ColumnLayout { Layout.fillWidth: true @@ -115,7 +115,7 @@ KeycardBasePage { PropertyChanges { target: root title: qsTr("Plug in your Keycard reader") - image.source: Theme.png("onboarding/keycard/empty") + image.source: Assets.png("onboarding/keycard/empty") } PropertyChanges { target: promoBanner @@ -132,7 +132,7 @@ KeycardBasePage { infoText.hoveredLink, Theme.palette.baseColor1, Theme.palette.primaryColor1)) - image.source: Theme.png("onboarding/keycard/insert") + image.source: Assets.png("onboarding/keycard/insert") } }, State { @@ -141,7 +141,7 @@ KeycardBasePage { PropertyChanges { target: root title: qsTr("Reading Keycard...") - image.source: Theme.png("onboarding/keycard/reading") + image.source: Assets.png("onboarding/keycard/reading") } }, // error states @@ -152,7 +152,7 @@ KeycardBasePage { target: root title: qsTr("Oops this isn’t a Keycard") subtitle: qsTr("Remove card and insert a Keycard") - image.source: Theme.png("onboarding/keycard/invalid") + image.source: Assets.png("onboarding/keycard/invalid") } }, State { @@ -162,7 +162,7 @@ KeycardBasePage { target: root title: qsTr("Smartcard reader service unavailable") subtitle: qsTr("The Smartcard reader service (PCSC service), required for using Keycard, is not currently working. Ensure PCSC is installed and running and try again.") - image.source: Theme.png("onboarding/keycard/error") + image.source: Assets.png("onboarding/keycard/error") } }, State { @@ -172,7 +172,7 @@ KeycardBasePage { target: root title: qsTr("All pairing slots occupied") subtitle: qsTr("Factory reset this Keycard or insert a different one") - image.source: Theme.png("onboarding/keycard/error") + image.source: Assets.png("onboarding/keycard/error") } PropertyChanges { target: btnFactoryReset @@ -186,7 +186,7 @@ KeycardBasePage { target: root title: "".arg(Theme.palette.dangerColor1) + qsTr("Keycard blocked") + "" subtitle: qsTr("The Keycard you have inserted is blocked, you will need to unblock it or insert a different one") - image.source: Theme.png("onboarding/keycard/error") + image.source: Assets.png("onboarding/keycard/error") } PropertyChanges { target: btnUnblockWithPuk @@ -208,7 +208,7 @@ KeycardBasePage { target: root title: "".arg(Theme.palette.dangerColor1) + qsTr("Keycard blocked") + "" subtitle: qsTr("The Keycard you have inserted is blocked, you will need to unblock it, factory reset or insert a different one") - image.source: Theme.png("onboarding/keycard/error") + image.source: Assets.png("onboarding/keycard/error") } PropertyChanges { target: btnUnblockWithSeedphrase diff --git a/ui/app/AppLayouts/Onboarding/pages/KeycardLostPage.qml b/ui/app/AppLayouts/Onboarding/pages/KeycardLostPage.qml index 353d46b249..82563c9368 100644 --- a/ui/app/AppLayouts/Onboarding/pages/KeycardLostPage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/KeycardLostPage.qml @@ -13,7 +13,7 @@ KeycardBasePage { title: qsTr("Lost Keycard") subtitle: qsTr("Sorry you've lost your Keycard") - image.source: Theme.png("onboarding/keycard/empty") + image.source: Assets.png("onboarding/keycard/empty") buttons: [ StatusButton { diff --git a/ui/app/AppLayouts/Onboarding/pages/KeycardNotEmptyPage.qml b/ui/app/AppLayouts/Onboarding/pages/KeycardNotEmptyPage.qml index 83f50fa87b..b80dfad937 100644 --- a/ui/app/AppLayouts/Onboarding/pages/KeycardNotEmptyPage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/KeycardNotEmptyPage.qml @@ -12,7 +12,7 @@ KeycardBasePage { title: qsTr("Keycard is not empty") subtitle: qsTr("You can’t use it to store new keys right now") - image.source: Theme.png("onboarding/keycard/error") + image.source: Assets.png("onboarding/keycard/error") buttons: [ MaybeOutlineButton { diff --git a/ui/app/AppLayouts/Onboarding/pages/LoginScreen.qml b/ui/app/AppLayouts/Onboarding/pages/LoginScreen.qml index b8d935cedb..9c355b87ae 100644 --- a/ui/app/AppLayouts/Onboarding/pages/LoginScreen.qml +++ b/ui/app/AppLayouts/Onboarding/pages/LoginScreen.qml @@ -194,7 +194,7 @@ OnboardingPage { Layout.preferredWidth: 90 Layout.preferredHeight: 90 Layout.alignment: Qt.AlignHCenter - source: Theme.png("status") + source: Assets.png("status") mipmap: true } diff --git a/ui/app/AppLayouts/Onboarding/pages/NewAccountLoginPage.qml b/ui/app/AppLayouts/Onboarding/pages/NewAccountLoginPage.qml index b8ab454058..444d455d22 100644 --- a/ui/app/AppLayouts/Onboarding/pages/NewAccountLoginPage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/NewAccountLoginPage.qml @@ -60,7 +60,7 @@ OnboardingPage { Layout.alignment: Qt.AlignHCenter Layout.preferredWidth: Math.min(250, parent.width) Layout.preferredHeight: Math.min(250, height) - source: Theme.png("onboarding/status_login_seedphrase") + source: Assets.png("onboarding/status_login_seedphrase") mipmap: true } StatusBaseText { @@ -100,7 +100,7 @@ OnboardingPage { Layout.fillWidth: true text: qsTr("Log in by syncing") // FIXME wording, "Log in by pairing"? subTitle: qsTr("If you have Status on another device") - icon.source: Theme.png("onboarding/login_syncing") + icon.source: Assets.png("onboarding/login_syncing") onClicked: loginWithSyncAck.createObject(root).open() } Rectangle { @@ -116,7 +116,7 @@ OnboardingPage { Layout.fillWidth: true text: qsTr("Log in with Keycard") subTitle: qsTr("If your profile keys are stored on a Keycard") - icon.source: Theme.png("onboarding/create_profile_keycard") + icon.source: Assets.png("onboarding/create_profile_keycard") onClicked: root.loginWithKeycardRequested() visible: root.isKeycardEnabled } diff --git a/ui/app/AppLayouts/Onboarding/pages/SyncProgressPage.qml b/ui/app/AppLayouts/Onboarding/pages/SyncProgressPage.qml index ab2782c0b7..e819d7eb27 100644 --- a/ui/app/AppLayouts/Onboarding/pages/SyncProgressPage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/SyncProgressPage.qml @@ -36,7 +36,7 @@ OnboardingPage { } PropertyChanges { target: image - source: Theme.png("onboarding/status_sync_progress") + source: Assets.png("onboarding/status_sync_progress") } PropertyChanges { target: subImageText @@ -61,7 +61,7 @@ OnboardingPage { } PropertyChanges { target: image - source: Theme.png("onboarding/status_sync_success") + source: Assets.png("onboarding/status_sync_success") } PropertyChanges { target: loginButton @@ -85,7 +85,7 @@ OnboardingPage { } PropertyChanges { target: image - source: Theme.png("onboarding/status_sync_failed") + source: Assets.png("onboarding/status_sync_failed") } PropertyChanges { target: tryAgainButton @@ -134,7 +134,7 @@ OnboardingPage { Layout.preferredHeight: Math.min(214, height) Layout.topMargin: Theme.bigPadding Layout.bottomMargin: Theme.bigPadding - source: Theme.png("onboarding/status_generate_keys") + source: Assets.png("onboarding/status_generate_keys") mipmap: true } diff --git a/ui/app/AppLayouts/Onboarding/pages/WelcomePage.qml b/ui/app/AppLayouts/Onboarding/pages/WelcomePage.qml index e8f01b30a9..4fe0c71a7f 100644 --- a/ui/app/AppLayouts/Onboarding/pages/WelcomePage.qml +++ b/ui/app/AppLayouts/Onboarding/pages/WelcomePage.qml @@ -89,7 +89,7 @@ OnboardingPage { Layout.preferredWidth: 90 Layout.preferredHeight: 90 Layout.alignment: Qt.AlignHCenter - source: Theme.png("status") + source: Assets.png("status") mipmap: true layer.enabled: true layer.effect: DropShadow { diff --git a/ui/app/AppLayouts/Profile/controls/WalletNetworkDelegate.qml b/ui/app/AppLayouts/Profile/controls/WalletNetworkDelegate.qml index 46c73c32b9..34ceece279 100644 --- a/ui/app/AppLayouts/Profile/controls/WalletNetworkDelegate.qml +++ b/ui/app/AppLayouts/Profile/controls/WalletNetworkDelegate.qml @@ -33,7 +33,7 @@ StatusListItem { onClicked: d.toggleActive() title: chainName - asset.name: Theme.svg(iconUrl) + asset.name: Assets.svg(iconUrl) asset.isImage: true width: parent.width leftPadding: Theme.padding diff --git a/ui/app/AppLayouts/Profile/popups/ProfileShowcaseInfoPopup.qml b/ui/app/AppLayouts/Profile/popups/ProfileShowcaseInfoPopup.qml index a4b782f5b8..d82a4de2d0 100644 --- a/ui/app/AppLayouts/Profile/popups/ProfileShowcaseInfoPopup.qml +++ b/ui/app/AppLayouts/Profile/popups/ProfileShowcaseInfoPopup.qml @@ -35,7 +35,7 @@ StatusDialog { IntroPanel { Layout.fillWidth: true - image: Theme.png("onboarding/welcome") + image: Assets.png("onboarding/welcome") imageWidth: 200 imageBottomMargin: Theme.padding bottomPadding: 0 diff --git a/ui/app/AppLayouts/Profile/popups/SearchEngineModal.qml b/ui/app/AppLayouts/Profile/popups/SearchEngineModal.qml index 7f11feb8e4..4217b467ed 100644 --- a/ui/app/AppLayouts/Profile/popups/SearchEngineModal.qml +++ b/ui/app/AppLayouts/Profile/popups/SearchEngineModal.qml @@ -49,7 +49,7 @@ StatusDialog { implicitHeight: model.description ? 80 : 52 title: model.name subTitle: model.description - asset.name: Theme.svg(model.iconUrl) + asset.name: Assets.svg(model.iconUrl) asset.isImage: true buttonGroup: searchEnginGroup checked: accountSettings.selectedBrowserSearchEngineId === model.engineId diff --git a/ui/app/AppLayouts/Profile/popups/networkSettings/DeactivateNetworkPopup.qml b/ui/app/AppLayouts/Profile/popups/networkSettings/DeactivateNetworkPopup.qml index 7e35c6494c..917f6a83ec 100644 --- a/ui/app/AppLayouts/Profile/popups/networkSettings/DeactivateNetworkPopup.qml +++ b/ui/app/AppLayouts/Profile/popups/networkSettings/DeactivateNetworkPopup.qml @@ -15,7 +15,7 @@ StatusDialog { header: StatusDialogHeader { headline.title: qsTr("Disable %1 network").arg(chainName) leftComponent: StatusRoundedImage { - image.source: Theme.svg(root.iconUrl) + image.source: Assets.svg(root.iconUrl) width: 40 height: 40 } diff --git a/ui/app/AppLayouts/Profile/views/AboutView.qml b/ui/app/AppLayouts/Profile/views/AboutView.qml index 72e3d91f7c..071054b735 100644 --- a/ui/app/AppLayouts/Profile/views/AboutView.qml +++ b/ui/app/AppLayouts/Profile/views/AboutView.qml @@ -62,7 +62,7 @@ SettingsContentBase { id: statusIcon width: 80 height: 80 - source: root.isProduction ? Theme.png("status-logo-circle") : Theme.png("status-logo-dev-circle") + source: root.isProduction ? Assets.png("status-logo-circle") : Assets.png("status-logo-dev-circle") anchors.horizontalCenter: parent.horizontalCenter mipmap: true } diff --git a/ui/app/AppLayouts/Profile/views/AppearanceView.qml b/ui/app/AppLayouts/Profile/views/AppearanceView.qml index 7cec98bebf..eb5783b0d5 100644 --- a/ui/app/AppLayouts/Profile/views/AppearanceView.qml +++ b/ui/app/AppLayouts/Profile/views/AppearanceView.qml @@ -137,7 +137,7 @@ SettingsContentBase { StatusImageRadioButton { Layout.fillWidth: true - image.source: Theme.png("appearance-light") + image.source: Assets.png("appearance-light") control.text: qsTr("Light") control.checked: root.theme === Theme.Style.Light onRadioCheckedChanged: function(checked) { @@ -149,7 +149,7 @@ SettingsContentBase { StatusImageRadioButton { Layout.fillWidth: true - image.source: Theme.png("appearance-dark") + image.source: Assets.png("appearance-dark") control.text: qsTr("Dark") control.checked: root.theme === Theme.Style.Dark onRadioCheckedChanged: function(checked) { @@ -161,7 +161,7 @@ SettingsContentBase { StatusImageRadioButton { Layout.fillWidth: true - image.source: Theme.png("appearance-system") + image.source: Assets.png("appearance-system") control.text: qsTr("System") control.checked: root.theme === Theme.Style.System onRadioCheckedChanged: function(checked) { diff --git a/ui/app/AppLayouts/Profile/views/CommunitiesView.qml b/ui/app/AppLayouts/Profile/views/CommunitiesView.qml index b8cfb05953..bf2f2d5411 100644 --- a/ui/app/AppLayouts/Profile/views/CommunitiesView.qml +++ b/ui/app/AppLayouts/Profile/views/CommunitiesView.qml @@ -60,7 +60,7 @@ SettingsContentBase { Layout.alignment: Qt.AlignHCenter | Qt.AlignTop Image { - source: Theme.png("settings/communities") + source: Assets.png("settings/communities") mipmap: true Layout.alignment: Qt.AlignHCenter | Qt.AlignTop Layout.preferredWidth: 434 diff --git a/ui/app/AppLayouts/Profile/views/EnsSearchView.qml b/ui/app/AppLayouts/Profile/views/EnsSearchView.qml index 7d4d0a2855..edec8002eb 100644 --- a/ui/app/AppLayouts/Profile/views/EnsSearchView.qml +++ b/ui/app/AppLayouts/Profile/views/EnsSearchView.qml @@ -77,7 +77,7 @@ Item { SVGImage { visible: ensStatus === Constants.ens_taken fillMode: Image.PreserveAspectFit - source: Theme.svg("block-icon-white") + source: Assets.svg("block-icon-white") width: 20 height: 20 anchors.centerIn: parent diff --git a/ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml b/ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml index 03dd20f07c..3412094881 100644 --- a/ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml +++ b/ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml @@ -312,7 +312,7 @@ Item { id: image1 height: 50 width: height - source: Theme.png("tokens/SNT") + source: Assets.png("tokens/SNT") sourceSize: Qt.size(width, height) cache: false } diff --git a/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml b/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml index a47a9d49de..28b2c7e31a 100644 --- a/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml +++ b/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml @@ -40,7 +40,7 @@ Item { anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter fillMode: Image.PreserveAspectFit - source: Theme.png("ens/ens-header-" + Theme.palette.name + "@2x") + source: Assets.png("ens/ens-header-" + Theme.palette.name + "@2x") cache: false } diff --git a/ui/app/AppLayouts/Profile/views/WalletView.qml b/ui/app/AppLayouts/Profile/views/WalletView.qml index 87a7421c9a..df465a356f 100644 --- a/ui/app/AppLayouts/Profile/views/WalletView.qml +++ b/ui/app/AppLayouts/Profile/views/WalletView.qml @@ -455,7 +455,7 @@ SettingsContentBase { StatusRoundedImage { width: 28 height: 28 - image.source: Theme.svg(!!editNetwork.network && !!editNetwork.network.iconUrl ? editNetwork.network.iconUrl: "") + image.source: Assets.svg(!!editNetwork.network && !!editNetwork.network.iconUrl ? editNetwork.network.iconUrl: "") image.fillMode: Image.PreserveAspectCrop } } diff --git a/ui/app/AppLayouts/Profile/views/keycard/MainView.qml b/ui/app/AppLayouts/Profile/views/keycard/MainView.qml index f3b7ccde68..7c452bc4da 100644 --- a/ui/app/AppLayouts/Profile/views/keycard/MainView.qml +++ b/ui/app/AppLayouts/Profile/views/keycard/MainView.qml @@ -39,7 +39,7 @@ ColumnLayout { Layout.preferredWidth: 350 fillMode: Image.PreserveAspectFit antialiasing: true - source: Theme.png("keycard/keycard-security") + source: Assets.png("keycard/keycard-security") mipmap: true cache: false } diff --git a/ui/app/AppLayouts/Wallet/WalletUtils.qml b/ui/app/AppLayouts/Wallet/WalletUtils.qml index 4e49abbee8..e02a8cd3e9 100644 --- a/ui/app/AppLayouts/Wallet/WalletUtils.qml +++ b/ui/app/AppLayouts/Wallet/WalletUtils.qml @@ -345,14 +345,14 @@ QtObject { function getIconForFeeMode(feeMode) { switch(feeMode) { case Constants.FeePriorityModeType.Fast: - return Theme.png("wallet/car") + return Assets.png("wallet/car") case Constants.FeePriorityModeType.Urgent: - return Theme.png("wallet/rocket") + return Assets.png("wallet/rocket") case Constants.FeePriorityModeType.Custom: - return Theme.png("wallet/handwrite") + return Assets.png("wallet/handwrite") case Constants.FeePriorityModeType.Normal: default: - return Theme.png("wallet/clock") + return Assets.png("wallet/clock") } } diff --git a/ui/app/AppLayouts/Wallet/adaptors/CollectiblesSelectionAdaptor.qml b/ui/app/AppLayouts/Wallet/adaptors/CollectiblesSelectionAdaptor.qml index 183cdd8820..a6ae54a0b9 100644 --- a/ui/app/AppLayouts/Wallet/adaptors/CollectiblesSelectionAdaptor.qml +++ b/ui/app/AppLayouts/Wallet/adaptors/CollectiblesSelectionAdaptor.qml @@ -112,7 +112,7 @@ QObject { readonly property string key: model.symbol readonly property url icon: - model.imageUrl || model.mediaUrl || Theme.png("tokens/DEFAULT-TOKEN") + model.imageUrl || model.mediaUrl || Assets.png("tokens/DEFAULT-TOKEN") SortFilterProxyModel { /* 1 */ id: ownershipFiltered diff --git a/ui/app/AppLayouts/Wallet/controls/CollectibleDetailsHeader.qml b/ui/app/AppLayouts/Wallet/controls/CollectibleDetailsHeader.qml index 21edd0be8f..28e948508a 100644 --- a/ui/app/AppLayouts/Wallet/controls/CollectibleDetailsHeader.qml +++ b/ui/app/AppLayouts/Wallet/controls/CollectibleDetailsHeader.qml @@ -227,7 +227,7 @@ Control { InformationTag { id: networkTag readonly property bool isNetworkValid: networkShortName !== "" - asset.name: isNetworkValid && networkIconURL !== "" ? Theme.svg(networkIconURL) : "" + asset.name: isNetworkValid && networkIconURL !== "" ? Assets.svg(networkIconURL) : "" asset.isImage: true tagPrimaryLabel.text: isNetworkValid ? networkShortName : "---" tagPrimaryLabel.color: isNetworkValid ? networkColor : "black" diff --git a/ui/app/AppLayouts/Wallet/controls/CollectiblesHeader.qml b/ui/app/AppLayouts/Wallet/controls/CollectiblesHeader.qml index c1fe22fe9a..bf230a2585 100644 --- a/ui/app/AppLayouts/Wallet/controls/CollectiblesHeader.qml +++ b/ui/app/AppLayouts/Wallet/controls/CollectiblesHeader.qml @@ -87,7 +87,7 @@ Rectangle { SVGImage { id: caretImg anchors.verticalCenter: parent.verticalCenter - source: Theme.svg("caret") + source: Assets.svg("caret") width: 11 anchors.left: numberCollectibleText.right anchors.leftMargin: Theme.padding diff --git a/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml b/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml index e04c55c6a3..453259b246 100644 --- a/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml +++ b/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml @@ -71,7 +71,7 @@ StatusComboBox { asset.bgColor: Theme.palette.background asset.bgHeight: 15 asset.isImage: true - asset.name: Theme.png("status-gradient-dot") + asset.name: Assets.png("status-gradient-dot") asset.color: Theme.palette.transparent } } @@ -92,7 +92,7 @@ StatusComboBox { asset.height: 24 asset.width: 24 asset.isImage: !root.multiSelection - asset.name: !root.multiSelection ? Theme.svg(d.singleSelectionIconUrl) : "" + asset.name: !root.multiSelection ? Assets.svg(d.singleSelectionIconUrl) : "" active: !root.multiSelection visible: active } @@ -116,7 +116,7 @@ StatusComboBox { width: 24 height: 24 - image.source: Theme.svg(model.iconUrl) + image.source: Assets.svg(model.iconUrl) z: index + 1 image.layer.enabled: index < chainRepeater.count - 1 && row.spacing < 0 diff --git a/ui/app/AppLayouts/Wallet/panels/ActivityFilterPanel.qml b/ui/app/AppLayouts/Wallet/panels/ActivityFilterPanel.qml index c39517f92a..1b47711648 100644 --- a/ui/app/AppLayouts/Wallet/panels/ActivityFilterPanel.qml +++ b/ui/app/AppLayouts/Wallet/panels/ActivityFilterPanel.qml @@ -133,13 +133,13 @@ Column { } asset.name: switch(activityFilterStore.statusFilters[index]) { case Constants.TransactionStatus.Failed: - return Theme.svg("transaction/failed") + return Assets.svg("transaction/failed") case Constants.TransactionStatus.Pending: - return Theme.svg("transaction/pending") + return Assets.svg("transaction/pending") case Constants.TransactionStatus.Complete: - return Theme.svg("transaction/confirmed") + return Assets.svg("transaction/confirmed") case Constants.TransactionStatus.Finished: - return Theme.svg("transaction/finished") + return Assets.svg("transaction/finished") default: console.warn("Unhandled status :: ",activityFilterStore.statusFilters[index]) return "" diff --git a/ui/app/AppLayouts/Wallet/panels/BuyReceiveBanner.qml b/ui/app/AppLayouts/Wallet/panels/BuyReceiveBanner.qml index 02e975a9f2..4eb8be8c88 100644 --- a/ui/app/AppLayouts/Wallet/panels/BuyReceiveBanner.qml +++ b/ui/app/AppLayouts/Wallet/panels/BuyReceiveBanner.qml @@ -31,7 +31,7 @@ Control { Layout.preferredWidth: root.buyEnabled ? layout.width / layout.children.length : 0 title: qsTr("Ways to buy") subTitle: qsTr("Via card or bank") - image: Theme.png("wallet/wallet-green") + image: Assets.png("wallet/wallet-green") closeEnabled: root.closeEnabled visible: Layout.preferredWidth > 0 opacity: root.buyEnabled ? 1 : 0 @@ -53,7 +53,7 @@ Control { Layout.preferredWidth: root.receiveEnabled ? layout.width / layout.children.length : 0 title: qsTr("Receive") subTitle: qsTr("Deposit to your Wallet") - image: Theme.png("wallet/flying-coin") + image: Assets.png("wallet/flying-coin") closeEnabled: root.closeEnabled visible: Layout.preferredWidth > 0 opacity: root.receiveEnabled ? 1 : 0 diff --git a/ui/app/AppLayouts/Wallet/panels/WalletAccountHeader.qml b/ui/app/AppLayouts/Wallet/panels/WalletAccountHeader.qml index 505d3b1321..30b74b1f9e 100644 --- a/ui/app/AppLayouts/Wallet/panels/WalletAccountHeader.qml +++ b/ui/app/AppLayouts/Wallet/panels/WalletAccountHeader.qml @@ -121,7 +121,7 @@ Control { Binding on source { // fallback when we have no emoji when: root.emojiId === "" - value: Theme.svg("filled-account") + value: Assets.svg("filled-account") } } } diff --git a/ui/app/AppLayouts/Wallet/popups/dapps/DAppsWorkflow.qml b/ui/app/AppLayouts/Wallet/popups/dapps/DAppsWorkflow.qml index 68bd434367..31410dc6f7 100644 --- a/ui/app/AppLayouts/Wallet/popups/dapps/DAppsWorkflow.qml +++ b/ui/app/AppLayouts/Wallet/popups/dapps/DAppsWorkflow.qml @@ -368,7 +368,7 @@ SQUtils.QObject { accountEmoji: account.emoji networkName: network.chainName - networkIconPath: Theme.svg(network.iconUrl) + networkIconPath: Assets.svg(network.iconUrl) fiatFees: request.fiatMaxFees ? request.fiatMaxFees.toFixed() : "" fiatSymbol: request.fiatSymbol @@ -470,7 +470,7 @@ SQUtils.QObject { StatusListItem { objectName: "btnStatusConnector" title: "Status Connector" - asset.name: Theme.png("status-logo") + asset.name: Assets.png("status-logo") asset.isImage: true enabled: root.connectorEnabled components: [ @@ -487,7 +487,7 @@ SQUtils.QObject { StatusListItem { objectName: "btnWalletConnect" title: "Wallet Connect" - asset.name: Theme.svg("walletconnect") + asset.name: Assets.svg("walletconnect") asset.isImage: true enabled: root.walletConnectEnabled components: [ diff --git a/ui/app/AppLayouts/Wallet/popups/filterSubMenus/ActivityStatusFilterSubMenu.qml b/ui/app/AppLayouts/Wallet/popups/filterSubMenus/ActivityStatusFilterSubMenu.qml index 6d914ddbe6..b8d63ee5a8 100644 --- a/ui/app/AppLayouts/Wallet/popups/filterSubMenus/ActivityStatusFilterSubMenu.qml +++ b/ui/app/AppLayouts/Wallet/popups/filterSubMenus/ActivityStatusFilterSubMenu.qml @@ -34,7 +34,7 @@ StatusMenu { ActivityTypeCheckBox { id: sendCheckbox title: qsTr("Failed") - assetSettings.name: Theme.svg("transaction/failed") + assetSettings.name: Assets.svg("transaction/failed") assetSettings.color: "transparent" buttonGroup: typeButtonGroup allChecked: root.allChecked @@ -46,7 +46,7 @@ StatusMenu { ActivityTypeCheckBox { id: receiveCheckbox title: qsTr("Pending") - assetSettings.name: Theme.svg("transaction/pending") + assetSettings.name: Assets.svg("transaction/pending") assetSettings.color: "transparent" buttonGroup: typeButtonGroup allChecked: root.allChecked @@ -58,7 +58,7 @@ StatusMenu { ActivityTypeCheckBox { id: buyCheckbox title: qsTr("Complete") - assetSettings.name: Theme.svg("transaction/confirmed") + assetSettings.name: Assets.svg("transaction/confirmed") assetSettings.color: "transparent" buttonGroup: typeButtonGroup allChecked: root.allChecked @@ -70,7 +70,7 @@ StatusMenu { ActivityTypeCheckBox { id: swapCheckbox title: qsTr("Finalised") - assetSettings.name: Theme.svg("transaction/finished") + assetSettings.name: Assets.svg("transaction/finished") assetSettings.color: "transparent" buttonGroup: typeButtonGroup allChecked: root.allChecked diff --git a/ui/app/AppLayouts/Wallet/popups/simpleSend/SendSignModal.qml b/ui/app/AppLayouts/Wallet/popups/simpleSend/SendSignModal.qml index ec8e817031..1be076764e 100644 --- a/ui/app/AppLayouts/Wallet/popups/simpleSend/SendSignModal.qml +++ b/ui/app/AppLayouts/Wallet/popups/simpleSend/SendSignModal.qml @@ -50,7 +50,7 @@ SignTransactionModalBase { /** Input property holding selected network name **/ required property string networkName /** Input property holding selected network icon path - e.g. `Theme.svg("network/Network=Optimism")`**/ + e.g. `Assets.svg("network/Network=Optimism")`**/ required property string networkIconPath /** Input property holding selected network blockchain explorer name **/ @@ -200,7 +200,7 @@ SignTransactionModalBase { bridgeBadge.visible: true bridgeBadge.border.width: 2 bridgeBadge.color: Theme.palette.darkBlue - bridgeBadge.image.source: Theme.svg("sign") + bridgeBadge.image.source: Assets.svg("sign") } leftFooterContents: ObjectModel { diff --git a/ui/app/AppLayouts/Wallet/popups/swap/SwapApproveCapModal.qml b/ui/app/AppLayouts/Wallet/popups/swap/SwapApproveCapModal.qml index 69543159c8..fb6094a605 100644 --- a/ui/app/AppLayouts/Wallet/popups/swap/SwapApproveCapModal.qml +++ b/ui/app/AppLayouts/Wallet/popups/swap/SwapApproveCapModal.qml @@ -33,7 +33,7 @@ SignTransactionModalBase { required property string networkShortName // e.g. "oeth" required property string networkName // e.g. "Optimism" - required property string networkIconPath // e.g. `Theme.svg("network/Network=Optimism")` + required property string networkIconPath // e.g. `Assets.svg("network/Network=Optimism")` required property string networkBlockExplorerUrl required property int networkChainId @@ -47,7 +47,7 @@ SignTransactionModalBase { property string serviceProviderTandCUrl: Constants.swap.paraswapTermsAndConditionUrl property string serviceProviderURL: Constants.swap.paraswapUrl // TODO https://github.com/status-im/status-desktop/issues/15329 property string serviceProviderContractAddress: Constants.swap.paraswapV6_2ContractAddress - property string serviceProviderIcon: Theme.png("swap/%1".arg(Constants.swap.paraswapIcon)) // FIXME svg + property string serviceProviderIcon: Assets.png("swap/%1".arg(Constants.swap.paraswapIcon)) // FIXME svg title: qsTr("Approve spending cap") subtitle: root.serviceProviderHostname diff --git a/ui/app/AppLayouts/Wallet/popups/swap/SwapModal.qml b/ui/app/AppLayouts/Wallet/popups/swap/SwapModal.qml index 30e2e26cb4..92122c8ded 100644 --- a/ui/app/AppLayouts/Wallet/popups/swap/SwapModal.qml +++ b/ui/app/AppLayouts/Wallet/popups/swap/SwapModal.qml @@ -579,7 +579,7 @@ StatusDialog { networkShortName: networkFilter.singleSelectionItemData.shortName networkName: networkFilter.singleSelectionItemData.chainName - networkIconPath: Theme.svg(networkFilter.singleSelectionItemData.iconUrl) + networkIconPath: Assets.svg(networkFilter.singleSelectionItemData.iconUrl) networkBlockExplorerUrl: networkFilter.singleSelectionItemData.blockExplorerURL networkChainId: networkFilter.singleSelectionItemData.chainId @@ -595,7 +595,7 @@ StatusDialog { serviceProviderName: Constants.swap.paraswapName serviceProviderURL: Constants.swap.paraswapUrl // TODO https://github.com/status-im/status-desktop/issues/15329 serviceProviderTandCUrl: Constants.swap.paraswapTermsAndConditionUrl // TODO https://github.com/status-im/status-desktop/issues/15329 - serviceProviderIcon: Theme.png("swap/%1".arg(Constants.swap.paraswapIcon)) // FIXME svg + serviceProviderIcon: Assets.png("swap/%1".arg(Constants.swap.paraswapIcon)) // FIXME svg serviceProviderContractAddress: root.swapAdaptor.swapOutputData.approvalContractAddress serviceProviderHostname: Constants.swap.paraswapHostname @@ -639,7 +639,7 @@ StatusDialog { networkShortName: networkFilter.singleSelectionItemData.shortName networkName: networkFilter.singleSelectionItemData.chainName - networkIconPath: Theme.svg(networkFilter.singleSelectionItemData.iconUrl) + networkIconPath: Assets.svg(networkFilter.singleSelectionItemData.iconUrl) networkBlockExplorerUrl: networkFilter.singleSelectionItemData.blockExplorerURL networkChainId: root.swapInputParamsForm.selectedNetworkChainId diff --git a/ui/app/AppLayouts/Wallet/popups/swap/SwapSignModal.qml b/ui/app/AppLayouts/Wallet/popups/swap/SwapSignModal.qml index 54b5f9514e..c352b9fca5 100644 --- a/ui/app/AppLayouts/Wallet/popups/swap/SwapSignModal.qml +++ b/ui/app/AppLayouts/Wallet/popups/swap/SwapSignModal.qml @@ -34,7 +34,7 @@ SignTransactionModalBase { required property string networkShortName // e.g. "oeth" required property string networkName // e.g. "Optimism" - required property string networkIconPath // e.g. `Theme.svg("network/Network=Optimism")` + required property string networkIconPath // e.g. `Assets.svg("network/Network=Optimism")` required property string networkBlockExplorerUrl required property int networkChainId @@ -76,7 +76,7 @@ SignTransactionModalBase { bridgeBadge.visible: true bridgeBadge.border.width: 2 bridgeBadge.color: Theme.palette.darkBlue - bridgeBadge.image.source: Theme.svg("sign") + bridgeBadge.image.source: Assets.svg("sign") } leftFooterContents: ObjectModel { diff --git a/ui/app/AppLayouts/Wallet/stores/RootStore.qml b/ui/app/AppLayouts/Wallet/stores/RootStore.qml index 354bf12dc2..301937c32b 100644 --- a/ui/app/AppLayouts/Wallet/stores/RootStore.qml +++ b/ui/app/AppLayouts/Wallet/stores/RootStore.qml @@ -488,7 +488,7 @@ QtObject { case Constants.swap.paraswapV5ApproveContractAddress: case Constants.swap.paraswapV5SwapContractAddress: return { - "icon": Theme.png("swap/%1".arg(Constants.swap.paraswapIcon)), + "icon": Assets.png("swap/%1".arg(Constants.swap.paraswapIcon)), "url": Constants.swap.paraswapHostname, "name": Constants.swap.paraswapName, "approvalContractAddress": Constants.swap.paraswapV5ApproveContractAddress, @@ -496,7 +496,7 @@ QtObject { } case Constants.swap.paraswapV6_2ContractAddress: return { - "icon": Theme.png("swap/%1".arg(Constants.swap.paraswapIcon)), + "icon": Assets.png("swap/%1".arg(Constants.swap.paraswapIcon)), "url": Constants.swap.paraswapUrl, "name": Constants.swap.paraswapName, "approvalContractAddress": Constants.swap.paraswapV6_2ContractAddress, diff --git a/ui/app/AppLayouts/Wallet/views/AssetsDetailView.qml b/ui/app/AppLayouts/Wallet/views/AssetsDetailView.qml index b65e066e3c..367376cda2 100644 --- a/ui/app/AppLayouts/Wallet/views/AssetsDetailView.qml +++ b/ui/app/AppLayouts/Wallet/views/AssetsDetailView.qml @@ -498,7 +498,7 @@ Item { } delegate: InformationTag { hoverEnabled: true - asset.name: Theme.svg(model.iconUrl) + asset.name: Assets.svg(model.iconUrl) asset.isImage: true tagPrimaryLabel.text: model.chainName tagSecondaryLabel.text: SQUtils.Utils.elideAndFormatWalletAddress(model.address) diff --git a/ui/app/AppLayouts/Wallet/views/LoadingGraphView.qml b/ui/app/AppLayouts/Wallet/views/LoadingGraphView.qml index 1c42f5e41b..0d8292c7f2 100644 --- a/ui/app/AppLayouts/Wallet/views/LoadingGraphView.qml +++ b/ui/app/AppLayouts/Wallet/views/LoadingGraphView.qml @@ -25,7 +25,7 @@ Loader { Image { id: mask - source: Theme.svg("mask/dummyLineGraph") + source: Assets.svg("mask/dummyLineGraph") sourceSize: Qt.size(parent.width, parent.height) smooth: true visible: false diff --git a/ui/app/AppLayouts/Wallet/views/NetworkSelectorView.qml b/ui/app/AppLayouts/Wallet/views/NetworkSelectorView.qml index 4a3d888863..7f428889b6 100644 --- a/ui/app/AppLayouts/Wallet/views/NetworkSelectorView.qml +++ b/ui/app/AppLayouts/Wallet/views/NetworkSelectorView.qml @@ -56,7 +56,7 @@ StatusListView { height: 48 width: ListView.view.width title: model.chainName - iconUrl: Theme.svg(model.iconUrl) + iconUrl: Assets.svg(model.iconUrl) showIndicator: root.showIndicator multiSelection: root.multiSelection interactive: root.interactive diff --git a/ui/app/AppLayouts/Wallet/views/TokenSelectorAssetDelegate.qml b/ui/app/AppLayouts/Wallet/views/TokenSelectorAssetDelegate.qml index 264d36c621..68eab6f988 100644 --- a/ui/app/AppLayouts/Wallet/views/TokenSelectorAssetDelegate.qml +++ b/ui/app/AppLayouts/Wallet/views/TokenSelectorAssetDelegate.qml @@ -122,7 +122,7 @@ ItemDelegate { StatusRoundedImage { Layout.preferredWidth: 16 Layout.preferredHeight: 16 - image.source: Theme.svg(model.iconUrl) + image.source: Assets.svg(model.iconUrl) } StatusBaseText { font.pixelSize: Theme.tertiaryTextFontSize diff --git a/ui/app/AppLayouts/Wallet/views/TokenSelectorCollectibleDelegate.qml b/ui/app/AppLayouts/Wallet/views/TokenSelectorCollectibleDelegate.qml index af26cc3fa6..e1f1d3051b 100644 --- a/ui/app/AppLayouts/Wallet/views/TokenSelectorCollectibleDelegate.qml +++ b/ui/app/AppLayouts/Wallet/views/TokenSelectorCollectibleDelegate.qml @@ -95,7 +95,7 @@ ItemDelegate { Layout.preferredWidth: 20 Layout.preferredHeight: 20 - image.source: Theme.svg(root.networkIcon) + image.source: Assets.svg(root.networkIcon) visible:(root.hovered || root.isAutoHovered) && !root.goDeeperIconVisible } diff --git a/ui/app/AppLayouts/stores/RootStore.qml b/ui/app/AppLayouts/stores/RootStore.qml index 70499e58a0..2ff1f6b4db 100644 --- a/ui/app/AppLayouts/stores/RootStore.qml +++ b/ui/app/AppLayouts/stores/RootStore.qml @@ -322,7 +322,7 @@ QtObject { proxyRoles: FastExpressionRole { function collectibleIcon(icon) { - return !!icon ? icon : Theme.png("tokens/DEFAULT-TOKEN") + return !!icon ? icon : Assets.png("tokens/DEFAULT-TOKEN") } name: "iconSource" expression: collectibleIcon(model.icon) diff --git a/ui/app/mainui/Handlers/SendModalHandler.qml b/ui/app/mainui/Handlers/SendModalHandler.qml index 11e1580330..f740049167 100644 --- a/ui/app/mainui/Handlers/SendModalHandler.qml +++ b/ui/app/mainui/Handlers/SendModalHandler.qml @@ -881,7 +881,7 @@ QtObject { networkShortName: signSendAdaptor.selectedNetwork.shortName networkName: signSendAdaptor.selectedNetwork.chainName - networkIconPath: Theme.svg(signSendAdaptor.selectedNetwork.iconUrl) + networkIconPath: Assets.svg(signSendAdaptor.selectedNetwork.iconUrl) networkBlockExplorerUrl: signSendAdaptor.selectedNetwork.blockExplorerURL networkChainId: signSendAdaptor.selectedNetwork.chainId diff --git a/ui/app/mainui/SplashScreen.qml b/ui/app/mainui/SplashScreen.qml index c4e898de79..03179aa1c5 100644 --- a/ui/app/mainui/SplashScreen.qml +++ b/ui/app/mainui/SplashScreen.qml @@ -24,7 +24,7 @@ Item { Layout.alignment: Qt.AlignHCenter Layout.preferredWidth: 320 Layout.preferredHeight: 320 - source: Theme.png("status-preparing") + source: Assets.png("status-preparing") } StatusBaseText { id: loadingText diff --git a/ui/app/mainui/StatusTrayIcon.qml b/ui/app/mainui/StatusTrayIcon.qml index 6e026a515d..5b2ed23dbe 100644 --- a/ui/app/mainui/StatusTrayIcon.qml +++ b/ui/app/mainui/StatusTrayIcon.qml @@ -16,9 +16,9 @@ SystemTrayIcon { icon.source: { if (Qt.platform.os === SQUtils.Utils.windows) { - return root.showRedDot ? Theme.svg("status-logo-white-windows-with-red-dot") : Theme.svg("status-logo-white-windows") + return root.showRedDot ? Assets.svg("status-logo-white-windows-with-red-dot") : Assets.svg("status-logo-white-windows") } - return root.showRedDot ? Theme.svg("status-logo-white-with-red-dot") : Theme.svg("status-logo-white") + return root.showRedDot ? Assets.svg("status-logo-white-with-red-dot") : Assets.svg("status-logo-white") } icon.mask: Qt.platform.os !== SQUtils.Utils.windows diff --git a/ui/app/mainui/ToastsManager.qml b/ui/app/mainui/ToastsManager.qml index ce8a3acf49..40a1418d73 100644 --- a/ui/app/mainui/ToastsManager.qml +++ b/ui/app/mainui/ToastsManager.qml @@ -204,7 +204,7 @@ QtObject { Global.displayImageToastWithActionMessage( newsTitle, qsTr("Read more"), - Theme.png("status-logo"), + Assets.png("status-logo"), Constants.ephemeralNotificationType.normal, ToastsManager.ActionType.OpenNewsMessagePopup, notificationId diff --git a/ui/imports/shared/LoadingAnimation.qml b/ui/imports/shared/LoadingAnimation.qml index 0a070ff144..a899ea0a00 100644 --- a/ui/imports/shared/LoadingAnimation.qml +++ b/ui/imports/shared/LoadingAnimation.qml @@ -7,7 +7,7 @@ import shared.panels SVGImage { id: loadingImg - source: Theme.svg("loading") + source: Assets.svg("loading") width: 25 height: 25 fillMode: Image.Stretch diff --git a/ui/imports/shared/controls/AssetsDetailsHeader.qml b/ui/imports/shared/controls/AssetsDetailsHeader.qml index 4cd54b83d1..7d915797e3 100644 --- a/ui/imports/shared/controls/AssetsDetailsHeader.qml +++ b/ui/imports/shared/controls/AssetsDetailsHeader.qml @@ -137,7 +137,7 @@ Control { } tagPrimaryLabel.text: root.formatBalance(aggregatedbalance) tagPrimaryLabel.color: model.chainColor - asset.name: Theme.svg(model.iconUrl) + asset.name: Assets.svg(model.iconUrl) asset.isImage: true loading: root.isLoading visible: balancesAggregator.value > 0 diff --git a/ui/imports/shared/controls/TransactionDelegate.qml b/ui/imports/shared/controls/TransactionDelegate.qml index 91b541f9c8..8dca023215 100644 --- a/ui/imports/shared/controls/TransactionDelegate.qml +++ b/ui/imports/shared/controls/TransactionDelegate.qml @@ -176,12 +176,12 @@ StatusListItem { name: { switch(root.transactionStatus) { case Constants.TransactionStatus.Pending: - return Theme.svg("transaction/pending") + return Assets.svg("transaction/pending") case Constants.TransactionStatus.Complete: case Constants.TransactionStatus.Finalised: - return Theme.svg("transaction/confirmed") + return Assets.svg("transaction/confirmed") case Constants.TransactionStatus.Failed: - return Theme.svg("transaction/failed") + return Assets.svg("transaction/failed") default: return "" } diff --git a/ui/imports/shared/controls/WalletAccountListItem.qml b/ui/imports/shared/controls/WalletAccountListItem.qml index 60754d71b3..8ca627b3d8 100644 --- a/ui/imports/shared/controls/WalletAccountListItem.qml +++ b/ui/imports/shared/controls/WalletAccountListItem.qml @@ -94,7 +94,7 @@ StatusListItem { titleText.font.pixelSize: Theme.tertiaryTextFontSize titleText.color: root.accountBalance.balance === "0" ? Theme.palette.baseColor1 : Theme.palette.directColor1 asset.isImage: true - asset.name: Theme.svg(root.accountBalance.iconUrl) + asset.name: Assets.svg(root.accountBalance.iconUrl) asset.color: root.accountBalance.chainColor closeButtonVisible: false hoverEnabled: true diff --git a/ui/imports/shared/controls/chat/PaymentRequestMiniCardDelegate.qml b/ui/imports/shared/controls/chat/PaymentRequestMiniCardDelegate.qml index ecb73b330a..8fb7b0b305 100644 --- a/ui/imports/shared/controls/chat/PaymentRequestMiniCardDelegate.qml +++ b/ui/imports/shared/controls/chat/PaymentRequestMiniCardDelegate.qml @@ -45,7 +45,7 @@ CalloutCard { asset.bgHeight: 36 asset.bgWidth: 36 asset.color: Theme.palette.primaryColor1 - asset.name: Theme.svg("send") + asset.name: Assets.svg("send") StatusSmartIdenticon { anchors.bottom: parent.bottom diff --git a/ui/imports/shared/controls/chat/ProfileHeader.qml b/ui/imports/shared/controls/chat/ProfileHeader.qml index 0f5b8cd96e..5cb330856d 100644 --- a/ui/imports/shared/controls/chat/ProfileHeader.qml +++ b/ui/imports/shared/controls/chat/ProfileHeader.qml @@ -228,7 +228,7 @@ Item { objectName: "ProfileHeader_displayNameEditIcon" height: compact ? 10 : 16 width: compact ? 10 : 16 - source: Theme.svg("edit-message") + source: Assets.svg("edit-message") StatusMouseArea { anchors.fill: parent cursorShape: Qt.PointingHandCursor diff --git a/ui/imports/shared/controls/chat/VerificationLabel.qml b/ui/imports/shared/controls/chat/VerificationLabel.qml index cd9afe8d7a..c32ac83d2b 100644 --- a/ui/imports/shared/controls/chat/VerificationLabel.qml +++ b/ui/imports/shared/controls/chat/VerificationLabel.qml @@ -18,9 +18,9 @@ SVGImage { source: { switch(trustStatus) { case Constants.trustStatus.trusted: - return Theme.svg("verified"); + return Assets.svg("verified"); case Constants.trustStatus.untrustworthy: - return Theme.svg("untrustworthy"); + return Assets.svg("untrustworthy"); default: return ""; } diff --git a/ui/imports/shared/controls/delegates/PaymentRequestCardDelegate.qml b/ui/imports/shared/controls/delegates/PaymentRequestCardDelegate.qml index 087c1094b8..e2d0d54632 100644 --- a/ui/imports/shared/controls/delegates/PaymentRequestCardDelegate.qml +++ b/ui/imports/shared/controls/delegates/PaymentRequestCardDelegate.qml @@ -63,7 +63,7 @@ CalloutCard { StatusImage { anchors.fill: parent asynchronous: true - source: Theme.png("chat/request_payment_banner") + source: Assets.png("chat/request_payment_banner") } Row { diff --git a/ui/imports/shared/panels/ImageLoader.qml b/ui/imports/shared/panels/ImageLoader.qml index d7197f3469..9e1e16464a 100644 --- a/ui/imports/shared/panels/ImageLoader.qml +++ b/ui/imports/shared/panels/ImageLoader.qml @@ -91,7 +91,7 @@ Rectangle { Component { id: reload SVGImage { - source: Theme.svg("reload") + source: Assets.svg("reload") mipmap: false width: 15.5 height: 19.5 diff --git a/ui/imports/shared/panels/NoImageUploadedPanel.qml b/ui/imports/shared/panels/NoImageUploadedPanel.qml index 7ebeff5931..92fe892063 100644 --- a/ui/imports/shared/panels/NoImageUploadedPanel.qml +++ b/ui/imports/shared/panels/NoImageUploadedPanel.qml @@ -79,7 +79,7 @@ Control { id: content Image { id: imageImg - source: Theme.svg("images_icon") + source: Assets.svg("images_icon") width: 20 height: 18 sourceSize.width: width || undefined diff --git a/ui/imports/shared/panels/PrivacyWallCarousel.qml b/ui/imports/shared/panels/PrivacyWallCarousel.qml index 492b563845..0ab2194f3b 100644 --- a/ui/imports/shared/panels/PrivacyWallCarousel.qml +++ b/ui/imports/shared/panels/PrivacyWallCarousel.qml @@ -32,7 +32,7 @@ Control { const imageName = root.model.get(currentIndex).image const platformPostfix = isSmallPortraitScreen ? "-small": "" const imagePath = "%1-%2%3".arg(imageName).arg(Theme.palette.name).arg(platformPostfix) - return Theme.png(imagePath) + return Assets.png(imagePath) } } diff --git a/ui/imports/shared/panels/RoundedIcon.qml b/ui/imports/shared/panels/RoundedIcon.qml index f10d07de15..5fc43c2ef5 100644 --- a/ui/imports/shared/panels/RoundedIcon.qml +++ b/ui/imports/shared/panels/RoundedIcon.qml @@ -36,7 +36,7 @@ Rectangle { width: 12 height: 12 fillMode: Image.PreserveAspectFit - source: Theme.svg("new_chat") + source: Assets.svg("new_chat") } ColorOverlay { anchors.fill: roundedIconImage diff --git a/ui/imports/shared/popups/BlockchainExplorersMenu.qml b/ui/imports/shared/popups/BlockchainExplorersMenu.qml index a7848c7cfe..6a49583df7 100644 --- a/ui/imports/shared/popups/BlockchainExplorersMenu.qml +++ b/ui/imports/shared/popups/BlockchainExplorersMenu.qml @@ -26,7 +26,7 @@ StatusMenu { delegate: StatusMenuItem { action: StatusAction { text: Utils.getChainExplorerName(model.shortName) - assetSettings.name: Theme.svg(model.iconUrl) + assetSettings.name: Assets.svg(model.iconUrl) assetSettings.isImage: true onTriggered: { root.networkClicked(model.shortName, model.isTest) diff --git a/ui/imports/shared/popups/DownloadPage.qml b/ui/imports/shared/popups/DownloadPage.qml index 758d717848..bea454c86b 100644 --- a/ui/imports/shared/popups/DownloadPage.qml +++ b/ui/imports/shared/popups/DownloadPage.qml @@ -34,7 +34,7 @@ Rectangle { SVGImage { id: logoImage - source: Theme.svg(Theme.palette.name == "light" ? "status-logo-light" : "status-logo-dark") + source: Assets.svg(Theme.palette.name == "light" ? "status-logo-light" : "status-logo-dark") anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.top anchors.topMargin: 108 diff --git a/ui/imports/shared/popups/EnableBiometricsPopup.qml b/ui/imports/shared/popups/EnableBiometricsPopup.qml index cce2caf350..aebc38c21b 100644 --- a/ui/imports/shared/popups/EnableBiometricsPopup.qml +++ b/ui/imports/shared/popups/EnableBiometricsPopup.qml @@ -28,7 +28,7 @@ StatusDialog { Layout.alignment: Qt.AlignHCenter mipmap: true smooth: false - source: Theme.png("onboarding/enable_biometrics") + source: Assets.png("onboarding/enable_biometrics") } StatusBaseText { Layout.fillWidth: true diff --git a/ui/imports/shared/popups/IntroduceYourselfPopup.qml b/ui/imports/shared/popups/IntroduceYourselfPopup.qml index beb0bc3ea3..75b7d39163 100644 --- a/ui/imports/shared/popups/IntroduceYourselfPopup.qml +++ b/ui/imports/shared/popups/IntroduceYourselfPopup.qml @@ -95,7 +95,7 @@ StatusDialog { name: root.pubKey usesDefaultName: true - image: Theme.png("onboarding/avatar") + image: Assets.png("onboarding/avatar") userColor: Utils.colorForColorId(root.colorId) imageWidth: 68 imageHeight: 68 diff --git a/ui/imports/shared/popups/NewsMessagePopup.qml b/ui/imports/shared/popups/NewsMessagePopup.qml index 956e8ebb5d..871da133e0 100644 --- a/ui/imports/shared/popups/NewsMessagePopup.qml +++ b/ui/imports/shared/popups/NewsMessagePopup.qml @@ -48,7 +48,7 @@ StatusDialog { width: 40 height: 40 StatusImage { - source: Theme.png("status") + source: Assets.png("status") anchors.fill: parent } } diff --git a/ui/imports/shared/popups/addaccount/states/ConfirmAddingNewMasterKey.qml b/ui/imports/shared/popups/addaccount/states/ConfirmAddingNewMasterKey.qml index 85faa86948..f288acb776 100644 --- a/ui/imports/shared/popups/addaccount/states/ConfirmAddingNewMasterKey.qml +++ b/ui/imports/shared/popups/addaccount/states/ConfirmAddingNewMasterKey.qml @@ -50,7 +50,7 @@ Item { Layout.preferredWidth: 120 Layout.preferredHeight: 120 fillMode: Image.PreserveAspectFit - source: Theme.png("onboarding/keys") + source: Assets.png("onboarding/keys") mipmap: true cache: false } diff --git a/ui/imports/shared/popups/keycard/helpers/KeycardImage.qml b/ui/imports/shared/popups/keycard/helpers/KeycardImage.qml index 1b6e05a881..766227ee27 100644 --- a/ui/imports/shared/popups/keycard/helpers/KeycardImage.qml +++ b/ui/imports/shared/popups/keycard/helpers/KeycardImage.qml @@ -59,7 +59,7 @@ Item { antialiasing: true mipmap: true source: d.isAnimation? - Theme.png(root.pattern.arg(img.currentImgIndex)) : + Assets.png(root.pattern.arg(img.currentImgIndex)) : root.source property int currentImgIndex: root.startImgIndexForTheFirstLoop diff --git a/ui/imports/shared/popups/keycard/states/EnterPassword.qml b/ui/imports/shared/popups/keycard/states/EnterPassword.qml index 9d312eaacd..dcaf569614 100644 --- a/ui/imports/shared/popups/keycard/states/EnterPassword.qml +++ b/ui/imports/shared/popups/keycard/states/EnterPassword.qml @@ -121,7 +121,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.enterPassword PropertyChanges { target: image - source: Theme.png("keycard/authenticate") + source: Assets.png("keycard/authenticate") pattern: "" } PropertyChanges { @@ -144,7 +144,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.wrongPassword PropertyChanges { target: image - source: Theme.png("keycard/authenticate") + source: Assets.png("keycard/authenticate") pattern: "" } PropertyChanges { @@ -168,7 +168,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.enterBiometricsPassword PropertyChanges { target: image - source: Theme.png("keycard/biometrics-success") + source: Assets.png("keycard/biometrics-success") pattern: "" } PropertyChanges { @@ -193,7 +193,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.wrongBiometricsPassword PropertyChanges { target: image - source: Theme.png("keycard/biometrics-success") + source: Assets.png("keycard/biometrics-success") pattern: "" } PropertyChanges { diff --git a/ui/imports/shared/popups/keycard/states/KeycardInit.qml b/ui/imports/shared/popups/keycard/states/KeycardInit.qml index a4d114ab2f..1d6533006b 100644 --- a/ui/imports/shared/popups/keycard/states/KeycardInit.qml +++ b/ui/imports/shared/popups/keycard/states/KeycardInit.qml @@ -566,7 +566,7 @@ Item { } PropertyChanges { target: image - source: Theme.png("keycard/empty-reader") + source: Assets.png("keycard/empty-reader") pattern: "" } PropertyChanges { @@ -765,7 +765,7 @@ Item { pattern: d.authenticationOrSigning? "" : Constants.keycardAnimations.strongError.pattern source: d.authenticationOrSigning? - Theme.png("keycard/plain-error") : "" + Assets.png("keycard/plain-error") : "" startImgIndexForTheFirstLoop: d.authenticationOrSigning? 0 : Constants.keycardAnimations.strongError.startImgIndexForTheFirstLoop startImgIndexForOtherLoops: d.authenticationOrSigning? @@ -829,7 +829,7 @@ Item { } PropertyChanges { target: image - source: Theme.png("keycard/plain-error") + source: Assets.png("keycard/plain-error") pattern: "" } PropertyChanges { @@ -868,7 +868,7 @@ Item { } PropertyChanges { target: image - source: Theme.png("keycard/card-inserted") + source: Assets.png("keycard/card-inserted") pattern: "" } PropertyChanges { @@ -896,7 +896,7 @@ Item { } PropertyChanges { target: image - source: Theme.png("keycard/card-empty") + source: Assets.png("keycard/card-empty") pattern: "" } PropertyChanges { @@ -924,7 +924,7 @@ Item { } PropertyChanges { target: image - source: Theme.png("keycard/card-inserted") + source: Assets.png("keycard/card-inserted") pattern: "" } PropertyChanges { @@ -1224,7 +1224,7 @@ Item { } PropertyChanges { target: image - source: Theme.png("keycard/card-inserted") + source: Assets.png("keycard/card-inserted") pattern: "" } PropertyChanges { @@ -1249,7 +1249,7 @@ Item { } PropertyChanges { target: image - source: Theme.png("keycard/card-inserted") + source: Assets.png("keycard/card-inserted") pattern: "" } PropertyChanges { @@ -1262,7 +1262,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.biometricsPasswordFailed PropertyChanges { target: image - source: Theme.png("keycard/biometrics-fail") + source: Assets.png("keycard/biometrics-fail") pattern: "" } PropertyChanges { @@ -1283,7 +1283,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.biometricsPinFailed PropertyChanges { target: image - source: Theme.png("keycard/plain-error") + source: Assets.png("keycard/plain-error") pattern: "" } PropertyChanges { @@ -1304,7 +1304,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.biometricsPinInvalid PropertyChanges { target: image - source: Theme.png("keycard/plain-error") + source: Assets.png("keycard/plain-error") pattern: "" } PropertyChanges { @@ -1386,7 +1386,7 @@ Item { } PropertyChanges { target: image - source: Theme.png("keycard/card-inserted") + source: Assets.png("keycard/card-inserted") pattern: "" } PropertyChanges { @@ -1538,7 +1538,7 @@ Item { } PropertyChanges { target: image - source: Theme.png("keycard/biometrics-success") + source: Assets.png("keycard/biometrics-success") pattern: "" } PropertyChanges { diff --git a/ui/imports/shared/popups/keycard/states/KeycardPin.qml b/ui/imports/shared/popups/keycard/states/KeycardPin.qml index e01aac1efc..71f92d1e9f 100644 --- a/ui/imports/shared/popups/keycard/states/KeycardPin.qml +++ b/ui/imports/shared/popups/keycard/states/KeycardPin.qml @@ -119,7 +119,7 @@ Item { root.pinUpdated(pinInput) if (root.sharedKeycardModule.currentState.stateType !== Constants.keycardSharedState.wrongPin && root.sharedKeycardModule.currentState.stateType !== Constants.keycardSharedState.wrongKeychainPin) { - image.source = Theme.png("keycard/enter-pin-%1".arg(pinInput.length)) + image.source = Assets.png("keycard/enter-pin-%1".arg(pinInput.length)) } if(pinInput.length === 0) { return @@ -144,7 +144,7 @@ Item { root.sharedKeycardModule.currentState.doSecondaryAction() } else { info.text = qsTr("PINs don't match") - image.source = Theme.png("keycard/plain-error") + image.source = Assets.png("keycard/plain-error") } } } @@ -224,7 +224,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.enterPin PropertyChanges { target: image - source: Theme.png("keycard/card-empty") + source: Assets.png("keycard/card-empty") pattern: "" } PropertyChanges { @@ -256,7 +256,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.wrongPin PropertyChanges { target: image - source: Theme.png("keycard/plain-error") + source: Assets.png("keycard/plain-error") pattern: "" } PropertyChanges { @@ -289,7 +289,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.wrongKeychainPin PropertyChanges { target: image - source: Theme.png("keycard/plain-error") + source: Assets.png("keycard/plain-error") pattern: "" } PropertyChanges { @@ -324,7 +324,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.createPin PropertyChanges { target: image - source: Theme.png("keycard/enter-pin-0") + source: Assets.png("keycard/enter-pin-0") pattern: "" } PropertyChanges { @@ -363,7 +363,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.repeatPin PropertyChanges { target: image - source: Theme.png("keycard/enter-pin-0") + source: Assets.png("keycard/enter-pin-0") pattern: "" } PropertyChanges { diff --git a/ui/imports/shared/popups/keycard/states/KeycardPuk.qml b/ui/imports/shared/popups/keycard/states/KeycardPuk.qml index ede7be8324..18c746101a 100644 --- a/ui/imports/shared/popups/keycard/states/KeycardPuk.qml +++ b/ui/imports/shared/popups/keycard/states/KeycardPuk.qml @@ -66,7 +66,7 @@ Item { root.pukUpdated(pinInput) if (root.sharedKeycardModule.currentState.stateType !== Constants.keycardSharedState.enterPuk && root.sharedKeycardModule.currentState.stateType !== Constants.keycardSharedState.wrongPuk) { - image.source = Theme.png("keycard/card-inserted") + image.source = Assets.png("keycard/card-inserted") } if(pinInput.length == 0) { return @@ -84,7 +84,7 @@ Item { root.sharedKeycardModule.currentState.doSecondaryAction() } else { info.text = qsTr("The PUK doesn’t match") - image.source = Theme.png("keycard/plain-error") + image.source = Assets.png("keycard/plain-error") } } } @@ -117,7 +117,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.enterPuk PropertyChanges { target: image - source: Theme.png("keycard/card-inserted") + source: Assets.png("keycard/card-inserted") pattern: "" } PropertyChanges { @@ -140,7 +140,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.wrongPuk PropertyChanges { target: image - source: Theme.png("keycard/plain-error") + source: Assets.png("keycard/plain-error") pattern: "" } PropertyChanges { @@ -169,7 +169,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.createPuk PropertyChanges { target: image - source: Theme.png("keycard/card-inserted") + source: Assets.png("keycard/card-inserted") pattern: "" } PropertyChanges { @@ -192,7 +192,7 @@ Item { when: root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.repeatPuk PropertyChanges { target: image - source: Theme.png("keycard/card-inserted") + source: Assets.png("keycard/card-inserted") pattern: "" } PropertyChanges { diff --git a/ui/imports/shared/popups/send/views/NetworkCardsComponent.qml b/ui/imports/shared/popups/send/views/NetworkCardsComponent.qml index 3201103d1e..d199bb898d 100644 --- a/ui/imports/shared/popups/send/views/NetworkCardsComponent.qml +++ b/ui/imports/shared/popups/send/views/NetworkCardsComponent.qml @@ -103,7 +103,7 @@ Item { maxAdvancedValue: tokenBalance.amount state: (model.tokenBalance.amount === 0 && root.amountToSend > 0) || !model.hasGas ? "unavailable" : !advancedInput.valid && advancedInputCurrencyAmount > 0 ? "error" : "default" - cardIcon.source: Theme.svg(model.iconUrl) + cardIcon.source: Assets.svg(model.iconUrl) disabledText: qsTr("Disabled") disableText: qsTr("Disable") enableText: qsTr("Enable") @@ -165,7 +165,7 @@ Item { tertiaryText: state === "unpreferred" ? qsTr("UNPREFERRED") : "" state: !preferred ? "unpreferred" : "default" opacity: preferred || store.showUnPreferredChains ? 1 : 0 - cardIcon.source: Theme.svg(model.iconUrl) + cardIcon.source: Assets.svg(model.iconUrl) disabledText: qsTr("Disabled") disableText: qsTr("Disable") enableText: qsTr("Enable") diff --git a/ui/imports/shared/popups/walletconnect/DAppSignRequestModal.qml b/ui/imports/shared/popups/walletconnect/DAppSignRequestModal.qml index 4f3e66bcfb..1e0bb3dbd9 100644 --- a/ui/imports/shared/popups/walletconnect/DAppSignRequestModal.qml +++ b/ui/imports/shared/popups/walletconnect/DAppSignRequestModal.qml @@ -53,7 +53,7 @@ SignTransactionModalBase { height: 40 badgeSize: 16 badgeMargin: 2 - badgeIcon: Theme.svg("sign-blue") + badgeIcon: Assets.svg("sign-blue") } gradientColor: root.accountColor @@ -64,7 +64,7 @@ SignTransactionModalBase { fromImageSmartIdenticon.asset.emoji: root.accountEmoji fromImageSmartIdenticon.asset.color: root.accountColor fromImageSmartIdenticon.asset.isLetterIdenticon: !!root.accountEmoji - toImageSmartIdenticon.asset.name: Theme.svg("sign") + toImageSmartIdenticon.asset.name: Assets.svg("sign") toImageSmartIdenticon.asset.bgColor: Theme.palette.primaryColor3 toImageSmartIdenticon.asset.width: 24 toImageSmartIdenticon.asset.height: 24 diff --git a/ui/imports/shared/popups/walletconnect/panels/IntentionPanel.qml b/ui/imports/shared/popups/walletconnect/panels/IntentionPanel.qml index b4650a4a96..1e66a74c32 100644 --- a/ui/imports/shared/popups/walletconnect/panels/IntentionPanel.qml +++ b/ui/imports/shared/popups/walletconnect/panels/IntentionPanel.qml @@ -50,7 +50,7 @@ ColumnLayout { bgRadius: bgWidth / 2 bgBorderWidth: 2 bgBorderColor: Theme.palette.statusAppLayout.backgroundColor - source: Theme.svg("sign") + source: Assets.svg("sign") } } } diff --git a/ui/imports/shared/status/StatusChatImageValidator.qml b/ui/imports/shared/status/StatusChatImageValidator.qml index 030cd9052c..05f1309889 100644 --- a/ui/imports/shared/status/StatusChatImageValidator.qml +++ b/ui/imports/shared/status/StatusChatImageValidator.qml @@ -47,7 +47,7 @@ Item { anchors.topMargin: 6 anchors.leftMargin: 6 fillMode: Image.PreserveAspectFit - source: Theme.svg("exclamation_outline") + source: Assets.svg("exclamation_outline") } StyledText { id: txtValidationError diff --git a/ui/imports/shared/status/StatusChatInputImageArea.qml b/ui/imports/shared/status/StatusChatInputImageArea.qml index 2670ed1fd5..7ce727a350 100644 --- a/ui/imports/shared/status/StatusChatInputImageArea.qml +++ b/ui/imports/shared/status/StatusChatInputImageArea.qml @@ -68,7 +68,7 @@ Row { hoverEnabled: false opacity: mouseArea.containsMouse || buttonMouseArea.containsMouse ? 1 : 0 contentItem: SVGImage { - source: Theme.svg( !buttonMouseArea.containsMouse ? "close-filled" : "close-filled-hovered") + source: Assets.svg( !buttonMouseArea.containsMouse ? "close-filled" : "close-filled-hovered") width: closeBtn.width height: closeBtn.height } diff --git a/ui/imports/shared/status/StatusChatInputReplyArea.qml b/ui/imports/shared/status/StatusChatInputReplyArea.qml index 2445a1ebe8..7053c2ba19 100644 --- a/ui/imports/shared/status/StatusChatInputReplyArea.qml +++ b/ui/imports/shared/status/StatusChatInputReplyArea.qml @@ -113,7 +113,7 @@ Rectangle { anchors.rightMargin: 4 contentItem: StatusIcon { id: iconImg - source: Theme.svg("close") + source: Assets.svg("close") color: Theme.palette.textColor sourceSize: Qt.size(width, height) width: closeBtn.width diff --git a/ui/imports/shared/status/StatusGifPopup/ConfirmationPopup.qml b/ui/imports/shared/status/StatusGifPopup/ConfirmationPopup.qml index 7ec6a993df..81d03ac769 100644 --- a/ui/imports/shared/status/StatusGifPopup/ConfirmationPopup.qml +++ b/ui/imports/shared/status/StatusGifPopup/ConfirmationPopup.qml @@ -45,7 +45,7 @@ Popup { id: gifImage anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.top - source: Theme.svg(`gifs-${Theme.palette.name}`) + source: Assets.svg(`gifs-${Theme.palette.name}`) } StatusBaseText { diff --git a/ui/imports/shared/status/StatusStickerPackIconWithIndicator.qml b/ui/imports/shared/status/StatusStickerPackIconWithIndicator.qml index 861da728f2..945b5cba48 100644 --- a/ui/imports/shared/status/StatusStickerPackIconWithIndicator.qml +++ b/ui/imports/shared/status/StatusStickerPackIconWithIndicator.qml @@ -11,7 +11,7 @@ Item { property bool selected: false property bool useIconInsteadOfImage: false - property url source: Theme.svg("history") + property url source: Assets.svg("history") signal clicked implicitHeight: 24 diff --git a/ui/imports/shared/status/StatusStickersPopup.qml b/ui/imports/shared/status/StatusStickersPopup.qml index a2cf1cb84c..f81e290dd6 100644 --- a/ui/imports/shared/status/StatusStickersPopup.qml +++ b/ui/imports/shared/status/StatusStickersPopup.qml @@ -179,7 +179,7 @@ StatusDropdown { anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.top anchors.topMargin: 134 - source: Theme.svg("stickers_sad_icon") + source: Assets.svg("stickers_sad_icon") } Item { diff --git a/ui/imports/shared/views/chat/LinksMessageView.qml b/ui/imports/shared/views/chat/LinksMessageView.qml index 78abe3b597..e7ec503897 100644 --- a/ui/imports/shared/views/chat/LinksMessageView.qml +++ b/ui/imports/shared/views/chat/LinksMessageView.qml @@ -158,7 +158,7 @@ Flow { } Image { id: unfurlingImage - source: Theme.png("unfurling-image") + source: Assets.png("unfurling-image") width: 132 height: 94 anchors.horizontalCenter: parent.horizontalCenter diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml index 52e411ab0d..8495fab277 100644 --- a/ui/imports/shared/views/chat/MessageView.qml +++ b/ui/imports/shared/views/chat/MessageView.qml @@ -928,7 +928,7 @@ Loader { pubkey: root.senderId colorId: Utils.colorIdForPubkey(root.senderId) } - sender.badgeImage: Theme.svg("discord-bridge") + sender.badgeImage: Assets.svg("discord-bridge") } replyDetails: StatusMessageDetails { diff --git a/ui/imports/shared/views/profile/ProfileShowcaseCollectiblesView.qml b/ui/imports/shared/views/profile/ProfileShowcaseCollectiblesView.qml index 30de2d373a..263a0f8d0f 100644 --- a/ui/imports/shared/views/profile/ProfileShowcaseCollectiblesView.qml +++ b/ui/imports/shared/views/profile/ProfileShowcaseCollectiblesView.qml @@ -108,7 +108,7 @@ Item { id: gradient anchors.fill: collectibleImage visible: hoverHandler.hovered - source: Theme.png("profile/gradient") + source: Assets.png("profile/gradient") } //TODO Add drop shadow diff --git a/ui/imports/utils/Constants.qml b/ui/imports/utils/Constants.qml index ca2e621c0b..54ff157d9d 100644 --- a/ui/imports/utils/Constants.qml +++ b/ui/imports/utils/Constants.qml @@ -1338,10 +1338,10 @@ QtObject { const tmpSymbol = uniqueSymbolToTokenSymbol(symbol) if (!!tmpSymbol && knownTokenPNGs.indexOf(tmpSymbol) !== -1) - return Theme.png("tokens/" + tmpSymbol) + return Assets.png("tokens/" + tmpSymbol) if (useDefault) - return Theme.png("tokens/DEFAULT-TOKEN") + return Assets.png("tokens/DEFAULT-TOKEN") return "" } @@ -1351,16 +1351,16 @@ QtObject { function getSupportedTokenSourceImage(name, useDefault=true) { if (name === supportedTokenSources.uniswap) - return Theme.png("tokens/UNI") + return Assets.png("tokens/UNI") if (name === supportedTokenSources.aave) - return Theme.png("tokens/AAVE") + return Assets.png("tokens/AAVE") if (name === supportedTokenSources.status) - return Theme.png("tokens/SNT") + return Assets.png("tokens/SNT") if (useDefault) - return Theme.png("tokens/DEFAULT-TOKEN") + return Assets.png("tokens/DEFAULT-TOKEN") return "" } @@ -1524,8 +1524,8 @@ QtObject { property var dappImageByType: [ "", - Theme.svg("walletconnect"), - Theme.png("status-logo") + Assets.svg("walletconnect"), + Assets.png("status-logo") ] enum LimitWarning {