diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Card.ui.qml | 30 | ||||
| -rw-r--r-- | ChatForm.ui.qml | 9 | ||||
| -rw-r--r-- | ChatGroup.ui.qml | 45 | ||||
| -rw-r--r-- | Friends.ui.qml | 8 | ||||
| -rw-r--r-- | Messenger.qmlproject | 12 |
6 files changed, 57 insertions, 48 deletions
@@ -3,3 +3,4 @@ *.user .DS_Store build +translations.db* diff --git a/Card.ui.qml b/Card.ui.qml index 090b56d..44da57a 100644 --- a/Card.ui.qml +++ b/Card.ui.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtGraphicalEffects 1.15 -import Bootstrap 5.3 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Effects +import Bootstrap Item { property string imageSource: @@ -33,15 +33,21 @@ Item { width: 44 height: 44 } - layer.enabled: true - layer.effect: OpacityMask { - maskSource: Rectangle { - width: 44 - height: 44 - radius: 22 + layer { + enabled: true + effect: MultiEffect { + maskEnabled: true + maskSource: maskRectangle } } - + Rectangle { + id: maskRectangle + width: 44 + height: 44 + radius: 22 + layer.enabled: true + visible: false + } MouseArea { id: imageArea anchors.fill: parent diff --git a/ChatForm.ui.qml b/ChatForm.ui.qml index f53342d..330096d 100644 --- a/ChatForm.ui.qml +++ b/ChatForm.ui.qml @@ -1,8 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtGraphicalEffects 1.15 -import Bootstrap 5.3 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Bootstrap Item { width: 360 diff --git a/ChatGroup.ui.qml b/ChatGroup.ui.qml index 5d8052c..bb16852 100644 --- a/ChatGroup.ui.qml +++ b/ChatGroup.ui.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtGraphicalEffects 1.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtQuick.Effects Page { property string titleText: qsTr("Bootstrap Community") @@ -21,12 +21,10 @@ Page { rightMargin: 20 } model: [11, 1, 6, 1, 11, 1, 7, 1, 11, 1] - delegate: - Item { + delegate: Item { width: listView.width height: message.height + 16 - ColumnLayout { id: message width: parent.width @@ -38,7 +36,6 @@ Page { } spacing: 8 - Label { id: messageText text: qsTr("Hey, Marshall! How are you? Can you please change the color theme of the website to pink and purple? 😂") @@ -50,7 +47,7 @@ Page { Layout.maximumWidth: parent.width - (messageAvatar.width + 16) background: Rectangle { radius: 16 - color: modelData ==1 ? "#2787f5" : "#95aac9" + color: modelData == 1 ? "#2787f5" : "#95aac9" } } @@ -68,21 +65,26 @@ Page { bottom: parent.bottom } source: "https://offsetcode.com/themes/messenger/2.2.0/assets/img/avatars/" - + modelData + ".jpg" + + modelData + ".jpg" sourceSize { width: 26 height: 26 } layer { enabled: true - effect: OpacityMask { - maskSource: Rectangle { - width: 26 - height: 26 - radius: 13 - } + effect: MultiEffect { + maskEnabled: true + maskSource: maskRectangle } } + Rectangle { + id: maskRectangle + width: 26 + height: 26 + radius: 13 + layer.enabled: true + visible: false + } } } } @@ -90,17 +92,26 @@ Page { footer: Pane { RowLayout { width: parent.width + Rectangle { + color: "#ebf1f7" + anchors.fill: parent + radius: 100 + } TextArea { id: messageField Layout.fillWidth: true placeholderText: qsTr("Type your message...") wrapMode: TextArea.Wrap + Layout.leftMargin: 16 } - Button { + RoundButton { id: sendButton text: qsTr("Send") + icon.source: "../qeduport/Material/svg/outlined/send.svg" + display: AbstractButton.IconOnly + Layout.margins: 8 enabled: messageField.length > 0 } } diff --git a/Friends.ui.qml b/Friends.ui.qml index e960211..6c14549 100644 --- a/Friends.ui.qml +++ b/Friends.ui.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Bootstrap 5.3 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Bootstrap Flickable { property string titleText: qsTr("Friends") diff --git a/Messenger.qmlproject b/Messenger.qmlproject index f2e04f6..ee51a23 100644 --- a/Messenger.qmlproject +++ b/Messenger.qmlproject @@ -1,4 +1,4 @@ -import QmlProject 1.1 +import QmlProject Project { mainUiFile: "Friends.ui.qml" @@ -7,13 +7,5 @@ Project { directory: "." } - Environment { - QMLSCENE_CORE_PROFILE: "true" - } - - qdsVersion: "3.9" - quickVersion: "2.15" - multilanguageSupport: true - supportedLanguages: ["en", "id"] - primaryLanguage: "en" + qt6Project: true } |