From b2a3077198778fff2a3ea412d53525dc658223b7 Mon Sep 17 00:00:00 2001
From: Christophe Deschamps <christophe.deschamps.work@gmail.com>
Date: Thu, 16 Jun 2022 16:44:31 +0200
Subject: [PATCH] Group call creation tunnel fixes & cosmetics

---
 .../Base.lproj/ChatConversationCreateView.xib  |  9 +++++++++
 Classes/ChatConversationCreateView.h           |  1 +
 Classes/ChatConversationCreateView.m           | 18 +++++++++++++-----
 Classes/ChatConversationInfoView.m             |  2 ++
 Classes/ChatsListTableView.m                   |  1 +
 Classes/ChatsListView.m                        |  1 +
 .../LinphoneUI/Base.lproj/UIChatCreateCell.xib | 14 +++++++++-----
 Classes/Swift/Voip/Theme/VoipTheme.swift       |  2 +-
 8 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/Classes/Base.lproj/ChatConversationCreateView.xib b/Classes/Base.lproj/ChatConversationCreateView.xib
index 48ba99239..a3a8d83cd 100644
--- a/Classes/Base.lproj/ChatConversationCreateView.xib
+++ b/Classes/Base.lproj/ChatConversationCreateView.xib
@@ -21,7 +21,9 @@
                 <outlet property="selectedButtonImage" destination="ibu-Ra-oZO" id="jvl-ay-cfh"/>
                 <outlet property="switchView" destination="d5Q-XR-FNz" id="Xeo-ZG-6cr"/>
                 <outlet property="tableController" destination="4" id="18"/>
+                <outlet property="topBar" destination="7" id="svd-IV-RZN"/>
                 <outlet property="view" destination="5" id="14"/>
+                <outlet property="voipTitle" destination="Cwe-p4-hji" id="NLX-Og-4HS"/>
                 <outlet property="waitView" destination="Ztm-hK-aBp" id="qYh-M5-heN"/>
             </connections>
         </placeholder>
@@ -145,6 +147,13 @@
                                         </button>
                                     </subviews>
                                 </view>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cwe-p4-hji" userLabel="voipTitle">
+                                    <rect key="frame" x="82" y="0.0" width="249" height="66"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="22"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rBc-dQ-eIj" userLabel="nextButton" customClass="UIInterfaceStyleButton">
                                     <rect key="frame" x="331" y="0.0" width="83" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
diff --git a/Classes/ChatConversationCreateView.h b/Classes/ChatConversationCreateView.h
index 8c8f271ea..099090435 100644
--- a/Classes/ChatConversationCreateView.h
+++ b/Classes/ChatConversationCreateView.h
@@ -40,6 +40,7 @@
 @property (weak, nonatomic) IBOutlet UIView *switchView;
 @property (weak, nonatomic) IBOutlet UIImageView *chiffreImage;
 @property (weak, nonatomic) IBOutlet UIButton *chiffreButton;
+@property (weak, nonatomic) IBOutlet UIView *topBar;
 
 @property(nonatomic) Boolean isForEditing;
 @property(nonatomic) Boolean isGroupChat;
diff --git a/Classes/ChatConversationCreateView.m b/Classes/ChatConversationCreateView.m
index 30607e83f..749cf69c9 100644
--- a/Classes/ChatConversationCreateView.m
+++ b/Classes/ChatConversationCreateView.m
@@ -61,7 +61,9 @@ static UICompositeViewDescription *compositeDescription = nil;
 	[_collectionView setCollectionViewLayout:layout];
 	_tableController.collectionView = _collectionView;
 	_tableController.controllerNextButton = _nextButton;
-	_isForEditing = FALSE; 
+	_isForEditing = FALSE;
+	_voipTitle.text = VoipTexts.call_action_participants_list;
+
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -93,9 +95,11 @@ static UICompositeViewDescription *compositeDescription = nil;
 		} else {
 			[_nextButton setImage:[UIImage imageNamed:@"next_default"] forState:UIControlStateNormal];
 		}
+		_topBar.backgroundColor = VoipTheme.toolbar_color;
 	} else {
 		_voipTitle.hidden = true;
 		[_nextButton setImage:[UIImage imageNamed:@"next_default"] forState:UIControlStateNormal];
+		_topBar.backgroundColor = UIColor.secondarySystemBackgroundColor;
 	}
 	
 }
