From 61d5e682415b463003821beb3cfa03984566b79e Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 9 Sep 2015 16:48:26 +0200 Subject: [PATCH] major mv part 2 --- Classes/AboutView.m | 7 +++--- Classes/AssistantView.m | 7 +++--- ...sistantViews.xib => AssistantSubviews.xib} | 3 +-- Classes/CallIncomingView.m | 5 ++--- Classes/CallOutgoingView.m | 5 ++--- Classes/CallView.m | 5 ++--- Classes/ChatConversationView.m | 7 +++--- Classes/ChatsListView.m | 7 +++--- Classes/ContactDetailsLabelView.m | 7 +++--- Classes/ContactDetailsView.m | 7 +++--- Classes/ContactsListView.m | 7 +++--- Classes/DialerView.m | 7 +++--- Classes/HistoryDetailsView.m | 7 +++--- Classes/HistoryListView.m | 8 +++---- Classes/ImagePickerView.m | 5 ++--- Classes/ImageView.m | 5 ++--- Classes/LinphoneUI/StatusBarView.h | 2 +- Classes/LinphoneUI/UICallCell.m | 3 ++- Classes/LinphoneUI/UIChatCell.m | 3 ++- Classes/LinphoneUI/UIChatConversationCell.m | 2 +- Classes/LinphoneUI/UICompositeView.h | 8 +++---- Classes/LinphoneUI/UICompositeView.m | 20 ++++++++---------- Classes/LinphoneUI/UIContactCell.m | 3 ++- Classes/LinphoneUI/UIHistoryCell.m | 3 ++- Classes/PhoneMainView.m | 4 ++-- Classes/SettingsView.m | 7 +++--- ...iews.strings => AssistantSubviews.strings} | Bin ...iews.strings => AssistantSubviews.strings} | Bin ...iews.strings => AssistantSubviews.strings} | Bin linphone.xcodeproj/project.pbxproj | 18 ++++++++-------- 30 files changed, 78 insertions(+), 94 deletions(-) rename Classes/Base.lproj/{AssistantViews.xib => AssistantSubviews.xib} (99%) rename Classes/ar.lproj/{AssistantViews.strings => AssistantSubviews.strings} (100%) rename Classes/fr.lproj/{AssistantViews.strings => AssistantSubviews.strings} (100%) rename Classes/ru.lproj/{AssistantViews.strings => AssistantSubviews.strings} (100%) diff --git a/Classes/AboutView.m b/Classes/AboutView.m index ee0d2a6cc..7dc19408c 100644 --- a/Classes/AboutView.m +++ b/Classes/AboutView.m @@ -89,10 +89,9 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"About" - content:@"AboutView" - stateBar:@"StatusBarViewController" - tabBar:@"TabBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class + tabBar:TabBarView.class fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] portraitMode:true]; diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index 58ffc924d..c367566f1 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -47,7 +47,7 @@ typedef enum _ViewElement { - (id)init { self = [super initWithNibName:NSStringFromClass(self.class) bundle:[NSBundle mainBundle]]; if (self != nil) { - [[NSBundle mainBundle] loadNibNamed:@"AssistantViews" owner:self options:nil]; + [[NSBundle mainBundle] loadNibNamed:@"AssistantSubviews" owner:self options:nil]; historyViews = [[NSMutableArray alloc] init]; currentView = nil; } @@ -64,9 +64,8 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"Assistant" - content:@"AssistantView" - stateBar:@"StatusBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class tabBar:nil fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] diff --git a/Classes/Base.lproj/AssistantViews.xib b/Classes/Base.lproj/AssistantSubviews.xib similarity index 99% rename from Classes/Base.lproj/AssistantViews.xib rename to Classes/Base.lproj/AssistantSubviews.xib index 395cd038b..13c2e7f36 100644 --- a/Classes/Base.lproj/AssistantViews.xib +++ b/Classes/Base.lproj/AssistantSubviews.xib @@ -1,6 +1,7 @@ + @@ -8,14 +9,12 @@ - - diff --git a/Classes/CallIncomingView.m b/Classes/CallIncomingView.m index 102664011..6a50f7a7f 100644 --- a/Classes/CallIncomingView.m +++ b/Classes/CallIncomingView.m @@ -63,9 +63,8 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"IncomingCall" - content:@"CallIncomingView" - stateBar:@"StatusBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class tabBar:nil fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] diff --git a/Classes/CallOutgoingView.m b/Classes/CallOutgoingView.m index a65694a43..de16f25cc 100644 --- a/Classes/CallOutgoingView.m +++ b/Classes/CallOutgoingView.m @@ -28,9 +28,8 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"OutgoingCall" - content:@"CallOutgoingView" - stateBar:@"StatusBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class tabBar:nil fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] diff --git a/Classes/CallView.m b/Classes/CallView.m index 3b6bf62e8..f74a55107 100644 --- a/Classes/CallView.m +++ b/Classes/CallView.m @@ -74,9 +74,8 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"InCall" - content:@"CallView" - stateBar:@"StatusBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class tabBar:nil fullscreen:false landscapeMode:false diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m index ebd90b0bd..c9e4648ca 100644 --- a/Classes/ChatConversationView.m +++ b/Classes/ChatConversationView.m @@ -70,10 +70,9 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"ChatRoom" - content:@"ChatConversationView" - stateBar:@"StatusBarViewController" - tabBar:@"TabBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class + tabBar:TabBarView.class fullscreen:false landscapeMode:false portraitMode:true]; diff --git a/Classes/ChatsListView.m b/Classes/ChatsListView.m index 78fc5230e..3c5aec2ed 100644 --- a/Classes/ChatsListView.m +++ b/Classes/ChatsListView.m @@ -63,10 +63,9 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"Chat" - content:@"ChatsListView" - stateBar:@"StatusBarViewController" - tabBar:@"TabBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class + tabBar:TabBarView.class fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] portraitMode:true]; diff --git a/Classes/ContactDetailsLabelView.m b/Classes/ContactDetailsLabelView.m index a30846f32..b92586ff0 100644 --- a/Classes/ContactDetailsLabelView.m +++ b/Classes/ContactDetailsLabelView.m @@ -36,10 +36,9 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"ContactDetailsLabel" - content:@"ContactDetailsLabelView" - stateBar:@"StatusBarViewController" - tabBar:@"TabBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class + tabBar:TabBarView.class fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] portraitMode:true]; diff --git a/Classes/ContactDetailsView.m b/Classes/ContactDetailsView.m index 561dfba06..dc49f9435 100644 --- a/Classes/ContactDetailsView.m +++ b/Classes/ContactDetailsView.m @@ -207,10 +207,9 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"ContactDetails" - content:@"ContactDetailsView" - stateBar:@"StatusBarViewController" - tabBar:@"TabBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class + tabBar:TabBarView.class fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] portraitMode:true]; diff --git a/Classes/ContactsListView.m b/Classes/ContactsListView.m index 8049a5ea3..77cd03879 100644 --- a/Classes/ContactsListView.m +++ b/Classes/ContactsListView.m @@ -102,10 +102,9 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"Contacts" - content:@"ContactsListView" - stateBar:@"StatusBarViewController" - tabBar:@"TabBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class + tabBar:TabBarView.class fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] portraitMode:true]; diff --git a/Classes/DialerView.m b/Classes/DialerView.m index e65ec0bcc..a7dcc6293 100644 --- a/Classes/DialerView.m +++ b/Classes/DialerView.m @@ -74,10 +74,9 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"Dialer" - content:@"DialerView" - stateBar:@"StatusBarViewController" - tabBar:@"TabBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class + tabBar:TabBarView.class fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] portraitMode:true]; diff --git a/Classes/HistoryDetailsView.m b/Classes/HistoryDetailsView.m index 59f3d696b..9a8fe26f1 100644 --- a/Classes/HistoryDetailsView.m +++ b/Classes/HistoryDetailsView.m @@ -48,10 +48,9 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"HistoryDetails" - content:@"HistoryDetailsView" - stateBar:@"StatusBarViewController" - tabBar:@"TabBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class + tabBar:TabBarView.class fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] portraitMode:true]; diff --git a/Classes/HistoryListView.m b/Classes/HistoryListView.m index df4101433..5687e23bd 100644 --- a/Classes/HistoryListView.m +++ b/Classes/HistoryListView.m @@ -18,6 +18,7 @@ */ #import "HistoryListView.h" +#import "PhoneMainView.h" @implementation HistoryListView @@ -43,10 +44,9 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"History" - content:@"HistoryListView" - stateBar:@"StatusBarViewController" - tabBar:@"TabBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class + tabBar:TabBarView.class fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] portraitMode:true]; diff --git a/Classes/ImagePickerView.m b/Classes/ImagePickerView.m index 13f2c08a0..dbfde612b 100644 --- a/Classes/ImagePickerView.m +++ b/Classes/ImagePickerView.m @@ -49,9 +49,8 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"ImagePicker" - content:@"ImagePickerView" - stateBar:@"StatusBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class tabBar:nil fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] diff --git a/Classes/ImageView.m b/Classes/ImageView.m index 86711610e..5e08e1391 100644 --- a/Classes/ImageView.m +++ b/Classes/ImageView.m @@ -124,9 +124,8 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"ImageView" - content:@"ImageView" - stateBar:@"StatusBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class tabBar:nil fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] diff --git a/Classes/LinphoneUI/StatusBarView.h b/Classes/LinphoneUI/StatusBarView.h index ec9add23c..8a0961ae6 100644 --- a/Classes/LinphoneUI/StatusBarView.h +++ b/Classes/LinphoneUI/StatusBarView.h @@ -19,7 +19,7 @@ #import #import "TPMultiLayoutViewController.h" -#import "PhoneMainView.h" +#import "DTActionSheet.h" @interface StatusBarView : TPMultiLayoutViewController { DTActionSheet *securitySheet; diff --git a/Classes/LinphoneUI/UICallCell.m b/Classes/LinphoneUI/UICallCell.m index d0c75046d..4e21ee22c 100644 --- a/Classes/LinphoneUI/UICallCell.m +++ b/Classes/LinphoneUI/UICallCell.m @@ -114,7 +114,8 @@ - (id)initWithIdentifier:(NSString *)identifier { if ((self = [super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier]) != nil) { - NSArray *arrayOfViews = [[NSBundle mainBundle] loadNibNamed:@"UICallCell" owner:self options:nil]; + NSArray *arrayOfViews = + [[NSBundle mainBundle] loadNibNamed:NSStringFromClass(self.class) owner:self options:nil]; if ([arrayOfViews count] >= 1) { // resize cell to match .nib size. It is needed when resized the cell to diff --git a/Classes/LinphoneUI/UIChatCell.m b/Classes/LinphoneUI/UIChatCell.m index 7ad0ef3c4..b3e5e463a 100644 --- a/Classes/LinphoneUI/UIChatCell.m +++ b/Classes/LinphoneUI/UIChatCell.m @@ -34,7 +34,8 @@ - (id)initWithIdentifier:(NSString *)identifier { if ((self = [super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier]) != nil) { - NSArray *arrayOfViews = [[NSBundle mainBundle] loadNibNamed:@"UIChatCell" owner:self options:nil]; + NSArray *arrayOfViews = + [[NSBundle mainBundle] loadNibNamed:NSStringFromClass(self.class) owner:self options:nil]; if ([arrayOfViews count] >= 1) { diff --git a/Classes/LinphoneUI/UIChatConversationCell.m b/Classes/LinphoneUI/UIChatConversationCell.m index 7346b1d2e..4deb5b06b 100644 --- a/Classes/LinphoneUI/UIChatConversationCell.m +++ b/Classes/LinphoneUI/UIChatConversationCell.m @@ -57,7 +57,7 @@ static UIFont *CELL_FONT = nil; - (id)initWithIdentifier:(NSString *)identifier { if ((self = [super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier]) != nil) { - [[NSBundle mainBundle] loadNibNamed:@"UIChatConversationCell" owner:self options:nil]; + [[NSBundle mainBundle] loadNibNamed:NSStringFromClass(self.class) owner:self options:nil]; imageTapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onImageClick:)]; [messageImageView addGestureRecognizer:imageTapGestureRecognizer]; diff --git a/Classes/LinphoneUI/UICompositeView.h b/Classes/LinphoneUI/UICompositeView.h index 19796ad82..e889aa053 100644 --- a/Classes/LinphoneUI/UICompositeView.h +++ b/Classes/LinphoneUI/UICompositeView.h @@ -27,7 +27,6 @@ @interface UICompositeViewDescription : NSObject { } -@property(strong) NSString *name; @property(strong) NSString *content; @property(strong) NSString *stateBar; @property(strong) NSString *tabBar; @@ -38,10 +37,9 @@ - (id)copy; - (BOOL)equal:(UICompositeViewDescription *)description; -- (id)init:(NSString *)name - content:(NSString *)content - stateBar:(NSString *)stateBar - tabBar:(NSString *)tabBar +- (id)init:(Class)content + stateBar:(Class)stateBar + tabBar:(Class)tabBar fullscreen:(BOOL)fullscreen landscapeMode:(BOOL)landscapeMode portraitMode:(BOOL)portraitMode; diff --git a/Classes/LinphoneUI/UICompositeView.m b/Classes/LinphoneUI/UICompositeView.m index a1bf646ec..35592d406 100644 --- a/Classes/LinphoneUI/UICompositeView.m +++ b/Classes/LinphoneUI/UICompositeView.m @@ -21,10 +21,10 @@ #import "LinphoneAppDelegate.h" #import "Utils.h" +#import "SideMenuView.h" @implementation UICompositeViewDescription -@synthesize name; @synthesize content; @synthesize stateBar; @synthesize tabBar; @@ -45,20 +45,18 @@ } - (BOOL)equal:(UICompositeViewDescription *)description { - return [self.name compare:description.name] == NSOrderedSame; + return [self.content compare:description.content] == NSOrderedSame; } -- (id)init:(NSString *)aname - content:(NSString *)acontent - stateBar:(NSString *)astateBar - tabBar:(NSString *)atabBar +- (id)init:(Class)acontent + stateBar:(Class)astateBar + tabBar:(Class)atabBar fullscreen:(BOOL)afullscreen landscapeMode:(BOOL)alandscapeMode portraitMode:(BOOL)aportraitMode { - self.name = aname; - self.content = acontent; - self.stateBar = astateBar; - self.tabBar = atabBar; + self.content = NSStringFromClass(acontent); + self.stateBar = NSStringFromClass(astateBar); + self.tabBar = NSStringFromClass(atabBar); self.fullscreen = afullscreen; self.landscapeMode = alandscapeMode; self.portraitMode = aportraitMode; @@ -169,7 +167,7 @@ [self updateViewsFramesAccordingToLaunchOrientation]; [super viewDidLoad]; - _sideMenuViewController = [self getCachedController:@"SideMenuViewController"]; + _sideMenuViewController = [self getCachedController:NSStringFromClass(SideMenuView.class)]; [UICompositeView addSubView:_sideMenuViewController view:_sideMenuView]; } diff --git a/Classes/LinphoneUI/UIContactCell.m b/Classes/LinphoneUI/UIContactCell.m index 4f967e983..c5a03deac 100644 --- a/Classes/LinphoneUI/UIContactCell.m +++ b/Classes/LinphoneUI/UIContactCell.m @@ -32,7 +32,8 @@ - (id)initWithIdentifier:(NSString *)identifier { if ((self = [super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier]) != nil) { - NSArray *arrayOfViews = [[NSBundle mainBundle] loadNibNamed:@"UIContactCell" owner:self options:nil]; + NSArray *arrayOfViews = + [[NSBundle mainBundle] loadNibNamed:NSStringFromClass(self.class) owner:self options:nil]; if ([arrayOfViews count] >= 1) { [self.contentView addSubview:[arrayOfViews objectAtIndex:0]]; diff --git a/Classes/LinphoneUI/UIHistoryCell.m b/Classes/LinphoneUI/UIHistoryCell.m index 179599acd..be6fcc2fd 100644 --- a/Classes/LinphoneUI/UIHistoryCell.m +++ b/Classes/LinphoneUI/UIHistoryCell.m @@ -31,7 +31,8 @@ - (id)initWithIdentifier:(NSString *)identifier { if ((self = [super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier]) != nil) { - NSArray *arrayOfViews = [[NSBundle mainBundle] loadNibNamed:@"UIHistoryCell" owner:self options:nil]; + NSArray *arrayOfViews = + [[NSBundle mainBundle] loadNibNamed:NSStringFromClass(self.class) owner:self options:nil]; if ([arrayOfViews count] >= 1) { [self.contentView addSubview:[arrayOfViews objectAtIndex:0]]; diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index b2c825fa5..5c7ddc241 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -572,7 +572,7 @@ static RootViewManager *rootViewManagerInstance = nil; PhoneMainView *vc = [[RootViewManager instance] setViewControllerForDescription:view]; if (force || ![view equal:vc.currentView] || vc != self) { - LOGI(@"PhoneMainView: Change current view to %@", [view name]); + LOGI(@"PhoneMainView: Change current view to %@", [view content]); if (animated && transition == nil) transition = [PhoneMainView getTransition:vc.currentView new:view]; [vc.mainViewController setViewTransition:(animated ? transition : nil)]; @@ -705,7 +705,7 @@ static RootViewManager *rootViewManagerInstance = nil; } else { CallIncomingView *controller = nil; - if (![currentView.name isEqualToString:[CallIncomingView compositeViewDescription].name]) { + if (![currentView.content isEqualToString:[CallIncomingView compositeViewDescription].content]) { controller = DYNAMIC_CAST( [self changeCurrentView:[CallIncomingView compositeViewDescription] push:TRUE], CallIncomingView); } else { diff --git a/Classes/SettingsView.m b/Classes/SettingsView.m index bfde5b003..0094ac374 100644 --- a/Classes/SettingsView.m +++ b/Classes/SettingsView.m @@ -393,10 +393,9 @@ static UICompositeViewDescription *compositeDescription = nil; + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { - compositeDescription = [[UICompositeViewDescription alloc] init:@"Settings" - content:@"SettingsView" - stateBar:@"StatusBarViewController" - tabBar:@"TabBarViewController" + compositeDescription = [[UICompositeViewDescription alloc] init:self.class + stateBar:StatusBarView.class + tabBar:TabBarView.class fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] portraitMode:true]; diff --git a/Classes/ar.lproj/AssistantViews.strings b/Classes/ar.lproj/AssistantSubviews.strings similarity index 100% rename from Classes/ar.lproj/AssistantViews.strings rename to Classes/ar.lproj/AssistantSubviews.strings diff --git a/Classes/fr.lproj/AssistantViews.strings b/Classes/fr.lproj/AssistantSubviews.strings similarity index 100% rename from Classes/fr.lproj/AssistantViews.strings rename to Classes/fr.lproj/AssistantSubviews.strings diff --git a/Classes/ru.lproj/AssistantViews.strings b/Classes/ru.lproj/AssistantSubviews.strings similarity index 100% rename from Classes/ru.lproj/AssistantViews.strings rename to Classes/ru.lproj/AssistantSubviews.strings diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 113fbc8eb..e9c465ab1 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -384,7 +384,7 @@ D3A55FBC15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; }; D3A8BB7015A6C7D500F96BE5 /* UIChatConversationCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A8BB6F15A6C7D500F96BE5 /* UIChatConversationCell.m */; }; D3C6526715AC1A8F0092A874 /* UIEditableTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3C6526615AC1A8F0092A874 /* UIEditableTableViewCell.m */; }; - D3D5126C160B3A8E00946DF8 /* AssistantViews.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D5126A160B3A8E00946DF8 /* AssistantViews.xib */; }; + D3D5126C160B3A8E00946DF8 /* AssistantSubviews.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D5126A160B3A8E00946DF8 /* AssistantSubviews.xib */; }; D3EA53FD159850E80037DC6B /* LinphoneManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA53FC159850E80037DC6B /* LinphoneManager.m */; }; D3EA540D1598528B0037DC6B /* ChatsListTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA540C1598528B0037DC6B /* ChatsListTableView.m */; }; D3EA5411159853750037DC6B /* UIChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA5410159853750037DC6B /* UIChatCell.m */; }; @@ -1070,7 +1070,7 @@ F09548291883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIConferenceHeader.xib; sourceTree = ""; }; F095482C1883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/TabBarView.xib; sourceTree = ""; }; F095482E1883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AssistantView.xib; sourceTree = ""; }; - F09548301883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AssistantViews.xib; sourceTree = ""; }; + F09548301883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AssistantSubviews.xib; sourceTree = ""; }; F09548311883F1EB00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/ChatConversationView.strings; sourceTree = ""; }; F09548321883F20A00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/ChatConversationView.strings; sourceTree = ""; }; F09548331883F25C00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/ChatsListView.strings; sourceTree = ""; }; @@ -1097,8 +1097,8 @@ F09548561883F61600E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/TabBarView.strings; sourceTree = ""; }; F09548591883F67800E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AssistantView.strings; sourceTree = ""; }; F095485A1883F67B00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/AssistantView.strings; sourceTree = ""; }; - F095485D1883F6E700E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AssistantViews.strings; sourceTree = ""; }; - F095485E1883F6EA00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/AssistantViews.strings; sourceTree = ""; }; + F095485D1883F6E700E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AssistantSubviews.strings; sourceTree = ""; }; + F095485E1883F6EA00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/AssistantSubviews.strings; sourceTree = ""; }; F0AF06F01A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/AboutView.strings; sourceTree = ""; }; F0AF06F11A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ChatConversationView.strings; sourceTree = ""; }; F0AF06F21A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ChatsListView.strings; sourceTree = ""; }; @@ -1123,7 +1123,7 @@ F0AF070D1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/PhoneMainView.strings; sourceTree = ""; }; F0AF070E1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/SettingsView.strings; sourceTree = ""; }; F0AF070F1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/AssistantView.strings; sourceTree = ""; }; - F0AF07111A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/AssistantViews.strings; sourceTree = ""; }; + F0AF07111A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/AssistantSubviews.strings; sourceTree = ""; }; F0B026F21AA710AF00FF49F7 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; }; F0B89C2118DC89E30050B60E /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; }; F0BB8BD51936208100974404 /* liblinphoneTester.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = liblinphoneTester.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1282,7 +1282,7 @@ D350F20B15A43BB100149E54 /* AssistantView.h */, D350F20C15A43BB100149E54 /* AssistantView.m */, D38187E015FE348A00C3EDCA /* AssistantView.xib */, - D3D5126A160B3A8E00946DF8 /* AssistantViews.xib */, + D3D5126A160B3A8E00946DF8 /* AssistantSubviews.xib */, D3F26BEE15986B71005F9CAB /* CallIncomingView.h */, D3F26BEF15986B71005F9CAB /* CallIncomingView.m */, D38187DC15FE347700C3EDCA /* CallIncomingView.xib */, @@ -2395,7 +2395,7 @@ 634CEDC51B6630DB00D7A921 /* contacts_sip_default.png in Resources */, D381881915FE3FCA00C3EDCA /* CallView.xib in Resources */, 634CEDFA1B6630DB00D7A921 /* pause_small_over_selected.png in Resources */, - D3D5126C160B3A8E00946DF8 /* AssistantViews.xib in Resources */, + D3D5126C160B3A8E00946DF8 /* AssistantSubviews.xib in Resources */, 634CEDA01B6630DB00D7A921 /* call_quality_indicator_1.png in Resources */, 634CEDD01B6630DB00D7A921 /* footer_contacts.png in Resources */, 634CEDE51B6630DB00D7A921 /* numpad_1.png in Resources */, @@ -3012,7 +3012,7 @@ name = CallView.xib; sourceTree = ""; }; - D3D5126A160B3A8E00946DF8 /* AssistantViews.xib */ = { + D3D5126A160B3A8E00946DF8 /* AssistantSubviews.xib */ = { isa = PBXVariantGroup; children = ( F09548301883F15500E8A69B /* Base */, @@ -3020,7 +3020,7 @@ F095485E1883F6EA00E8A69B /* ru */, F0AF07111A24BA770086C9C1 /* ar */, ); - name = AssistantViews.xib; + name = AssistantSubviews.xib; sourceTree = ""; }; F088488D19FF8C41007FFCF3 /* UIContactCell.xib */ = {