mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix #LINQT-1994 wrong avatars

Browse source 
fix emoji initials for avatar
This commit is contained in:
gaelle 2025-09-16 15:07:44 +02:00
parent 73358b7a25
commit 23234bafc4
4 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Linphone/tool/Utils.cpp
View file

@ -117,21 +117,38 @@ QString Utils::getFamilyNameFromFullName(const QString &fullName) {
return nameSplitted.join(" ");
}
inline std::string u32_to_ascii(std::u32string const &s) {
std::string out;
std::transform(begin(s), end(s), back_inserter(out),
[](char32_t c) { return c < 128 ? static_cast<char>(c) : '?'; });
return out;
}
QString Utils::getInitials(const QString &username) {
if (username.isEmpty()) return "";
QRegularExpression regex("[\\s\\.]+");
QStringList words = username.split(regex); // Qt 5.14: Qt::SkipEmptyParts
QStringList initials;
auto str32 = words[0].toStdU32String();
std::u32string char32;
auto str32 = words[0].toStdU32String();
char32 += str32[0];
// if name starts by an emoji, only return this one
QVector<uint> utf32_string = username.toUcs4();
auto code = utf32_string[0];
if (Utils::codepointIsEmoji(code)) return QString::fromStdU32String(char32);
QStringList initials;
initials << QString::fromStdU32String(char32);
for (int i = 1; i < words.size() && initials.size() <= 1; ++i) {
if (words[i].size() > 0) {
str32 = words[i].toStdU32String();
char32[0] = str32[0];
initials << QString::fromStdU32String(char32);
std::string converted = u32_to_ascii(char32);
if (Utils::codepointIsEmoji(atoi(converted.c_str()))) {
break;
}
}
}
return QLocale().toUpper(initials.join(""));

2
Linphone/view/Control/Display/Call/CallHistoryListView.qml
View file

@ -133,7 +133,7 @@ ListView {
property var contactObj: UtilsCpp.findFriendByAddress(
modelData.core.remoteAddress)
contact: contactObj?.value || null
displayNameVal: modelData.core.displayName
_address: modelData.core.remoteAddress
secured: securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncryptedAndVerified
width: Math.round(45 * DefaultStyle.dp)
height: Math.round(45 * DefaultStyle.dp)

6
Linphone/view/Page/Layout/Chat/MessageImdnStatusInfos.qml
View file

@ -32,11 +32,7 @@ MessageInfosLayout {
Avatar {
Layout.alignment: Qt.AlignHCenter
contact: listDelegate.contact
displayNameVal: contact
? ""
: nameObj
? nameObj.value
: ""
_address: modelData.address
Layout.preferredWidth: Math.round(45 * DefaultStyle.dp)
Layout.preferredHeight: Math.round(45 * DefaultStyle.dp)
}

6
Linphone/view/Page/Layout/Chat/MessageReactionsInfos.qml
View file

@ -37,11 +37,7 @@ MessageInfosLayout {
Avatar {
Layout.alignment: Qt.AlignHCenter
contact: contactObj?.value || null
displayNameVal: contact
? ""
: nameObj
? nameObj.value
: ""
_address: modelData.address
Layout.preferredWidth: Math.round(45 * DefaultStyle.dp)
Layout.preferredHeight: Math.round(45 * DefaultStyle.dp)
}