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

chore: fix last anchor warnings

This commit is contained in:
Jonathan Rainville 2020-05-27 14:40:58 -04:00 committed by Iuri Matias
parent 4a00f3f307
commit cccc7f599f
4 changed files with 346 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ui/app/AppLayouts/Chat/ChatColumn.qml
View File

@ -115,7 +115,10 @@ StackLayout {
Menu { Menu {
id: contextMenu id: contextMenu
MenuItem { text: "Leave Chat"; onTriggered: chatsModel.leaveActiveChat() } MenuItem {
text: "Leave Chat"
onTriggered: chatsModel.leaveActiveChat()
}
} }
} }
} }
@ -215,7 +218,7 @@ StackLayout {
onCountChanged: { onCountChanged: {
if (!this.atYEnd) { if (!this.atYEnd) {
// User has scrolled up, we don't want to scroll back // User has scrolled up, we don't want to scroll back
return; return
} }
// positionViewAtEnd doesn't work well. Instead, we use highlightFollowsCurrentItem // positionViewAtEnd doesn't work well. Instead, we use highlightFollowsCurrentItem
@ -223,7 +226,6 @@ StackLayout {
while (this.currentIndex < this.count - 1) { while (this.currentIndex < this.count - 1) {
this.incrementCurrentIndex() this.incrementCurrentIndex()
} }
} }
} }
} }
@ -303,36 +305,39 @@ StackLayout {
id: mouseArea1 id: mouseArea1
anchors.rightMargin: 50 anchors.rightMargin: 50
anchors.fill: parent anchors.fill: parent
onClicked : { onClicked: {
txtData.forceActiveFocus(Qt.MouseFocusReason) txtData.forceActiveFocus(Qt.MouseFocusReason)
} }
} }
} }
} }
} }
} }
Item { Item {
id: element Layout.fillHeight: true
anchors.left: parent.left Layout.fillWidth: true
anchors.leftMargin: 200 Item {
anchors.right: parent.right id: walkieTalkieContainer
anchors.rightMargin: 200 anchors.left: parent.left
anchors.bottom: parent.bottom anchors.leftMargin: 200
anchors.bottomMargin: 200 anchors.right: parent.right
anchors.top: parent.top anchors.rightMargin: 200
anchors.topMargin: 100 anchors.bottom: parent.bottom
Image { anchors.bottomMargin: 200
source: "../../../onboarding/img/chat@2x.jpg" anchors.top: parent.top
} anchors.topMargin: 100
Image {
source: "../../../onboarding/img/chat@2x.jpg"
}
Text { Text {
text: "Select a chat to start messaging" text: "Select a chat to start messaging"
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
font.weight: Font.DemiBold font.weight: Font.DemiBold
font.pixelSize: 15 font.pixelSize: 15
color: Theme.darkGrey color: Theme.darkGrey
}
} }
} }
} }
@ -342,3 +347,4 @@ Designer {
D{i:0;formeditorColor:"#ffffff";height:770;width:800} D{i:0;formeditorColor:"#ffffff";height:770;width:800}
} }
##^##*/ ##^##*/

626
ui/app/AppLayouts/Chat/ContactsColumn.qml
View File

