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

refactor(ChatColumnView): move duplicated code to function

This commit is contained in:
Jonathan Rainville 2022-03-03 15:01:11 -05:00
parent 72e67159fc
commit a99c66ca8b
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,9 +131,21 @@ Item {
// This is kind of a solution for applying backend refactored changes with the minimal qml changes.
// The best would be if we made qml to follow the struct we have on the backend side.
Repeater {
id: chatRepeater
model: parentModule && parentModule.model
delegate: delegateChooser
function isChatActive(chatContentModule, activeChatId, activeSubItemId, isSectionActive) {
if(!chatContentModule || !isSectionActive)
return false
let myChatId = chatContentModule.getMyChatId()
if(myChatId === activeChatId || myChatId === activeSubItemId)
return true
return false
}
DelegateChooser {
id: delegateChooser
role: "type"
@ -149,6 +161,8 @@ Item {
delegate: ChatContentView {
width: parent.width
clip: true
// dynamically calculate the height of the view, if the active one is the current one
// then set the height to parent otherwise set it to 0
height: isActiveChannel ? parent.height : 0
rootStore: root.rootStore
contactsStore: root.contactsStore
@ -157,18 +171,7 @@ Item {
sendTransactionWithEnsModal: cmpSendTransactionWithEns
stickersLoaded: root.stickersLoaded
isBlocked: model.blocked
isActiveChannel: {
// dynamically calculate the height of the view, if the active one is the current one
// then set the height to parent otherwise set it to 0
if(!chatContentModule || !isSectionActive)
return false
let myChatId = chatContentModule.getMyChatId()
if(myChatId === root.activeChatId || myChatId === root.activeSubItemId)
return true
return false
}
isActiveChannel: chatRepeater.isChatActive(chatContentModule, root.activeChatId, root.activeSubItemId, root.isSectionActive)
Component.onCompleted: {
parentModule.prepareChatContentModuleForChatId(model.itemId)
chatContentModule = parentModule.getChatContentModule()
@ -188,18 +191,7 @@ Item {
sendTransactionWithEnsModal: cmpSendTransactionWithEns
stickersLoaded: root.stickersLoaded
isBlocked: model.blocked
isActiveChannel: {
// dynamically calculate the height of the view, if the active one is the current one
// then set the height to parent otherwise set it to 0
if(!chatContentModule || !isSectionActive)
return false
let myChatId = chatContentModule.getMyChatId()
if(myChatId === root.activeChatId || myChatId === root.activeSubItemId)
return true
return false
}
isActiveChannel: chatRepeater.isChatActive(chatContentModule, root.activeChatId, root.activeSubItemId, root.isSectionActive)
Component.onCompleted: {
parentModule.prepareChatContentModuleForChatId(itemId)
chatContentModule = parentModule.getChatContentModule()