witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Improved graphics/layout for incall view

Browse source
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2011-11-09 16:04:59 +01:00
parent 4e0cba4db9
commit ec261bd518
19 changed files with 883 additions and 826 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Classes/AdvancedPhoneViewController.m
View file

@ -52,8 +52,8 @@
}
-(void) displayInCall: (LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
if (self.presentedViewController != mIncallViewController &&
linphone_call_get_dir(call)==LinphoneCallIncoming){
if (self.presentedViewController != mIncallViewController && (call == 0x0 ||
linphone_call_get_dir(call)==LinphoneCallIncoming)){
[self presentModalViewController:mIncallViewController animated:true];
}

10
Classes/IncallViewController.h
View file

@ -26,12 +26,12 @@
@interface IncallViewController : UIViewController <ABPeoplePickerNavigationControllerDelegate,LinphoneUICallDelegate, UITableViewDelegate, UITableViewDataSource> {
UIView* controlSubView, *callControlSubView;
UIView* controlSubView, *callControlSubView, *hangUpView;
UIButton* endCtrl;
UIButton* dialer;
UIMuteButton* mute;
UIPauseResumeButton* pause;
UIButton* pause;
UISpeakerButton* speaker;
UIButton* contacts;
UITableView* callTableView;
@ -58,6 +58,10 @@
bool dismissed;
NSTimer *durationRefreasher;
NSTimer * glowingTimer;
float glow;
NSIndexPath* activePath;
ABPeoplePickerNavigationController* myPeoplePickerController;
@ -72,6 +76,8 @@
@property (nonatomic, retain) IBOutlet UIView* controlSubView;
@property (nonatomic, retain) IBOutlet UIView* callControlSubView;
@property (nonatomic, retain) IBOutlet UIView* padSubView;
@property (nonatomic, retain) IBOutlet UIView* hangUpView;
@property (nonatomic, retain) IBOutlet UIButton* endCtrl;
@property (nonatomic, retain) IBOutlet UIButton* dialer;

140
Classes/IncallViewController.m
View file

@ -28,6 +28,7 @@
@synthesize controlSubView;
@synthesize callControlSubView;
@synthesize padSubView;
@synthesize hangUpView;
@synthesize addToConf;
@synthesize endCtrl;
@ -67,6 +68,8 @@
bool isInConference(LinphoneCall* call) {
if (!call)
return false;
return linphone_call_get_current_params(call)->in_conference;
}
@ -88,10 +91,7 @@ int callCount(LinphoneCore* lc) {
[super viewDidLoad];
//Controls
[mute initWithOnImage:[UIImage imageNamed:@"mic_muted.png"] offImage:[UIImage imageNamed:@"mic_active.png"] ];
UIImage* rc = [UIImage imageNamed:@"resumecall.png"];
UIImage* pc = [UIImage imageNamed:@"pausecall.png"];
[pause initWithOnImage:rc offImage:pc ];
[speaker initWithOnImage:[UIImage imageNamed:@"Speaker-32-on.png"] offImage:[UIImage imageNamed:@"Speaker-32-off.png"] ];
[speaker initWithOnImage:[UIImage imageNamed:@"Speaker-32-on.png"] offImage:[UIImage imageNamed:@"Speaker-32-off.png"] ];
//Dialer init
@ -112,6 +112,8 @@ int callCount(LinphoneCore* lc) {
[mergeCalls addTarget:self action:@selector(mergeCallsPressed) forControlEvents:UIControlEventTouchDown];
[endCtrl addTarget:self action:@selector(endCallPressed) forControlEvents:UIControlEventTouchUpInside];
[addToConf addTarget:self action:@selector(addToConfCallPressed) forControlEvents:UIControlEventTouchUpInside];
[pause addTarget:self action:@selector(pauseCallPressed) forControlEvents:UIControlEventTouchUpInside];
[mergeCalls setHidden:YES];
@ -134,6 +136,14 @@ int callCount(LinphoneCore* lc) {
linphone_core_add_to_conference([LinphoneManager getLc], selectedCall);
}
-(void) pauseCallPressed {
if (!selectedCall)
return;
if (linphone_call_get_state(selectedCall) == LinphoneCallPaused)
linphone_core_resume_call([LinphoneManager getLc], selectedCall);
else
linphone_core_pause_call([LinphoneManager getLc], selectedCall);
}
-(void)updateCallsDurations {
@ -150,6 +160,13 @@ int callCount(LinphoneCore* lc) {
selector:@selector(updateCallsDurations)
userInfo:nil
repeats:YES];
glowingTimer = [NSTimer scheduledTimerWithTimeInterval:0.1
target:self
selector:@selector(updateGlow)
userInfo:nil
repeats:YES];
glow = 0;
}
}
@ -157,6 +174,8 @@ int callCount(LinphoneCore* lc) {
if (durationRefreasher != nil) {
[durationRefreasher invalidate];
durationRefreasher=nil;
[glowingTimer invalidate];
glowingTimer = nil;
}
}
@ -165,11 +184,15 @@ int callCount(LinphoneCore* lc) {
}
-(void) displayStatus:(NSString*) message; {
[self updateUIFromLinphoneState: nil];
}
-(void) displayPad:(bool) enable {
[callTableView setHidden:enable];
[hangUpView setHidden:enable];
[controlSubView setHidden:enable];
[padSubView setHidden:!enable];
}
@ -178,6 +201,8 @@ int callCount(LinphoneCore* lc) {
[self displayPad:false];
dismissed = false;
if (call)
selectedCall = call;
[self updateUIFromLinphoneState: nil];
}
@ -198,7 +223,10 @@ int callCount(LinphoneCore* lc) {
}
-(void) updateUIFromLinphoneState:(UIViewController *)viewCtrl {
[mute reset];
[pause reset];
// if (
// [pause reset];
LinphoneCore* lc;
@ -225,8 +253,28 @@ int callCount(LinphoneCore* lc) {
[addToConf setHidden:(linphone_core_get_conference_size(lc) == 0 ||
isInConference(selectedCall))];
}
// hide pause/resume if in conference
[pause setHidden:linphone_core_is_in_conference(lc)];
int callsCount = linphone_core_get_calls_nb(lc);
// hide pause/resume if in conference
if (selectedCall) {
if (linphone_core_is_in_conference(lc))
[pause setHidden:YES];
else if (linphone_call_get_state(selectedCall)==LinphoneCallPaused) {
[pause setHidden:NO];
//[pause setTitle:@"Resume" forState:UIControlStateNormal];
pause.selected = YES;
pause.highlighted = NO;
} else if (callCount(lc) == callsCount && callsCount == 1) {
[pause setHidden:NO];
//[pause setTitle:@"Pause" forState:UIControlStateNormal];
pause.selected = NO;
pause.highlighted = NO;
} else {
[pause setHidden:YES];
}
} else {
[pause setHidden:callsCount > 0];
}
[mergeCalls setHidden:!pause.hidden];
}
- (IBAction)doAction:(id)sender {
@ -295,7 +343,42 @@ int callCount(LinphoneCore* lc) {
}
}
-(void) updateActive:(bool_t)active cell:(UITableViewCell*) cell {
if (!active) {
cell.backgroundColor = [UIColor colorWithRed:0.2 green:0.2 blue:0.2 alpha:0.2];
UIColor* c = [[UIColor blackColor] colorWithAlphaComponent:0.5];
[cell.textLabel setTextColor:c];
[cell.detailTextLabel setTextColor:c];
} else {
cell.backgroundColor = [UIColor colorWithRed:0.4 green:0.4 blue:0.4 alpha:(0.7+sin(2*glow)*0.3)];
[cell.textLabel setTextColor:[UIColor whiteColor]];
[cell.detailTextLabel setTextColor:[UIColor whiteColor]];
}
[cell.textLabel setBackgroundColor:[UIColor clearColor]];
[cell.detailTextLabel setBackgroundColor:[UIColor clearColor]];
[cell.accessoryView setHidden:YES];
//[cell.backgroundView setBackgroundColor:cell.backgroundColor];
}
-(void) updateGlow {
glow += 0.1;
NSIndexPath* path = [callTableView indexPathForSelectedRow];
if (path) {
UITableViewCell* cell = [callTableView cellForRowAtIndexPath:path];
[self updateActive:YES cell:cell];
[cell.backgroundView setNeedsDisplay];
[cell setNeedsDisplay];
[callTableView setNeedsDisplay];
}
}
-(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
[self updateActive:(cell.accessoryType == UITableViewCellAccessoryCheckmark) cell:cell];
//cell.accessoryType = UITableViewCellAccessoryNone;
}
- (void) updateCell:(UITableViewCell*)cell at:(NSIndexPath*) path withCall:(LinphoneCall*) call conferenceActive:(bool)confActive{
if (call == NULL) {
@ -328,30 +411,39 @@ int callCount(LinphoneCore* lc) {
}
[cell.detailTextLabel setText:ms];
/*
if (linphone_core_get_current_call([LinphoneManager getLc]) == call) {
cell.backgroundColor = [UIColor colorWithRed:0 green:1 blue:0 alpha:0.5];
cell.backgroundColor = [UIColor colorWithRed:0 green:1 blue:0 alpha:1];
} else if (confActive && isInConference(call)) {
cell.backgroundColor = [UIColor colorWithRed:0 green:0 blue:1 alpha:0.5];
cell.backgroundColor = [UIColor colorWithRed:0 green:0 blue:1 alpha:1];
} else{
cell.backgroundColor = [UIColor colorWithRed:1 green:0.5 blue:0 alpha:0.5];
}
cell.backgroundColor = [UIColor colorWithRed:1 green:0.5 blue:0 alpha:1];
}*/
if (call == selectedCall) {
// [cell setSelected:YES animated:NO];
[cell setSelected:YES animated:NO];
[callTableView selectRowAtIndexPath:path animated:NO scrollPosition:UITableViewScrollPositionNone];
cell.accessoryType = UITableViewCellAccessoryCheckmark;
}else{
//[cell setSelected:NO animated:NO];
[cell setSelected:NO animated:NO];
[callTableView deselectRowAtIndexPath:path animated:NO];
cell.accessoryType = UITableViewCellAccessoryNone;
}
}
-(void) updateConferenceCell:(UITableViewCell*) cell at:(NSIndexPath*)indexPath {
[cell.textLabel setText:@"Conference"];
LinphoneCore* lc = [LinphoneManager getLc];
cell.accessoryType = UITableViewCellAccessoryNone;
[self updateActive:NO cell:cell];
cell.selected = NO;
[callTableView deselectRowAtIndexPath:indexPath animated:NO];
NSMutableString* ms = [[NSMutableString alloc] init ];
const MSList* calls = linphone_core_get_calls(lc);
@ -366,18 +458,23 @@ int callCount(LinphoneCore* lc) {
else
[ms appendFormat:@"%s ", linphone_address_get_username(addr), nil];
if (call == selectedCall)
cell.accessoryType = UITableViewCellAccessoryCheckmark;
//if (call == selectedCall)
// [self updateActive:YES cell:cell];
if (call == selectedCall) {
[callTableView selectRowAtIndexPath:indexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
cell.selected = YES;
cell.accessoryType = UITableViewCellAccessoryCheckmark;
}
}
calls = calls->next;
}
[cell.detailTextLabel setText:ms];
if (linphone_core_is_in_conference(lc))
cell.backgroundColor = [UIColor colorWithRed:0 green:1 blue:0 alpha:0.5];
/*if (linphone_core_is_in_conference(lc))
cell.backgroundColor = [UIColor colorWithRed:0 green:1 blue:0 alpha:1];
else
cell.backgroundColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:0.5];
cell.backgroundColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];*/
}
@ -398,7 +495,7 @@ int callCount(LinphoneCore* lc) {
cell.userInteractionEnabled = YES;
cell.selectionStyle = UITableViewCellSelectionStyleNone;
cell.selectionStyle = UITableViewCellSelectionStyleBlue;
//cell.selectionStyle = UITableViewCellSelectionStyleBlue;
@ -445,6 +542,7 @@ int callCount(LinphoneCore* lc) {
// UITableViewDataSource
- (NSString*) tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
{
return nil;
return @"Calls";
if (section == 0 && linphone_core_get_conference_size([LinphoneManager getLc]) > 0)
return @"Conference";

1450
Classes/IncallViewController.xib
View file

File diff suppressed because it is too large Load diff

8
Classes/LinphoneAppDelegate.m
View file

@ -143,9 +143,13 @@
[super dealloc];
}
- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification {
linphone_core_accept_call([LinphoneManager getLc],linphone_core_get_current_call([LinphoneManager getLc]));
LinphoneCall* call = (LinphoneCall*)[notification.userInfo objectForKey:@"call"];
if (!call) {
ms_warning("Local notification received with nil call");
return;
}
linphone_core_accept_call([LinphoneManager getLc], call);
}

6
Classes/LinphoneUI/UIToggleButton.m
View file

@ -47,9 +47,9 @@
}
-(void) initWithOnImage:(UIImage*) onImage offImage:(UIImage*) offImage {
mOnImage = [onImage retain];
mOffImage = [offImage retain];
mIsOn=false;
mOnImage = [onImage retain];
mOffImage = [offImage retain];
mIsOn=false;
[self reset];
[self addTarget:self action:@selector(touchUp:) forControlEvents:UIControlEventTouchUpInside];

1
Classes/PhoneViewController.m
View file

@ -247,6 +247,7 @@
notif.alertBody =[NSString stringWithFormat:NSLocalizedString(@" %@ is calling you",nil),[displayName length]>0?displayName:username];
notif.alertAction = @"Answer";
notif.soundName = @"oldphone-mono-30s.caf";
notif.userInfo = [NSDictionary dictionaryWithObject:call forKey:"call"];
[[UIApplication sharedApplication] presentLocalNotificationNow:notif];
}

26
PhoneMainView.xib
View file

@ -65,18 +65,12 @@
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
<object class="IBUIViewController" key="IBUISelectedViewController" id="258574391">
<object class="IBUITabBarItem" key="IBUITabBarItem" id="64474689">
<string key="IBUITitle">Dialer</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">dialer-orange.png</string>
</object>
<object class="IBUIViewController" key="IBUISelectedViewController" id="383050823">
<object class="IBUITabBarItem" key="IBUITabBarItem" id="672878446">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUISystemItemIdentifier">5</int>
</object>
<reference key="IBUIParentViewController" ref="952473143"/>
<string key="IBUINibName">PhoneViewController</string>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
@ -105,13 +99,18 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
<reference ref="258574391"/>
<object class="IBUIViewController" id="383050823">
<object class="IBUITabBarItem" key="IBUITabBarItem" id="672878446">
<object class="IBUIViewController" id="258574391">
<object class="IBUITabBarItem" key="IBUITabBarItem" id="64474689">
<string key="IBUITitle">Dialer</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">dialer-orange.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUISystemItemIdentifier">5</int>
</object>
<reference key="IBUIParentViewController" ref="952473143"/>
<string key="IBUINibName">PhoneViewController</string>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
@ -119,6 +118,7 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
<reference ref="383050823"/>
<object class="IBUIViewController" id="555899988">
<object class="IBUITabBarItem" key="IBUITabBarItem" id="534357631">
<string key="IBUITitle"/>

BIN
Resources/Speaker-32-off.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 615 B

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
Resources/Speaker-32-on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 569 B

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
Resources/addcall-green.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
Resources/conf_merge.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
Resources/contact_orange.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
Resources/mic_active.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
Resources/mic_muted.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
Resources/numpad.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
Resources/pausecall.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
Resources/resumecall.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

64
linphone.xcodeproj/project.pbxproj
View file

@ -38,8 +38,6 @@
223963171393CFAF001DE689 /* FastAddressBook.m in Sources */ = {isa = PBXBuildFile; fileRef = 223963161393CFAF001DE689 /* FastAddressBook.m */; };
2242D91610D66BF300E9963F /* in_call.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91410D66BF300E9963F /* in_call.png */; };
2242D91710D66BF300E9963F /* out_call.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91510D66BF300E9963F /* out_call.png */; };
2242D91A10D66C2100E9963F /* mic_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91810D66C2100E9963F /* mic_active.png */; };
2242D91B10D66C2100E9963F /* mic_muted.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91910D66C2100E9963F /* mic_muted.png */; };
2242D9C910D691F900E9963F /* GenericTabViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2242D9C810D691F900E9963F /* GenericTabViewController.m */; };
2242E313125235120061DDCE /* oldphone-mono-30s.caf in Resources */ = {isa = PBXBuildFile; fileRef = 2242E312125235120061DDCE /* oldphone-mono-30s.caf */; };
2245671D107699F700F10948 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2245671C107699F700F10948 /* Settings.bundle */; };
@ -70,8 +68,6 @@
22BB1A69132FF16A005CD7AA /* UIEraseButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22BB1A68132FF16A005CD7AA /* UIEraseButton.m */; };
22C755601317E59C007BC101 /* UIBluetoothButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22C7555F1317E59C007BC101 /* UIBluetoothButton.m */; };
22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B68012A3E0BE001AE361 /* libresolv.dylib */; };
22E0A785111C1BA800B04932 /* Speaker-32-on.png in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A783111C1BA800B04932 /* Speaker-32-on.png */; };
22E0A786111C1BA800B04932 /* Speaker-32-off.png in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A784111C1BA800B04932 /* Speaker-32-off.png */; };
22E0A822111C44E100B04932 /* MoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81C111C44E100B04932 /* MoreViewController.m */; };
22E0A823111C44E100B04932 /* ConsoleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */; };
22E0A824111C44E100B04932 /* ConsoleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81F111C44E100B04932 /* ConsoleViewController.m */; };
@ -86,10 +82,18 @@
3440A549146978BB0076355C /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3440A548146978BB0076355C /* libsrtp.a */; };
346A75C714619F1D005C9D07 /* AdvancedPhoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 346A75C614619F1D005C9D07 /* AdvancedPhoneViewController.m */; };
346A75C814619F73005C9D07 /* IncallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 222A483212F7176F0075F07F /* IncallViewController.m */; };
346A75CB14628DC6005C9D07 /* pausecall.png in Resources */ = {isa = PBXBuildFile; fileRef = 346A75C914628DC6005C9D07 /* pausecall.png */; };
346A75CC14628DC6005C9D07 /* resumecall.png in Resources */ = {isa = PBXBuildFile; fileRef = 346A75CA14628DC6005C9D07 /* resumecall.png */; };
346A75CF14628F02005C9D07 /* UIPauseResumeButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 346A75CE14628F02005C9D07 /* UIPauseResumeButton.m */; };
346A75D21462A786005C9D07 /* CallDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 346A75D11462A786005C9D07 /* CallDelegate.m */; };
34FD9BC0146ACC05004AB726 /* addcall-green.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FD9BB7146ACC05004AB726 /* addcall-green.png */; };
34FD9BC1146ACC05004AB726 /* conf_merge.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FD9BB8146ACC05004AB726 /* conf_merge.png */; };
34FD9BC2146ACC05004AB726 /* mic_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FD9BB9146ACC05004AB726 /* mic_active.png */; };
34FD9BC3146ACC05004AB726 /* mic_muted.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FD9BBA146ACC05004AB726 /* mic_muted.png */; };
34FD9BC4146ACC05004AB726 /* numpad.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FD9BBB146ACC05004AB726 /* numpad.png */; };
34FD9BC5146ACC05004AB726 /* pausecall.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FD9BBC146ACC05004AB726 /* pausecall.png */; };
34FD9BC6146ACC05004AB726 /* resumecall.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FD9BBD146ACC05004AB726 /* resumecall.png */; };
34FD9BC7146ACC05004AB726 /* Speaker-32-off.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FD9BBE146ACC05004AB726 /* Speaker-32-off.png */; };
34FD9BC8146ACC05004AB726 /* Speaker-32-on.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FD9BBF146ACC05004AB726 /* Speaker-32-on.png */; };
34FD9BCA146ACD76004AB726 /* contact_orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FD9BC9146ACD76004AB726 /* contact_orange.png */; };
70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */ = {isa = PBXBuildFile; fileRef = 70571E1913FABCB000CDD3C2 /* rootca.pem */; };
/* End PBXBuildFile section */
@ -274,8 +278,6 @@
223963161393CFAF001DE689 /* FastAddressBook.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FastAddressBook.m; sourceTree = "<group>"; };
2242D91410D66BF300E9963F /* in_call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = in_call.png; path = Resources/in_call.png; sourceTree = "<group>"; };
2242D91510D66BF300E9963F /* out_call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = out_call.png; path = Resources/out_call.png; sourceTree = "<group>"; };
2242D91810D66C2100E9963F /* mic_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_active.png; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/mic_active.png"; sourceTree = "<group>"; };
2242D91910D66C2100E9963F /* mic_muted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_muted.png; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/mic_muted.png"; sourceTree = "<group>"; };
2242D9C710D691F900E9963F /* GenericTabViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenericTabViewController.h; sourceTree = "<group>"; };
2242D9C810D691F900E9963F /* GenericTabViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenericTabViewController.m; sourceTree = "<group>"; };
2242E312125235120061DDCE /* oldphone-mono-30s.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "oldphone-mono-30s.caf"; path = "liblinphone-sdk/apple-darwin/share/sounds/linphone/rings/oldphone-mono-30s.caf"; sourceTree = "<group>"; };
@ -388,8 +390,6 @@
22C7564A13265C6A007BC101 /* x509_vfy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509_vfy.h; sourceTree = "<group>"; };
22C7564B13265C6A007BC101 /* x509v3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509v3.h; sourceTree = "<group>"; };
22D1B68012A3E0BE001AE361 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = usr/lib/libresolv.dylib; sourceTree = SDKROOT; };
22E0A783111C1BA800B04932 /* Speaker-32-on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Speaker-32-on.png"; path = "Resources/Speaker-32-on.png"; sourceTree = "<group>"; };
22E0A784111C1BA800B04932 /* Speaker-32-off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Speaker-32-off.png"; path = "Resources/Speaker-32-off.png"; sourceTree = "<group>"; };
22E0A81B111C44E100B04932 /* MoreViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MoreViewController.xib; sourceTree = "<group>"; };
22E0A81C111C44E100B04932 /* MoreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MoreViewController.m; sourceTree = "<group>"; };
22E0A81D111C44E100B04932 /* MoreViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoreViewController.h; sourceTree = "<group>"; };
@ -410,12 +410,20 @@
3440A548146978BB0076355C /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsrtp.a; path = "liblinphone-sdk/apple-darwin/lib/libsrtp.a"; sourceTree = "<group>"; };
346A75C514619F1D005C9D07 /* AdvancedPhoneViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdvancedPhoneViewController.h; sourceTree = "<group>"; };
346A75C614619F1D005C9D07 /* AdvancedPhoneViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdvancedPhoneViewController.m; sourceTree = "<group>"; };
346A75C914628DC6005C9D07 /* pausecall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pausecall.png; path = submodules/linphone/pixmaps/pausecall.png; sourceTree = "<group>"; };
346A75CA14628DC6005C9D07 /* resumecall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = resumecall.png; path = submodules/linphone/pixmaps/resumecall.png; sourceTree = "<group>"; };
346A75CD14628F02005C9D07 /* UIPauseResumeButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIPauseResumeButton.h; sourceTree = "<group>"; };
346A75CE14628F02005C9D07 /* UIPauseResumeButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIPauseResumeButton.m; sourceTree = "<group>"; };
346A75D01462A786005C9D07 /* CallDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallDelegate.h; sourceTree = "<group>"; };
346A75D11462A786005C9D07 /* CallDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallDelegate.m; sourceTree = "<group>"; };
34FD9BB7146ACC05004AB726 /* addcall-green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "addcall-green.png"; path = "Resources/addcall-green.png"; sourceTree = "<group>"; };
34FD9BB8146ACC05004AB726 /* conf_merge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = conf_merge.png; path = Resources/conf_merge.png; sourceTree = "<group>"; };
34FD9BB9146ACC05004AB726 /* mic_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_active.png; path = Resources/mic_active.png; sourceTree = "<group>"; };
34FD9BBA146ACC05004AB726 /* mic_muted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_muted.png; path = Resources/mic_muted.png; sourceTree = "<group>"; };
34FD9BBB146ACC05004AB726 /* numpad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = numpad.png; path = Resources/numpad.png; sourceTree = "<group>"; };
34FD9BBC146ACC05004AB726 /* pausecall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pausecall.png; path = Resources/pausecall.png; sourceTree = "<group>"; };
34FD9BBD146ACC05004AB726 /* resumecall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = resumecall.png; path = Resources/resumecall.png; sourceTree = "<group>"; };
34FD9BBE146ACC05004AB726 /* Speaker-32-off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Speaker-32-off.png"; path = "Resources/Speaker-32-off.png"; sourceTree = "<group>"; };
34FD9BBF146ACC05004AB726 /* Speaker-32-on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Speaker-32-on.png"; path = "Resources/Speaker-32-on.png"; sourceTree = "<group>"; };
34FD9BC9146ACD76004AB726 /* contact_orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_orange.png; path = Resources/contact_orange.png; sourceTree = "<group>"; };
70571E1913FABCB000CDD3C2 /* rootca.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rootca.pem; path = Resources/rootca.pem; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* linphone-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "linphone-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -863,8 +871,16 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
346A75C914628DC6005C9D07 /* pausecall.png */,
346A75CA14628DC6005C9D07 /* resumecall.png */,
34FD9BC9146ACD76004AB726 /* contact_orange.png */,
34FD9BB7146ACC05004AB726 /* addcall-green.png */,
34FD9BB8146ACC05004AB726 /* conf_merge.png */,
34FD9BB9146ACC05004AB726 /* mic_active.png */,
34FD9BBA146ACC05004AB726 /* mic_muted.png */,
34FD9BBB146ACC05004AB726 /* numpad.png */,
34FD9BBC146ACC05004AB726 /* pausecall.png */,
34FD9BBD146ACC05004AB726 /* resumecall.png */,
34FD9BBE146ACC05004AB726 /* Speaker-32-off.png */,
34FD9BBF146ACC05004AB726 /* Speaker-32-on.png */,
70571E1913FABCB000CDD3C2 /* rootca.pem */,
22E19E47138A67A000FBFE87 /* missed_call.png */,
228B19AE130290C500F154D3 /* iTunesArtwork */,
@ -880,10 +896,6 @@
22226C11118197C0000CA27B /* startcall-green.png */,
22058C70116E305000B08DDD /* icone-linphone-57.png */,
2237D4081084D7A9001383EE /* oldphone-mono.wav */,
22E0A783111C1BA800B04932 /* Speaker-32-on.png */,
22E0A784111C1BA800B04932 /* Speaker-32-off.png */,
2242D91810D66C2100E9963F /* mic_active.png */,
2242D91910D66C2100E9963F /* mic_muted.png */,
2242D91410D66BF300E9963F /* in_call.png */,
2242D91510D66BF300E9963F /* out_call.png */,
22F254801073D99800AC9B3F /* ringback.wav */,
@ -991,10 +1003,6 @@
227BCDC310D4004600FBFD76 /* CallHistoryTableViewController.xib in Resources */,
2242D91610D66BF300E9963F /* in_call.png in Resources */,
2242D91710D66BF300E9963F /* out_call.png in Resources */,
2242D91A10D66C2100E9963F /* mic_active.png in Resources */,
2242D91B10D66C2100E9963F /* mic_muted.png in Resources */,
22E0A785111C1BA800B04932 /* Speaker-32-on.png in Resources */,
22E0A786111C1BA800B04932 /* Speaker-32-off.png in Resources */,
22E0A823111C44E100B04932 /* ConsoleViewController.xib in Resources */,
22058C71116E305000B08DDD /* icone-linphone-57.png in Resources */,
22226C12118197C0000CA27B /* startcall-green.png in Resources */,
@ -1014,8 +1022,16 @@
2214783D1386A2030020F8B8 /* Localizable.strings in Resources */,
22E19E48138A67A000FBFE87 /* missed_call.png in Resources */,
70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */,
346A75CB14628DC6005C9D07 /* pausecall.png in Resources */,
346A75CC14628DC6005C9D07 /* resumecall.png in Resources */,
34FD9BC0146ACC05004AB726 /* addcall-green.png in Resources */,
34FD9BC1146ACC05004AB726 /* conf_merge.png in Resources */,
34FD9BC2146ACC05004AB726 /* mic_active.png in Resources */,
34FD9BC3146ACC05004AB726 /* mic_muted.png in Resources */,
34FD9BC4146ACC05004AB726 /* numpad.png in Resources */,
34FD9BC5146ACC05004AB726 /* pausecall.png in Resources */,
34FD9BC6146ACC05004AB726 /* resumecall.png in Resources */,
34FD9BC7146ACC05004AB726 /* Speaker-32-off.png in Resources */,
34FD9BC8146ACC05004AB726 /* Speaker-32-on.png in Resources */,
34FD9BCA146ACD76004AB726 /* contact_orange.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};