summary refs log tree commit diff
path: root/resources
diff options
context:
space:
mode:
Diffstat (limited to 'resources')
-rw-r--r--resources/qml/TimelineView.qml13
-rw-r--r--resources/qml/UserProfile.qml85
-rw-r--r--resources/res.qrc1
3 files changed, 97 insertions, 2 deletions
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index dd35473c..ed403aa9 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -286,7 +286,10 @@ Page {
 
 							MouseArea {
 								anchors.fill: parent
-								onClicked: chat.model.openUserProfile(modelData.userId)
+                                onClicked: {
+                                    userProfile.user_data = modelData
+                                    userProfile.show()
+                                }
 								cursorShape: Qt.PointingHandCursor
 								propagateComposedEvents: true
 							}
@@ -300,7 +303,10 @@ Page {
 
 							MouseArea {
 								anchors.fill: parent
-								onClicked: chat.model.openUserProfile(section.split(" ")[0])
+                                onClicked: {
+                                    userProfile.user_data = modelData
+                                    userProfile.show()
+                                }
 								cursorShape: Qt.PointingHandCursor
 								propagateComposedEvents: true
 							}
@@ -314,6 +320,9 @@ Page {
 							width: chat.delegateMaxWidth - parent.spacing*2 - userName.implicitWidth - avatarSize
 							font.italic: true
 						}
+                        UserProfile{
+                            id: userProfile
+                        }
 					}
 				}
 			}
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml
new file mode 100644
index 00000000..f019ee25
--- /dev/null
+++ b/resources/qml/UserProfile.qml
@@ -0,0 +1,85 @@
+import QtQuick 2.9
+import QtQuick.Controls 2.3
+import QtQuick.Layouts 1.2
+import QtQuick.Window 2.3
+
+ApplicationWindow{
+    property var user_data
+    property var colors: currentActivePalette
+
+    id:userProfileDialog
+    height: 500
+    width: 500
+    modality:Qt.WindowModal
+    Layout.alignment: Qt.AlignHCenter
+    palette: colors
+
+    onAfterRendering: {
+        userProfileAvatar.url = chat.model.avatarUrl(user_data.userId).replace("mxc://", "image://MxcImage/")
+        userProfileName.text = user_data.userName
+        matrixUserID.text = user_data.userId
+        console.log("this is happening");
+    }
+
+    background: Item{
+        id: userProfileItem
+        width: userProfileDialog.width
+        height: userProfileDialog.height
+        anchors.margins: {
+            top:20
+        }
+
+        ColumnLayout{
+            anchors.fill: userProfileItem
+            width: userProfileDialog.width
+            spacing: 10
+
+            Avatar{
+                id: userProfileAvatar
+                height: 130
+                width: 130
+                displayName: modelData.userName
+                Layout.alignment: Qt.AlignHCenter
+            }
+
+            Label{
+                id: userProfileName
+                fontSizeMode: Text.HorizontalFit
+                Layout.alignment: Qt.AlignHCenter
+            }
+
+            Label{
+                id: matrixUserID
+                fontSizeMode: Text.HorizontalFit
+                Layout.alignment: Qt.AlignHCenter
+            }
+
+            ScrollView {
+                implicitHeight: userProfileDialog.height/2+20
+                implicitWidth: userProfileDialog.width-20
+                clip: true
+                Layout.alignment: Qt.AlignHCenter
+                ScrollBar.horizontal.policy: ScrollBar.AlwaysOn
+                ScrollBar.vertical.policy: ScrollBar.AlwaysOn
+
+                Label {
+                    text: "ABC"
+                    font.pixelSize: 700
+                }
+            }
+
+            Button{
+                text:"OK"
+                onClicked: userProfileDialog.close()
+                anchors.margins: {
+                    right:10
+                    bottom:10
+                }
+
+                Layout.alignment: Qt.AlignRight | Qt.AlignBottom
+            }
+        }
+
+        Item { Layout.fillHeight: true }
+    }
+}
diff --git a/resources/res.qrc b/resources/res.qrc
index ec086b3a..cb724dd3 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -126,6 +126,7 @@
         <file>qml/TimelineRow.qml</file>
         <file>qml/emoji/EmojiButton.qml</file>
         <file>qml/emoji/EmojiPicker.qml</file>
+        <file>qml/UserProfile.qml</file>
         <file>qml/delegates/MessageDelegate.qml</file>
         <file>qml/delegates/TextMessage.qml</file>
         <file>qml/delegates/NoticeMessage.qml</file>