@@ -163,10 +167,14 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (IBAction)onBackClick:(id)sender {
 	[_tableController.contactsGroup removeAllObjects];
-	if (_tableController.isForEditing)
-		[PhoneMainView.instance popToView:ChatConversationInfoView.compositeViewDescription];
-	else
-		[PhoneMainView.instance popToView:ChatsListView.compositeViewDescription];
+	if (_isForVoipConference) {
+		[PhoneMainView.instance popToView:ConferenceSchedulingView.compositeViewDescription];
+	} else {
+		if (_tableController.isForEditing)
+			[PhoneMainView.instance popToView:ChatConversationInfoView.compositeViewDescription];
+		else
+			[PhoneMainView.instance popToView:ChatsListView.compositeViewDescription];
+	}
 }
 
 - (IBAction)onNextClick:(id)sender {
diff --git a/Classes/ChatConversationInfoView.m b/Classes/ChatConversationInfoView.m
index 516f95699..3fc5da3db 100644
--- a/Classes/ChatConversationInfoView.m
+++ b/Classes/ChatConversationInfoView.m
@@ -273,6 +273,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		view.tableController.contactsGroup = [_contacts mutableCopy];
 		view.tableController.notFirstTime = TRUE;
 		view.isForEditing = FALSE;
+		view.isForVoipConference = FALSE;
 		[PhoneMainView.instance popToView:view.compositeViewDescription];
 	} else {
 		ChatConversationView *view = VIEW(ChatConversationView);
@@ -299,6 +300,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		view.isForEditing = !_create;
 		view.isGroupChat = TRUE;
 		view.tableController.contactsGroup = [_contacts mutableCopy];
+		view.isForVoipConference = FALSE;
 		[PhoneMainView.instance popToView:view.compositeViewDescription];
 	}
 }
diff --git a/Classes/ChatsListTableView.m b/Classes/ChatsListTableView.m
index e8ed14c76..6f8c3fd36 100644
--- a/Classes/ChatsListTableView.m
+++ b/Classes/ChatsListTableView.m
@@ -126,6 +126,7 @@ static int sorted_history_comparison(LinphoneChatRoom *to_insert, LinphoneChatRo
 		} else if (![self selectFirstRow]) {
 			ChatConversationCreateView *view = VIEW(ChatConversationCreateView);
 			view.tableController.notFirstTime = FALSE;
+			view.isForVoipConference = FALSE;
 			[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
 		}
 	}
diff --git a/Classes/ChatsListView.m b/Classes/ChatsListView.m
index e80421b5f..d689ec9cc 100644
--- a/Classes/ChatsListView.m
+++ b/Classes/ChatsListView.m
@@ -120,6 +120,7 @@ static UICompositeViewDescription *compositeDescription = nil;
     view.isForEditing = false;
     view.isGroupChat = isGroup;
     view.tableController.notFirstTime = FALSE;
+		view.isForVoipConference = FALSE;
     [view.tableController.contactsGroup removeAllObjects];
     [PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
 }
diff --git a/Classes/LinphoneUI/Base.lproj/UIChatCreateCell.xib b/Classes/LinphoneUI/Base.lproj/UIChatCreateCell.xib
index b40e9419a..a837d752f 100644
--- a/Classes/LinphoneUI/Base.lproj/UIChatCreateCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIChatCreateCell.xib
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" 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="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -37,7 +38,7 @@
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" fixedFrame="YES" image="check_selected.png" translatesAutoresizingMaskIntoConstraints="NO" id="qMd-eD-DOW" userLabel="selectedImage">
+                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" image="check_selected.png" translatesAutoresizingMaskIntoConstraints="NO" id="qMd-eD-DOW" userLabel="selectedImage">
                     <rect key="frame" x="347" y="21" width="21" height="22"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                 </imageView>
@@ -57,10 +58,10 @@
                 <view hidden="YES" alpha="0.65000000000000002" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="THU-mJ-O0r" userLabel="greyView">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                 </view>
             </subviews>
-            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <nil key="simulatedStatusBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <point key="canvasLocation" x="890.39999999999998" y="192.50374812593705"/>
@@ -71,5 +72,8 @@
         <image name="check_selected.png" width="75.199996948242188" height="51.200000762939453"/>
         <image name="linphone_user.png" width="41.599998474121094" height="42.400001525878906"/>
         <image name="security_toogle_icon_green.png" width="33.599998474121094" height="38.400001525878906"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/Classes/Swift/Voip/Theme/VoipTheme.swift b/Classes/Swift/Voip/Theme/VoipTheme.swift
index 22383fe0a..723e35818 100644
--- a/Classes/Swift/Voip/Theme/VoipTheme.swift
+++ b/Classes/Swift/Voip/Theme/VoipTheme.swift
@@ -48,7 +48,7 @@ import UIKit
 	static let primary_dark_color = UIColor(hex:"#e65000")
 	static let green_color = UIColor(hex:"#96c11f")
 	static let dark_green_color = UIColor(hex:"#7d9f21")
-	static let toolbar_color = UIColor(hex:"#e1e1e1")
+	@objc static let toolbar_color = UIColor(hex:"#e1e1e1")
 	static let form_field_gray_background = UIColor(hex:"#F7F7F7")
 	static let light_grey_color = UIColor(hex:"#c4c4c4")
 	static let header_background_color = UIColor(hex:"#f3f3f3")