mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-03 20:46:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change presence value in AvatarBridge with PresenceModel.consolidatedPresence

Browse source
This commit is contained in:
benoit.martins 2023-04-12 18:06:37 +02:00 • committed by Benoit Martins
parent 26fcac9bef
commit e5e49530dd
2 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Classes/Swift/Voip/Widgets/Avatar.swift
View file

@ -111,7 +111,11 @@ class Avatar : UIView {
let avatarWithPresence = UIView(frame: CGRect(x: 0, y: 0, width: size, height: size))
let avatarImageWihtoutPresence = UIImageView(image: shared?.toImage())
let iconPresenceView = UIImageView(image: UIImage(named:"led_connected"))
let contactAddress = Address.getSwiftObject(cObject: address).contact()
var iconPresenceView = UIImageView()
if contactAddress != nil {
iconPresenceView = updatePresenceImage(contact: Address.getSwiftObject(cObject: address).contact()!)
}
avatarWithPresence.addSubview(avatarImageWihtoutPresence)
avatarWithPresence.addSubview(iconPresenceView)
@ -120,7 +124,8 @@ class Avatar : UIView {
return avatarWithPresence.toImage()
}
@objc static func imageForInitials(displayName:String) -> UIImage? {
@objc static func imageForInitials(contact:Contact) -> UIImage? {
let displayName: String = contact.displayName
if (shared == nil) {
prepareIt()
}
@ -133,7 +138,7 @@ class Avatar : UIView {
let avatarWithPresence = UIView(frame: CGRect(x: 0, y: 0, width: size, height: size))
let avatarImageWihtoutPresence = UIImageView(image: shared?.toImage())
let iconPresenceView = UIImageView(image: UIImage(named:"led_connected"))
let iconPresenceView = updatePresenceImage(contact: contact)
avatarWithPresence.addSubview(avatarImageWihtoutPresence)
avatarWithPresence.addSubview(iconPresenceView)
@ -142,4 +147,26 @@ class Avatar : UIView {
return avatarWithPresence.toImage()
}
@objc static func updatePresenceImage(contact:Contact) -> UIImageView {
let friend = Friend.getSwiftObject(cObject: contact.friend)
var presenceModel : PresenceModel?
var hasPresence : Bool? = false
var imageName = "";
if friend.address?.asStringUriOnly() != nil {
presenceModel = friend.getPresenceModelForUriOrTel(uriOrTel: (friend.address?.asStringUriOnly())!)
hasPresence = presenceModel != nil && presenceModel!.basicStatus == PresenceBasicStatus.Open
}
if (hasPresence! && presenceModel?.consolidatedPresence == ConsolidatedPresence.Online) {
imageName = "led_connected";
} else {
imageName = "led_inprogress";
}
return UIImageView(image: UIImage(named:imageName))
}
}

2
Classes/Utils/FastAddressBook.m
View file

@ -36,7 +36,7 @@
if (retImage == nil) {
retImage = contact.friend && linphone_friend_get_addresses(contact.friend) ?
[AvatarBridge imageForAddressWithAddress:linphone_friend_get_addresses(contact.friend)->data] :
[AvatarBridge imageForInitialsWithDisplayName:[contact displayName]];
[AvatarBridge imageForInitialsWithContact:contact];
}
if (retImage.size.width != retImage.size.height) {
retImage = [retImage squareCrop];