From 73e702c188e1d59227ad5339e23ff25116f96207 Mon Sep 17 00:00:00 2001
From: Danmei Chen <danmei.chen@belledonne-communications.com>
Date: Tue, 5 Mar 2019 13:39:37 +0100
Subject: [PATCH] add 'maybe later' button for link account

---
 Classes/AssistantLinkView.h                |   6 +-
 Classes/AssistantLinkView.m                |  18 ++++
 Classes/Base.lproj/AssistantLinkView.xib   | 107 ++++++++++++---------
 Classes/fr.lproj/AssistantLinkView.strings | Bin 6746 -> 3678 bytes
 linphone.xcodeproj/project.pbxproj         |   4 +-
 5 files changed, 86 insertions(+), 49 deletions(-)

diff --git a/Classes/AssistantLinkView.h b/Classes/AssistantLinkView.h
index a97aea968..7fcdcac88 100644
--- a/Classes/AssistantLinkView.h
+++ b/Classes/AssistantLinkView.h
@@ -5,17 +5,18 @@
 //  Created by Gautier Pelloux-Prayer on 29/08/16.
 //
 //
-
 #import "PhoneMainView.h"
 #import <UIKit/UIKit.h>
+#import "TPKeyboardAvoidingScrollView.h"
 
 @interface AssistantLinkView : UIViewController <UITextFieldDelegate, UICompositeViewDelegate>
-@property(weak, nonatomic) IBOutlet UIView *linkAccountView;
+@property(weak, nonatomic) IBOutlet TPKeyboardAvoidingScrollView *linkAccountView;
 @property(weak, nonatomic) IBOutlet UIView *activateSMSView;
 
 @property(weak, nonatomic) IBOutlet UIButton *countryButton;
 @property(weak, nonatomic) IBOutlet UITextField *countryCodeField;
 @property(weak, nonatomic) IBOutlet UITextField *activationCodeField;
+@property (weak, nonatomic) IBOutlet UIRoundBorderedButton *maybeLaterButton;
 @property(weak, nonatomic) IBOutlet UIRoundBorderedButton *linkAccountButton;
 @property(weak, nonatomic) IBOutlet UIRoundBorderedButton *checkValidationButton;
 @property(weak, nonatomic) IBOutlet UIView *waitView;
@@ -28,5 +29,6 @@
 - (IBAction)onCountryClick:(id)sender;
 - (IBAction)onDialerClick:(id)sender;
 - (IBAction)onPhoneNumberDisclosureClick:(id)sender;
+- (IBAction)onMaybeLater:(id)sender;
 
 @end
diff --git a/Classes/AssistantLinkView.m b/Classes/AssistantLinkView.m
index 06a1d7082..2a169c500 100644
--- a/Classes/AssistantLinkView.m
+++ b/Classes/AssistantLinkView.m
@@ -41,6 +41,7 @@
 
 	_linkAccountView.hidden = _activateSMSView.userInteractionEnabled = NO;
 	_activateSMSView.hidden = _linkAccountView.userInteractionEnabled = YES;
+	[self fitScrollContentSize];
 
 	if (!account_creator) {
 		account_creator = linphone_account_creator_new(
@@ -103,6 +104,19 @@
 	[super viewDidDisappear:animated];
 }
 
+- (void)fitScrollContentSize {
+	// make view scrollable only if next button is too away
+	CGRect viewframe = _linkAccountView.frame;
+	if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation])) {
+		viewframe.size.height += 60;
+	}
+	[_linkAccountView  setContentSize:viewframe.size];
+}
+
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
+	[self fitScrollContentSize];
+}
+
 #pragma mark - UICompositeViewDelegate Functions
 
 static UICompositeViewDescription *compositeDescription = nil;
@@ -280,6 +294,10 @@ void assistant_activate_phone_number_link(LinphoneAccountCreator *creator, Linph
 	[self presentViewController:errView animated:YES completion:nil];
 }
 
