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(CreateChatView): Move `ActivityCenterPopup` to appmain 

Closes: #6345
This commit is contained in:
Boris Melnik 2022-07-26 17:23:45 +03:00
parent 2398b67bc1
commit f1651ce4aa
6 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/app/AppLayouts/Chat/popups/ActivityCenterPopup.qml
View File

@ -8,12 +8,16 @@ import StatusQ.Controls 0.1
import shared 1.0
import shared.popups 1.0
import shared.views.chat 1.0
import utils 1.0
import "../views"
import "../panels"
Popup {
id: activityCenter
enum Filter {
All,
Mentions,
@ -28,11 +32,13 @@ Popup {
property bool hideReadNotifications: false
property var store
property var chatSectionModule
property var messageContextMenu
property var messageContextMenu: MessageContextMenuView {
store: activityCenter.store
reactionModel: activityCenter.store.emojiReactionsModel
}
readonly property int unreadNotificationsCount : activityCenter.store.activityCenterList.unreadCount
id: activityCenter
modal: false
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside

1
ui/app/AppLayouts/Chat/popups/qmldir
View File

@ -2,3 +2,4 @@ PinnedMessagesPopup 1.0 PinnedMessagesPopup.qml
ChooseBrowserPopup 1.0 ChooseBrowserPopup.qml
InviteFriendsToCommunityPopup 1.0 community/InviteFriendsToCommunityPopup.qml
CommunityProfilePopup 1.0 community/CommunityProfilePopup.qml
ActivityCenterPopup 1.0 ActivityCenterPopup.qml

23
ui/app/AppLayouts/Chat/views/ChatColumnView.qml
View File

@ -155,12 +155,6 @@ Item {
}
}
MessageContextMenuView {
id: contextmenu
store: root.rootStore
reactionModel: root.rootStore.emojiReactionsModel
}
EmptyChatPanel {
anchors.fill: parent
visible: root.activeChatId === "" || root.chatsCount == 0
@ -233,14 +227,14 @@ Item {
stickersLoaded: root.stickersLoaded
isBlocked: model.blocked
isActiveChannel: categoryChatLoader.isActiveChannel
activityCenterVisible: activityCenter.visible
activityCenterNotificationsCount: activityCenter.unreadNotificationsCount
activityCenterVisible: Global.activityCenterPopupOpened
activityCenterNotificationsCount: root.rootStore.activityCenterList.unreadCount
pinnedMessagesPopupComponent: root.pinnedMessagesListPopupComponent
onOpenStickerPackPopup: {
root.openStickerPackPopup(stickerPackId)
}
onNotificationButtonClicked: {
activityCenter.open();
Global.openActivityCenterPopup()
}
onOpenAppSearch: {
root.openAppSearch();
@ -297,7 +291,7 @@ Item {
root.openStickerPackPopup(stickerPackId)
}
onNotificationButtonClicked: {
activityCenter.open();
Global.openActivityCenterPopup()
}
onOpenAppSearch: {
root.openAppSearch();
@ -414,15 +408,6 @@ Item {
}
}
ActivityCenterPopup {
id: activityCenter
height: root.height - 56 * 2 // TODO get screen size // Taken from old code top bar height was fixed there to 56
y: 56
store: root.rootStore
chatSectionModule: root.parentModule
messageContextMenu: contextmenu
}
// Not Refactored Yet
// Connections {
// target: root.rootStore.chatsModelInst.stickers

4
ui/app/AppLayouts/Chat/views/CreateChatView.qml
View File

@ -12,6 +12,8 @@ import StatusQ.Core.Theme 0.1
import utils 1.0
import shared.status 1.0
import "../popups"
Page {
id: root
Behavior on anchors.bottomMargin { NumberAnimation { duration: 30 }}
@ -136,7 +138,7 @@ Page {
height: parent.height
tooltip.offset: width/2
unreadNotificationsCount: activityCenter.unreadNotificationsCount
onClicked: activityCenter.open()
onClicked: Global.openActivityCenterPopup()
}
}
}

20
ui/app/mainui/AppMain.qml
View File

@ -89,6 +89,12 @@ Item {
popup.openPopup(publicKey, state);
Global.profilePopupOpened = true;
}
onOpenActivityCenterPopupRequested: {
Global.openPopup(activityCenterPopupComponent)
Global.activityCenterPopupOpened = true
}
onOpenChangeProfilePicPopup: {
var popup = changeProfilePicComponent.createObject(appMain);
popup.chooseImageToCrop();
@ -762,6 +768,20 @@ Item {
}
}
Component {
id: activityCenterPopupComponent
ActivityCenterPopup {
id: activityCenter
height: appView.height - 56 * 2 // TODO get screen size // Taken from old code top bar height was fixed there to 56
y: 56
store: chatLayoutContainer.rootStore
chatSectionModule: chatLayoutContainer.rootStore.chatCommunitySectionModule
onClosed: {
Global.activityCenterPopupOpened = false
}
}
}
DropArea {
id: dragTarget

7
ui/imports/utils/Global.qml
View File

@ -19,6 +19,8 @@ QtObject {
property var inviteFriendsToCommunityPopup
property bool profilePopupOpened: false
property bool activityCenterPopupOpened: false
property var sendMessageSound
property var notificationSound
property var errorSound
@ -37,11 +39,16 @@ QtObject {
signal openChangeProfilePicPopup()
signal displayToastMessage(string title, string subTitle, string icon, bool loading, int ephNotifType, string url)
signal openEditDisplayNamePopup()
signal openActivityCenterPopupRequested
function openProfilePopup(publicKey, parentPopup, state = "") {
openProfilePopupRequested(publicKey, parentPopup, state);
}
function openActivityCenterPopup() {
openActivityCenterPopupRequested()
}
function openPopup(popupComponent, params = {}) {
const popup = popupComponent.createObject(root.appMain, params);
popup.open();