From 55e325c7ec84cdf87765ef2a3a02b2c3968ba229 Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Thu, 26 Dec 2024 12:12:05 +0100 Subject: [PATCH] LINQT-1503 meeting avatar --- .../view/Control/Container/Call/CallHistoryLayout.qml | 1 + Linphone/view/Control/Display/Call/CallListView.qml | 1 + Linphone/view/Control/Display/Contact/Avatar.qml | 8 +++++--- .../Popup/Notification/NotificationReceivedCall.qml | 1 + Linphone/view/Page/Main/Call/CallPage.qml | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Linphone/view/Control/Container/Call/CallHistoryLayout.qml b/Linphone/view/Control/Container/Call/CallHistoryLayout.qml index f86e1360c..6f866d127 100644 --- a/Linphone/view/Control/Container/Call/CallHistoryLayout.qml +++ b/Linphone/view/Control/Container/Call/CallHistoryLayout.qml @@ -73,6 +73,7 @@ ColumnLayout { width: 100 * DefaultStyle.dp height: 100 * DefaultStyle.dp contact: mainItem.contact || null + isConferenceInfo: mainItem.conferenceInfo _address: mainItem.conferenceInfo ? mainItem.conferenceInfo.core.subject : mainItem.contactAddress || mainItem.contactName diff --git a/Linphone/view/Control/Display/Call/CallListView.qml b/Linphone/view/Control/Display/Call/CallListView.qml index 0f9b9eb39..6cbcb8465 100644 --- a/Linphone/view/Control/Display/Call/CallListView.qml +++ b/Linphone/view/Control/Display/Call/CallListView.qml @@ -31,6 +31,7 @@ ListView { Layout.preferredWidth: 45 * DefaultStyle.dp Layout.preferredHeight: 45 * DefaultStyle.dp _address: modelData.core.remoteAddress + isConferenceInfo: modelData.core.isConference } ColumnLayout { spacing: 0 diff --git a/Linphone/view/Control/Display/Contact/Avatar.qml b/Linphone/view/Control/Display/Contact/Avatar.qml index 6ab5b669a..74b2bc261 100644 --- a/Linphone/view/Control/Display/Contact/Avatar.qml +++ b/Linphone/view/Control/Display/Contact/Avatar.qml @@ -15,6 +15,7 @@ Loader{ property AccountGui account: null property FriendGui contact: null property CallGui call: null + property bool isConferenceInfo: false property string _address: account ? account.core?.identityAddress || "" : call @@ -143,7 +144,7 @@ Loader{ width: height Rectangle { id: initialItem - property string initials: UtilsCpp.getInitials(mainItem.displayNameVal) + property string initials: mainItem.isConferenceInfo ? "" : UtilsCpp.getInitials(mainItem.displayNameVal) radius: width / 2 color: DefaultStyle.main2_200 height: stackView.height @@ -163,9 +164,9 @@ Loader{ Image { id: initialImg visible: initialItem.initials == '' - width: stackView.width/3 + width: stackView.width/2 height: width - source: AppIcons.profile + source: mainItem.isConferenceInfo ? AppIcons.usersThree : AppIcons.profile sourceSize.width: width sourceSize.height: height anchors.centerIn: parent @@ -193,6 +194,7 @@ Loader{ width: height Image { id: image + z: 200 visible: false width: parent.width height: parent.height diff --git a/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml b/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml index 55ddd16f2..58ebb5e94 100644 --- a/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml +++ b/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml @@ -64,6 +64,7 @@ Notification { Layout.preferredHeight: 60 * DefaultStyle.dp Layout.alignment: Qt.AlignHCenter call: mainItem.call + isConferenceInfo: mainItem.call && mainItem.call.core.isConference } ColumnLayout { spacing: 0 diff --git a/Linphone/view/Page/Main/Call/CallPage.qml b/Linphone/view/Page/Main/Call/CallPage.qml index c3b3dfa89..a104bf2dc 100644 --- a/Linphone/view/Page/Main/Call/CallPage.qml +++ b/Linphone/view/Page/Main/Call/CallPage.qml @@ -305,6 +305,7 @@ AbstractMainPage { _address: modelData.core.remoteAddress width: 45 * DefaultStyle.dp height: 45 * DefaultStyle.dp + isConferenceInfo: modelData.core.isConference } ColumnLayout { Layout.fillHeight: true