fix: fix QML warnings + some UI fixes to match the design
This commit is contained in:
Jonathan Rainville
Iuri Matias
parent
f2eda36569
commit
8462c1c013
|
|
@ -142,9 +142,9 @@ Item {
|
|||
|
||||
Separator {
|
||||
id: communitySep
|
||||
visible: communitiesListLoader.active
|
||||
anchors.top: visible ? communitiesListLoader.bottom : 0
|
||||
anchors.topMargin: Style.current.halfPadding
|
||||
visible: communitiesListLoader.active && communitiesListLoader.height > 0
|
||||
anchors.top: communitiesListLoader.bottom
|
||||
anchors.topMargin: visible ? Style.current.halfPadding : 0
|
||||
}
|
||||
|
||||
ChannelList {
|
||||
|
|
|
|||
|
|
@ -9,253 +9,260 @@ import "./Contacts"
|
|||
|
||||
Item {
|
||||
id: contactsContainer
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: contentMargin
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: contentMargin
|
||||
property alias searchStr: searchBox.text
|
||||
property bool isPending: false
|
||||
height: parent.height
|
||||
Layout.fillWidth: true
|
||||
|
||||
SearchBox {
|
||||
id: searchBox
|
||||
Item {
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 32
|
||||
fontPixelSize: 15
|
||||
}
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: contentMargin
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: contentMargin
|
||||
|
||||
Item {
|
||||
id: addNewContact
|
||||
anchors.top: searchBox.bottom
|
||||
anchors.topMargin: Style.current.bigPadding
|
||||
width: addButton.width + usernameText.width + Style.current.padding
|
||||
height: addButton.height
|
||||
|
||||
|
||||
StatusRoundButton {
|
||||
id: addButton
|
||||
icon.name: "plusSign"
|
||||
size: "medium"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
||||
StyledText {
|
||||
id: usernameText
|
||||
//% "Add new contact"
|
||||
text: qsTrId("add-new-contact")
|
||||
color: Style.current.blue
|
||||
anchors.left: addButton.right
|
||||
anchors.leftMargin: Style.current.padding
|
||||
anchors.verticalCenter: addButton.verticalCenter
|
||||
font.pixelSize: 15
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
onClicked: {
|
||||
addContactModal.open()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
id: blockedContactsButton
|
||||
anchors.top: addNewContact.bottom
|
||||
anchors.topMargin: Style.current.bigPadding
|
||||
width: blockButton.width + blockButtonLabel.width + Style.current.padding
|
||||
height: addButton.height
|
||||
|
||||
StatusRoundButton {
|
||||
id: blockButton
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
icon.name: "block-icon"
|
||||
icon.color: Style.current.lightBlue
|
||||
width: 40
|
||||
height: 40
|
||||
}
|
||||
|
||||
StyledText {
|
||||
id: blockButtonLabel
|
||||
//% "Blocked contacts"
|
||||
text: qsTrId("blocked-contacts")
|
||||
color: Style.current.blue
|
||||
anchors.left: blockButton.right
|
||||
anchors.leftMargin: Style.current.padding
|
||||
anchors.verticalCenter: blockButton.verticalCenter
|
||||
font.pixelSize: 15
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
onClicked: {
|
||||
blockedContactsModal.open()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ModalPopup {
|
||||
id: blockedContactsModal
|
||||
//% "Blocked contacts"
|
||||
title: qsTrId("blocked-contacts")
|
||||
|
||||
ContactList {
|
||||
SearchBox {
|
||||
id: searchBox
|
||||
anchors.top: parent.top
|
||||
anchors.bottom: parent.bottom
|
||||
contacts: profileModel.contacts.blockedContacts
|
||||
selectable: false
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: profileModel.contacts
|
||||
onContactToAddChanged: {
|
||||
contactsContainer.isPending = false
|
||||
}
|
||||
}
|
||||
|
||||
Component {
|
||||
id: loadingIndicator
|
||||
LoadingImage {
|
||||
width: 12
|
||||
height: 12
|
||||
}
|
||||
}
|
||||
|
||||
ModalPopup {
|
||||
id: addContactModal
|
||||
//% "Add contact"
|
||||
title: qsTrId("add-contact")
|
||||
|
||||
property var lookupContact: Backpressure.debounce(addContactSearchInput, 400, function (value) {
|
||||
profileModel.contacts.lookupContact(value)
|
||||
})
|
||||
|
||||
onOpened: {
|
||||
addContactSearchInput.text = ""
|
||||
}
|
||||
|
||||
Input {
|
||||
id: addContactSearchInput
|
||||
//% "Enter ENS username or chat key"
|
||||
placeholderText: qsTrId("enter-contact-code")
|
||||
customHeight: 44
|
||||
fontPixelSize: 15
|
||||
onEditingFinished: {
|
||||
contactsContainer.isPending = true
|
||||
profileModel.contacts.lookupContact(inputValue)
|
||||
contactsContainer.isPending = false
|
||||
}
|
||||
onTextChanged: {
|
||||
if (addContactSearchInput.text !== "") {
|
||||
contactsContainer.isPending = true
|
||||
}
|
||||
}
|
||||
Keys.onReleased: {
|
||||
Qt.callLater(addContactModal.lookupContact, addContactSearchInput.text)
|
||||
}
|
||||
}
|
||||
|
||||
Loader {
|
||||
sourceComponent: loadingIndicator
|
||||
anchors.top: addContactSearchInput.bottom
|
||||
anchors.topMargin: Style.current.padding
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
active: contactsContainer.isPending
|
||||
}
|
||||
|
||||
Item {
|
||||
id: contactToAddInfo
|
||||
anchors.top: addContactSearchInput.bottom
|
||||
anchors.topMargin: Style.current.padding
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
height: contactUsername.height
|
||||
width: contactUsername.width + contactPubKey.width
|
||||
visible: !contactsContainer.isPending && !!addContactSearchInput.text
|
||||
|
||||
|
||||
StyledText {
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
font.pixelSize: 12
|
||||
color: Style.current.darkGrey
|
||||
//% "User not found"
|
||||
text: qsTrId("user-not-found")
|
||||
visible: !contactsContainer.isPending && !!!profileModel.contacts.contactToAddUsername
|
||||
}
|
||||
|
||||
StyledText {
|
||||
id: contactUsername
|
||||
text: profileModel.contacts.contactToAddUsername + " • "
|
||||
font.pixelSize: 12
|
||||
color: Style.current.darkGrey
|
||||
visible: !!profileModel.contacts.contactToAddPubKey
|
||||
}
|
||||
|
||||
StyledText {
|
||||
id: contactPubKey
|
||||
text: profileModel.contacts.contactToAddPubKey
|
||||
anchors.left: contactUsername.right
|
||||
width: 100
|
||||
font.pixelSize: 12
|
||||
elide: Text.ElideMiddle
|
||||
color: Style.current.darkGrey
|
||||
visible: !!profileModel.contacts.contactToAddPubKey
|
||||
}
|
||||
|
||||
}
|
||||
footer: StyledButton {
|
||||
anchors.right: parent.right
|
||||
anchors.leftMargin: Style.current.padding
|
||||
//% "Add contact"
|
||||
label: qsTrId("add-contact")
|
||||
disabled: !contactToAddInfo.visible
|
||||
anchors.bottom: parent.bottom
|
||||
onClicked: {
|
||||
profileModel.contacts.addContact(profileModel.contacts.contactToAddPubKey);
|
||||
addContactModal.close()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ContactList {
|
||||
id: contactListView
|
||||
anchors.top: blockedContactsButton.bottom
|
||||
anchors.topMargin: Style.current.bigPadding
|
||||
anchors.bottom: parent.bottom
|
||||
contacts: profileModel.contacts.addedContacts
|
||||
selectable: false
|
||||
searchString: searchBox.text
|
||||
}
|
||||
|
||||
Item {
|
||||
id: element
|
||||
visible: profileModel.contacts.list.rowCount() === 0
|
||||
anchors.fill: parent
|
||||
|
||||
StyledText {
|
||||
id: noFriendsText
|
||||
//% "You don’t have any contacts yet"
|
||||
text: qsTrId("you-don-t-have-any-contacts-yet")
|
||||
anchors.verticalCenterOffset: -Style.current.bigPadding
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
font.pixelSize: 15
|
||||
color: Style.current.darkGrey
|
||||
}
|
||||
|
||||
StyledButton {
|
||||
anchors.horizontalCenter: noFriendsText.horizontalCenter
|
||||
anchors.top: noFriendsText.bottom
|
||||
id: addNewContact
|
||||
anchors.top: searchBox.bottom
|
||||
anchors.topMargin: Style.current.bigPadding
|
||||
//% "Invite friends"
|
||||
label: qsTrId("invite-friends")
|
||||
onClicked: function () {
|
||||
inviteFriendsPopup.open()
|
||||
width: addButton.width + usernameText.width + Style.current.padding
|
||||
height: addButton.height
|
||||
|
||||
|
||||
StatusRoundButton {
|
||||
id: addButton
|
||||
icon.name: "plusSign"
|
||||
size: "medium"
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
||||
StyledText {
|
||||
id: usernameText
|
||||
//% "Add new contact"
|
||||
text: qsTrId("add-new-contact")
|
||||
color: Style.current.blue
|
||||
anchors.left: addButton.right
|
||||
anchors.leftMargin: Style.current.padding
|
||||
anchors.verticalCenter: addButton.verticalCenter
|
||||
font.pixelSize: 15
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
onClicked: {
|
||||
addContactModal.open()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
InviteFriendsPopup {
|
||||
id: inviteFriendsPopup
|
||||
Item {
|
||||
id: blockedContactsButton
|
||||
anchors.top: addNewContact.bottom
|
||||
anchors.topMargin: Style.current.bigPadding
|
||||
width: blockButton.width + blockButtonLabel.width + Style.current.padding
|
||||
height: addButton.height
|
||||
|
||||
StatusRoundButton {
|
||||
id: blockButton
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
icon.name: "block-icon"
|
||||
icon.color: Style.current.lightBlue
|
||||
width: 40
|
||||
height: 40
|
||||
}
|
||||
|
||||
StyledText {
|
||||
id: blockButtonLabel
|
||||
//% "Blocked contacts"
|
||||
text: qsTrId("blocked-contacts")
|
||||
color: Style.current.blue
|
||||
anchors.left: blockButton.right
|
||||
anchors.leftMargin: Style.current.padding
|
||||
anchors.verticalCenter: blockButton.verticalCenter
|
||||
font.pixelSize: 15
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
onClicked: {
|
||||
blockedContactsModal.open()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ModalPopup {
|
||||
id: blockedContactsModal
|
||||
//% "Blocked contacts"
|
||||
title: qsTrId("blocked-contacts")
|
||||
|
||||
ContactList {
|
||||
anchors.top: parent.top
|
||||
anchors.bottom: parent.bottom
|
||||
contacts: profileModel.contacts.blockedContacts
|
||||
selectable: false
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: profileModel.contacts
|
||||
onContactToAddChanged: {
|
||||
contactsContainer.isPending = false
|
||||
}
|
||||
}
|
||||
|
||||
Component {
|
||||
id: loadingIndicator
|
||||
LoadingImage {
|
||||
width: 12
|
||||
height: 12
|
||||
}
|
||||
}
|
||||
|
||||
ModalPopup {
|
||||
id: addContactModal
|
||||
//% "Add contact"
|
||||
title: qsTrId("add-contact")
|
||||
|
||||
property var lookupContact: Backpressure.debounce(addContactSearchInput, 400, function (value) {
|
||||
profileModel.contacts.lookupContact(value)
|
||||
})
|
||||
|
||||
onOpened: {
|
||||
addContactSearchInput.text = ""
|
||||
}
|
||||
|
||||
Input {
|
||||
id: addContactSearchInput
|
||||
//% "Enter ENS username or chat key"
|
||||
placeholderText: qsTrId("enter-contact-code")
|
||||
customHeight: 44
|
||||
fontPixelSize: 15
|
||||
onEditingFinished: {
|
||||
contactsContainer.isPending = true
|
||||
profileModel.contacts.lookupContact(inputValue)
|
||||
contactsContainer.isPending = false
|
||||
}
|
||||
onTextChanged: {
|
||||
if (addContactSearchInput.text !== "") {
|
||||
contactsContainer.isPending = true
|
||||
}
|
||||
}
|
||||
Keys.onReleased: {
|
||||
Qt.callLater(addContactModal.lookupContact, addContactSearchInput.text)
|
||||
}
|
||||
}
|
||||
|
||||
Loader {
|
||||
sourceComponent: loadingIndicator
|
||||
anchors.top: addContactSearchInput.bottom
|
||||
anchors.topMargin: Style.current.padding
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
active: contactsContainer.isPending
|
||||
}
|
||||
|
||||
Item {
|
||||
id: contactToAddInfo
|
||||
anchors.top: addContactSearchInput.bottom
|
||||
anchors.topMargin: Style.current.padding
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
height: contactUsername.height
|
||||
width: contactUsername.width + contactPubKey.width
|
||||
visible: !contactsContainer.isPending && !!addContactSearchInput.text
|
||||
|
||||
|
||||
StyledText {
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
font.pixelSize: 12
|
||||
color: Style.current.darkGrey
|
||||
//% "User not found"
|
||||
text: qsTrId("user-not-found")
|
||||
visible: !contactsContainer.isPending && !!!profileModel.contacts.contactToAddUsername
|
||||
}
|
||||
|
||||
StyledText {
|
||||
id: contactUsername
|
||||
text: profileModel.contacts.contactToAddUsername + " • "
|
||||
font.pixelSize: 12
|
||||
color: Style.current.darkGrey
|
||||
visible: !!profileModel.contacts.contactToAddPubKey
|
||||
}
|
||||
|
||||
StyledText {
|
||||
id: contactPubKey
|
||||
text: profileModel.contacts.contactToAddPubKey
|
||||
anchors.left: contactUsername.right
|
||||
width: 100
|
||||
font.pixelSize: 12
|
||||
elide: Text.ElideMiddle
|
||||
color: Style.current.darkGrey
|
||||
visible: !!profileModel.contacts.contactToAddPubKey
|
||||
}
|
||||
|
||||
}
|
||||
footer: StyledButton {
|
||||
anchors.right: parent.right
|
||||
anchors.leftMargin: Style.current.padding
|
||||
//% "Add contact"
|
||||
label: qsTrId("add-contact")
|
||||
disabled: !contactToAddInfo.visible
|
||||
anchors.bottom: parent.bottom
|
||||
onClicked: {
|
||||
profileModel.addContact(profileModel.contacts.contactToAddPubKey);
|
||||
addContactModal.close()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ContactList {
|
||||
id: contactListView
|
||||
anchors.top: blockedContactsButton.bottom
|
||||
anchors.topMargin: Style.current.bigPadding
|
||||
anchors.bottom: parent.bottom
|
||||
contacts: profileModel.contacts.addedContacts
|
||||
selectable: false
|
||||
searchString: searchBox.text
|
||||
}
|
||||
|
||||
Item {
|
||||
id: element
|
||||
visible: profileModel.contacts.list.rowCount() === 0
|
||||
anchors.fill: parent
|
||||
|
||||
StyledText {
|
||||
id: noFriendsText
|
||||
//% "You don’t have any contacts yet"
|
||||
text: qsTrId("you-don-t-have-any-contacts-yet")
|
||||
anchors.verticalCenterOffset: -Style.current.bigPadding
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
font.pixelSize: 15
|
||||
color: Style.current.darkGrey
|
||||
}
|
||||
|
||||
StyledButton {
|
||||
anchors.horizontalCenter: noFriendsText.horizontalCenter
|
||||
anchors.top: noFriendsText.bottom
|
||||
anchors.topMargin: Style.current.bigPadding
|
||||
//% "Invite friends"
|
||||
label: qsTrId("invite-friends")
|
||||
onClicked: function () {
|
||||
inviteFriendsPopup.open()
|
||||
}
|
||||
}
|
||||
|
||||
InviteFriendsPopup {
|
||||
id: inviteFriendsPopup
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,9 +31,10 @@ Rectangle {
|
|||
border.width: 1
|
||||
radius: Style.current.padding
|
||||
width: 255
|
||||
height: childrenRect.height + Style.current.padding
|
||||
height: shareYourMindText.height + Style.current.padding
|
||||
|
||||
StyledText {
|
||||
id: shareYourMindText
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: Style.current.halfPadding
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ ScrollView {
|
|||
id: root
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
contentHeight: timelineContainer.height + 40
|
||||
contentHeight: chatLogView.contentHeight + 40
|
||||
clip: true
|
||||
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
||||
|
||||
|
|
@ -59,13 +59,12 @@ ScrollView {
|
|||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
Item {
|
||||
id: timelineContainer
|
||||
width: 624
|
||||
anchors.top: parent.top
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
height: childrenRect.height
|
||||
color: "transparent"
|
||||
anchors.bottom: parent.bottom
|
||||
|
||||
StatusChatInput {
|
||||
id: statusUpdateInput
|
||||
|
|
@ -99,11 +98,11 @@ ScrollView {
|
|||
ListView {
|
||||
id: chatLogView
|
||||
anchors.top: statusUpdateInput.bottom
|
||||
anchors.topMargin: 40
|
||||
anchors.topMargin: Style.current.bigPadding
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
height: childrenRect.height + 40
|
||||
spacing: 10
|
||||
anchors.bottom: parent.bottom
|
||||
spacing: Style.current.halfPadding
|
||||
flickDeceleration: 10000
|
||||
interactive: false
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue