diff --git a/Classes/LinphoneUI/Base.lproj/UICompositeViewController.xib b/Classes/LinphoneUI/Base.lproj/UICompositeViewController.xib index c400fdb98..77e810de0 100644 --- a/Classes/LinphoneUI/Base.lproj/UICompositeViewController.xib +++ b/Classes/LinphoneUI/Base.lproj/UICompositeViewController.xib @@ -1,14 +1,14 @@ - 1296 - 11E53 - 2549 - 1138.47 - 569.00 + 1536 + 14D136 + 7706 + 1347.57 + 758.70 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 7703 IBProxyObject @@ -34,41 +34,42 @@ 301 - + - 314 - {{0, 23}, {320, 397}} + 290 + {360, 40} - + _NS:9 3 MCAwAA NO - 1 + 2 IBCocoaTouchFramework - + - 290 - {320, 23} + 314 + {{0, 40}, {360, 537}} - + _NS:9 NO - 2 + 1 IBCocoaTouchFramework 266 - {{0, 420}, {320, 60}} + {{0, 577}, {360, 63}} + _NS:9 NO @@ -76,34 +77,25 @@ IBCocoaTouchFramework - {320, 480} + {360, 640} + + IBUISimulatedFreeformSizeMetricsSentinel + Freeform + IBCocoaTouchFramework 301 - - - 314 - {{0, 23}, {480, 237}} - - - - _NS:9 - - NO - 1 - IBCocoaTouchFramework - 290 - {480, 23} + {640, 26} @@ -113,12 +105,26 @@ 2 IBCocoaTouchFramework + + + 314 + {{0, 26}, {640, 284}} + + + + _NS:9 + + NO + 1 + IBCocoaTouchFramework + 266 - {{0, 260}, {480, 60}} + {{0, 310}, {640, 50}} + _NS:9 NO @@ -126,7 +132,7 @@ IBCocoaTouchFramework - {480, 320} + {640, 360} @@ -135,11 +141,12 @@ 3 3 + IBCocoaTouchFramework - + view @@ -241,8 +248,8 @@ 20 - + @@ -274,12 +281,15 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + {1095, -76} com.apple.InterfaceBuilder.IBCocoaTouchPlugin UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -314,7 +324,7 @@ IBProjectSource - ./Classes/TPMultiLayoutViewController.h + ../Classes/Utils/TPMultiLayoutViewController/TPMultiLayoutViewController.h @@ -341,7 +351,7 @@ IBProjectSource - ./Classes/UICompositeViewController.h + ../Classes/LinphoneUI/UICompositeViewController.h @@ -349,19 +359,69 @@ UIView IBProjectSource - ./Classes/UITransparentView.h + ../Classes/LinphoneUI/UITransparentView.h + + + + + + UIGestureRecognizer + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIGestureRecognizer.h + + + + UIResponder + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UIView + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIView.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + NO + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + YES 3 - 1498 diff --git a/Classes/LinphoneUI/Base.lproj/UIMainBar.xib b/Classes/LinphoneUI/Base.lproj/UIMainBar.xib index 5a283796e..e269f6777 100644 --- a/Classes/LinphoneUI/Base.lproj/UIMainBar.xib +++ b/Classes/LinphoneUI/Base.lproj/UIMainBar.xib @@ -21,11 +21,11 @@ - + - + @@ -91,7 +91,7 @@ - + @@ -115,7 +115,7 @@ - + diff --git a/Classes/LinphoneUI/UIPlusDigitButton.m b/Classes/LinphoneUI/UIPlusDigitButton.m deleted file mode 100644 index 4e3c72211..000000000 --- a/Classes/LinphoneUI/UIPlusDigitButton.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// UIPlusDigitButton.m -// linphone -// -// Created by Gautier Pelloux-Prayer on 24/09/14. -// -// - -#import - -@interface UIDigitButton : UILongTouchButton { -} \ No newline at end of file diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index b970da49d..5aac6f0c2 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -174,6 +174,8 @@ 636316DE1A1DEF2F0009B839 /* UIButtonShrinkable.m in Sources */ = {isa = PBXBuildFile; fileRef = 636316DD1A1DEF2F0009B839 /* UIButtonShrinkable.m */; }; 636BC9971B5F921B00C754CE /* UIIconButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 636BC9961B5F921B00C754CE /* UIIconButton.m */; }; 637157A11B283FE200C91677 /* FileTransferDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 637157A01B283FE200C91677 /* FileTransferDelegate.m */; }; + 637BC58A1B5FDA1600A2EA37 /* UICallStateBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 637BC5891B5FDA1600A2EA37 /* UICallStateBar.m */; }; + 637BC5AD1B5FDA2100A2EA37 /* UICallStateBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 637BC5931B5FDA2100A2EA37 /* UICallStateBar.xib */; }; 639CEAFD1A1DF4D9004DE38F /* UIStateBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEAFF1A1DF4D9004DE38F /* UIStateBar.xib */; }; 639CEB001A1DF4E4004DE38F /* UIHistoryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB021A1DF4E4004DE38F /* UIHistoryCell.xib */; }; 639CEB031A1DF4EB004DE38F /* UICompositeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB051A1DF4EB004DE38F /* UICompositeViewController.xib */; }; @@ -1126,6 +1128,9 @@ 636BC9961B5F921B00C754CE /* UIIconButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIIconButton.m; sourceTree = ""; }; 6371579F1B283FE200C91677 /* FileTransferDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileTransferDelegate.h; path = Utils/FileTransferDelegate.h; sourceTree = ""; }; 637157A01B283FE200C91677 /* FileTransferDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FileTransferDelegate.m; path = Utils/FileTransferDelegate.m; sourceTree = ""; }; + 637BC5881B5FDA1600A2EA37 /* UICallStateBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICallStateBar.h; sourceTree = ""; }; + 637BC5891B5FDA1600A2EA37 /* UICallStateBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICallStateBar.m; sourceTree = ""; }; + 637BC5941B5FDA2100A2EA37 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UICallStateBar.xib; sourceTree = ""; }; 639CEAFE1A1DF4D9004DE38F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIStateBar.xib; sourceTree = ""; }; 639CEB011A1DF4E4004DE38F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIHistoryCell.xib; sourceTree = ""; }; 639CEB041A1DF4EB004DE38F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UICompositeViewController.xib; sourceTree = ""; }; @@ -2156,6 +2161,9 @@ D36C43C4158F2E5A0048BA40 /* UICallCell.h */, D36C43C5158F2E5A0048BA40 /* UICallCell.m */, D381881415FE3F0B00C3EDCA /* UICallCell.xib */, + 637BC5881B5FDA1600A2EA37 /* UICallStateBar.h */, + 637BC5891B5FDA1600A2EA37 /* UICallStateBar.m */, + 637BC5931B5FDA2100A2EA37 /* UICallStateBar.xib */, 22AA8AFF13D83F6300B30535 /* UICamSwitch.h */, 22AA8B0013D83F6300B30535 /* UICamSwitch.m */, D3EA540F159853750037DC6B /* UIChatCell.h */, @@ -2194,6 +2202,8 @@ D31C9C96158A1CDE00756B45 /* UIHistoryCell.h */, D31C9C97158A1CDE00756B45 /* UIHistoryCell.m */, 639CEB021A1DF4E4004DE38F /* UIHistoryCell.xib */, + 636BC9951B5F921B00C754CE /* UIIconButton.h */, + 636BC9961B5F921B00C754CE /* UIIconButton.m */, D3E84F3C15B018A600420DAC /* UILinphone.h */, D380800415C28A7A005BE9BC /* UILinphone.m */, D35E91F6160CA4FF0023116B /* UILinphoneButton.h */, @@ -2232,8 +2242,6 @@ D32460E5159D9AAD00BA7F3A /* UITransparentView.m */, 340751E5150F38FC00B89C47 /* UIVideoButton.h */, 340751E6150F38FD00B89C47 /* UIVideoButton.m */, - 636BC9951B5F921B00C754CE /* UIIconButton.h */, - 636BC9961B5F921B00C754CE /* UIIconButton.m */, ); path = LinphoneUI; sourceTree = ""; @@ -3631,6 +3639,7 @@ D3128FF515AABE4E00A2147A /* contact_edit_over.png in Resources */, D37C638E15AAD251009D0BAC /* contact_number_over.png in Resources */, D37C639015AAD251009D0BAC /* contact_number.png in Resources */, + 637BC5AD1B5FDA2100A2EA37 /* UICallStateBar.xib in Resources */, D381881515FE3F7F00C3EDCA /* UIContactDetailsHeader.xib in Resources */, D3C6526B15AC228A0092A874 /* contact_ok_default.png in Resources */, D3C6526D15AC228A0092A874 /* contact_ok_over.png in Resources */, @@ -4125,6 +4134,7 @@ D3C6526715AC1A8F0092A874 /* UIEditableTableViewCell.m in Sources */, D378906515AC373B00BD776C /* ContactDetailsLabelViewController.m in Sources */, D3E8F68615ADE05B0065A226 /* UIContactDetailsFooter.m in Sources */, + 637BC58A1B5FDA1600A2EA37 /* UICallStateBar.m in Sources */, C90FAA7915AF54E6002091CB /* HistoryDetailsViewController.m in Sources */, 63FB30351A680E73008CA393 /* UIRoundedImageView.m in Sources */, F066515517F9A02E0064280C /* UITransparentTVCell.m in Sources */, @@ -4320,6 +4330,14 @@ name = PhoneMainView.xib; sourceTree = ""; }; + 637BC5931B5FDA2100A2EA37 /* UICallStateBar.xib */ = { + isa = PBXVariantGroup; + children = ( + 637BC5941B5FDA2100A2EA37 /* Base */, + ); + name = UICallStateBar.xib; + sourceTree = ""; + }; 639CEAFF1A1DF4D9004DE38F /* UIStateBar.xib */ = { isa = PBXVariantGroup; children = (