Commit d0475037 authored by Jonah Brüchert's avatar Jonah Brüchert Committed by LNJ

Add abstract Avatar for displaying Image or TextAvatar

parent 8fa25830
......@@ -26,10 +26,13 @@
<file alias="qml/elements/MediaPreviewOther.qml">src/qml/elements/MediaPreviewOther.qml</file>
<file alias="qml/elements/EmojiPicker.qml">src/qml/elements/EmojiPicker.qml</file>
<file alias="qml/elements/TextAvatar.qml">src/qml/elements/TextAvatar.qml</file>
<file alias="qml/elements/Avatar.qml">src/qml/elements/Avatar.qml</file>
<file alias="qml/settings/SettingsItem.qml">src/qml/settings/SettingsItem.qml</file>
<file alias="qml/settings/SettingsPage.qml">src/qml/settings/SettingsPage.qml</file>
<file alias="qml/settings/SettingsSheet.qml">src/qml/settings/SettingsSheet.qml</file>
<file alias="qml/settings/ChangePassword.qml">src/qml/settings/ChangePassword.qml</file>
<file alias="qtquickcontrols2.conf">misc/qtquickcontrols2.conf</file>
</qresource>
</RCC>
/*
* Kaidan - A user-friendly XMPP client for every device!
*
* Copyright (C) 2016-2019 Kaidan developers and contributors
* (see the LICENSE file for a full list of copyright authors)
*
* Kaidan is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* In addition, as a special exception, the author of Kaidan gives
* permission to link the code of its release with the OpenSSL
* project's "OpenSSL" library (or with modified versions of it that
* use the same license as the "OpenSSL" library), and distribute the
* linked executables. You must obey the GNU General Public License in
* all respects for all of the code used other than "OpenSSL". If you
* modify this file, you may extend this exception to your version of
* the file, but you are not obligated to do so. If you do not wish to
* do so, delete this exception statement from your version.
*
* Kaidan is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Kaidan. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
import QtQuick.Layouts 1.3
import org.kde.kirigami 2.2 as Kirigami
Item {
id: avatar
property string avatarUrl
property string name
RoundImage {
id: imageAvatar
visible: avatarUrl
source: avatarUrl
fillMode: Image.PreserveAspectFit
mipmap: true
height: width
anchors.fill: parent
isRound: true
}
TextAvatar {
id: textAvatar
visible: !avatarUrl
name: avatar.name
anchors.fill: parent
}
}
......@@ -74,25 +74,12 @@ RowLayout {
Layout.preferredWidth: root.layoutDirection === Qt.LeftToRight ? 5 : 10
}
RoundImage {
Avatar {
id: avatar
visible: !sentByMe && avatarUrl
source: avatarUrl
fillMode: Image.PreserveAspectFit
mipmap: true
height: width
visible: !sentByMe
avatarUrl: root.avatarUrl
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.2
Layout.preferredWidth: Kirigami.Units.gridUnit * 2.2
sourceSize.height: Kirigami.Units.gridUnit * 2.2
sourceSize.width: Kirigami.Units.gridUnit * 2.2
}
TextAvatar {
id: textAvatar
visible: !sentByMe && !avatar.visible
name: root.name
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.2
Layout.preferredWidth: Kirigami.Units.gridUnit * 2.2
}
......
......@@ -78,22 +78,12 @@ Kirigami.SwipeListItem {
listItem.presenceType, listItem.statusMsg)
}
RoundImage {
Avatar {
id: avatar
visible: avatarImagePath !== ""
anchors.fill: parent
source: avatarImagePath
width: height
fillMode: Image.PreserveAspectFit
mipmap: true
}
TextAvatar {
visible: avatarImagePath == ""
anchors.fill: parent
width: height
id: textAvatar
avatarUrl: avatarImagePath
name: listItem.name
width: height
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment