fix: fix QML warnings + some UI fixes to match the design
This commit is contained in:
parent
f2eda36569
commit
8462c1c013
|
@ -142,9 +142,9 @@ Item {
|
||||||
|
|
||||||
Separator {
|
Separator {
|
||||||
id: communitySep
|
id: communitySep
|
||||||
visible: communitiesListLoader.active
|
visible: communitiesListLoader.active && communitiesListLoader.height > 0
|
||||||
anchors.top: visible ? communitiesListLoader.bottom : 0
|
anchors.top: communitiesListLoader.bottom
|
||||||
anchors.topMargin: Style.current.halfPadding
|
anchors.topMargin: visible ? Style.current.halfPadding : 0
|
||||||
}
|
}
|
||||||
|
|
||||||
ChannelList {
|
ChannelList {
|
||||||
|
|
|
@ -9,17 +9,23 @@ import "./Contacts"
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: contactsContainer
|
id: contactsContainer
|
||||||
|
property alias searchStr: searchBox.text
|
||||||
|
property bool isPending: false
|
||||||
|
height: parent.height
|
||||||
|
Layout.fillWidth: true
|
||||||
|
|
||||||
|
Item {
|
||||||
|
anchors.top: parent.top
|
||||||
|
anchors.topMargin: 32
|
||||||
|
anchors.bottom: parent.bottom
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.rightMargin: contentMargin
|
anchors.rightMargin: contentMargin
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.leftMargin: contentMargin
|
anchors.leftMargin: contentMargin
|
||||||
property alias searchStr: searchBox.text
|
|
||||||
property bool isPending: false
|
|
||||||
|
|
||||||
SearchBox {
|
SearchBox {
|
||||||
id: searchBox
|
id: searchBox
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.topMargin: 32
|
|
||||||
fontPixelSize: 15
|
fontPixelSize: 15
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -211,7 +217,7 @@ Item {
|
||||||
disabled: !contactToAddInfo.visible
|
disabled: !contactToAddInfo.visible
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
onClicked: {
|
onClicked: {
|
||||||
profileModel.contacts.addContact(profileModel.contacts.contactToAddPubKey);
|
profileModel.addContact(profileModel.contacts.contactToAddPubKey);
|
||||||
addContactModal.close()
|
addContactModal.close()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -258,6 +264,7 @@ Item {
|
||||||
id: inviteFriendsPopup
|
id: inviteFriendsPopup
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*##^##
|
/*##^##
|
||||||
|
|
|
@ -31,9 +31,10 @@ Rectangle {
|
||||||
border.width: 1
|
border.width: 1
|
||||||
radius: Style.current.padding
|
radius: Style.current.padding
|
||||||
width: 255
|
width: 255
|
||||||
height: childrenRect.height + Style.current.padding
|
height: shareYourMindText.height + Style.current.padding
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
|
id: shareYourMindText
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.leftMargin: Style.current.halfPadding
|
anchors.leftMargin: Style.current.halfPadding
|
||||||
|
|
|
@ -14,7 +14,7 @@ ScrollView {
|
||||||
id: root
|
id: root
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
contentHeight: timelineContainer.height + 40
|
contentHeight: chatLogView.contentHeight + 40
|
||||||
clip: true
|
clip: true
|
||||||
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
||||||
|
|
||||||
|
@ -59,13 +59,12 @@ ScrollView {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
Item {
|
||||||
id: timelineContainer
|
id: timelineContainer
|
||||||
width: 624
|
width: 624
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
height: childrenRect.height
|
anchors.bottom: parent.bottom
|
||||||
color: "transparent"
|
|
||||||
|
|
||||||
StatusChatInput {
|
StatusChatInput {
|
||||||
id: statusUpdateInput
|
id: statusUpdateInput
|
||||||
|
@ -99,11 +98,11 @@ ScrollView {
|
||||||
ListView {
|
ListView {
|
||||||
id: chatLogView
|
id: chatLogView
|
||||||
anchors.top: statusUpdateInput.bottom
|
anchors.top: statusUpdateInput.bottom
|
||||||
anchors.topMargin: 40
|
anchors.topMargin: Style.current.bigPadding
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
height: childrenRect.height + 40
|
anchors.bottom: parent.bottom
|
||||||
spacing: 10
|
spacing: Style.current.halfPadding
|
||||||
flickDeceleration: 10000
|
flickDeceleration: 10000
|
||||||
interactive: false
|
interactive: false
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue