From dc81cda66c1b7874c9e96326753e4f519d03589f Mon Sep 17 00:00:00 2001 From: Pascal Precht Date: Thu, 14 Oct 2021 12:24:37 +0200 Subject: [PATCH] refactor: move `CopyToClipboardButton` to ui/shared/controls --- ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml | 1 + ui/shared/InviteFriendsPopup.qml | 2 ++ ui/shared/TextWithLabel.qml | 3 +++ ui/shared/{ => controls}/CopyToClipBoardButton.qml | 4 +++- ui/shared/qmldir | 1 - ui/shared/status/StatusExpandableAddress.qml | 4 +++- ui/shared/status/StatusSectionDescItem.qml | 4 +++- 7 files changed, 15 insertions(+), 4 deletions(-) rename ui/shared/{ => controls}/CopyToClipBoardButton.qml (96%) diff --git a/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml b/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml index d44fd17d1d..def8572884 100644 --- a/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml +++ b/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml @@ -9,6 +9,7 @@ import "../../../../shared/controls" import "../../Wallet/views" import "../stores" +// TODO: replace with StatusPopupMenu Popup { id: popup modal: false diff --git a/ui/shared/InviteFriendsPopup.qml b/ui/shared/InviteFriendsPopup.qml index 3554bf46bb..7042a18110 100644 --- a/ui/shared/InviteFriendsPopup.qml +++ b/ui/shared/InviteFriendsPopup.qml @@ -2,8 +2,10 @@ import QtQuick 2.12 import QtQuick.Controls 2.3 import utils 1.0 +import "./controls" import "." +// TODO: replace with StatusModal ModalPopup { id: popup //% "Get Status at https://status.im" diff --git a/ui/shared/TextWithLabel.qml b/ui/shared/TextWithLabel.qml index 5a159493e5..1c550e3c38 100644 --- a/ui/shared/TextWithLabel.qml +++ b/ui/shared/TextWithLabel.qml @@ -4,6 +4,9 @@ import QtQuick.Layouts 1.13 import utils 1.0 +import "./controls" + +// TODO: replace with StatusQ components Item { property string text: "My Text" property string label: "My Label" diff --git a/ui/shared/CopyToClipBoardButton.qml b/ui/shared/controls/CopyToClipBoardButton.qml similarity index 96% rename from ui/shared/CopyToClipBoardButton.qml rename to ui/shared/controls/CopyToClipBoardButton.qml index 009a92c5a7..2f7e9450a0 100644 --- a/ui/shared/CopyToClipBoardButton.qml +++ b/ui/shared/controls/CopyToClipBoardButton.qml @@ -3,8 +3,10 @@ import QtQuick.Controls 2.13 import QtGraphicalEffects 1.13 import utils 1.0 -import "../shared/status" +import "../" +import "../status" +// TODO: Replace with StatusQ components Rectangle { id: copyToClipboardButton height: 32 diff --git a/ui/shared/qmldir b/ui/shared/qmldir index fa702838bc..70e71a22d5 100644 --- a/ui/shared/qmldir +++ b/ui/shared/qmldir @@ -15,7 +15,6 @@ StyledTextEdit 1.0 StyledTextEdit.qml Identicon 1.0 Identicon.qml RoundedImage 1.0 RoundedImage.qml SplitViewHandle 1.0 SplitViewHandle.qml -CopyToClipBoardButton 1.0 CopyToClipBoardButton.qml NotificationWindow 1.0 NotificationWindow.qml BlockContactConfirmationDialog 1.0 BlockContactConfirmationDialog.qml ConfirmationDialog 1.0 ConfirmationDialog.qml diff --git a/ui/shared/status/StatusExpandableAddress.qml b/ui/shared/status/StatusExpandableAddress.qml index 59b62234c4..cd93cda427 100644 --- a/ui/shared/status/StatusExpandableAddress.qml +++ b/ui/shared/status/StatusExpandableAddress.qml @@ -2,8 +2,10 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import utils 1.0 -import "../../shared" +import "../" +import "../controls" +// TODO: replace with StatusQ components Item { id: root height: control.height diff --git a/ui/shared/status/StatusSectionDescItem.qml b/ui/shared/status/StatusSectionDescItem.qml index edde6b612d..884e75e65f 100644 --- a/ui/shared/status/StatusSectionDescItem.qml +++ b/ui/shared/status/StatusSectionDescItem.qml @@ -4,8 +4,10 @@ import QtQuick.Layouts 1.13 import QtGraphicalEffects 1.13 import utils 1.0 -import "../../shared" +import "../" +import "../controls" +// TODO: replace with StatusQ component Item { property string name property string description