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(InvitationBubbleView): Community invite box cta bleeds out of box 

a simple refactor to use a QML Control with separate `background` and
`contentItem`

Fixes: #8360
This commit is contained in:
Lukáš Tinkl 2022-11-29 15:29:39 +01:00 committed by Lukáš Tinkl
parent 4de8c6c313
commit 6ceb4bde26
1 changed files with 102 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
ui/imports/shared/views/chat/InvitationBubbleView.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.3
import QtQuick.Dialogs 1.3
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import utils 1.0
@ -12,11 +12,14 @@ import StatusQ.Components 0.1
import shared.panels 1.0
import shared.popups 1.0
Item {
Control {
id: root
implicitHeight: loader.height
implicitWidth: loader.width
implicitWidth: 270 // by design
implicitHeight: !d.invitedCommunity ? 0 : Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + verticalPadding)
padding: 1
property var store
property string communityId
@ -69,42 +72,24 @@ Item {
}
}
Loader {
id: loader
active: !!d.invitedCommunity
sourceComponent: Rectangle {
id: rectangleBubble
width: 270
height: columnLayout.implicitHeight + border.width * 2
background: Rectangle {
radius: d.radius
color: Style.current.background
border.color: Style.current.border
border.width: 1
}
ColumnLayout {
id: columnLayout
anchors.fill: parent
anchors.margins: 1
contentItem: ColumnLayout {
spacing: 0
ColumnLayout {
id: invitationDescriptionLayout
Layout.leftMargin: d.margin
Layout.rightMargin: d.margin
Layout.topMargin: 8
Layout.bottomMargin: 8
spacing: 4
StatusBaseText {
id: title
Layout.fillWidth: true
Layout.leftMargin: d.margin
Layout.rightMargin: d.margin
Layout.topMargin: 8
Layout.bottomMargin: 8
text: d.invitedCommunity.verifed ? qsTr("Verified community invitation") : qsTr("Community invitation")
color: d.invitedCommunity.verifed ? Theme.palette.primaryColor1 : Theme.palette.baseColor1
@ -112,32 +97,9 @@ Item {
font.pixelSize: 13
}
StatusBaseText {
id: invitedYou
Layout.fillWidth: true
visible: text != ""
text: {
// Not Refactored Yet
return ""
// if (root.store.chatsModelInst.channelView.activeChannel.chatType === Constants.chatType.oneToOne) {
// return isCurrentUser ?
// qsTr("You invited %1 to join a community").arg(root.store.chatsModelInst.userNameOrAlias(root.store.chatsModelInst.channelView.activeChannel.id))
// : qsTr("%1 invited you to join a community").arg(displayUserName)
// } else {
// return isCurrentUser ?
// qsTr("You shared a community")
// : qsTr("A community has been shared")
// }
}
wrapMode: Text.WordWrap
}
}
Rectangle {
Layout.fillWidth: true
implicitHeight: 1
Layout.preferredHeight: 1
color: Style.current.separator
}
@ -201,7 +163,7 @@ Item {
Rectangle {
Layout.fillWidth: true
implicitHeight: 1
Layout.preferredHeight: 1
color: Style.current.separator
}
@ -224,5 +186,3 @@ Item {
}
}
}
}
}