mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

major mv part 2

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-09-09 16:48:26 +02:00
parent 2c05f973c0
commit 61d5e68241
30 changed files with 78 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Classes/AboutView.m
View file

@ -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];

7
Classes/AssistantView.m
View file

@ -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]

3
Classes/Base.lproj/AssistantViews.xib → Classes/Base.lproj/AssistantSubviews.xib
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
</dependencies>
<objects>
@ -8,14 +9,12 @@
<connections>
<outlet property="createAccountActivationView" destination="101" id="cxQ-rX-4fA"/>
<outlet property="createAccountView" destination="44" id="70"/>
<outlet property="createUsername" destination="74" id="qzA-BS-SGt"/>
<outlet property="gotoCreateAccountButton" destination="36" id="bZf-lI-yJp"/>
<outlet property="gotoLoginButton" destination="39" id="uSY-cr-j4w"/>
<outlet property="gotoRemoteProvisionningButton" destination="Kbn-dL-C5h" id="pgT-y6-qKj"/>
<outlet property="linphoneLoginView" destination="52" id="9NX-6W-50g"/>
<outlet property="loginView" destination="56" id="bJH-N8-uPi"/>
<outlet property="remoteProvisionningView" destination="xVK-hL-6pe" id="kgd-JJ-OWw"/>
<outlet property="transportChooser" destination="Nrv-SM-lMf" id="7iR-aG-eQf"/>
<outlet property="welcomeView" destination="33" id="46a-AR-5mN"/>
</connections>
</placeholder>

5
Classes/CallIncomingView.m
View file

@ -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]

5
Classes/CallOutgoingView.m
View file

@ -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]

5
Classes/CallView.m
View file

@ -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

7
Classes/ChatConversationView.m
View file

@ -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];

7
Classes/ChatsListView.m
View file

@ -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];

7
Classes/ContactDetailsLabelView.m
View file

@ -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];

7
Classes/ContactDetailsView.m
View file

@ -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];

7
Classes/ContactsListView.m
View file

@ -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];

7
Classes/DialerView.m
View file

@ -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];

7
Classes/HistoryDetailsView.m
View file

@ -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];

8
Classes/HistoryListView.m
View file

@ -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];

5
Classes/ImagePickerView.m
View file

@ -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]

5
Classes/ImageView.m
View file

@ -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]

2
Classes/LinphoneUI/StatusBarView.h
View file

@ -19,7 +19,7 @@
#import <UIKit/UIKit.h>
#import "TPMultiLayoutViewController.h"
#import "PhoneMainView.h"
#import "DTActionSheet.h"
@interface StatusBarView : TPMultiLayoutViewController <UIActionSheetDelegate> {
DTActionSheet *securitySheet;

3
Classes/LinphoneUI/UICallCell.m
View file

@ -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

3
Classes/LinphoneUI/UIChatCell.m
View file

@ -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) {

2
Classes/LinphoneUI/UIChatConversationCell.m
View file

@ -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];

8
Classes/LinphoneUI/UICompositeView.h
View file

@ -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;

20
Classes/LinphoneUI/UICompositeView.m
View file

@ -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];
}

3
Classes/LinphoneUI/UIContactCell.m
View file

@ -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]];

3
Classes/LinphoneUI/UIHistoryCell.m
View file

@ -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]];

4
Classes/PhoneMainView.m
View file

@ -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 {

7
Classes/SettingsView.m
View file

@ -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];

0
Classes/ar.lproj/AssistantViews.strings → Classes/ar.lproj/AssistantSubviews.strings
View file

0
Classes/fr.lproj/AssistantViews.strings → Classes/fr.lproj/AssistantSubviews.strings
View file

0
Classes/ru.lproj/AssistantViews.strings → Classes/ru.lproj/AssistantSubviews.strings
View file

18
linphone.xcodeproj/project.pbxproj
View file

@ -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 = "<group>"; };
F095482C1883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/TabBarView.xib; sourceTree = "<group>"; };
F095482E1883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AssistantView.xib; sourceTree = "<group>"; };
F09548301883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AssistantViews.xib; sourceTree = "<group>"; };
F09548301883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AssistantSubviews.xib; sourceTree = "<group>"; };
F09548311883F1EB00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/ChatConversationView.strings; sourceTree = "<group>"; };
F09548321883F20A00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/ChatConversationView.strings; sourceTree = "<group>"; };
F09548331883F25C00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/ChatsListView.strings; sourceTree = "<group>"; };
@ -1097,8 +1097,8 @@
F09548561883F61600E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/TabBarView.strings; sourceTree = "<group>"; };
F09548591883F67800E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AssistantView.strings; sourceTree = "<group>"; };
F095485A1883F67B00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/AssistantView.strings; sourceTree = "<group>"; };
F095485D1883F6E700E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AssistantViews.strings; sourceTree = "<group>"; };
F095485E1883F6EA00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/AssistantViews.strings; sourceTree = "<group>"; };
F095485D1883F6E700E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AssistantSubviews.strings; sourceTree = "<group>"; };
F095485E1883F6EA00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/AssistantSubviews.strings; sourceTree = "<group>"; };
F0AF06F01A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/AboutView.strings; sourceTree = "<group>"; };
F0AF06F11A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ChatConversationView.strings; sourceTree = "<group>"; };
F0AF06F21A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ChatsListView.strings; sourceTree = "<group>"; };
@ -1123,7 +1123,7 @@
F0AF070D1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/PhoneMainView.strings; sourceTree = "<group>"; };
F0AF070E1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/SettingsView.strings; sourceTree = "<group>"; };
F0AF070F1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/AssistantView.strings; sourceTree = "<group>"; };
F0AF07111A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/AssistantViews.strings; sourceTree = "<group>"; };
F0AF07111A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/AssistantSubviews.strings; sourceTree = "<group>"; };
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 = "<group>";
};
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 = "<group>";
};
F088488D19FF8C41007FFCF3 /* UIContactCell.xib */ = {