+- (IBAction)onMaybeLater:(id)sender {
+	[PhoneMainView.instance popToView:DialerView.compositeViewDescription];
+}
+
 #pragma mark - select country delegate
 
 - (void)didSelectCountry:(NSDictionary *)country {
diff --git a/Classes/Base.lproj/AssistantLinkView.xib b/Classes/Base.lproj/AssistantLinkView.xib
index 0b7830fd1..d206e13ab 100644
--- a/Classes/Base.lproj/AssistantLinkView.xib
+++ b/Classes/Base.lproj/AssistantLinkView.xib
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AssistantLinkView">
             <connections>
-                <outlet property="activateSMSView" destination="2Nl-QG-fTA" id="kfz-Eh-D1e"/>
+                <outlet property="activateSMSView" destination="2Nl-QG-fTA" id="32Y-Z3-OYi"/>
                 <outlet property="activationCodeField" destination="PXL-cl-haZ" id="faz-N0-sjR"/>
                 <outlet property="checkValidationButton" destination="bIM-bh-Huy" id="yr2-9j-ejj"/>
                 <outlet property="countryButton" destination="rLT-uU-cJS" id="lNp-Qo-AKx"/>
                 <outlet property="countryCodeField" destination="DBr-NA-Ibx" id="cRz-xe-r5D"/>
                 <outlet property="linkAccountButton" destination="D25-6f-qRg" id="aid-PS-8mU"/>
-                <outlet property="linkAccountView" destination="ImD-Y4-3nC" id="8yc-Dr-cZ8"/>
+                <outlet property="linkAccountView" destination="ImD-Y4-3nC" id="231-q3-rGe"/>
                 <outlet property="linkSMSText" destination="Dvq-wa-3k8" id="4Ne-Ud-aA1"/>
+                <outlet property="maybeLaterButton" destination="bes-x4-C4l" id="l5a-ON-h9a"/>
                 <outlet property="phoneField" destination="cEN-WO-5qv" id="Ftl-EA-afz"/>
                 <outlet property="view" destination="FBm-gC-sIQ" id="Bhr-VA-MJs"/>
                 <outlet property="waitView" destination="J3A-Fb-Dpg" id="zbb-YB-ace"/>
@@ -27,19 +31,19 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view tag="1" contentMode="scaleToFill" id="FBm-gC-sIQ">
-                    <frame key="frameInset" minY="66"/>
+                    <rect key="frame" x="0.0" y="66" width="375" height="601"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
-                        <view tag="2" contentMode="scaleToFill" misplaced="YES" id="c7I-Cv-d4R" userLabel="topBar">
-                            <frame key="frameInset" height="66" maxX="8"/>
+                        <view tag="2" contentMode="scaleToFill" id="c7I-Cv-d4R" userLabel="topBar">
+                            <rect key="frame" x="0.0" y="0.0" width="367" height="66"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
-                                <imageView userInteractionEnabled="NO" tag="3" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="color_F.png" id="q79-qx-kgb" userLabel="backgroundColor">
-                                    <frame key="frameInset" height="66" maxX="-8"/>
+                                <imageView userInteractionEnabled="NO" tag="3" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="q79-qx-kgb" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="66"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 </imageView>
-                                <button opaque="NO" tag="4" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="VlN-Em-1V6" userLabel="dialerBackButton" customClass="UIIconButton">
-                                    <frame key="frameInset" width="76" height="66" maxX="-9"/>
+                                <button opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="VlN-Em-1V6" userLabel="dialerBackButton" customClass="UIIconButton">
+                                    <rect key="frame" x="300" y="0.0" width="76" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Add contact"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
@@ -53,7 +57,7 @@
                                     </connections>
                                 </button>
                                 <label opaque="NO" userInteractionEnabled="NO" tag="5" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ASSISTANT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zrj-TX-1RP" userLabel="titleLabel">
-                                    <frame key="frameInset" width="375" height="66"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="27"/>
                                     <color key="textColor" red="0.98766469955444336" green="0.27512490749359131" blue="0.029739789664745331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -61,12 +65,12 @@
                                 </label>
                             </subviews>
                         </view>
-                        <view hidden="YES" contentMode="scaleToFill" id="ImD-Y4-3nC" userLabel="linkAccountView">
-                            <frame key="frameInset" minY="66" height="535"/>
+                        <view hidden="YES" contentMode="scaleToFill" id="ImD-Y4-3nC" userLabel="linkAccountView" customClass="TPKeyboardAvoidingScrollView">
+                            <rect key="frame" x="0.0" y="66" width="375" height="535"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="LINK YOUR ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="0xQ-6c-cAc" userLabel="titleLabel">
-                                    <frame key="frameInset" minX="50.00%" width="299" height="59"/>
+                                    <rect key="frame" x="38" y="0.0" width="299" height="59"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Account setup assistant"/>
                                     <fontDescription key="fontDescription" type="system" weight="light" pointSize="24"/>
@@ -75,7 +79,7 @@
                                     <size key="shadowOffset" width="-1" height="-1"/>
                                 </label>
                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please confirm your country code and enter your phone number" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumFontSize="11" id="RQz-tT-5vp" userLabel="subtitleLabel">
-                                    <frame key="frameInset" minX="10.13%" minY="13.04%" width="79.73%" height="29"/>
+                                    <rect key="frame" x="38" y="66" width="299" height="29"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Account setup assistant"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
@@ -83,15 +87,15 @@
                                     <nil key="highlightedColor"/>
                                     <size key="shadowOffset" width="-1" height="-1"/>
                                 </label>
-                                <label opaque="NO" userInteractionEnabled="NO" tag="122" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="PHONE NUMBER" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="v2Q-jf-BdL" userLabel="phoneLabel">
-                                    <frame key="frameInset" minX="10.13%" minY="25.14%" width="79.73%" height="14"/>
+                                <label opaque="NO" userInteractionEnabled="NO" tag="122" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="PHONE NUMBER" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="v2Q-jf-BdL" userLabel="phoneLabel">
+                                    <rect key="frame" x="38" y="131" width="299" height="14"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                     <color key="textColor" red="0.4266758859" green="0.42666310070000002" blue="0.42667034269999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" tag="150" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="rLT-uU-cJS" userLabel="countryButton" customClass="UIRoundBorderedButton">
-                                    <frame key="frameInset" minX="10.13%" minY="30.30%" width="79.73%" height="30"/>
+                                    <rect key="frame" x="38" y="153" width="299" height="30"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     <state key="normal" title="Select your country">
                                         <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -101,12 +105,12 @@
                                         <action selector="onCountryClick:" destination="-1" eventType="touchUpInside" id="AUl-nx-xOA"/>
                                     </connections>
                                 </button>
-                                <view contentMode="scaleToFill" misplaced="YES" id="88g-7g-gGM" userLabel="phoneNumberView">
-                                    <frame key="frameInset" minX="10.13%" minY="189" width="79.73%" height="43"/>
+                                <view contentMode="scaleToFill" id="88g-7g-gGM" userLabel="phoneNumberView">
+                                    <rect key="frame" x="38" y="189" width="299" height="43"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <subviews>
-                                        <textField opaque="NO" clipsSubviews="YES" tag="109" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="+1" textAlignment="center" minimumFontSize="5" id="DBr-NA-Ibx" userLabel="countryCodeField">
-                                            <frame key="frameInset" minX="1" minY="53.85%" width="18.12%" height="30"/>
+                                        <textField opaque="NO" clipsSubviews="YES" tag="109" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="+1" textAlignment="center" minimumFontSize="5" id="DBr-NA-Ibx" userLabel="countryCodeField">
+                                            <rect key="frame" x="1" y="7" width="54" height="30"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                             <color key="backgroundColor" red="0.85415387149999999" green="0.85412830110000004" blue="0.85414278509999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -117,7 +121,7 @@
                                             </connections>
                                         </textField>
                                         <textField opaque="NO" clipsSubviews="YES" tag="107" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" adjustsFontSizeToFit="NO" minimumFontSize="10" id="cEN-WO-5qv" userLabel="phoneField">
-                                            <frame key="frameInset" minY="53.85%" width="80.67%" height="30" maxX="-1"/>
+                                            <rect key="frame" x="58" y="7" width="242" height="30"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                             <color key="backgroundColor" red="0.85415387149999999" green="0.85412830110000004" blue="0.85414278509999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <accessibility key="accessibilityConfiguration" label="Username"/>
@@ -129,15 +133,15 @@
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     <inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="299" maxY="0.0"/>
                                 </view>
-                                <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="infoDark" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="9cd-3u-fU5" userLabel="infoButton">
-                                    <frame key="frameInset" minX="84.99%" minY="24.76%" width="22" height="22"/>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="infoDark" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="9cd-3u-fU5" userLabel="infoButton">
+                                    <rect key="frame" x="300" y="127" width="22" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     <connections>
                                         <action selector="onPhoneNumberDisclosureClick:" destination="-1" eventType="touchUpInside" id="FEb-Xm-Pyx"/>
                                     </connections>
                                 </button>
-                                <button opaque="NO" tag="130" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="D25-6f-qRg" userLabel="linkAccountButton" customClass="UIRoundBorderedButton">
-                                    <frame key="frameInset" minX="10.13%" minY="50.91%" width="79.73%" height="40"/>
+                                <button opaque="NO" tag="130" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="D25-6f-qRg" userLabel="linkAccountButton" customClass="UIRoundBorderedButton">
+                                    <rect key="frame" x="38" y="252" width="299" height="40"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Create account">
                                         <bool key="isElement" value="YES"/>
@@ -154,15 +158,33 @@
                                         <action selector="onLinkAccount:" destination="-1" eventType="touchUpInside" id="wd4-6V-tMa"/>
                                     </connections>
                                 </button>
+                                <button opaque="NO" tag="130" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="bes-x4-C4l" userLabel="maybeLaterButton" customClass="UIRoundBorderedButton">
+                                    <rect key="frame" x="38" y="312" width="299" height="40"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                    <accessibility key="accessibilityConfiguration" label="Finish configuration">
+                                        <bool key="isElement" value="YES"/>
+                                    </accessibility>
+                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                    <state key="normal" title="MAYBE LATER">
+                                        <color key="titleColor" red="0.20521381499999999" green="0.20520767570000001" blue="0.2052111626" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <state key="disabled">
+                                        <color key="titleColor" red="0.71885228160000003" green="0.71883076430000004" blue="0.71884298319999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    </state>
+                                    <state key="highlighted" backgroundImage="color_F.png"/>
+                                    <connections>
+                                        <action selector="onMaybeLater:" destination="-1" eventType="touchUpInside" id="IcP-2Y-18k"/>
+                                    </connections>
+                                </button>
                             </subviews>
                             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                         <view contentMode="scaleToFill" id="2Nl-QG-fTA" userLabel="activateSMSView">
-                            <frame key="frameInset" minY="66" height="535"/>
+                            <rect key="frame" x="0.0" y="66" width="375" height="535"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="LINK YOUR ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="5aj-17-dC2" userLabel="titleLabel">
-                                    <frame key="frameInset" minX="52.78%" width="303" height="59"/>
+                                    <rect key="frame" x="38" y="0.0" width="303" height="59"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Account setup assistant"/>
                                     <fontDescription key="fontDescription" type="system" weight="light" pointSize="24"/>
@@ -171,7 +193,7 @@
                                     <size key="shadowOffset" width="-1" height="-1"/>
                                 </label>
                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="2/2" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumFontSize="10" id="bU8-Tu-9O4" userLabel="subtitleLabel">
-                                    <frame key="frameInset" minX="10.13%" minY="13.04%" width="80.80%" height="29"/>
+                                    <rect key="frame" x="38" y="66" width="303" height="29"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Account setup assistant"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -179,15 +201,15 @@
                                     <nil key="highlightedColor"/>
                                     <size key="shadowOffset" width="-1" height="-1"/>
                                 </label>
-                                <textField opaque="NO" clipsSubviews="YES" tag="108" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Activation code" textAlignment="center" minimumFontSize="17" clearButtonMode="always" id="PXL-cl-haZ" userLabel="activationCodeField">
-                                    <frame key="frameInset" minX="10.13%" minY="42.38%" width="80.80%" height="30"/>
+                                <textField opaque="NO" clipsSubviews="YES" tag="108" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Activation code" textAlignment="center" minimumFontSize="17" clearButtonMode="always" id="PXL-cl-haZ" userLabel="activationCodeField">
+                                    <rect key="frame" x="38" y="214" width="303" height="30"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     <color key="backgroundColor" red="0.85415387153625488" green="0.85412830114364624" blue="0.85414278507232666" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="26"/>
                                     <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="numberPad" returnKeyType="done"/>
                                 </textField>
-                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" misplaced="YES" text="We have sent you a SMS with a validation code. To complete your phone number verification, please enter the 4 digit code below:" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="8" baselineAdjustment="alignBaselines" minimumFontSize="10" id="Dvq-wa-3k8" userLabel="activateDescLabel">
-                                    <frame key="frameInset" minX="10.13%" minY="23.46%" width="80.80%" height="96"/>
+                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="We have sent you a SMS with a validation code. To complete your phone number verification, please enter the 4 digit code below:" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="8" baselineAdjustment="alignBaselines" minimumFontSize="10" id="Dvq-wa-3k8" userLabel="activateDescLabel">
+                                    <rect key="frame" x="38" y="103" width="303" height="96"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Account setup assistant"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -195,8 +217,8 @@
                                     <nil key="highlightedColor"/>
                                     <size key="shadowOffset" width="-1" height="-1"/>
                                 </label>
-                                <button opaque="NO" tag="130" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="bIM-bh-Huy" userLabel="checkValidationButton" customClass="UIRoundBorderedButton">
-                                    <frame key="frameInset" minX="10.13%" minY="50.91%" width="79.73%" height="40"/>
+                                <button opaque="NO" tag="130" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="bIM-bh-Huy" userLabel="checkValidationButton" customClass="UIRoundBorderedButton">
+                                    <rect key="frame" x="38" y="252" width="299" height="40"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Finish configuration">
                                         <bool key="isElement" value="YES"/>
@@ -217,11 +239,11 @@
                             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                         <view hidden="YES" tag="8" contentMode="scaleToFill" id="J3A-Fb-Dpg" userLabel="waitView">
-                            <frame key="frameInset" minY="-33" maxY="-33"/>
+                            <rect key="frame" x="0.0" y="-33" width="375" height="667"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <activityIndicatorView opaque="NO" tag="9" contentMode="scaleToFill" animating="YES" style="gray" id="mQl-pi-5rq" userLabel="activityIndicatorView">
-                                    <frame key="frameInset" minX="50.42%" minY="49.77%" width="20" height="20"/>
+                                    <rect key="frame" x="179" y="322" width="20" height="20"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 </activityIndicatorView>
                             </subviews>
@@ -233,7 +255,7 @@
                 </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-            <point key="canvasLocation" x="235.5" y="318.5"/>
+            <point key="canvasLocation" x="376.80000000000001" y="286.50674662668666"/>
         </view>
     </objects>
     <resources>
@@ -242,9 +264,4 @@
         <image name="dialer_back_default.png" width="27" height="27"/>
         <image name="dialer_back_disabled.png" width="27" height="27"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/Classes/fr.lproj/AssistantLinkView.strings b/Classes/fr.lproj/AssistantLinkView.strings
index 2ecf6c760cf63f52899bf7cb6d05dc9dc80bec0d..dd872acd57e9702bb4c1c562040419a01dc1db89 100644
GIT binary patch
literal 3678
zcmc(i&2rl|5XbL&3XCtANdme4Y}!l@6va%GQXiHmC+YM8k&p?MB4iMxEx&>D6uIg-
z_+ni^6v>dH<8+ki!5Yt!*!}I|k6o~J{1TY~i6Zm|I-2%uGNZxKTSQ!!MiHB_fXTHs
zs^^C5@;H<zqB33~Si~YpLJ98=XAA1eURS;K%l#F;bg^r=@ZjZft7K@`{T^w@J6Fh~
z$mQXj-Nb@O#>1^)xsvqgZL75(R?>T^yx6_LpXl>&I!1<R4yOa>2f&mMjbit#F}fZ)
zV+)zX{>ZVK<JOaTevvN70-yYfJ@YgxQepUii&Svb!G5Gjomfg9f{*=GG6f})s)tHZ
zm5u72Uf|0)z8&9W427YoIHpK9RG>Hn`RrFq4is{+B!R<ZKy%gX7fcbh&QbDG=*Dgq
zjROLE$7tYzt5rZ;>hr(@V$kiYlWP7Qfd>Ze&F*(`b3?ndR>ysHcJ^}=+D&fp9l>Y+
zyxBqIhNew04swh?Qsk3_LYIM7v*s}(XwsjcJ0^YjHz5J@wynYC9&ICs>n#r`$O+yS
zXyx;eqA*_0pu7ncY|dQ0;58JUl87R343DHw(K+(i4U^yj8V|HSe)oHIFY>JGWysIN
zfX5L^)DKB`7(sx9uhWf^qe6#l+^sYriuZ!Jk|mm`{dYK0$T}%S%caoh=|=F^03Wj;
zpbrXIz+(`s22H;Lxa+g|T+j%)413V5Rdj%_HpwS+XXG5(Z6)#1CmXu~_Q_va;)S6m
zLQ|EmoLHUX5R+wm^?;>=FOpS;R2Y7)Bu87_=*c9OTbb#`CDz*=A)%M4swTloSqtQP
z4!NF8H3G#Fc0PE)LQm^=j%2zC(v6ZgyN#jVG}Ft9tU+=xmI;H29Kot@bfjJ^mhPFO
zd1u_;stwPBBtr?Zt>khY46wDtC)bx*E`_0SKNdVzhfg=^%x6`y-{E=3LKgW7skkOo
zz-GNZp85EFyw1Q1Llc-o#gc{UkddnEM!wPv_|7CL;@5#nUY<2c4snuZ(>K_O@o&TP
z9Zzm(D$rq?`{}W|@RYBMPod-oLN9CFhyA*Jj!tNV@6WM$uI{|*syfRJO=UQMPWr~@
zj)iQ)vBuR}<l*Z)Rhf*ese{um>Y_TbrxWBD<8Hm}mfQdSGEE~YLb8Ou@XfZk)&PGT
z;)~lPLn#bRr5W%g41rj}M?(acyI9n5@}upu8$W<QNxl3gX8N4Nbk-d->#h|jVLLdU
zV)w%&gDMQ|sz-g6CeSkB!$f~b#7H&DCzwhVR>yfl)zbfpQ*!oflHJKxvR4G7_rrmO
z2Gf40rj+FL3NPlk<Jnmy3PU?THLx;$91l^~LQeW<r;plUy#m#^#$?i)I7aOQ>Om~9
S^9i4fM_JIqPy{V4Zv6`qsDPya

literal 6746
zcmd^^&vF_^5XSqgr=WC6l^sap*s+sT4hSg~IT9iQ%SkF136P9}kc<Hdy<y(MSHDD(
z-#5c*fE`#ZmMU_kwszT_?VahrUw04x{Jmyh*dr@g#kzKA?>Gwf1LwNEvTfU8?8w@@
zTet5SJ+vlA+tGD+)8S3W1~#6eOujEW+H)IP4~hccwD}#{g_}n!bvOsisrP>VJ?1=x
zuF1%@Z9?gJ`O>cJ7c1H~yeV>OZvVw2_+R5bMp3#Izw0-vlqYfpt_s$In*yty!{sp?
zpCCb>c?aBUY?|T>*#^*yvo(%9n$>q#e4R+VgZx$dndjeZ4_oYWSH?;e_f)mUJ!vfA
zBWOjOY`OIhSi8a97QBd$U90iDwUWI5l_x#JcBlBzSN5E13pt)lG?{o(jN<?7NiluQ
z#$Jq~<RU>Heb=6}K?Dvs6n&nLJib&RdfP6371#dD1f%?Hi!f*tPkH7r=$PwU;^1V?
zb7B;EJxBa~fWtoA2{}FX<Uy9SetPJtZ)Zr`C0>QsT~<gVO&)xS$vW#5F^Uor#dwMN
z$j(YQ)0p7skI1RK)tcDof_quJZExT}<6g%;zdQyHvaG*>4vS!Nnd>%r>MCXZG)0Mw
z5L-9M``Etb(As%3Mjo#(Be`<eUF70T8{z#$yF{Nwc>mL0q%@JH$QuU_DHp%SR|@#e
zA(HD(m5i@x#!jcgk%HC9hjo50U4*^iPNO5Ps*zg!hMGaPkO!8aXmB5*T#>09T%e|s
zy@Uf7&S!gWw8z+)tI706{PdY!l}U4Ih0onrnoBjEX7e0-pC2%v#-4Jv`0|8Pl}Ex=
z!Oh=g{Y(2UGcMA$p2vYSMJzj1oxG|)M>luUxNu&hl0Z*m@G-&0MCaZz&71KcNy|P%
z2dXDKd>w31vOk!w=2r5WOzh-!q?HEfR(kR}|G?9^Nwd=WkomeCZM$Z~Ygg2o%cE=H
z;XPy0brZeIR>y8$$<*XoRfw;sWp9moooC^}YDgy}nAb(H{BjJe*{{_3s=vEj6%W79
zMShGT8v`ro)z{gJto143<363rHToG4*+nXb5%D`45iyES86RuT;}fKj-}_!kHODlL
z>5b1oeWEycoshDJ2PARiqbM8ymV0YV%eS#Zx&xAb28n#ccfpm8<2oSkF%k?wr!HrL
z*&TA_koZpe#A#f)K<@Db+l0UGcverWQ>ZOunWmq{p=7@K^={XFrfbA})kMo#%UfC<
zyf9_CH4e~9m3Y{~C)9l%(96$SBSw)wDo&k`$%aDWP(dqS2R^f~_2cxT+Oy}Zs45`D
z!~EXCa*Z8PW$vP@BapUeKOxI_PGd2Oyc$y$QJjk7BzviDS<ZES{l)A4kLy8V^3VEI
zjN<-#kcYBscErBX3w)=6?-cD@c5I%eJSa_(*MlBXrT&CHw`4zOQ6ImmR?>MPtd<oI
ziZbnm%y*@EQ1_L~34P-9ka+btU%;mE9n&UAE4+OTg{qLZWRls~h*9LVy=r#lc-3v%
zmGS$*%45=&x)-gPrJXd|s!l!u_tZJ*SF^PudlwbnopbmeCsYhVuTW_$$JstLttz!4
z(W2V+C0*RCreYK&R$k6y=<(~WCh)u3Vb^$w-jWJnH7za2)H*s-C!*ZExC*-;-NZS&
zYmLm~Y!abKR;iIS_lSZm<ga4gUEAP(e`4K5kuw58^k2g%eOi$(TKLDTKg1~F9j(^<
zixv0aVAJu@;CY8L@OB&9XGvPdXY14pbv(I@tXcmKToakv1#i&NsT$jdpII4W6fqg&
HE3etV)@~r)

diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 32062e220..2f57c21f9 100644
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -1114,6 +1114,7 @@
 		61AEBEC72191E48400F35E7F /* chevron_list_close@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "chevron_list_close@2x.png"; sourceTree = "<group>"; };
 		61AEBEC92191E49200F35E7F /* chevron_list_open.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = chevron_list_open.png; sourceTree = "<group>"; };
 		61AEBECB2191E4A300F35E7F /* chevron_list_open@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "chevron_list_open@2x.png"; sourceTree = "<group>"; };
+		61BD122D222EA29300563181 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AssistantLinkView.strings; sourceTree = "<group>"; };
 		61CCC3D721933B380060EDEA /* UIDeviceCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIDeviceCell.h; sourceTree = "<group>"; };
 		61CCC3DE21933B580060EDEA /* UIDeviceCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UIDeviceCell.m; sourceTree = "<group>"; };
 		61CCC3E021933B660060EDEA /* UIDeviceCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UIDeviceCell.xib; sourceTree = "<group>"; };
@@ -1770,7 +1771,6 @@
 		8CBD7BAA20B6B82A00E5DCC0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIChatConversationImdnTableViewCell.xib; sourceTree = "<group>"; };
 		8CBD7BAD20B6B82F00E5DCC0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIChatCreateCollectionViewCell.xib; sourceTree = "<group>"; };
 		8CBD7BAF20B6B86800E5DCC0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AboutView.strings; sourceTree = "<group>"; };
-		8CBD7BB020B6B86800E5DCC0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AssistantLinkView.strings; sourceTree = "<group>"; };
 		8CBD7BB120B6B86900E5DCC0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AssistantView.strings; sourceTree = "<group>"; };
 		8CBD7BB220B6B86A00E5DCC0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AssistantViewScreens.strings; sourceTree = "<group>"; };
 		8CBD7BB320B6B86B00E5DCC0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/CallIncomingView.strings; sourceTree = "<group>"; };
@@ -5353,7 +5353,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				63EC8D3A1D7438660066547B /* Base */,
-				8CBD7BB020B6B86800E5DCC0 /* fr */,
+				61BD122D222EA29300563181 /* fr */,
 			);
 			name = AssistantLinkView.xib;
 			sourceTree = "<group>";