From 61ccf9c757d177b3770a573f23c7a60fe9f2fc38 Mon Sep 17 00:00:00 2001 From: Pascal Precht Date: Thu, 14 Oct 2021 15:09:35 +0200 Subject: [PATCH] refactor: move `StyledText` to ui/shared/panels --- ui/app/AppLayouts/Browser/controls/styles/BrowserTabStyle.qml | 1 + ui/app/AppLayouts/Browser/panels/BrowserHeader.qml | 1 + ui/app/AppLayouts/Browser/panels/FindBar.qml | 1 + ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml | 1 + .../Chat/ChatColumn/ChatComponents/ActivityCenterTopBar.qml | 1 + .../Chat/ChatColumn/ChatComponents/ChatRequestMessage.qml | 1 + ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml | 1 + .../Chat/ChatColumn/MessageComponents/ChatReply.qml | 1 + .../AppLayouts/Chat/ChatColumn/MessageComponents/ChatTime.qml | 1 + .../Chat/ChatColumn/MessageComponents/DateGroup.qml | 1 + ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/Retry.qml | 1 + .../Chat/ChatColumn/MessageComponents/TransactionBubble.qml | 1 + .../Chat/ChatColumn/MessageComponents/UsernameLabel.qml | 1 + ui/app/AppLayouts/Chat/ChatColumn/SuggestionBox.qml | 1 + ui/app/AppLayouts/Chat/ChatColumn/User.qml | 1 + ui/app/AppLayouts/Chat/ChatColumn/UserList.qml | 1 + .../Chat/CommunityComponents/AccessExistingCommunityPopup.qml | 1 + .../CommunityProfilePopupInviteFriendsView.qml | 1 + .../AppLayouts/Chat/CommunityComponents/CommunityUserList.qml | 1 + ui/app/AppLayouts/Chat/ContactsColumn/ClosedEmptyView.qml | 1 + ui/app/AppLayouts/Chat/components/Contact.qml | 1 + ui/app/AppLayouts/Chat/components/ContactRequest.qml | 1 + ui/app/AppLayouts/Chat/components/GroupChatPopup.qml | 1 + ui/app/AppLayouts/Chat/components/PublicChatPopup.qml | 1 + ui/app/AppLayouts/Chat/components/SuggestedChannel.qml | 1 + ui/app/AppLayouts/Chat/components/SuggestedChannels.qml | 1 + ui/app/AppLayouts/Node/NodeLayout.qml | 1 + ui/app/AppLayouts/Onboarding/controls/AccountViewDelegate.qml | 1 + ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml | 1 + .../Onboarding/popups/ConfirmAddExistingKeyModal.qml | 1 + ui/app/AppLayouts/Onboarding/popups/EnterSeedPhraseModal.qml | 1 + .../AppLayouts/Onboarding/popups/InvalidSeedPhraseModal.qml | 1 + ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml | 1 + ui/app/AppLayouts/Onboarding/views/KeysMainView.qml | 1 + ui/app/AppLayouts/Profile/controls/BloomSelectorButton.qml | 1 + ui/app/AppLayouts/Profile/panels/ContactPanel.qml | 1 + ui/app/AppLayouts/Profile/popups/BackupSeedModal.qml | 1 + ui/app/AppLayouts/Profile/popups/ChangePasswordModal.qml | 1 + ui/app/AppLayouts/Profile/popups/ConfirmAppRestartModal.qml | 1 + ui/app/AppLayouts/Profile/popups/MutedChatsModal.qml | 1 + ui/app/AppLayouts/Profile/popups/NetworksModal.qml | 1 + ui/app/AppLayouts/Profile/views/ContactsView.qml | 1 + ui/app/AppLayouts/Wallet/controls/AssetDelegate.qml | 1 + ui/app/AppLayouts/Wallet/panels/SetCurrencyModalContent.qml | 1 + ui/app/AppLayouts/Wallet/panels/TokenSettingsModalContent.qml | 1 + ui/app/AppLayouts/Wallet/panels/WalletHeader.qml | 1 + .../Wallet/popups/AddAccountWithPrivateKeyModal.qml | 1 + ui/app/AppLayouts/Wallet/views/CollectiblesView.qml | 1 + ui/app/AppLayouts/Wallet/views/HistoryView.qml | 1 + ui/app/AppLayouts/Wallet/views/LeftTabView.qml | 1 + ui/app/AppLayouts/WalletV2/panels/NetworkFilterPanel.qml | 1 + ui/app/AppLayouts/WalletV2/panels/WalletHeaderPanel.qml | 1 + .../AppLayouts/WalletV2/popups/AddEditSavedAddressPopup.qml | 1 + ui/app/AppLayouts/WalletV2/popups/CryptoServicesModal.qml | 1 + ui/app/AppLayouts/WalletV2/popups/NetworkSelectPopup.qml | 2 ++ ui/app/AppLayouts/WalletV2/popups/ShareModal.qml | 1 + ui/app/AppLayouts/WalletV2/views/CollectiblesView.qml | 1 + ui/shared/StyledTextArea.qml | 1 + ui/shared/TertiaryButton.qml | 4 +++- ui/shared/TextWithLabel.qml | 1 + ui/shared/TransactionSigner.qml | 1 + ui/shared/UnblockContactConfirmationDialog.qml | 1 + ui/shared/controls/AddressSourceSelector.qml | 1 + ui/shared/controls/AssetAndAmountInput.qml | 1 + ui/shared/controls/ContactSelector.qml | 1 + ui/shared/controls/ContactsListAndSearch.qml | 1 + ui/shared/controls/GasSelector.qml | 1 + ui/shared/controls/GasSelectorButton.qml | 1 + ui/shared/controls/SeedPhraseTextArea.qml | 1 + ui/shared/controls/StatusTabButton.qml | 1 + ui/shared/controls/StyledButton.qml | 1 + ui/shared/panels/Address.qml | 2 +- ui/shared/panels/GlossaryLetter.qml | 2 +- ui/shared/panels/LabelValueRow.qml | 1 + ui/shared/{ => panels}/StyledText.qml | 0 ui/shared/popups/BlockContactConfirmationDialog.qml | 1 + ui/shared/popups/InviteFriendsPopup.qml | 1 + ui/shared/popups/TransactionSettingsConfirmationPopup.qml | 1 + ui/shared/qmldir | 1 - ui/shared/status/StatusChatImageLoader.qml | 1 + ui/shared/status/StatusChatInput.qml | 1 + ui/shared/status/StatusExpandableAddress.qml | 1 + ui/shared/status/StatusLetterIdenticon.qml | 1 + ui/shared/status/StatusRadioButton.qml | 1 + ui/shared/status/StatusRadioButtonRow.qml | 1 + ui/shared/status/StatusSectionDescItem.qml | 1 + ui/shared/status/StatusSectionHeadline.qml | 2 +- ui/shared/status/StatusStickersPopup.qml | 1 + ui/shared/status/StatusSwitch.qml | 1 + ui/shared/status/StatusToolTip.qml | 1 + ui/shared/status/StatusWalletColorSelect.qml | 1 + ui/shared/views/NoFriendsRectangle.qml | 1 + 92 files changed, 93 insertions(+), 5 deletions(-) rename ui/shared/{ => panels}/StyledText.qml (100%) diff --git a/ui/app/AppLayouts/Browser/controls/styles/BrowserTabStyle.qml b/ui/app/AppLayouts/Browser/controls/styles/BrowserTabStyle.qml index 1807983333..61d8ffe0dc 100644 --- a/ui/app/AppLayouts/Browser/controls/styles/BrowserTabStyle.qml +++ b/ui/app/AppLayouts/Browser/controls/styles/BrowserTabStyle.qml @@ -1,6 +1,7 @@ import QtQuick 2.13 import QtQuick.Controls.Styles 1.0 import "../../../../../shared" +import "../../../../../shared/panels" import "../../../../../shared/status" import "../" diff --git a/ui/app/AppLayouts/Browser/panels/BrowserHeader.qml b/ui/app/AppLayouts/Browser/panels/BrowserHeader.qml index 768a65105b..48ba2b4990 100644 --- a/ui/app/AppLayouts/Browser/panels/BrowserHeader.qml +++ b/ui/app/AppLayouts/Browser/panels/BrowserHeader.qml @@ -6,6 +6,7 @@ import QtQuick.Controls.Styles 1.0 import QtWebEngine 1.10 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" import "../popups" import "../controls" diff --git a/ui/app/AppLayouts/Browser/panels/FindBar.qml b/ui/app/AppLayouts/Browser/panels/FindBar.qml index 1bf3483274..f028f2e6df 100644 --- a/ui/app/AppLayouts/Browser/panels/FindBar.qml +++ b/ui/app/AppLayouts/Browser/panels/FindBar.qml @@ -53,6 +53,7 @@ import QtQuick.Controls 2.13 import QtGraphicalEffects 1.13 import QtQuick.Layouts 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" import utils 1.0 diff --git a/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml b/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml index def8572884..d01dc0d6f0 100644 --- a/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml +++ b/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml @@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13 import QtGraphicalEffects 1.13 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" import "../../../../shared/controls" import "../../Wallet/views" diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ActivityCenterTopBar.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ActivityCenterTopBar.qml index 2131946f87..48be559b98 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ActivityCenterTopBar.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ActivityCenterTopBar.qml @@ -4,6 +4,7 @@ import QtQuick.Controls 2.13 import utils 1.0 import "../../../../../shared" import "../../../../../shared/popups" +import "../../../../../shared/panels" import "../../../../../shared/status" import ".." diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatRequestMessage.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatRequestMessage.qml index e8eed12cb4..c98b2ce663 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatRequestMessage.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatRequestMessage.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import utils 1.0 import "../../../../../shared" +import "../../../../../shared/panels" import "../../../../../shared/status" Item { diff --git a/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml b/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml index d3856195f6..a748827e3d 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import "../../../../shared" import "../../../../shared/popups" +import "../../../../shared/panels" import utils 1.0 import "../components" diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatReply.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatReply.qml index 9fb96e31df..bde85262a2 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatReply.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatReply.qml @@ -2,6 +2,7 @@ import QtQuick 2.14 import QtQuick.Shapes 1.13 import QtGraphicalEffects 1.13 import "../../../../../shared" +import "../../../../../shared/panels" import "../../../../../shared/status" import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatTime.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatTime.qml index 6a425ba6bd..5c8489dfd3 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatTime.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatTime.qml @@ -1,5 +1,6 @@ import QtQuick 2.14 import "../../../../../shared" +import "../../../../../shared/panels" import "../../../../../shared/status" import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/DateGroup.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/DateGroup.qml index 2b37ab32d0..e76580bb7d 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/DateGroup.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/DateGroup.qml @@ -1,5 +1,6 @@ import QtQuick 2.3 import "../../../../../shared" +import "../../../../../shared/panels" import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/Retry.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/Retry.qml index fe0d5021d4..5461b4081a 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/Retry.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/Retry.qml @@ -1,6 +1,7 @@ import QtQuick 2.3 import "../../../../../shared" +import "../../../../../shared/panels" import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionBubble.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionBubble.qml index 6ff6278123..79c4b711ca 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionBubble.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionBubble.qml @@ -1,5 +1,6 @@ import QtQuick 2.3 import "../../../../../shared" +import "../../../../../shared/panels" import utils 1.0 import "./TransactionComponents" diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/UsernameLabel.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/UsernameLabel.qml index 3748f60f5a..413af8e1c0 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/UsernameLabel.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/UsernameLabel.qml @@ -1,5 +1,6 @@ import QtQuick 2.3 import "../../../../../shared" +import "../../../../../shared/panels" import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/ChatColumn/SuggestionBox.qml b/ui/app/AppLayouts/Chat/ChatColumn/SuggestionBox.qml index 01fc00c16f..8f45227f3f 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/SuggestionBox.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/SuggestionBox.qml @@ -24,6 +24,7 @@ import QtQml.Models 2.13 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" Rectangle { diff --git a/ui/app/AppLayouts/Chat/ChatColumn/User.qml b/ui/app/AppLayouts/Chat/ChatColumn/User.qml index 33119eb460..93e4075138 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/User.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/User.qml @@ -1,6 +1,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/ChatColumn/UserList.qml b/ui/app/AppLayouts/Chat/ChatColumn/UserList.qml index edafc43eb5..578b000f42 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/UserList.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/UserList.qml @@ -7,6 +7,7 @@ import QtQml.Models 2.13 import QtGraphicalEffects 1.13 import QtQuick.Dialogs 1.3 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/CommunityComponents/AccessExistingCommunityPopup.qml b/ui/app/AppLayouts/Chat/CommunityComponents/AccessExistingCommunityPopup.qml index 54eb359709..be70e64742 100644 --- a/ui/app/AppLayouts/Chat/CommunityComponents/AccessExistingCommunityPopup.qml +++ b/ui/app/AppLayouts/Chat/CommunityComponents/AccessExistingCommunityPopup.qml @@ -6,6 +6,7 @@ import QtQuick.Dialogs 1.3 import utils 1.0 import "../../../../shared" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/status" // TODO: replace with StatusModal diff --git a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopupInviteFriendsView.qml b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopupInviteFriendsView.qml index 9bb98e6ccf..707ab286c8 100644 --- a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopupInviteFriendsView.qml +++ b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityProfilePopupInviteFriendsView.qml @@ -7,6 +7,7 @@ import QtGraphicalEffects 1.13 import utils 1.0 import "../../../../shared" import "../../../../shared/controls" +import "../../../../shared/panels" import "../../../../shared/status" import StatusQ.Components 0.1 diff --git a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityUserList.qml b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityUserList.qml index ed532d6cf5..d866cd9d8a 100644 --- a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityUserList.qml +++ b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityUserList.qml @@ -7,6 +7,7 @@ import QtQml.Models 2.13 import QtGraphicalEffects 1.13 import QtQuick.Dialogs 1.3 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/ContactsColumn/ClosedEmptyView.qml b/ui/app/AppLayouts/Chat/ContactsColumn/ClosedEmptyView.qml index 65a8136a49..4ec14175f8 100644 --- a/ui/app/AppLayouts/Chat/ContactsColumn/ClosedEmptyView.qml +++ b/ui/app/AppLayouts/Chat/ContactsColumn/ClosedEmptyView.qml @@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13 import QtGraphicalEffects 1.13 import "../components" import "../../../../shared" +import "../../../../shared/panels" import utils 1.0 diff --git a/ui/app/AppLayouts/Chat/components/Contact.qml b/ui/app/AppLayouts/Chat/components/Contact.qml index 66b2007a2a..8c08f91ea6 100644 --- a/ui/app/AppLayouts/Chat/components/Contact.qml +++ b/ui/app/AppLayouts/Chat/components/Contact.qml @@ -5,6 +5,7 @@ import Qt.labs.platform 1.1 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" Rectangle { diff --git a/ui/app/AppLayouts/Chat/components/ContactRequest.qml b/ui/app/AppLayouts/Chat/components/ContactRequest.qml index 02483eeea6..1044cd6fd0 100644 --- a/ui/app/AppLayouts/Chat/components/ContactRequest.qml +++ b/ui/app/AppLayouts/Chat/components/ContactRequest.qml @@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" Rectangle { diff --git a/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml b/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml index bf73812b53..c3e4dcbd5d 100644 --- a/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml +++ b/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml @@ -7,6 +7,7 @@ import utils 1.0 import "../../../../shared" import "../../../../shared/controls" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/views" import "../../../../shared/status" import "./" diff --git a/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml b/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml index 32e3a2104e..05c00f8fa3 100644 --- a/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml +++ b/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml @@ -6,6 +6,7 @@ import utils 1.0 import "../../../../shared" import "../../../../shared/controls" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/status" import "../data/channelList.js" as ChannelJSON import "./" diff --git a/ui/app/AppLayouts/Chat/components/SuggestedChannel.qml b/ui/app/AppLayouts/Chat/components/SuggestedChannel.qml index c485e929f6..ead2ace231 100644 --- a/ui/app/AppLayouts/Chat/components/SuggestedChannel.qml +++ b/ui/app/AppLayouts/Chat/components/SuggestedChannel.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" Rectangle { property string channel: "status" diff --git a/ui/app/AppLayouts/Chat/components/SuggestedChannels.qml b/ui/app/AppLayouts/Chat/components/SuggestedChannels.qml index ed0d6da4aa..6eb39bf6a8 100644 --- a/ui/app/AppLayouts/Chat/components/SuggestedChannels.qml +++ b/ui/app/AppLayouts/Chat/components/SuggestedChannels.qml @@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../data/channelList.js" as ChannelJSON import "./" diff --git a/ui/app/AppLayouts/Node/NodeLayout.qml b/ui/app/AppLayouts/Node/NodeLayout.qml index 61d3904e10..2500ae5a2f 100644 --- a/ui/app/AppLayouts/Node/NodeLayout.qml +++ b/ui/app/AppLayouts/Node/NodeLayout.qml @@ -7,6 +7,7 @@ import StatusQ.Core.Theme 0.1 import utils 1.0 import "../../../shared" +import "../../../shared/panels" import "stores" import "views" diff --git a/ui/app/AppLayouts/Onboarding/controls/AccountViewDelegate.qml b/ui/app/AppLayouts/Onboarding/controls/AccountViewDelegate.qml index 13c97bc752..c52a4f8828 100644 --- a/ui/app/AppLayouts/Onboarding/controls/AccountViewDelegate.qml +++ b/ui/app/AppLayouts/Onboarding/controls/AccountViewDelegate.qml @@ -4,6 +4,7 @@ import QtQuick.Controls 2.13 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" Rectangle { diff --git a/ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml b/ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml index 09558d5149..2538d779c4 100644 --- a/ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml +++ b/ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml @@ -6,6 +6,7 @@ import utils 1.0 import "../../../../shared" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/status" // TODO: replace with StatusModal diff --git a/ui/app/AppLayouts/Onboarding/popups/ConfirmAddExistingKeyModal.qml b/ui/app/AppLayouts/Onboarding/popups/ConfirmAddExistingKeyModal.qml index 3ce1635b82..63f479ec46 100644 --- a/ui/app/AppLayouts/Onboarding/popups/ConfirmAddExistingKeyModal.qml +++ b/ui/app/AppLayouts/Onboarding/popups/ConfirmAddExistingKeyModal.qml @@ -5,6 +5,7 @@ import utils 1.0 import "../../../../shared" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/status" // TODO: replace with StatusModal diff --git a/ui/app/AppLayouts/Onboarding/popups/EnterSeedPhraseModal.qml b/ui/app/AppLayouts/Onboarding/popups/EnterSeedPhraseModal.qml index 4ca70c511e..b2f747caf0 100644 --- a/ui/app/AppLayouts/Onboarding/popups/EnterSeedPhraseModal.qml +++ b/ui/app/AppLayouts/Onboarding/popups/EnterSeedPhraseModal.qml @@ -6,6 +6,7 @@ import utils 1.0 import "../../../../shared" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/controls" import "../../../../shared/status" diff --git a/ui/app/AppLayouts/Onboarding/popups/InvalidSeedPhraseModal.qml b/ui/app/AppLayouts/Onboarding/popups/InvalidSeedPhraseModal.qml index 16858fa214..3fcd8ab54b 100644 --- a/ui/app/AppLayouts/Onboarding/popups/InvalidSeedPhraseModal.qml +++ b/ui/app/AppLayouts/Onboarding/popups/InvalidSeedPhraseModal.qml @@ -6,6 +6,7 @@ import utils 1.0 import "../../../../shared" import "../../../../shared/status" import "../../../../shared/popups" +import "../../../../shared/panels" // TODO: replace with StatusModal ModalPopup { diff --git a/ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml b/ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml index b6024b2afd..e0d52d7a2a 100644 --- a/ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml +++ b/ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml @@ -6,6 +6,7 @@ import StatusQ.Controls 0.1 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/controls" import "../../../../shared/popups" diff --git a/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml b/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml index bd20be38df..7de1aed726 100644 --- a/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml +++ b/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 2.13 import QtQuick.Controls.Universal 2.12 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" import "../popups" diff --git a/ui/app/AppLayouts/Profile/controls/BloomSelectorButton.qml b/ui/app/AppLayouts/Profile/controls/BloomSelectorButton.qml index e1f2411673..41b5a87ac5 100644 --- a/ui/app/AppLayouts/Profile/controls/BloomSelectorButton.qml +++ b/ui/app/AppLayouts/Profile/controls/BloomSelectorButton.qml @@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" diff --git a/ui/app/AppLayouts/Profile/panels/ContactPanel.qml b/ui/app/AppLayouts/Profile/panels/ContactPanel.qml index d3308ed156..a2ebf543c5 100644 --- a/ui/app/AppLayouts/Profile/panels/ContactPanel.qml +++ b/ui/app/AppLayouts/Profile/panels/ContactPanel.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../../../../shared" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/status" Rectangle { diff --git a/ui/app/AppLayouts/Profile/popups/BackupSeedModal.qml b/ui/app/AppLayouts/Profile/popups/BackupSeedModal.qml index 06bfcd0adc..85a6f52ecd 100644 --- a/ui/app/AppLayouts/Profile/popups/BackupSeedModal.qml +++ b/ui/app/AppLayouts/Profile/popups/BackupSeedModal.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.3 import utils 1.0 import "../../../../shared" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/controls" import "../../../../shared/status" diff --git a/ui/app/AppLayouts/Profile/popups/ChangePasswordModal.qml b/ui/app/AppLayouts/Profile/popups/ChangePasswordModal.qml index c5763d82fb..d723240c37 100644 --- a/ui/app/AppLayouts/Profile/popups/ChangePasswordModal.qml +++ b/ui/app/AppLayouts/Profile/popups/ChangePasswordModal.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.12 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/controls" import StatusQ.Popups 0.1 diff --git a/ui/app/AppLayouts/Profile/popups/ConfirmAppRestartModal.qml b/ui/app/AppLayouts/Profile/popups/ConfirmAppRestartModal.qml index b9ca99fb7f..71b568eadc 100644 --- a/ui/app/AppLayouts/Profile/popups/ConfirmAppRestartModal.qml +++ b/ui/app/AppLayouts/Profile/popups/ConfirmAppRestartModal.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../../../../shared" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/status" // TODO: replace with StatusModal diff --git a/ui/app/AppLayouts/Profile/popups/MutedChatsModal.qml b/ui/app/AppLayouts/Profile/popups/MutedChatsModal.qml index 1843891c98..7b6c8f99f9 100644 --- a/ui/app/AppLayouts/Profile/popups/MutedChatsModal.qml +++ b/ui/app/AppLayouts/Profile/popups/MutedChatsModal.qml @@ -6,6 +6,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../../../../shared" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/status" // TODO: replace with StatusModal diff --git a/ui/app/AppLayouts/Profile/popups/NetworksModal.qml b/ui/app/AppLayouts/Profile/popups/NetworksModal.qml index fae2341739..62aaae334e 100644 --- a/ui/app/AppLayouts/Profile/popups/NetworksModal.qml +++ b/ui/app/AppLayouts/Profile/popups/NetworksModal.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../../../../shared" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/status" import "../controls" diff --git a/ui/app/AppLayouts/Profile/views/ContactsView.qml b/ui/app/AppLayouts/Profile/views/ContactsView.qml index 3188cb7895..3f72194ddf 100644 --- a/ui/app/AppLayouts/Profile/views/ContactsView.qml +++ b/ui/app/AppLayouts/Profile/views/ContactsView.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../../../../shared" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/controls" import "../../../../shared/views" import "../../../../shared/status/core" diff --git a/ui/app/AppLayouts/Wallet/controls/AssetDelegate.qml b/ui/app/AppLayouts/Wallet/controls/AssetDelegate.qml index aecee65632..d55000e8f3 100644 --- a/ui/app/AppLayouts/Wallet/controls/AssetDelegate.qml +++ b/ui/app/AppLayouts/Wallet/controls/AssetDelegate.qml @@ -3,6 +3,7 @@ import QtQuick 2.13 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" Item { diff --git a/ui/app/AppLayouts/Wallet/panels/SetCurrencyModalContent.qml b/ui/app/AppLayouts/Wallet/panels/SetCurrencyModalContent.qml index 04e34ba0d1..030a59f964 100644 --- a/ui/app/AppLayouts/Wallet/panels/SetCurrencyModalContent.qml +++ b/ui/app/AppLayouts/Wallet/panels/SetCurrencyModalContent.qml @@ -4,6 +4,7 @@ import QtQuick.Controls 2.13 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" Item { diff --git a/ui/app/AppLayouts/Wallet/panels/TokenSettingsModalContent.qml b/ui/app/AppLayouts/Wallet/panels/TokenSettingsModalContent.qml index 184eec7ff1..0e1855f1c2 100644 --- a/ui/app/AppLayouts/Wallet/panels/TokenSettingsModalContent.qml +++ b/ui/app/AppLayouts/Wallet/panels/TokenSettingsModalContent.qml @@ -6,6 +6,7 @@ import utils 1.0 import "../../../../shared" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/controls" import "../../../../shared/status" diff --git a/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml b/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml index c2becbec2a..599e896d89 100644 --- a/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml +++ b/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml @@ -6,6 +6,7 @@ import utils 1.0 import "../../../../shared" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/status" import "../popups" import "../controls" diff --git a/ui/app/AppLayouts/Wallet/popups/AddAccountWithPrivateKeyModal.qml b/ui/app/AppLayouts/Wallet/popups/AddAccountWithPrivateKeyModal.qml index e5f3ab00b3..201305d111 100644 --- a/ui/app/AppLayouts/Wallet/popups/AddAccountWithPrivateKeyModal.qml +++ b/ui/app/AppLayouts/Wallet/popups/AddAccountWithPrivateKeyModal.qml @@ -7,6 +7,7 @@ import utils 1.0 import "../../../../shared" import "../../../../shared/controls" import "../../../../shared/popups" +import "../../../../shared/panels" import "../../../../shared/status" import "../stores" diff --git a/ui/app/AppLayouts/Wallet/views/CollectiblesView.qml b/ui/app/AppLayouts/Wallet/views/CollectiblesView.qml index c780cea794..426782058e 100644 --- a/ui/app/AppLayouts/Wallet/views/CollectiblesView.qml +++ b/ui/app/AppLayouts/Wallet/views/CollectiblesView.qml @@ -4,6 +4,7 @@ import QtGraphicalEffects 1.13 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../helpers/collectiblesData.js" as CollectiblesData import "../popups" import "../panels" diff --git a/ui/app/AppLayouts/Wallet/views/HistoryView.qml b/ui/app/AppLayouts/Wallet/views/HistoryView.qml index 08f2889edc..55972ea9df 100644 --- a/ui/app/AppLayouts/Wallet/views/HistoryView.qml +++ b/ui/app/AppLayouts/Wallet/views/HistoryView.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.3 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status/core" import "../../../../shared/status" import "../popups" diff --git a/ui/app/AppLayouts/Wallet/views/LeftTabView.qml b/ui/app/AppLayouts/Wallet/views/LeftTabView.qml index c14ac20586..d88c4ca417 100644 --- a/ui/app/AppLayouts/Wallet/views/LeftTabView.qml +++ b/ui/app/AppLayouts/Wallet/views/LeftTabView.qml @@ -5,6 +5,7 @@ import QtGraphicalEffects 1.13 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../controls" import "../popups" import "../stores" diff --git a/ui/app/AppLayouts/WalletV2/panels/NetworkFilterPanel.qml b/ui/app/AppLayouts/WalletV2/panels/NetworkFilterPanel.qml index bca446e96a..d63c9287f5 100644 --- a/ui/app/AppLayouts/WalletV2/panels/NetworkFilterPanel.qml +++ b/ui/app/AppLayouts/WalletV2/panels/NetworkFilterPanel.qml @@ -1,5 +1,6 @@ import QtQuick 2.13 import "../../../../shared" +import "../../../../shared/panels" import utils 1.0 diff --git a/ui/app/AppLayouts/WalletV2/panels/WalletHeaderPanel.qml b/ui/app/AppLayouts/WalletV2/panels/WalletHeaderPanel.qml index de39457a01..f9cbb2fbe8 100644 --- a/ui/app/AppLayouts/WalletV2/panels/WalletHeaderPanel.qml +++ b/ui/app/AppLayouts/WalletV2/panels/WalletHeaderPanel.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" import "../controls" import "../panels" diff --git a/ui/app/AppLayouts/WalletV2/popups/AddEditSavedAddressPopup.qml b/ui/app/AppLayouts/WalletV2/popups/AddEditSavedAddressPopup.qml index 681ff58efc..4d9baac2ae 100644 --- a/ui/app/AppLayouts/WalletV2/popups/AddEditSavedAddressPopup.qml +++ b/ui/app/AppLayouts/WalletV2/popups/AddEditSavedAddressPopup.qml @@ -5,6 +5,7 @@ import QtQuick.Dialogs 1.3 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status" import StatusQ.Core 0.1 diff --git a/ui/app/AppLayouts/WalletV2/popups/CryptoServicesModal.qml b/ui/app/AppLayouts/WalletV2/popups/CryptoServicesModal.qml index 05c2e73dc1..80451bf6f1 100644 --- a/ui/app/AppLayouts/WalletV2/popups/CryptoServicesModal.qml +++ b/ui/app/AppLayouts/WalletV2/popups/CryptoServicesModal.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 2.14 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import StatusQ.Popups 0.1 import StatusQ.Components 0.1 diff --git a/ui/app/AppLayouts/WalletV2/popups/NetworkSelectPopup.qml b/ui/app/AppLayouts/WalletV2/popups/NetworkSelectPopup.qml index 571887ad90..d3b947266c 100644 --- a/ui/app/AppLayouts/WalletV2/popups/NetworkSelectPopup.qml +++ b/ui/app/AppLayouts/WalletV2/popups/NetworkSelectPopup.qml @@ -7,7 +7,9 @@ import StatusQ.Controls 0.1 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" +// TODO: replace with StatusModal Popup { id: popup modal: false diff --git a/ui/app/AppLayouts/WalletV2/popups/ShareModal.qml b/ui/app/AppLayouts/WalletV2/popups/ShareModal.qml index 8a91b25dd0..6048828c13 100644 --- a/ui/app/AppLayouts/WalletV2/popups/ShareModal.qml +++ b/ui/app/AppLayouts/WalletV2/popups/ShareModal.qml @@ -6,6 +6,7 @@ import StatusQ.Controls 0.1 import StatusQ.Core.Theme 0.1 import "../../../../shared" +import "../../../../shared/panels" StatusModal { id: shareModal diff --git a/ui/app/AppLayouts/WalletV2/views/CollectiblesView.qml b/ui/app/AppLayouts/WalletV2/views/CollectiblesView.qml index 82370cb546..1649d91512 100644 --- a/ui/app/AppLayouts/WalletV2/views/CollectiblesView.qml +++ b/ui/app/AppLayouts/WalletV2/views/CollectiblesView.qml @@ -4,6 +4,7 @@ import QtGraphicalEffects 1.13 import utils 1.0 import "../../../../shared" +import "../../../../shared/panels" import "../../../../shared/status/core" import "../popups" diff --git a/ui/shared/StyledTextArea.qml b/ui/shared/StyledTextArea.qml index d72778a44a..d3d1dd759d 100644 --- a/ui/shared/StyledTextArea.qml +++ b/ui/shared/StyledTextArea.qml @@ -4,6 +4,7 @@ import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.12 import utils 1.0 +import "./panels" Item { property alias textField: textArea diff --git a/ui/shared/TertiaryButton.qml b/ui/shared/TertiaryButton.qml index 6890cc71d5..9a6d59d458 100644 --- a/ui/shared/TertiaryButton.qml +++ b/ui/shared/TertiaryButton.qml @@ -3,6 +3,8 @@ import QtQuick.Controls 2.13 import utils 1.0 +import "./panels" + Button { id: root property alias label: txtBtnLabel.text @@ -37,4 +39,4 @@ Button { parent.clicked() } } -} \ No newline at end of file +} diff --git a/ui/shared/TextWithLabel.qml b/ui/shared/TextWithLabel.qml index 1c550e3c38..8cc1645f86 100644 --- a/ui/shared/TextWithLabel.qml +++ b/ui/shared/TextWithLabel.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "./controls" +import "./panels" // TODO: replace with StatusQ components Item { diff --git a/ui/shared/TransactionSigner.qml b/ui/shared/TransactionSigner.qml index d9e2536820..8031857505 100644 --- a/ui/shared/TransactionSigner.qml +++ b/ui/shared/TransactionSigner.qml @@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../shared/status" +import "../shared/panels" import "./controls" Item { diff --git a/ui/shared/UnblockContactConfirmationDialog.qml b/ui/shared/UnblockContactConfirmationDialog.qml index d562d460bc..52b2a27503 100644 --- a/ui/shared/UnblockContactConfirmationDialog.qml +++ b/ui/shared/UnblockContactConfirmationDialog.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../shared/status" import "./popups" +import "./panels" import "./" // TODO: replace with StatusModal diff --git a/ui/shared/controls/AddressSourceSelector.qml b/ui/shared/controls/AddressSourceSelector.qml index 132534ff4e..a2f65f8754 100644 --- a/ui/shared/controls/AddressSourceSelector.qml +++ b/ui/shared/controls/AddressSourceSelector.qml @@ -6,6 +6,7 @@ import QtGraphicalEffects 1.13 import utils 1.0 import "../" +import "../panels" import "." Item { diff --git a/ui/shared/controls/AssetAndAmountInput.qml b/ui/shared/controls/AssetAndAmountInput.qml index a9dbacab4c..86ec6ccea1 100644 --- a/ui/shared/controls/AssetAndAmountInput.qml +++ b/ui/shared/controls/AssetAndAmountInput.qml @@ -6,6 +6,7 @@ import QtGraphicalEffects 1.13 import utils 1.0 import "../" +import "../panels" import "." Item { diff --git a/ui/shared/controls/ContactSelector.qml b/ui/shared/controls/ContactSelector.qml index 28837d7a41..3c443ec65a 100644 --- a/ui/shared/controls/ContactSelector.qml +++ b/ui/shared/controls/ContactSelector.qml @@ -6,6 +6,7 @@ import QtGraphicalEffects 1.13 import utils 1.0 import "../" import "../views" +import "../panels" import "../status" import "." diff --git a/ui/shared/controls/ContactsListAndSearch.qml b/ui/shared/controls/ContactsListAndSearch.qml index 64ec2ab1ab..69f2a5b37b 100644 --- a/ui/shared/controls/ContactsListAndSearch.qml +++ b/ui/shared/controls/ContactsListAndSearch.qml @@ -5,6 +5,7 @@ import QtGraphicalEffects 1.13 import utils 1.0 import "../" import "../views" +import "../panels" import "../status" import "." diff --git a/ui/shared/controls/GasSelector.qml b/ui/shared/controls/GasSelector.qml index b50bb302d7..df30f0c6b8 100644 --- a/ui/shared/controls/GasSelector.qml +++ b/ui/shared/controls/GasSelector.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../status" import "../" +import "../panels" import "." Item { diff --git a/ui/shared/controls/GasSelectorButton.qml b/ui/shared/controls/GasSelectorButton.qml index eb2f0c95a6..61b04e5192 100644 --- a/ui/shared/controls/GasSelectorButton.qml +++ b/ui/shared/controls/GasSelectorButton.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../status" import "../" +import "../panels" // TODO: use StatusQ components Rectangle { diff --git a/ui/shared/controls/SeedPhraseTextArea.qml b/ui/shared/controls/SeedPhraseTextArea.qml index ab65e62ab5..37898b4c71 100644 --- a/ui/shared/controls/SeedPhraseTextArea.qml +++ b/ui/shared/controls/SeedPhraseTextArea.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 2.13 import utils 1.0 import "../" +import "../panels" Item { property bool correctWordCount: Utils.seedPhraseValidWordCount(mnemonicTextField.text) diff --git a/ui/shared/controls/StatusTabButton.qml b/ui/shared/controls/StatusTabButton.qml index b2cf70a1af..a7a2e7e2c4 100644 --- a/ui/shared/controls/StatusTabButton.qml +++ b/ui/shared/controls/StatusTabButton.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 2.13 import utils 1.0 import "../" +import "../panels" TabButton { property string btnText: "Default Button" diff --git a/ui/shared/controls/StyledButton.qml b/ui/shared/controls/StyledButton.qml index 59d0d26d73..a9cf155666 100644 --- a/ui/shared/controls/StyledButton.qml +++ b/ui/shared/controls/StyledButton.qml @@ -4,6 +4,7 @@ import QtQml 2.14 import utils 1.0 import "../" +import "../panels" Button { property string label: "My button" diff --git a/ui/shared/panels/Address.qml b/ui/shared/panels/Address.qml index d6b1f83a0c..cc24af4a25 100644 --- a/ui/shared/panels/Address.qml +++ b/ui/shared/panels/Address.qml @@ -1,7 +1,7 @@ import QtQuick 2.13 import utils 1.0 -import "../" +import "." StyledText { property bool expanded: false diff --git a/ui/shared/panels/GlossaryLetter.qml b/ui/shared/panels/GlossaryLetter.qml index 063fdfa5f8..c14e2ced68 100644 --- a/ui/shared/panels/GlossaryLetter.qml +++ b/ui/shared/panels/GlossaryLetter.qml @@ -1,7 +1,7 @@ import QtQuick 2.13 import utils 1.0 -import "../" +import "./" // TODO: replace with StatusBaseText StyledText { diff --git a/ui/shared/panels/LabelValueRow.qml b/ui/shared/panels/LabelValueRow.qml index ad6d9a8783..2572eeaeb4 100644 --- a/ui/shared/panels/LabelValueRow.qml +++ b/ui/shared/panels/LabelValueRow.qml @@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../" +import "./" Item { id: itmFrom diff --git a/ui/shared/StyledText.qml b/ui/shared/panels/StyledText.qml similarity index 100% rename from ui/shared/StyledText.qml rename to ui/shared/panels/StyledText.qml diff --git a/ui/shared/popups/BlockContactConfirmationDialog.qml b/ui/shared/popups/BlockContactConfirmationDialog.qml index 035aee1219..44412cdec5 100644 --- a/ui/shared/popups/BlockContactConfirmationDialog.qml +++ b/ui/shared/popups/BlockContactConfirmationDialog.qml @@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../status" +import "../panels" import "../" import "." diff --git a/ui/shared/popups/InviteFriendsPopup.qml b/ui/shared/popups/InviteFriendsPopup.qml index ab3c2132bf..39037eae1f 100644 --- a/ui/shared/popups/InviteFriendsPopup.qml +++ b/ui/shared/popups/InviteFriendsPopup.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 2.3 import utils 1.0 import "../controls" +import "../panels" import "../" import "." diff --git a/ui/shared/popups/TransactionSettingsConfirmationPopup.qml b/ui/shared/popups/TransactionSettingsConfirmationPopup.qml index cb768909e5..fe7cc304ee 100644 --- a/ui/shared/popups/TransactionSettingsConfirmationPopup.qml +++ b/ui/shared/popups/TransactionSettingsConfirmationPopup.qml @@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../status" +import "../panels" import "../" import "." diff --git a/ui/shared/qmldir b/ui/shared/qmldir index d66b7298ce..36482a4be6 100644 --- a/ui/shared/qmldir +++ b/ui/shared/qmldir @@ -2,7 +2,6 @@ TextWithLabel 1.0 TextWithLabel.qml Input 1.0 Input.qml Select 1.0 Select.qml StyledTextArea 1.0 StyledTextArea.qml -StyledText 1.0 StyledText.qml StyledTextField 1.0 StyledTextField.qml StyledTextEdit 1.0 StyledTextEdit.qml Identicon 1.0 Identicon.qml diff --git a/ui/shared/status/StatusChatImageLoader.qml b/ui/shared/status/StatusChatImageLoader.qml index 9eaf194413..5e2a06f09a 100644 --- a/ui/shared/status/StatusChatImageLoader.qml +++ b/ui/shared/status/StatusChatImageLoader.qml @@ -1,6 +1,7 @@ import QtQuick 2.3 import QtGraphicalEffects 1.13 import "../../shared/" +import "../../shared/panels" import utils 1.0 diff --git a/ui/shared/status/StatusChatInput.qml b/ui/shared/status/StatusChatInput.qml index a368f26942..c658f198c0 100644 --- a/ui/shared/status/StatusChatInput.qml +++ b/ui/shared/status/StatusChatInput.qml @@ -8,6 +8,7 @@ import DotherSide 0.1 import utils 1.0 import "../../shared" +import "../../shared/panels" import "../../app/AppLayouts/Chat/ChatColumn/samples" import "../../app/AppLayouts/Chat/ChatColumn" diff --git a/ui/shared/status/StatusExpandableAddress.qml b/ui/shared/status/StatusExpandableAddress.qml index cd93cda427..1d8d8df0ec 100644 --- a/ui/shared/status/StatusExpandableAddress.qml +++ b/ui/shared/status/StatusExpandableAddress.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 2.13 import utils 1.0 import "../" +import "../panels" import "../controls" // TODO: replace with StatusQ components diff --git a/ui/shared/status/StatusLetterIdenticon.qml b/ui/shared/status/StatusLetterIdenticon.qml index 51b09a9b3a..d0021fcb89 100644 --- a/ui/shared/status/StatusLetterIdenticon.qml +++ b/ui/shared/status/StatusLetterIdenticon.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import utils 1.0 import "../../shared" +import "../../shared/panels" Rectangle { id: root diff --git a/ui/shared/status/StatusRadioButton.qml b/ui/shared/status/StatusRadioButton.qml index 16ef0959da..26e634d4d5 100644 --- a/ui/shared/status/StatusRadioButton.qml +++ b/ui/shared/status/StatusRadioButton.qml @@ -4,6 +4,7 @@ import QtQml 2.14 import utils 1.0 import "../../shared" +import "../../shared/panels" RadioButton { id: control diff --git a/ui/shared/status/StatusRadioButtonRow.qml b/ui/shared/status/StatusRadioButtonRow.qml index f4f12a443f..fe04361678 100644 --- a/ui/shared/status/StatusRadioButtonRow.qml +++ b/ui/shared/status/StatusRadioButtonRow.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 2.13 import utils 1.0 import ".." +import "../panels" import "." Rectangle { diff --git a/ui/shared/status/StatusSectionDescItem.qml b/ui/shared/status/StatusSectionDescItem.qml index 884e75e65f..04afceac0e 100644 --- a/ui/shared/status/StatusSectionDescItem.qml +++ b/ui/shared/status/StatusSectionDescItem.qml @@ -5,6 +5,7 @@ import QtGraphicalEffects 1.13 import utils 1.0 import "../" +import "../panels" import "../controls" // TODO: replace with StatusQ component diff --git a/ui/shared/status/StatusSectionHeadline.qml b/ui/shared/status/StatusSectionHeadline.qml index 17581402d4..ddb9e57a1e 100644 --- a/ui/shared/status/StatusSectionHeadline.qml +++ b/ui/shared/status/StatusSectionHeadline.qml @@ -2,7 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import utils 1.0 -import "../../shared" +import "../../shared/panels" StyledText { font.pixelSize: 15 diff --git a/ui/shared/status/StatusStickersPopup.qml b/ui/shared/status/StatusStickersPopup.qml index 2308341cf8..63f3bb3663 100644 --- a/ui/shared/status/StatusStickersPopup.qml +++ b/ui/shared/status/StatusStickersPopup.qml @@ -5,6 +5,7 @@ import QtGraphicalEffects 1.0 import utils 1.0 import "../../shared" +import "../../shared/panels" import "../../shared/status/core" import "../../shared/status" import "../../app/AppLayouts/Chat/ChatColumn/samples" diff --git a/ui/shared/status/StatusSwitch.qml b/ui/shared/status/StatusSwitch.qml index 5bc38d5a1c..30894f267b 100644 --- a/ui/shared/status/StatusSwitch.qml +++ b/ui/shared/status/StatusSwitch.qml @@ -4,6 +4,7 @@ import QtGraphicalEffects 1.13 import utils 1.0 import "../../shared" +import "../../shared/panels" Switch { id: control diff --git a/ui/shared/status/StatusToolTip.qml b/ui/shared/status/StatusToolTip.qml index 00c245c988..95c94fddb7 100644 --- a/ui/shared/status/StatusToolTip.qml +++ b/ui/shared/status/StatusToolTip.qml @@ -3,6 +3,7 @@ import QtQuick.Controls 2.13 import utils 1.0 import "../../shared" +import "../../shared/panels" ToolTip { id: tooltip diff --git a/ui/shared/status/StatusWalletColorSelect.qml b/ui/shared/status/StatusWalletColorSelect.qml index 3235fc3c9a..c11d0463d9 100644 --- a/ui/shared/status/StatusWalletColorSelect.qml +++ b/ui/shared/status/StatusWalletColorSelect.qml @@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13 import utils 1.0 import "../../shared" +import "../../shared/panels" import "../../shared/status" Item { diff --git a/ui/shared/views/NoFriendsRectangle.qml b/ui/shared/views/NoFriendsRectangle.qml index 6124bf2146..bee2b45465 100644 --- a/ui/shared/views/NoFriendsRectangle.qml +++ b/ui/shared/views/NoFriendsRectangle.qml @@ -4,6 +4,7 @@ import utils 1.0 import "../" import "../status" import "../popups" +import "../panels" Item { id: noContactsRect