From c2818536ad206f94d9595b0e1e4d33aafbf2c5ca Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Mon, 21 Mar 2022 13:46:20 -0400 Subject: [PATCH] chore(GroupChatPopup): remove GroupChatPopup as it is no longer used --- .../AppLayouts/Chat/popups/GroupChatPopup.qml | 186 ------------------ .../Chat/views/ContactsColumnView.qml | 11 -- 2 files changed, 197 deletions(-) delete mode 100644 ui/app/AppLayouts/Chat/popups/GroupChatPopup.qml diff --git a/ui/app/AppLayouts/Chat/popups/GroupChatPopup.qml b/ui/app/AppLayouts/Chat/popups/GroupChatPopup.qml deleted file mode 100644 index 6cf39ce521..0000000000 --- a/ui/app/AppLayouts/Chat/popups/GroupChatPopup.qml +++ /dev/null @@ -1,186 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 -import QtQml.Models 2.3 - -import utils 1.0 -import shared.controls 1.0 - -import StatusQ.Controls 0.1 - -import shared.views 1.0 -import shared.panels 1.0 -import shared.popups 1.0 -import "../panels" -import "../controls" - -// TODO: replace with StatusModal -ModalPopup { - id: popup - - property var chatSectionModule - property var store - property bool selectChatMembers: true - property int memberCount: 1 - readonly property int maxMembers: 20 - property string channelNameValidationError: "" - - onOpened: { - groupName.text = ""; - searchBox.text = ""; - selectChatMembers = true; - memberCount = 1; - contactList.selectedPubKeys = []; - - chatSectionModule.populateMyContacts("") - - noContactsRect.visible = !chatSectionModule.listOfMyContacts.rowCount() > 0 - contactList.visible = !noContactsRect.visible; - if (!contactList.visible) { - memberCount = 0; - } - } - - onClosed: chatSectionModule.clearMyContacts() - - function validate() { - if (groupName.text === "") { - //% "You need to enter a channel name" - channelNameValidationError = qsTrId("you-need-to-enter-a-channel-name") - } else if (!Utils.isValidChannelName(groupName.text)) { - //% "The channel name can only contain lowercase letters, numbers and dashes" - channelNameValidationError = qsTrId("the-channel-name-can-only-contain-lowercase-letters--numbers-and-dashes") - } else { - channelNameValidationError = "" - } - - return channelNameValidationError === "" - } - - function doJoin() { - if (!validate()) { - return - } - if (contactList.selectedPubKeys.length === 0) { - return; - } - - popup.chatSectionModule.createGroupChat(Utils.filterXSS(groupName.text), JSON.stringify(contactList.selectedPubKeys)); - popup.close(); - } - - function groupNameFilter(text) { - groupName.text = text.toLowerCase().replace(' ', '-'); - } - - header: Item { - height: 30 - width: parent.width - - StyledText { - id: lblNewGroup - //% "New group chat" - text: qsTrId("new-group-chat") - anchors.left: parent.left - font.bold: true - font.pixelSize: 17 - anchors.top: parent.top - } - - StyledText { - anchors.top: lblNewGroup.bottom - text: qsTr("%1/%2 members").arg(popup.memberCount).arg(popup.maxMembers) - color: Style.current.secondaryText - font.pixelSize: 15 - } - } - - SearchBox { - id: searchBox - visible: selectChatMembers - iconWidth: 17 - iconHeight: 17 - customHeight: 44 - fontPixelSize: 15 - } - - Input { - id: groupName - //% "Group name" - placeholderText: qsTrId("group-name") - visible: !selectChatMembers - validationError: channelNameValidationError - onTextEdited: function (text) { - groupNameFilter(text) - } - validator: RegExpValidator { regExp: /^[a-zA-Z0-9\-\ ]+$/ } - } - - NoFriendsRectangle { - id: noContactsRect - visible: false - anchors.top: groupName.bottom - anchors.topMargin: Style.current.xlPadding - anchors.horizontalCenter: parent.horizontalCenter - } - - ContactListPanel { - id: contactList - anchors.fill: parent - model: chatSectionModule.listOfMyContacts - searchString: searchBox.text.toLowerCase() - selectMode: selectChatMembers && memberCount < maxMembers - anchors.topMargin: 50 - anchors.top: searchBox.bottom - onSelectedPubKeysChanged:{ - memberCount = selectedPubKeys.length + 1; - } - } - - footer: Item { - width: parent.width - height: btnSelectMembers.height - - StatusRoundButton { - id: btnSelectMembers - visible: selectChatMembers - anchors.bottom: parent.bottom - anchors.right: parent.right - icon.name: "arrow-right" - icon.width: 20 - icon.height: 16 - enabled: contactList.selectedPubKeys.length > 0 - onClicked : { - if (contactList.selectedPubKeys.length > 0) - selectChatMembers = false - searchBox.text = "" - groupName.forceActiveFocus(Qt.MouseFocusReason) - } - } - - StatusRoundButton { - id: btnBack - visible: !selectChatMembers - anchors.bottom: parent.bottom - anchors.left: parent.left - icon.name: "arrow-right" - icon.width: 20 - icon.height: 16 - icon.rotation: 180 - onClicked : { - selectChatMembers = true - } - } - - StatusButton { - visible: !selectChatMembers - anchors.bottom: parent.bottom - anchors.right: parent.right - //% "Create Group Chat" - text: qsTrId("create-group-chat") - enabled: groupName.text !== "" - onClicked : doJoin() - } - } -} - diff --git a/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml b/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml index 032acfeb14..7ee30c59b6 100644 --- a/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml +++ b/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml @@ -265,17 +265,6 @@ Item { } } - Component { - id: groupChatPopupComponent - GroupChatPopup { - chatSectionModule: root.chatSectionModule - store: root.store - onClosed: { - destroy() - } - } - } - Component { id: privateChatPopupComponent PrivateChatPopup {