@ -14,232 +14,228 @@ Item {
id: contactsColumn id: contactsColumn
width: 300 width: 300
Layout.minimumWidth: 200 Layout.minimumWidth: 200
Layout.fillHeight: true
Item { Text {
Layout.preferredHeight: 100 id: title
Layout.fillHeight: false x: 772
Layout.fillWidth: true text: qsTr("Chat")
anchors.top: parent.top
anchors.topMargin: 17
font.bold: true
anchors.horizontalCenter: parent.horizontalCenter
font.pixelSize: 17
}
Rectangle {
id: searchBox
height: 36
color: Theme.grey
anchors.top: parent.top
anchors.topMargin: 59
radius: 8
anchors.right: parent.right
anchors.rightMargin: 65
anchors.left: parent.left
anchors.leftMargin: 16
TextField {
id: searchText
placeholderText: qsTr("Search or join channel")
anchors.left: parent.left
anchors.leftMargin: 32
anchors.verticalCenter: parent.verticalCenter
font.pixelSize: 12
background: Rectangle {
color: "#00000000"
}
}
Image {
id: image4
anchors.left: parent.left
anchors.leftMargin: 10
anchors.verticalCenter: parent.verticalCenter
fillMode: Image.PreserveAspectFit
source: "../../img/search.svg"
}
MouseArea {
id: mouseArea
anchors.fill: parent
onClicked: {
searchText.forceActiveFocus(Qt.MouseFocusReason)
}
}
}
Rectangle {
id: addChat
x: 183
width: 36
height: 36
color: Theme.blue
radius: 50
anchors.right: parent.right
anchors.rightMargin: 16
anchors.top: parent.top
anchors.topMargin: 59
Text { Text {
id: title id: addChatLbl
x: 772 color: "#ffffff"
text: qsTr("Chat") text: qsTr("+")
anchors.top: parent.top anchors.verticalCenterOffset: -1
anchors.topMargin: 17 anchors.horizontalCenterOffset: 1
font.bold: true
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
font.pixelSize: 17 anchors.verticalCenter: parent.verticalCenter
lineHeight: 1
fontSizeMode: Text.FixedSize
font.bold: true
font.pixelSize: 28
state: "default"
rotation: 0
states: [
State {
name: "default"
PropertyChanges {
target: addChatLbl
rotation: 0
}
},
State {
name: "rotated"
PropertyChanges {
target: addChatLbl
rotation: 45
}
}
]
transitions: [
Transition {
from: "default"
to: "rotated"
RotationAnimation {
duration: 150
direction: RotationAnimation.Clockwise
easing.type: Easing.InCubic
}
},
Transition {
from: "rotated"
to: "default"
RotationAnimation {
duration: 150
direction: RotationAnimation.Counterclockwise
easing.type: Easing.OutCubic
}
}
]
} }
Rectangle { MouseArea {
id: searchBox anchors.fill: parent
height: 36 acceptedButtons: Qt.LeftButton | Qt.RightButton
color: Theme.grey onClicked: {
anchors.top: parent.top addChatLbl.state = "rotated"
anchors.topMargin: 59 let x = addChatLbl.x + addChatLbl.width / 2 - newChatMenu.width / 2
radius: 8 newChatMenu.popup(x, addChatLbl.height + 10)
anchors.right: parent.right }
anchors.rightMargin: 65
anchors.left: parent.left
anchors.leftMargin: 16
TextField { QQC2.Menu {
id: searchText id: newChatMenu
placeholderText: qsTr("Search or join channel") QQC2.Action {
anchors.left: parent.left text: qsTr("Start new chat")
anchors.leftMargin: 32 icon.source: "../../img/new_chat.svg"
anchors.verticalCenter: parent.verticalCenter onTriggered: {
font.pixelSize: 12 console.log("TODO: Start new chat")
background: Rectangle { }
color: "#00000000"
} }
} QQC2.Action {
text: qsTr("Start group chat")
Image { icon.source: "../../img/group_chat.svg"
id: image4 onTriggered: {
anchors.left: parent.left console.log("TODO: Start group chat")
anchors.leftMargin: 10 }
anchors.verticalCenter: parent.verticalCenter
fillMode: Image.PreserveAspectFit
source: "../../img/search.svg"
}
MouseArea {
id: mouseArea
anchors.fill: parent
onClicked: {
searchText.forceActiveFocus(Qt.MouseFocusReason)
} }
} QQC2.Action {
} text: qsTr("Join public chat")
icon.source: "../../img/public_chat.svg"
Rectangle { onTriggered: {
id: addChat chatGroupsListView.currentIndex = chatsModel.joinChat(
width: 36 searchText.text)
height: 36 searchText.text = ""
color: Theme.blue
radius: 50
anchors.right: parent.right
anchors.rightMargin: 16
anchors.top: parent.top
anchors.topMargin: 59
Text {
id: addChatLbl
color: "#ffffff"
text: qsTr("+")
anchors.verticalCenterOffset: -1
anchors.horizontalCenterOffset: 1
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
lineHeight: 1
fontSizeMode: Text.FixedSize
font.bold: true
font.pixelSize: 28
state: "default"
rotation: 0
states: [
State {
name: "default"
PropertyChanges {
target: addChatLbl
rotation: 0
}
},
State {
name: "rotated"
PropertyChanges {
target: addChatLbl
rotation: 45
}
} }
]
transitions: [
Transition {
from: "default"
to: "rotated"
RotationAnimation {
duration: 150
direction: RotationAnimation.Clockwise
easing.type: Easing.InCubic
}
},
Transition {
from: "rotated"
to: "default"
RotationAnimation {
duration: 150
direction: RotationAnimation.Counterclockwise
easing.type: Easing.OutCubic
}
}
]
}
MouseArea {
anchors.fill: parent
acceptedButtons: Qt.LeftButton | Qt.RightButton
onClicked: {
addChatLbl.state = "rotated"
let x = addChatLbl.x + addChatLbl.width / 2 - newChatMenu.width / 2
newChatMenu.popup(x, addChatLbl.height + 10)
} }
onAboutToHide: {
addChatLbl.state = "default"
}
topPadding: 16
bottomPadding: 16
QQC2.Menu { delegate: QQC2.MenuItem {
id: newChatMenu id: addChatMenuItem
QQC2.Action { implicitWidth: 200
text: qsTr("Start new chat") implicitHeight: 40
icon.source: "../../img/new_chat.svg" font.pixelSize: 15
onTriggered: { icon.color: addChatMenuItem.highlighted ? "white" : Theme.blue
console.log("TODO: Start new chat")
}
}
QQC2.Action {
text: qsTr("Start group chat")
icon.source: "../../img/group_chat.svg"
onTriggered: {
console.log("TODO: Start group chat")
}
}
QQC2.Action {
text: qsTr("Join public chat")
icon.source: "../../img/public_chat.svg"
onTriggered: {
chatGroupsListView.currentIndex = chatsModel.joinChat(
searchText.text)
searchText.text = ""
}
}
onAboutToHide: {
addChatLbl.state = "default"
}
topPadding: 16
bottomPadding: 16
delegate: QQC2.MenuItem {
id: addChatMenuItem
implicitWidth: 200
implicitHeight: 40
font.pixelSize: 15
icon.color: addChatMenuItem.highlighted ? "white" : Theme.blue
background: Rectangle {
implicitWidth: 220
implicitHeight: 40
color: addChatMenuItem.highlighted ? Theme.blue : "transparent"
}
}
background: Rectangle { background: Rectangle {
id: bgAddItemMenu
implicitWidth: 220 implicitWidth: 220
implicitHeight: 172 implicitHeight: 40
color: "transparent" color: addChatMenuItem.highlighted ? Theme.blue : "transparent"
}
}
Rectangle { background: Rectangle {
id: bgAddItemMenuArrow id: bgAddItemMenu
color: Theme.white2 implicitWidth: 220
height: 14 implicitHeight: 172
width: 14 color: "transparent"
rotation: 135
x: bgAddItemMenu.width / 2 - width / 2 Rectangle {
layer.enabled: true id: bgAddItemMenuArrow
layer.effect: DropShadow { color: Theme.white2
width: bgAddItemMenuArrow.width height: 14
height: bgAddItemMenuArrow.height width: 14
x: bgAddItemMenuArrow.x rotation: 135
y: bgAddItemMenuArrow.y + 10 x: bgAddItemMenu.width / 2 - width / 2
visible: bgAddItemMenuArrow.visible layer.enabled: true
source: bgAddItemMenuArrow layer.effect: DropShadow {
horizontalOffset: 0 width: bgAddItemMenuArrow.width
verticalOffset: 5 height: bgAddItemMenuArrow.height
radius: 10 x: bgAddItemMenuArrow.x
samples: 15 y: bgAddItemMenuArrow.y + 10
color: "#22000000" visible: bgAddItemMenuArrow.visible
} source: bgAddItemMenuArrow
horizontalOffset: 0
verticalOffset: 5
radius: 10
samples: 15
color: "#22000000"
} }
}
Rectangle { Rectangle {
id: bgAddItemMenu2 id: bgAddItemMenu2
y: 7 y: 7
implicitWidth: 220 implicitWidth: 220
implicitHeight: 152 implicitHeight: 152
color: Theme.white2 color: Theme.white2
radius: 16 radius: 16
layer.enabled: true layer.enabled: true
layer.effect: DropShadow { layer.effect: DropShadow {
width: bgAddItemMenu2.width width: bgAddItemMenu2.width
height: bgAddItemMenu2.height height: bgAddItemMenu2.height
x: bgAddItemMenu2.x x: bgAddItemMenu2.x
y: bgAddItemMenu2.y + 10 y: bgAddItemMenu2.y + 10
visible: bgAddItemMenu2.visible visible: bgAddItemMenu2.visible
source: bgAddItemMenu2 source: bgAddItemMenu2
horizontalOffset: 0 horizontalOffset: 0
verticalOffset: 7 verticalOffset: 7
radius: 10 radius: 10
samples: 15 samples: 15
color: "#22000000" color: "#22000000"
}
} }
} }
} }
@ -248,8 +244,15 @@ Item {
} }
StackLayout { StackLayout {
Layout.fillHeight: true anchors.bottom: parent.bottom
Layout.fillWidth: true anchors.bottomMargin: 0
anchors.left: parent.left
anchors.leftMargin: 0
anchors.right: parent.right
anchors.rightMargin: 0
anchors.top: searchBox.bottom
anchors.topMargin: 16
currentIndex: chatGroupsListView.count > 0 ? 1 : 0 currentIndex: chatGroupsListView.count > 0 ? 1 : 0
Item { Item {
@ -321,120 +324,121 @@ Item {
} }
} }
} }
}
Item { Item {
id: chatGroupsContainer id: chatGroupsContainer
Layout.fillWidth: true Layout.fillHeight: true
Layout.fillHeight: true Layout.fillWidth: true
Component { Component {
id: chatViewDelegate id: chatViewDelegate
Rectangle {
id: wrapper
color: ListView.isCurrentItem ? Theme.lightBlue : Theme.transparent
anchors.right: parent.right
anchors.rightMargin: Theme.padding
anchors.top: applicationWindow.top
anchors.topMargin: 0
anchors.left: parent.left
anchors.leftMargin: Theme.padding
radius: 8
// Hide the box if it is filtered out
property bool isVisible: searchStr == "" || name.includes(searchStr)
visible: isVisible ? true : false
height: isVisible ? 64 : 0
MouseArea {
cursorShape: Qt.PointingHandCursor
anchors.fill: parent
onClicked: {
chatsModel.setActiveChannelByIndex(index)
chatGroupsListView.currentIndex = index
}
}
Rectangle { Rectangle {
id: contactImage id: wrapper
width: 40 color: ListView.isCurrentItem ? Theme.lightBlue : Theme.transparent
color: Theme.darkGrey anchors.right: parent.right
anchors.rightMargin: Theme.padding
anchors.top: applicationWindow.top
anchors.topMargin: 0
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: Theme.padding anchors.leftMargin: Theme.padding
anchors.top: parent.top radius: 8
anchors.topMargin: 12 // Hide the box if it is filtered out
anchors.bottom: parent.bottom property bool isVisible: searchStr == "" || name.includes(searchStr)
anchors.bottomMargin: 12 visible: isVisible ? true : false
radius: 50 height: isVisible ? 64 : 0
}
MouseArea {
cursorShape: Qt.PointingHandCursor
anchors.fill: parent
onClicked: {
chatsModel.setActiveChannelByIndex(index)
chatGroupsListView.currentIndex = index
}
}
Rectangle {
id: contactImage
width: 40
color: Theme.darkGrey
anchors.left: parent.left
anchors.leftMargin: Theme.padding
anchors.top: parent.top
anchors.topMargin: 12
anchors.bottom: parent.bottom
anchors.bottomMargin: 12
radius: 50
}
Text {
id: contactInfo
text: name
anchors.right: contactTime.left
anchors.rightMargin: Theme.smallPadding
elide: Text.ElideRight
font.weight: Font.Medium
font.pixelSize: 15
anchors.left: contactImage.right
anchors.leftMargin: Theme.padding
anchors.top: parent.top
anchors.topMargin: Theme.smallPadding
color: "black"
}
Text {
id: lastChatMessage
text: lastMessage || qsTr("No messages")
anchors.right: contactNumberChatsCircle.left
anchors.rightMargin: Theme.smallPadding
elide: Text.ElideRight
anchors.bottom: parent.bottom
anchors.bottomMargin: Theme.smallPadding
font.pixelSize: 15
anchors.left: contactImage.right
anchors.leftMargin: Theme.padding
color: Theme.darkGrey
}
Text {
id: contactTime
text: timestamp
anchors.right: parent.right
anchors.rightMargin: Theme.padding
anchors.top: parent.top
anchors.topMargin: Theme.smallPadding
font.pixelSize: 11
color: Theme.darkGrey
}
Rectangle {
id: contactNumberChatsCircle
width: 22
height: 22
radius: 50
anchors.bottom: parent.bottom
anchors.bottomMargin: Theme.smallPadding
anchors.right: parent.right
anchors.rightMargin: Theme.padding
color: Theme.blue
visible: unviewedMessagesCount > 0
Text { Text {
id: contactNumberChats id: contactInfo
text: unviewedMessagesCount text: name
anchors.horizontalCenter: parent.horizontalCenter anchors.right: contactTime.left
anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: Theme.smallPadding
color: "white" elide: Text.ElideRight
font.weight: Font.Medium
font.pixelSize: 15
anchors.left: contactImage.right
anchors.leftMargin: Theme.padding
anchors.top: parent.top
anchors.topMargin: Theme.smallPadding
color: "black"
}
Text {
id: lastChatMessage
text: lastMessage || qsTr("No messages")
anchors.right: contactNumberChatsCircle.left
anchors.rightMargin: Theme.smallPadding
elide: Text.ElideRight
anchors.bottom: parent.bottom
anchors.bottomMargin: Theme.smallPadding
font.pixelSize: 15
anchors.left: contactImage.right
anchors.leftMargin: Theme.padding
color: Theme.darkGrey
}
Text {
id: contactTime
text: timestamp
anchors.right: parent.right
anchors.rightMargin: Theme.padding
anchors.top: parent.top
anchors.topMargin: Theme.smallPadding
font.pixelSize: 11
color: Theme.darkGrey
}
Rectangle {
id: contactNumberChatsCircle
width: 22
height: 22
radius: 50
anchors.bottom: parent.bottom
anchors.bottomMargin: Theme.smallPadding
anchors.right: parent.right
anchors.rightMargin: Theme.padding
color: Theme.blue
visible: unviewedMessagesCount > 0
Text {
id: contactNumberChats
text: unviewedMessagesCount
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
color: "white"
}
} }
} }
} }
}
ListView { ListView {
id: chatGroupsListView id: chatGroupsListView
anchors.topMargin: 24 anchors.topMargin: 24
anchors.fill: parent anchors.fill: parent
model: chatsModel.chats model: chatsModel.chats
delegate: chatViewDelegate delegate: chatViewDelegate
}
} }
} }
} }
/*##^## /*##^##

2
ui/app/AppLayouts/Profile/ProfileLayout.qml
View File

@ -99,7 +99,7 @@ Item {
ListView { ListView {
id: contactListView id: contactListView
anchors.topMargin: 48 anchors.topMargin: 48
anchors.top: element4.bottom anchors.top: element2.bottom
anchors.fill: parent anchors.fill: parent
model: profileModel.contactList model: profileModel.contactList
delegate: contactsList delegate: contactsList

3
ui/app/AppLayouts/Wallet/LeftTab.qml
View File

@ -6,10 +6,9 @@ import Qt.labs.platform 1.1
import "../../../imports" import "../../../imports"
import "../../../shared" import "../../../shared"
Column { Item {
id: walletInfoContainer id: walletInfoContainer
width: 340 width: 340
spacing: 0
Text { Text {
id: title id: title