From df53cc73e9548fc44ccdc1b8623f38a247fea3a2 Mon Sep 17 00:00:00 2001
From: Christophe Deschamps <christophe.deschamps.work@gmail.com>
Date: Thu, 3 Nov 2022 08:39:02 +0100
Subject: [PATCH] Avatar icon colour fixes

---
 Classes/Swift/Voip/Theme/VoipTheme.swift |  2 +-
 Classes/Swift/Voip/Widgets/Avatar.swift  | 26 ++++++++++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Classes/Swift/Voip/Theme/VoipTheme.swift b/Classes/Swift/Voip/Theme/VoipTheme.swift
index ab361b52c..28f8d17a0 100644
--- a/Classes/Swift/Voip/Theme/VoipTheme.swift
+++ b/Classes/Swift/Voip/Theme/VoipTheme.swift
@@ -88,7 +88,7 @@ import UIKit
 	static let call_header_subtitle = TextStyle(fgColor: LightDarkColor(.white,.white), bgColor: LightDarkColor(.clear,.clear), allCaps: false, align: .center, font: fontName+"-Regular", size: 14.0)
 	static let call_generated_avatar_large = TextStyle(fgColor: LightDarkColor(.white,.white), bgColor: LightDarkColor(.clear,.clear), allCaps: true, align: .center, font: fontName+"-Regular", size: 53.0)
 	static let call_generated_avatar_medium = TextStyle(fgColor: LightDarkColor(.white,.white), bgColor: LightDarkColor(.clear,.clear), allCaps: true, align: .center, font: fontName+"-Regular", size: 27.0)
-	static let call_generated_avatar_small = TextStyle(fgColor: LightDarkColor(.white,.white), bgColor: LightDarkColor(.clear,.clear), allCaps: true, align: .center, font: fontName+"-Regular", size: 16.0)
+	static let call_generated_avatar_small = TextStyle(fgColor: LightDarkColor(.white,.white), bgColor: LightDarkColor(.clear,.clear), allCaps: true, align: .center, font: fontName+"-Bold", size: 25.0)
 
 	static let dtmf_label = TextStyle(fgColor: LightDarkColor(.white,.white), bgColor: LightDarkColor(.clear,.clear), allCaps: false, align: .center, font: fontName+"-Regular", size: 30.0)
 	static let call_remote_name = TextStyle(fgColor: LightDarkColor(.white,.white), bgColor: LightDarkColor(.clear,.clear), allCaps: false, align: .left, font: fontName+"-Regular", size: 18.0)
diff --git a/Classes/Swift/Voip/Widgets/Avatar.swift b/Classes/Swift/Voip/Widgets/Avatar.swift
index 7152b6d2f..5042f1b57 100644
--- a/Classes/Swift/Voip/Widgets/Avatar.swift
+++ b/Classes/Swift/Voip/Widgets/Avatar.swift
@@ -21,12 +21,12 @@ import Foundation
 import linphonesw
 import SnapKit
 
-class Avatar : UIImageView {
+class Avatar : UIView {
 	
 	static let diameter_for_call_views = 191
 	static let diameter_for_call_views_land = 130
 	static let groupAvatar = UIImage(named:"voip_multiple_contacts_avatar")
-	static let singleAvatar = UIImage(named:"avatar")?.tinted(with: .white)
+	static let singleAvatar = UIImage(named:"avatar")
 	
 	required init?(coder: NSCoder) {
 		initialsLabel =  StyledLabel(VoipTheme.call_generated_avatar_large)
@@ -34,39 +34,47 @@ class Avatar : UIImageView {
 	}
 	
 	let initialsLabel: StyledLabel
-	
+	let iconImageView = UIImageView()
+
 	init (color:LightDarkColor,textStyle:TextStyle) {
 		initialsLabel =  StyledLabel(textStyle)
 		super.init(frame: .zero)
 		clipsToBounds = true
 		self.backgroundColor = color.get()
 		addSubview(initialsLabel)
-		_ = initialsLabel.matchParentSideBorders().matchParentHeight()
+		addSubview(iconImageView)
+		iconImageView.backgroundColor = .white
+		initialsLabel.matchParentSideBorders().matchParentHeight().done()
+		iconImageView.matchParentDimmensions().done()
 	}
 	
 	
 	func fillFromAddress(address:Address, isGroup:Bool = false) {
 		if (isGroup) {
-			self.image = Avatar.groupAvatar
+			iconImageView.image = Avatar.groupAvatar
+			iconImageView.isHidden = false
 			initialsLabel.isHidden = true
 		} else if let image = address.contact()?.avatar() {
-			self.image = image
+			iconImageView.image = image
 			initialsLabel.isHidden = true
+			iconImageView.isHidden = false
 		} else {
 			if (Core.get().defaultAccount?.isPhoneNumber(username: address.username) == true) {
-				self.image = Avatar.singleAvatar
+				iconImageView.image = Avatar.singleAvatar
 				initialsLabel.isHidden = true
+				iconImageView.isHidden = false
 			} else {
-				self.image = nil
 				initialsLabel.text = address.initials()
 				initialsLabel.isHidden = false
+				iconImageView.isHidden = true
 			}
 		}
 	}
 	
 	func showAsAvatarIcon() {
-		self.image = Avatar.singleAvatar
+		iconImageView.image = Avatar.singleAvatar
 		initialsLabel.isHidden = true
+		iconImageView.isHidden = false
 	}
 		
 	override func layoutSubviews() {