diff --git a/Classes/Base.lproj/ContactDetailsView.xib b/Classes/Base.lproj/ContactDetailsView.xib
index 2d8acdb4b..5e146ae4e 100644
--- a/Classes/Base.lproj/ContactDetailsView.xib
+++ b/Classes/Base.lproj/ContactDetailsView.xib
@@ -118,33 +118,12 @@
-
diff --git a/Classes/LinphoneUI/Base.lproj/UICallConferenceCell.xib b/Classes/LinphoneUI/Base.lproj/UICallConferenceCell.xib
index 12e94423a..1173ed64d 100644
--- a/Classes/LinphoneUI/Base.lproj/UICallConferenceCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UICallConferenceCell.xib
@@ -1,5 +1,5 @@
-
+
@@ -20,6 +20,7 @@
+
@@ -28,6 +29,7 @@
-
+
+
-
-
-
-
-
-
-
-
-
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/Classes/LinphoneUI/Base.lproj/UIChatCell.xib b/Classes/LinphoneUI/Base.lproj/UIChatCell.xib
index ce13e8829..3dca78195 100644
--- a/Classes/LinphoneUI/Base.lproj/UIChatCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIChatCell.xib
@@ -1,5 +1,5 @@
-
+
@@ -22,10 +22,12 @@
+
+
@@ -34,14 +36,16 @@
+
-
+
+
@@ -50,11 +54,13 @@
+
diff --git a/Classes/LinphoneUI/Base.lproj/UIContactCell.xib b/Classes/LinphoneUI/Base.lproj/UIContactCell.xib
index 34b5123a8..22a593e5e 100644
--- a/Classes/LinphoneUI/Base.lproj/UIContactCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIContactCell.xib
@@ -2,10 +2,10 @@
1536
- 14F1021
+ 15B42
7706
- 1348.17
- 758.70
+ 1404.13
+ 806.00
IBCocoaTouchFramework
- YES
-
+ John Doe
1
10
+
+ 1
+ 0
+ 25
+
YES
diff --git a/Classes/LinphoneUI/Base.lproj/UIHistoryCell.xib b/Classes/LinphoneUI/Base.lproj/UIHistoryCell.xib
index c061394a1..2892144ff 100644
--- a/Classes/LinphoneUI/Base.lproj/UIHistoryCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIHistoryCell.xib
@@ -1,5 +1,5 @@
-
+
@@ -21,37 +21,26 @@
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/Classes/LinphoneUI/UIAssistantTextField.m b/Classes/LinphoneUI/UIAssistantTextField.m
index 1bbe83309..d548b9ba3 100644
--- a/Classes/LinphoneUI/UIAssistantTextField.m
+++ b/Classes/LinphoneUI/UIAssistantTextField.m
@@ -28,7 +28,7 @@
if (!_errorLabel) {
_errorLabel = [[UILabel alloc] initWithFrame:self.frame];
- _errorLabel.font = [UIFont fontWithName:@"Helvetica" size:11.];
+ _errorLabel.font = [UIFont systemFontOfSize:11];
_errorLabel.textColor = [UIColor redColor];
}
_errorLabel.text = msg;
diff --git a/Classes/LinphoneUI/UICallPausedCell.xib b/Classes/LinphoneUI/UICallPausedCell.xib
index 5922cf011..de8636bf7 100644
--- a/Classes/LinphoneUI/UICallPausedCell.xib
+++ b/Classes/LinphoneUI/UICallPausedCell.xib
@@ -1,5 +1,5 @@
-
+
@@ -21,40 +21,30 @@
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/Classes/LinphoneUI/UIChatBubblePhotoCell.xib b/Classes/LinphoneUI/UIChatBubblePhotoCell.xib
index 5e8fb0646..6882fb8da 100644
--- a/Classes/LinphoneUI/UIChatBubblePhotoCell.xib
+++ b/Classes/LinphoneUI/UIChatBubblePhotoCell.xib
@@ -43,27 +43,13 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -108,7 +94,7 @@
-
+
diff --git a/Classes/LinphoneUI/UIChatBubbleTextCell.xib b/Classes/LinphoneUI/UIChatBubbleTextCell.xib
index 8e5cf61f1..5f0ec4b18 100644
--- a/Classes/LinphoneUI/UIChatBubbleTextCell.xib
+++ b/Classes/LinphoneUI/UIChatBubbleTextCell.xib
@@ -1,5 +1,5 @@
-
+
@@ -33,40 +33,30 @@
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
https://beta.itunes.apple.com/v1/invite/deb3eac7cecf43c7a33cfd2300e480f0a1a5f645a88240e8b0fe9951b7f1eae215762a66?ct=Z2V957B3D6&pt=2003
@@ -75,17 +65,21 @@
+
+
+
+
diff --git a/Classes/Utils/GrowingTextView/HPGrowingTextView.m b/Classes/Utils/GrowingTextView/HPGrowingTextView.m
index ba747064c..018a029d5 100755
--- a/Classes/Utils/GrowingTextView/HPGrowingTextView.m
+++ b/Classes/Utils/GrowingTextView/HPGrowingTextView.m
@@ -76,24 +76,24 @@
internalTextView = [[HPTextViewInternal alloc] initWithFrame:r];
internalTextView.delegate = self;
internalTextView.scrollEnabled = NO;
- internalTextView.font = [UIFont fontWithName:@"Helvetica" size:13];
- internalTextView.contentInset = UIEdgeInsetsZero;
- internalTextView.showsHorizontalScrollIndicator = NO;
- internalTextView.text = @"-";
- [self addSubview:internalTextView];
-
- minHeight = internalTextView.frame.size.height;
- minNumberOfLines = 1;
-
- animateHeightChange = YES;
- animationDuration = 0.1f;
-
- internalTextView.text = @"";
-
- [self setMaxNumberOfLines:3];
+ internalTextView.font = [UIFont systemFontOfSize:13];
+ internalTextView.contentInset = UIEdgeInsetsZero;
+ internalTextView.showsHorizontalScrollIndicator = NO;
+ internalTextView.text = @"-";
+ [self addSubview:internalTextView];
- [self setPlaceholderColor:[UIColor lightGrayColor]];
- internalTextView.displayPlaceHolder = YES;
+ minHeight = internalTextView.frame.size.height;
+ minNumberOfLines = 1;
+
+ animateHeightChange = YES;
+ animationDuration = 0.1f;
+
+ internalTextView.text = @"";
+
+ [self setMaxNumberOfLines:3];
+
+ [self setPlaceholderColor:[UIColor lightGrayColor]];
+ internalTextView.displayPlaceHolder = YES;
}
-(CGSize)sizeThatFits:(CGSize)size
diff --git a/Tools/change_ios_custom_font.sh b/Tools/change_ios_custom_font.sh
index 20c024f95..bf25b1dd1 100755
--- a/Tools/change_ios_custom_font.sh
+++ b/Tools/change_ios_custom_font.sh
@@ -88,10 +88,10 @@ for font in "${fonts[@]}"; do
new_font=${font#*:}
echo "$system_font -> $new_font"
- find . -name '*.xib' -exec \
- sed -E -i.font_backup \
- -e "s|\"|g" \
- -e "s||g" {} \;
+ find . -name '*.xib' -exec \
+ sed -E -i.font_backup \
+ -e "s|\"|g" \
+ -e "s||g" {} \;
done
echo "**********************
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 611b6c3b1..9b72b22e8 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 611b6c3b1d237dc9fa4113c39c2f5f070235b783
+Subproject commit 9b72b22e81db1aeb2782413648dbcde5d41d8067
diff --git a/submodules/linphone b/submodules/linphone
index 3331ad4a1..bf20c29de 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 3331ad4a1047818f7d2e1a108b736725de06702e
+Subproject commit bf20c29de6e6e1b7716e984e241a3fdcaf8b2bec