diff --git a/Classes/Base.lproj/AboutViewController.xib b/Classes/Base.lproj/AboutViewController.xib index 63262041c..af8f02388 100644 --- a/Classes/Base.lproj/AboutViewController.xib +++ b/Classes/Base.lproj/AboutViewController.xib @@ -18,78 +18,81 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + diff --git a/Classes/Base.lproj/ChatRoomViewController.xib b/Classes/Base.lproj/ChatRoomViewController.xib index eeb4b8342..884acb066 100644 --- a/Classes/Base.lproj/ChatRoomViewController.xib +++ b/Classes/Base.lproj/ChatRoomViewController.xib @@ -1,6 +1,7 @@ + @@ -22,158 +23,164 @@ - - + + - - - + + + - - - - - - - - - - - + + - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + - - - - - + + + @@ -181,17 +188,17 @@ - + - - + + - + diff --git a/Classes/Base.lproj/ChatViewController.xib b/Classes/Base.lproj/ChatViewController.xib index afda726f9..a5b5d31d5 100644 --- a/Classes/Base.lproj/ChatViewController.xib +++ b/Classes/Base.lproj/ChatViewController.xib @@ -12,94 +12,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -107,14 +19,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + diff --git a/Classes/Base.lproj/ContactDetailsLabelViewController.xib b/Classes/Base.lproj/ContactDetailsLabelViewController.xib index 3a0268547..2def5d896 100644 --- a/Classes/Base.lproj/ContactDetailsLabelViewController.xib +++ b/Classes/Base.lproj/ContactDetailsLabelViewController.xib @@ -12,58 +12,64 @@ - - - + + + - - + + - - - - - - - - + + + + - + + + + + + + + + - + + - + - + - - - - - - - - - - - - - - + + diff --git a/Classes/Base.lproj/ContactDetailsViewController.xib b/Classes/Base.lproj/ContactDetailsViewController.xib index dfd1f70b1..cccd71b51 100644 --- a/Classes/Base.lproj/ContactDetailsViewController.xib +++ b/Classes/Base.lproj/ContactDetailsViewController.xib @@ -14,75 +14,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -90,11 +21,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/Classes/Base.lproj/ContactsViewController.xib b/Classes/Base.lproj/ContactsViewController.xib index 3750e6602..bb316f9d9 100644 --- a/Classes/Base.lproj/ContactsViewController.xib +++ b/Classes/Base.lproj/ContactsViewController.xib @@ -19,147 +19,152 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - + + + + + + + diff --git a/Classes/Base.lproj/DialerViewController.xib b/Classes/Base.lproj/DialerViewController.xib index aa716c003..b66e76398 100644 --- a/Classes/Base.lproj/DialerViewController.xib +++ b/Classes/Base.lproj/DialerViewController.xib @@ -30,295 +30,300 @@ - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/Classes/Base.lproj/FirstLoginViewController.xib b/Classes/Base.lproj/FirstLoginViewController.xib index 9c6f64cff..ce9eeae41 100644 --- a/Classes/Base.lproj/FirstLoginViewController.xib +++ b/Classes/Base.lproj/FirstLoginViewController.xib @@ -16,81 +16,86 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + diff --git a/Classes/Base.lproj/HistoryDetailsViewController.xib b/Classes/Base.lproj/HistoryDetailsViewController.xib index d367ba3e9..b4477fa60 100644 --- a/Classes/Base.lproj/HistoryDetailsViewController.xib +++ b/Classes/Base.lproj/HistoryDetailsViewController.xib @@ -17,139 +17,144 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + diff --git a/Classes/Base.lproj/HistoryViewController.xib b/Classes/Base.lproj/HistoryViewController.xib index 0801e37cd..0fa491c05 100644 --- a/Classes/Base.lproj/HistoryViewController.xib +++ b/Classes/Base.lproj/HistoryViewController.xib @@ -17,94 +17,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -112,16 +24,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + diff --git a/Classes/Base.lproj/ImageViewController.xib b/Classes/Base.lproj/ImageViewController.xib index 41e05ef89..30da26666 100644 --- a/Classes/Base.lproj/ImageViewController.xib +++ b/Classes/Base.lproj/ImageViewController.xib @@ -13,46 +13,53 @@ - - - + + + - - - + + + - - + + - - + + + + + + + + + + + + + + - - - - - - - + + diff --git a/Classes/Base.lproj/InCallViewController.xib b/Classes/Base.lproj/InCallViewController.xib index a1b75e7bc..2a6cb41f7 100644 --- a/Classes/Base.lproj/InCallViewController.xib +++ b/Classes/Base.lproj/InCallViewController.xib @@ -18,75 +18,81 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Classes/Base.lproj/IncomingCallViewController.xib b/Classes/Base.lproj/IncomingCallViewController.xib index 9424ba02f..c284cc685 100644 --- a/Classes/Base.lproj/IncomingCallViewController.xib +++ b/Classes/Base.lproj/IncomingCallViewController.xib @@ -1,6 +1,7 @@ + @@ -13,98 +14,104 @@ - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/Classes/Base.lproj/OutgoingCallViewController.xib b/Classes/Base.lproj/OutgoingCallViewController.xib index e54a932ac..8a55beec8 100644 --- a/Classes/Base.lproj/OutgoingCallViewController.xib +++ b/Classes/Base.lproj/OutgoingCallViewController.xib @@ -1,6 +1,7 @@ + @@ -13,98 +14,104 @@ - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/Classes/Base.lproj/PhoneMainView.xib b/Classes/Base.lproj/PhoneMainView.xib index 523ad4c3e..fe8a1a2ea 100644 --- a/Classes/Base.lproj/PhoneMainView.xib +++ b/Classes/Base.lproj/PhoneMainView.xib @@ -13,29 +13,35 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Classes/Base.lproj/SettingsViewController.xib b/Classes/Base.lproj/SettingsViewController.xib index 0a79f6755..191293830 100644 --- a/Classes/Base.lproj/SettingsViewController.xib +++ b/Classes/Base.lproj/SettingsViewController.xib @@ -34,21 +34,6 @@ IBFirstResponder IBCocoaTouchFramework - - - 274 - {360, 537} - _NS:9 - - 3 - MCAwAA - - - IBUISimulatedFreeformSizeMetricsSentinel - Freeform - - IBCocoaTouchFramework - NO @@ -105,17 +90,52 @@ + + + 292 + + + + 274 + {{0, 42}, {375, 559}} + + _NS:9 + + 3 + MCAwAA + + IBCocoaTouchFramework + + + {{0, 20}, {375, 647}} + + + 3 + MQA + + + + IBUIScreenMetrics + IBCocoaTouchFramework + iPhone 4.7-inch + + YES + + + + + + {375, 667} + {667, 375} + + + 2 + + IBCocoaTouchFramework + - - - view - - - - 9 - navigationController @@ -132,6 +152,14 @@ 8 + + + view + + + + 9 + @@ -152,12 +180,6 @@ - - 4 - - - - 10 @@ -189,6 +211,20 @@ settingsItem + + 20 + + + + + + iphone6MetricsView + + + 4 + + + @@ -201,6 +237,7 @@ UINavigationBarEx com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin IASKAppSettingsViewControllerEx com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -209,7 +246,7 @@ - 19 + 20 0 diff --git a/Classes/LaunchScreen.xib b/Classes/LaunchScreen.xib index d59d540f7..e9b12ed5f 100644 --- a/Classes/LaunchScreen.xib +++ b/Classes/LaunchScreen.xib @@ -7,91 +7,95 @@ - - - + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/Classes/LinphoneUI/Base.lproj/UICallBar.xib b/Classes/LinphoneUI/Base.lproj/UICallBar.xib index 959fcd0dc..66a8681e8 100644 --- a/Classes/LinphoneUI/Base.lproj/UICallBar.xib +++ b/Classes/LinphoneUI/Base.lproj/UICallBar.xib @@ -776,7 +776,7 @@ - + diff --git a/Classes/LinphoneUI/Base.lproj/UICompositeViewController.xib b/Classes/LinphoneUI/Base.lproj/UICompositeViewController.xib index 7208757d7..d5a905cc6 100644 --- a/Classes/LinphoneUI/Base.lproj/UICompositeViewController.xib +++ b/Classes/LinphoneUI/Base.lproj/UICompositeViewController.xib @@ -38,7 +38,7 @@ 314 - {{0, 40}, {360, 537}} + {{0, 42}, {375, 559}} @@ -55,7 +55,7 @@ 290 - {360, 40} + {375, 42} @@ -69,9 +69,10 @@ 266 - {{0, 577}, {360, 63}} + {{0, 604}, {375, 66}} + _NS:9 NO @@ -82,7 +83,7 @@ -2147483329 - {{-360, 40}, {360, 640}} + {{-375, 42}, {375, 625}} @@ -90,14 +91,27 @@ IBCocoaTouchFramework - {360, 640} + {375, 667} - - IBUISimulatedFreeformSizeMetricsSentinel - Freeform + + IBUIScreenMetrics + IBCocoaTouchFramework + iPhone 4.7-inch + + YES + + + + + + {375, 667} + {667, 375} + + + 2 IBCocoaTouchFramework @@ -108,7 +122,7 @@ 314 - {{0, 26}, {640, 284}} + {{0, 27}, {667, 296}} @@ -121,7 +135,7 @@ 290 - {640, 26} + {667, 26} @@ -134,9 +148,10 @@ 266 - {{0, 310}, {640, 50}} + {{0, 325}, {667, 50}} + _NS:9 NO @@ -144,7 +159,7 @@ IBCocoaTouchFramework - {640, 360} + {667, 375} @@ -153,10 +168,10 @@ 3 3 - + IBCocoaTouchFramework - + @@ -220,7 +235,7 @@ gestureRecognizers - + YES 41 @@ -228,7 +243,7 @@ delegate - + 42 @@ -236,7 +251,7 @@ onRightSwipe: - + 43 @@ -332,7 +347,7 @@ 40 - + @@ -343,7 +358,7 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {-78, 343} + {-110.5, 22.5} com.apple.InterfaceBuilder.IBCocoaTouchPlugin UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -351,7 +366,7 @@ UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {1095, -76} + {452.5, -106.5} com.apple.InterfaceBuilder.IBCocoaTouchPlugin UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -369,7 +384,7 @@ - 43 + 44 diff --git a/Classes/SideMenuViewController.xib b/Classes/SideMenuViewController.xib index 9340abfaf..d07859fd6 100644 --- a/Classes/SideMenuViewController.xib +++ b/Classes/SideMenuViewController.xib @@ -15,53 +15,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -77,9 +30,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/submodules/belle-sip b/submodules/belle-sip index 580012c55..7ec48ad64 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 580012c556ba0e4d0f09bf3f182cdf55e030f215 +Subproject commit 7ec48ad644bbb7906e2f06e8abde5633b52f1926 diff --git a/submodules/linphone b/submodules/linphone index e0b013c8b..747fd8e6f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit e0b013c8bb630be19540b132ba1b94354384c175 +Subproject commit 747fd8e6f613d741d50e6e3da90be321a16c4163