From 14ddbaa58a591472b06fffe8c8eafd3ddf26e6ce Mon Sep 17 00:00:00 2001
From: Christophe Deschamps <christophe.deschamps.work@gmail.com>
Date: Thu, 3 Nov 2022 00:28:44 +0100
Subject: [PATCH] New message indicator icon in orange background

---
 Classes/LinphoneUI/Base.lproj/UIChatCell.xib | 17 ++++++-----------
 Classes/LinphoneUI/UIChatCell.m              |  5 +++++
 Classes/Swift/Voip/Theme/VoipTheme.swift     |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Classes/LinphoneUI/Base.lproj/UIChatCell.xib b/Classes/LinphoneUI/Base.lproj/UIChatCell.xib
index 9ed041472..b6de45b80 100644
--- a/Classes/LinphoneUI/Base.lproj/UIChatCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIChatCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -66,15 +66,11 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7DE-KJ-9Q3" userLabel="unreadCountView" customClass="UIBouncingView">
-                    <rect key="frame" x="338" y="12" width="21" height="21"/>
+                    <rect key="frame" x="338" y="12" width="20" height="20"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                     <subviews>
-                        <imageView userInteractionEnabled="NO" tag="8" contentMode="scaleAspectFit" fixedFrame="YES" image="chat_list_indicator.png" translatesAutoresizingMaskIntoConstraints="NO" id="NXj-A8-YLh" userLabel="unreadCountImage">
-                            <rect key="frame" x="0.0" y="0.0" width="21" height="21"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                        </imageView>
                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="9" contentMode="left" fixedFrame="YES" text="99" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="ZXq-Do-7Ua" userLabel="unreadCountLabel">
-                            <rect key="frame" x="0.0" y="0.0" width="21" height="21"/>
+                            <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration">
                                 <accessibilityTraits key="traits" none="YES"/>
@@ -88,11 +84,11 @@
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="forward_message_default.png" id="rbY-QS-6QH" userLabel="transferIcon">
-                    <rect key="frame" x="338" y="33" width="21" height="21"/>
+                    <rect key="frame" x="338" y="33" width="20" height="20"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 </imageView>
                 <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="ephemeral_messages_color_A.png" translatesAutoresizingMaskIntoConstraints="NO" id="q18-yi-ol3">
-                    <rect key="frame" x="338" y="54" width="21" height="21"/>
+                    <rect key="frame" x="338" y="54" width="20" height="20"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                 </imageView>
             </subviews>
@@ -103,7 +99,6 @@
     </objects>
     <resources>
         <image name="avatar.png" width="414.39999389648438" height="414.39999389648438"/>
-        <image name="chat_list_indicator.png" width="28" height="28"/>
         <image name="chat_read.png" width="20" height="20"/>
         <image name="ephemeral_messages_color_A.png" width="136" height="158.39999389648438"/>
         <image name="forward_message_default.png" width="187" height="148"/>
diff --git a/Classes/LinphoneUI/UIChatCell.m b/Classes/LinphoneUI/UIChatCell.m
index 3fc01de59..0d6330496 100644
--- a/Classes/LinphoneUI/UIChatCell.m
+++ b/Classes/LinphoneUI/UIChatCell.m
@@ -21,6 +21,7 @@
 #import "PhoneMainView.h"
 #import "LinphoneManager.h"
 #import "Utils.h"
+#import "linphoneapp-Swift.h"
 
 @implementation UIChatCell
 
@@ -38,6 +39,10 @@
 		[self addSubview:sub];
 	}
 	[_imdmIcon setHidden:TRUE];
+	_unreadCountView.backgroundColor = VoipTheme.primary_color;
+	_unreadCountView.layer.cornerRadius = 10;
+	_unreadCountView.clipsToBounds = true;
+	_unreadCountLabel.textAlignment = NSTextAlignmentCenter;
 	return self;
 }
 
diff --git a/Classes/Swift/Voip/Theme/VoipTheme.swift b/Classes/Swift/Voip/Theme/VoipTheme.swift
index d1d7f1a55..ab361b52c 100644
--- a/Classes/Swift/Voip/Theme/VoipTheme.swift
+++ b/Classes/Swift/Voip/Theme/VoipTheme.swift
@@ -44,7 +44,7 @@ import UIKit
 	
 	// General colors (used by VoIP)
 	
-	static let primary_color = UIColor(hex:"#ff5e00")
+	@objc static let primary_color = UIColor(hex:"#ff5e00")
 	static let primary_dark_color = UIColor(hex:"#e65000")
 	static let green_color = UIColor(hex:"#96c11f")
 	static let dark_green_color = UIColor(hex:"#7d9f21")