status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@desktop/chat): pin button is blurred 

Updated from PopupMenu to StatusPopMenu. Removed buttons not in design.
Also added left and right button functionalXity on memeber list

fixes #2956, #3162
This commit is contained in:
Khushboo Mehta 2021-08-06 17:44:57 +02:00 committed by Khushboo-dev-cpp
parent 7c6b7819ca
commit b80ac8070f
8 changed files with 111 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/app/AppLayouts/Chat/ChatColumn.qml
View File

@ -23,6 +23,7 @@ Item {
id: chatColumnLayout
anchors.fill: parent
property var messageContextMenu
property alias pinnedMessagesPopupComponent: pinnedMessagesPopupComponent
property int chatGroupsListViewCount: 0
property bool isReply: false
@ -310,9 +311,7 @@ Item {
sourceComponent: ChatMessages {
id: chatMessages
messageList: messages
messageContextMenuInst: MessageContextMenu {
reactionModel: EmojiReactions { }
}
messageContextMenuInst: messageContextMenu
Component.onCompleted: {
chatColumnLayout.userList = chatMessages.messageList.userList;
}

1
ui/app/AppLayouts/Chat/ChatColumn/Message.qml
View File

@ -200,6 +200,7 @@ Item {
SelectedMessage.set(messageId, fromAuthor);
}
messageContextMenu.parent = root
messageContextMenu.messageId = root.messageId
messageContextMenu.contentType = root.contentType
messageContextMenu.linkUrls = root.linkUrls;

7
ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatButtons.qml
View File

@ -12,6 +12,7 @@ Rectangle {
property int containerMargin: 2
property int contentType: 2
property var messageContextMenu
property bool showMoreButton: true
visible: !activityCenterMessage &&
(buttonsContainer.parentIsHovered || isMessageActive)
@ -131,6 +132,7 @@ Rectangle {
StatusIconButton {
id: otherBtn
visible: showMoreButton
icon.name: "dots-icon"
width: 32
height: 32
@ -139,9 +141,8 @@ Rectangle {
setMessageActive(messageId, true)
}
clickMessage(false, isSticker, false, null, false, true);
messageContextMenu.parent = otherBtn;
messageContextMenu.x = 0;
messageContextMenu.y = (parent.height/2);
buttonsContainer.messageContextMenu.x = buttonsContainer.x + buttonsContainer.width - buttonsContainer.messageContextMenu.width
messageContextMenu.y = parent.height/2 + Style.current.smallPadding
}
onHoveredChanged: {
buttonsContainer.hoverChanged(this.hovered)

8
ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
View File

@ -16,6 +16,13 @@ Item {
property bool isHovered: typeof hoveredMessage !== "undefined" && hoveredMessage === messageId
property bool isMessageActive: typeof activeMessage !== "undefined" && activeMessage === messageId
property bool headerRepeatCondition: (authorCurrentMsg !== authorPrevMsg || shouldRepeatHeader || dateGroupLbl.visible || chatReply.active)
property bool showMoreButton: switch (chatsModel.channelView.activeChannel.chatType) {
case Constants.chatTypeOneToOne: return true
case Constants.chatTypePrivateGroupChat: return chatsModel.channelView.activeChannel.isAdmin(profileModel.profile.pubKey) ? true : isCurrentUser
case Constants.chatTypePublic: return isCurrentUser
case Constants.chatTypeCommunity: return chatsModel.communities.activeCommunity.admin ? true : isCurrentUser
case Constants.chatTypeStatusUpdate: return false
}
property bool showEdit: true
property var messageContextMenu
signal addEmoji(bool isProfileClick, bool isSticker, bool isImage , var image, bool emojiOnly, bool hideEmojiPicker)
@ -52,6 +59,7 @@ Item {
anchors.topMargin: -Style.current.halfPadding
showEdit: root.showEdit
messageContextMenu: root.messageContextMenu
showMoreButton: root.showMoreButton
}
Loader {

8
ui/app/AppLayouts/Chat/ChatColumn/User.qml
View File

@ -109,7 +109,13 @@ Item {
wrapper.hovered = false
}
onClicked: {
console.log("TODO: do something")
if (mouse.button === Qt.LeftButton) {
openProfilePopup(wrapper.name, wrapper.publicKey, (wrapper.profileImage || wrapper.identicon), "", appMain.getUserNickname(wrapper.publicKey));
}
else if (mouse.button === Qt.RightButton) {
messageContextMenu.isProfile = true;
messageContextMenu.show(wrapper.name, wrapper.publicKey, (wrapper.profileImage || wrapper.identicon), "", appMain.getUserNickname(wrapper.publicKey))
}
}
}

1
ui/app/AppLayouts/Chat/ChatColumn/UserList.qml
View File

@ -19,6 +19,7 @@ Item {
anchors.fill: parent
property var userList
property var currentTime
property var messageContextMenu
Rectangle {
anchors.fill: parent

9
ui/app/AppLayouts/Chat/ChatLayout.qml
View File

@ -5,6 +5,7 @@ import "../../../imports"
import "../../../shared"
import "../../../shared/status"
import "."
import "./data"
import "components"
import "./ChatColumn"
import "./CommunityComponents"
@ -40,6 +41,7 @@ StatusAppThreePanelLayout {
centerPanel: ChatColumn {
id: chatColumn
chatGroupsListViewCount: contactColumnLoader.item.chatGroupsListViewCount
messageContextMenu: quickActionMessageOptionsMenu
}
showRightPanel: chatColumn.showUsers && (chatsModel.channelView.activeChannel.chatType !== Constants.chatTypeOneToOne)
@ -52,7 +54,7 @@ StatusAppThreePanelLayout {
Component {
id: userListComponent
UserList { currentTime: chatColumn.currentTime; userList: chatColumn.userList }
UserList { currentTime: chatColumn.currentTime; userList: chatColumn.userList; messageContextMenu: quickActionMessageOptionsMenu }
}
Component {
@ -87,6 +89,11 @@ StatusAppThreePanelLayout {
}
}
MessageContextMenu {
id: quickActionMessageOptionsMenu
reactionModel: EmojiReactions { }
}
ConfirmationDialog {
id: removeContactConfirmationDialog
// % "Remove contact"

196
ui/app/AppLayouts/Chat/components/MessageContextMenu.qml
View File

@ -2,14 +2,17 @@ import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQml.Models 2.3
import StatusQ.Popups 0.1
import "../../../../imports"
import "../../../../shared"
import "../../../../shared/status"
import "./"
PopupMenu {
StatusPopupMenu {
id: messageContextMenu
width: messageContextMenu.isProfile ? profileHeader.width : emojiContainer.width
width: emojiContainer.visible ? emojiContainer.width : 176
closePolicy: Popup.CloseOnPressOutside | Popup.CloseOnEscape
property string messageId
@ -40,12 +43,6 @@ PopupMenu {
signal closeParentPopup
subMenuIcons: [{
source: Qt.resolvedUrl("../../../../shared/img/copy-to-clipboard-icon"),
width: 16,
height: 16
}]
function show(userNameParam, fromAuthorParam, identiconParam, textParam, nicknameParam, emojiReactionsModel) {
userName = userNameParam || ""
nickname = nicknameParam || ""
@ -60,9 +57,11 @@ PopupMenu {
}
emojiReactionsReactedByUser = newEmojiReactions;
/* // copy link feature not ready yet
const numLinkUrls = messageContextMenu.linkUrls.split(" ").length
copyLinkMenu.enabled = numLinkUrls > 1
copyLinkAction.enabled = !!messageContextMenu.linkUrls && numLinkUrls === 1 && !emojiOnly && !messageContextMenu.isProfile
*/
popup()
}
@ -73,9 +72,9 @@ PopupMenu {
visible: !hideEmojiPicker && (messageContextMenu.emojiOnly || !messageContextMenu.isProfile)
Row {
id: emojiRow
spacing: Style.current.smallPadding
leftPadding: Style.current.smallPadding
rightPadding: Style.current.smallPadding
spacing: Style.current.halfPadding
leftPadding: Style.current.halfPadding
rightPadding: Style.current.halfPadding
bottomPadding: messageContextMenu.emojiOnly ? 0 : Style.current.padding
Repeater {
@ -95,7 +94,7 @@ PopupMenu {
Item {
id: profileHeader
visible: messageContextMenu.isProfile
width: 200
width: parent.width
height: visible ? profileImage.height + username.height + Style.current.padding : 0
Rectangle {
anchors.fill: parent
@ -144,63 +143,8 @@ PopupMenu {
visible: !messageContextMenu.emojiOnly && !messageContextMenu.hideEmojiPicker
}
Action {
id: pinAction
text: {
if (pinnedMessage) {
//% "Unpin"
return qsTrId("unpin")
}
//% "Pin"
return qsTrId("pin")
}
onTriggered: {
if (pinnedMessage) {
chatsModel.messageView.unPinMessage(messageId, chatsModel.channelView.activeChannel.id)
return
}
if (!canPin) {
// Open pin modal so that the user can unpin one
openPopup(pinnedMessagesPopupComponent, {messageToPin: messageId})
return
}
chatsModel.messageView.pinMessage(messageId, chatsModel.channelView.activeChannel.id)
messageContextMenu.close()
}
icon.source: "../../../img/pin"
icon.width: 16
icon.height: 16
enabled: {
switch (chatsModel.channelView.activeChannel.chatType) {
case Constants.chatTypePublic: return false
case Constants.chatTypeStatusUpdate: return false
case Constants.chatTypeOneToOne: return true
case Constants.chatTypePrivateGroupChat: return chatsModel.channelView.activeChannel.isAdmin(profileModel.profile.pubKey)
case Constants.chatTypeCommunity: return chatsModel.communities.activeCommunity.admin
}
return false
}
}
Action {
id: copyAction
enabled: !isProfile && !emojiOnly
//% "Copy"
text: qsTrId("copy-to-clipboard")
onTriggered: {
chatsModel.copyToClipboard(messageContextMenu.text)
messageContextMenu.close()
}
icon.source: "../../../../shared/img/copy-to-clipboard-icon"
icon.width: 16
icon.height: 16
}
Action {
/* // copy link feature not ready yet
StatusMenuItem {
id: copyLinkAction
//% "Copy link"
text: qsTrId("copy-link")
@ -208,9 +152,7 @@ PopupMenu {
chatsModel.copyToClipboard(linkUrls.split(" ")[0])
messageContextMenu.close()
}
icon.source: "../../../../shared/img/copy-to-clipboard-icon"
icon.width: 16
icon.height: 16
icon.name: "link"
enabled: false
}
@ -245,8 +187,9 @@ PopupMenu {
}
}
}
*/
Action {
StatusMenuItem {
id: viewProfileAction
//% "View Profile"
text: qsTrId("view-profile")
@ -254,26 +197,12 @@ PopupMenu {
openProfilePopup(userName, fromAuthor, identicon, "", nickname);
messageContextMenu.close()
}
icon.source: "../../../img/profileActive.svg"
icon.width: 16
icon.height: 16
enabled: !emojiOnly && !copyLinkAction.enabled
icon.name: "profile"
enabled: isProfile
}
Action {
id: editMessageAction
//% "Edit message"
text: qsTrId("edit-message")
onTriggered: {
onClickEdit();
}
icon.source: "../../../img/edit-message.svg"
icon.width: 16
icon.height: 16
enabled: isCurrentUser && isText
}
Action {
StatusMenuItem {
id: sendMessageOrReplyTo
text: messageContextMenu.isProfile ?
//% "Send message"
qsTrId("send-message") :
@ -289,34 +218,71 @@ PopupMenu {
messageContextMenu.closeParentPopup()
messageContextMenu.close()
}
icon.source: "../../../img/messageActive.svg"
icon.width: 16
icon.height: 16
enabled: !isSticker && !emojiOnly
icon.name: "chat"
enabled: isProfile || (!hideEmojiPicker && !emojiOnly && !isProfile)
}
Separator {
visible: deleteMessageAction.enabled
height: visible ? Style.current.halfPadding : 0
}
Action {
//% "Jump to"
text: qsTrId("jump-to")
StatusMenuItem {
id: editMessageAction
//% "Edit message"
text: qsTrId("edit-message")
onTriggered: {
positionAtMessage(messageContextMenu.messageId)
messageContextMenu.closeParentPopup()
onClickEdit();
}
icon.name: "edit"
enabled: isCurrentUser && !hideEmojiPicker && !emojiOnly && !isProfile
}
StatusMenuItem {
id: pinAction
text: {
if (pinnedMessage) {
//% "Unpin"
return qsTrId("unpin")
}
//% "Pin"
return qsTrId("pin")
}
onTriggered: {
if (pinnedMessage) {
chatsModel.messageView.unPinMessage(messageId, chatsModel.channelView.activeChannel.id)
return
}
if (!canPin) {
// Open pin modal so that the user can unpin one
openPopup(pinnedMessagesPopupComponent, {messageToPin: messageId})
return
}
chatsModel.messageView.pinMessage(messageId, chatsModel.channelView.activeChannel.id)
messageContextMenu.close()
}
icon.source: "../../../img/arrow-up.svg"
icon.width: 16
icon.height: 16
enabled: messageContextMenu.pinnedMessage && messageContextMenu.showJumpTo
icon.name: "pin"
enabled: {
if(isProfile || emojiOnly)
return false
switch (chatsModel.channelView.activeChannel.chatType) {
case Constants.chatTypePublic: return false
case Constants.chatTypeStatusUpdate: return false
case Constants.chatTypeOneToOne: return true
case Constants.chatTypePrivateGroupChat: return chatsModel.channelView.activeChannel.isAdmin(profileModel.profile.pubKey)
case Constants.chatTypeCommunity: return chatsModel.communities.activeCommunity.admin
}
return false
}
}
Action {
StatusMenuSeparator {
visible: deleteMessageAction.enabled
}
StatusMenuItem {
id: deleteMessageAction
enabled: isCurrentUser &&
enabled: isCurrentUser && !isProfile && !emojiOnly &&
(contentType === Constants.messageType ||
contentType === Constants.stickerType ||
contentType === Constants.emojiType ||
@ -346,9 +312,7 @@ PopupMenu {
}
})
}
icon.source: "../../../img/delete.svg"
icon.color: Style.current.danger
icon.width: 16
icon.height: 16
icon.name: "delete"
type: StatusMenuItem.Type.Danger
}
}