diff --git a/Classes/AdvancedPhoneViewController.m b/Classes/AdvancedPhoneViewController.m index 39266f9c8..8ad355a1b 100644 --- a/Classes/AdvancedPhoneViewController.m +++ b/Classes/AdvancedPhoneViewController.m @@ -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]; } diff --git a/Classes/IncallViewController.h b/Classes/IncallViewController.h index a7c99288e..1efea4006 100644 --- a/Classes/IncallViewController.h +++ b/Classes/IncallViewController.h @@ -26,12 +26,12 @@ @interface IncallViewController : UIViewController { - 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; diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m index 4b2163559..8a961044b 100644 --- a/Classes/IncallViewController.m +++ b/Classes/IncallViewController.m @@ -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"; diff --git a/Classes/IncallViewController.xib b/Classes/IncallViewController.xib index ee5b5db69..a77415f09 100644 --- a/Classes/IncallViewController.xib +++ b/Classes/IncallViewController.xib @@ -45,130 +45,58 @@ 274 - {320, 182} + {320, 276} _NS:418 - + 3 - MQA + MC42NjY2NjY2NjY3AA YES IBCocoaTouchFramework YES NO - 1 0 - YES YES 44 22 22 - + 292 YES - - + + 292 - {{119, -4}, {82, 52}} - + {{36, 8}, {248, 52}} + - + + + 1 + MSAwIDAuMDgyMzIwMjU5MDQgMC4xOAA + NO NO IBCocoaTouchFramework 0 0 - 1 - Pau. Res. - + + 3 + MQA + 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA 3 MC41AA - - NSImage - mic_active.png - - - NSImage - pausecall.png - - - NSImage - mic_muted.png - - - - 2 - 10 - - - Helvetica-Bold - 10 - 16 - - - - - 292 - {{26, -4}, {82, 52}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - Add to conf - - - 1 - MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - - - - 2 - 14 - - - Helvetica-Bold - 14 - 16 - - - - - 292 - {{27, 56}, {262, 52}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - NSImage stopcall-red.png @@ -186,331 +114,15 @@ - {{0, 312}, {320, 148}} + {{0, 392}, {320, 68}} - + _NS:196 - + 3 - MC42NjY2NjY2NjY3AA + MC4zMzMzMzMzMzMzAA - NO - NO - IBCocoaTouchFramework - - - - -2147483356 - - YES - - - 292 - {{95, 244}, {82, 37}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - hide - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{95, 184}, {82, 52}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - 0 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{5, 9}, {82, 52}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - 1 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{95, 9}, {82, 52}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - 2 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{185, 9}, {82, 52}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - 3 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{5, 69}, {82, 52}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - 4 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{95, 69}, {82, 52}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - 5 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{185, 69}, {82, 52}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - 6 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{5, 124}, {82, 52}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - 7 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{95, 124}, {82, 52}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - 8 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{185, 124}, {82, 52}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - 9 - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{5, 184}, {82, 52}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - * - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - - 292 - {{185, 184}, {82, 52}} - - - - NO - NO - IBCocoaTouchFramework - 0 - 0 - 1 - # - - - 1 - MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA - - - - - - - {{24, 72}, {272, 317}} - - - - - NO - NO IBCocoaTouchFramework @@ -521,31 +133,32 @@ 292 - {{119, 55}, {82, 52}} + {{119, 58}, {82, 52}} - + + NO NO IBCocoaTouchFramework 0 0 - 1 - Merge 1 MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - + + NSImage + conf_merge.png + + + 2 17 - + Helvetica-Bold 17 16 @@ -554,27 +167,26 @@ 292 - {{25, 0}, {82, 52}} + {{36, 5}, {82, 52}} + NO NO IBCocoaTouchFramework 0 0 - 1 - Mute 1 MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - - - + + NSImage + mic_active.png + 2 2 @@ -588,53 +200,52 @@ 292 - {{25, 54}, {82, 52}} + {{36, 58}, {82, 52}} + NO NO IBCocoaTouchFramework 0 0 - 1 - Add call 1 MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - NSImage - startcall-green.png + addcall-green.png - - 292 - {{206, 54}, {82, 52}} + {{202, 58}, {82, 52}} - + + NO NO IBCocoaTouchFramework 0 0 - 1 Cont 1 MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - + + 1 + MCAwIDAAA + NSImage contact-orange.png @@ -645,17 +256,16 @@ 292 - {{116, 0}, {82, 52}} + {{119, 5}, {82, 52}} + NO NO IBCocoaTouchFramework 0 0 - 1 - DTMF 1 @@ -664,7 +274,7 @@ NSImage - dialer-orange.png + numpad.png @@ -672,16 +282,16 @@ 292 - {{206, 0}, {82, 52}} + {{202, 5}, {82, 52}} + NO NO IBCocoaTouchFramework 0 0 - 1 Spk @@ -689,19 +299,358 @@ MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA - - NSImage - Speaker-32-off.png - + + + 292 + {{119, 58}, {82, 52}} + + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + + + + 1 + MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA + + + + + NSImage + resumecall.png + + + NSImage + pausecall.png + + + + - {{0, 191}, {320, 113}} + {{0, 276}, {320, 115}} - + + NO + NO + IBCocoaTouchFramework + + + + -2147483356 + + YES + + + 292 + {{95, 219}, {82, 52}} + + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + Close + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{95, 166}, {82, 52}} + + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 0 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{12, 7}, {82, 52}} + + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 1 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{95, 7}, {82, 52}} + + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 2 + + + + + + + + + 292 + {{178, 7}, {82, 52}} + + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 3 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{12, 60}, {82, 52}} + + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 4 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{95, 60}, {82, 52}} + + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 5 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{178, 60}, {82, 52}} + + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 6 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{12, 113}, {82, 52}} + + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 7 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{95, 113}, {82, 52}} + + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 8 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{178, 113}, {82, 52}} + + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + 9 + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{12, 166}, {82, 52}} + + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + * + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + + 292 + {{178, 166}, {82, 52}} + + + + + NO + NO + IBCocoaTouchFramework + 0 + 0 + # + + + 1 + MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + + + + + + {{24, 115}, {272, 279}} + + + + NO NO IBCocoaTouchFramework @@ -746,126 +695,6 @@ 109 - - - eight - - - - 75 - - - - nine - - - - 58 - - - - seven - - - - 73 - - - - six - - - - 71 - - - - five - - - - 69 - - - - four - - - - 67 - - - - three - - - - 60 - - - - one - - - - 54 - - - - zero - - - - 55 - - - - two - - - - 59 - - - - hash - - - - 57 - - - - star - - - - 56 - - - - close - - - - 51 - - - - padSubView - - - - 45 - - - - callControlSubView - - - - 117 - endCtrl @@ -874,22 +703,6 @@ 99 - - - pause - - - - 115 - - - - mergeCalls - - - - 114 - addCall @@ -900,11 +713,19 @@ - contacts + controlSubView - + - 84 + 44 + + + + mergeCalls + + + + 114 @@ -922,6 +743,14 @@ 49 + + + pause + + + + 115 + mute @@ -932,19 +761,131 @@ - controlSubView + contacts - + - 44 + 84 - addToConf + star - + - 119 + 56 + + + + two + + + + 59 + + + + one + + + + 54 + + + + four + + + + 67 + + + + hash + + + + 57 + + + + nine + + + + 58 + + + + padSubView + + + + 45 + + + + zero + + + + 55 + + + + seven + + + + 73 + + + + three + + + + 60 + + + + close + + + + 51 + + + + eight + + + + 75 + + + + six + + + + 71 + + + + five + + + + 69 + + + + hangUpView + + + + 122 @@ -1026,10 +967,10 @@ YES - + + - @@ -1039,167 +980,41 @@ - 27 - - - YES - - - - - - - - - - - - - - - - pad - - - 33 - - - 8 - - - 32 - - - 9 - - - 34 - - - 7 - - - 37 - - - 6 - - - 36 - - - 5 - - - 35 - - - 4 - - - 38 - - - 3 - - - 30 - - - 1 - - - 41 - - - 0 - - - 39 - - - 2 - - - 40 - - - hash - - - 31 - - - star - - - 29 - - - close - - - 116 - + 120 + YES - - - callcontrols 18 - + end - - 113 - - - pauseresume - - - 118 - - - addtoconf - 26 YES - - + + + controls - 104 - + 113 + - merge - - - 111 - - - addcall - - - 15 - - - contacts + pauseresume 13 @@ -1213,12 +1028,130 @@ dialer + + 15 + + + contacts + + + 111 + + + addcall + 16 mute + + 104 + + + merge + + + 27 + + + YES + + + + + + + + + + + + + + + + pad + + + 31 + + + star + + + 30 + + + 1 + + + 33 + + + 8 + + + 40 + + + hash + + + 36 + + + 5 + + + 29 + + + close + + + 39 + + + 2 + + + 41 + + + 0 + + + 38 + + + 3 + + + 35 + + + 4 + + + 37 + + + 6 + + + 34 + + + 7 + + + 32 + + + 9 + @@ -1230,17 +1163,19 @@ -2.CustomClassName -2.IBPluginDependency 104.IBPluginDependency + 104.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 106.IBPluginDependency 111.IBPluginDependency - 113.CustomClassName + 111.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 113.IBPluginDependency - 116.IBPluginDependency - 118.IBPluginDependency + 113.IBUIButtonInspectorSelectedStateConfigurationMetadataKey + 120.IBPluginDependency 13.CustomClassName 13.IBPluginDependency 15.IBPluginDependency 16.CustomClassName 16.IBPluginDependency + 16.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 17.IBPluginDependency 18.IBPluginDependency 2.IBPluginDependency @@ -1280,17 +1215,19 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIPauseResumeButton - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIMuteButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1336,7 +1273,7 @@ - 119 + 122 @@ -1371,6 +1308,7 @@ endCtrl five four + hangUpView hash mergeCalls mute @@ -1400,6 +1338,7 @@ UIButton UIButton UIButton + UIView UIButton UIButton UIButton @@ -1432,6 +1371,7 @@ endCtrl five four + hangUpView hash mergeCalls mute @@ -1497,6 +1437,10 @@ four UIButton + + hangUpView + UIView + hash UIButton @@ -1576,14 +1520,6 @@ ./Classes/UIMuteButton.h - - UIPauseResumeButton - UIToggleButton - - IBProjectSource - ./Classes/UIPauseResumeButton.h - - UISpeakerButton UIToggleButton @@ -1608,10 +1544,6 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -1622,24 +1554,24 @@ YES YES - Speaker-32-off.png + addcall-green.png + conf_merge.png contact-orange.png - dialer-orange.png mic_active.png - mic_muted.png + numpad.png pausecall.png - startcall-green.png + resumecall.png stopcall-red.png YES - {32, 32} + {82, 71} + {82, 75} {25, 23} - {25, 24} - {20, 20} - {20, 20} - {25, 23} - {60, 52} + {82, 82} + {82, 82} + {82, 75} + {82, 75} {62, 54} diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 736d06e16..b73da3f43 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -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); } diff --git a/Classes/LinphoneUI/UIToggleButton.m b/Classes/LinphoneUI/UIToggleButton.m index 5961a46c1..04c0b3721 100644 --- a/Classes/LinphoneUI/UIToggleButton.m +++ b/Classes/LinphoneUI/UIToggleButton.m @@ -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]; diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m index 0e09d9a7c..243e5558d 100644 --- a/Classes/PhoneViewController.m +++ b/Classes/PhoneViewController.m @@ -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]; } diff --git a/PhoneMainView.xib b/PhoneMainView.xib index 26cbcfb90..1eb8dfbfc 100644 --- a/PhoneMainView.xib +++ b/PhoneMainView.xib @@ -65,18 +65,12 @@ IBCocoaTouchFramework NO - - - Dialer - - NSImage - dialer-orange.png - + + IBCocoaTouchFramework + 5 - PhoneViewController - 1 1 @@ -105,13 +99,18 @@ IBCocoaTouchFramework NO - - - + + + Dialer + + NSImage + dialer-orange.png + IBCocoaTouchFramework - 5 + PhoneViewController + 1 1 @@ -119,6 +118,7 @@ IBCocoaTouchFramework NO + diff --git a/Resources/Speaker-32-off.png b/Resources/Speaker-32-off.png index e93ae232f..3a5b3fd73 100644 Binary files a/Resources/Speaker-32-off.png and b/Resources/Speaker-32-off.png differ diff --git a/Resources/Speaker-32-on.png b/Resources/Speaker-32-on.png index de8d4460e..cd0fbd40d 100644 Binary files a/Resources/Speaker-32-on.png and b/Resources/Speaker-32-on.png differ diff --git a/Resources/addcall-green.png b/Resources/addcall-green.png new file mode 100644 index 000000000..8ccfe2ba1 Binary files /dev/null and b/Resources/addcall-green.png differ diff --git a/Resources/conf_merge.png b/Resources/conf_merge.png new file mode 100644 index 000000000..409609c06 Binary files /dev/null and b/Resources/conf_merge.png differ diff --git a/Resources/contact_orange.png b/Resources/contact_orange.png new file mode 100644 index 000000000..cbdf86df8 Binary files /dev/null and b/Resources/contact_orange.png differ diff --git a/Resources/mic_active.png b/Resources/mic_active.png new file mode 100644 index 000000000..e4b7c6a1b Binary files /dev/null and b/Resources/mic_active.png differ diff --git a/Resources/mic_muted.png b/Resources/mic_muted.png new file mode 100644 index 000000000..6110a04fc Binary files /dev/null and b/Resources/mic_muted.png differ diff --git a/Resources/numpad.png b/Resources/numpad.png new file mode 100644 index 000000000..966b48348 Binary files /dev/null and b/Resources/numpad.png differ diff --git a/Resources/pausecall.png b/Resources/pausecall.png new file mode 100644 index 000000000..ffac25a47 Binary files /dev/null and b/Resources/pausecall.png differ diff --git a/Resources/resumecall.png b/Resources/resumecall.png new file mode 100644 index 000000000..8c9ba5d45 Binary files /dev/null and b/Resources/resumecall.png differ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index e7f916b11..2c15008f4 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -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 = ""; }; 2242D91410D66BF300E9963F /* in_call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = in_call.png; path = Resources/in_call.png; sourceTree = ""; }; 2242D91510D66BF300E9963F /* out_call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = out_call.png; path = Resources/out_call.png; sourceTree = ""; }; - 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 = ""; }; - 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 = ""; }; 2242D9C710D691F900E9963F /* GenericTabViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenericTabViewController.h; sourceTree = ""; }; 2242D9C810D691F900E9963F /* GenericTabViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenericTabViewController.m; sourceTree = ""; }; 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 = ""; }; @@ -388,8 +390,6 @@ 22C7564A13265C6A007BC101 /* x509_vfy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509_vfy.h; sourceTree = ""; }; 22C7564B13265C6A007BC101 /* x509v3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509v3.h; sourceTree = ""; }; 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 = ""; }; - 22E0A784111C1BA800B04932 /* Speaker-32-off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Speaker-32-off.png"; path = "Resources/Speaker-32-off.png"; sourceTree = ""; }; 22E0A81B111C44E100B04932 /* MoreViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MoreViewController.xib; sourceTree = ""; }; 22E0A81C111C44E100B04932 /* MoreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MoreViewController.m; sourceTree = ""; }; 22E0A81D111C44E100B04932 /* MoreViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoreViewController.h; sourceTree = ""; }; @@ -410,12 +410,20 @@ 3440A548146978BB0076355C /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsrtp.a; path = "liblinphone-sdk/apple-darwin/lib/libsrtp.a"; sourceTree = ""; }; 346A75C514619F1D005C9D07 /* AdvancedPhoneViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdvancedPhoneViewController.h; sourceTree = ""; }; 346A75C614619F1D005C9D07 /* AdvancedPhoneViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdvancedPhoneViewController.m; sourceTree = ""; }; - 346A75C914628DC6005C9D07 /* pausecall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pausecall.png; path = submodules/linphone/pixmaps/pausecall.png; sourceTree = ""; }; - 346A75CA14628DC6005C9D07 /* resumecall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = resumecall.png; path = submodules/linphone/pixmaps/resumecall.png; sourceTree = ""; }; 346A75CD14628F02005C9D07 /* UIPauseResumeButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIPauseResumeButton.h; sourceTree = ""; }; 346A75CE14628F02005C9D07 /* UIPauseResumeButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIPauseResumeButton.m; sourceTree = ""; }; 346A75D01462A786005C9D07 /* CallDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallDelegate.h; sourceTree = ""; }; 346A75D11462A786005C9D07 /* CallDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallDelegate.m; sourceTree = ""; }; + 34FD9BB7146ACC05004AB726 /* addcall-green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "addcall-green.png"; path = "Resources/addcall-green.png"; sourceTree = ""; }; + 34FD9BB8146ACC05004AB726 /* conf_merge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = conf_merge.png; path = Resources/conf_merge.png; sourceTree = ""; }; + 34FD9BB9146ACC05004AB726 /* mic_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_active.png; path = Resources/mic_active.png; sourceTree = ""; }; + 34FD9BBA146ACC05004AB726 /* mic_muted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_muted.png; path = Resources/mic_muted.png; sourceTree = ""; }; + 34FD9BBB146ACC05004AB726 /* numpad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = numpad.png; path = Resources/numpad.png; sourceTree = ""; }; + 34FD9BBC146ACC05004AB726 /* pausecall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pausecall.png; path = Resources/pausecall.png; sourceTree = ""; }; + 34FD9BBD146ACC05004AB726 /* resumecall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = resumecall.png; path = Resources/resumecall.png; sourceTree = ""; }; + 34FD9BBE146ACC05004AB726 /* Speaker-32-off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Speaker-32-off.png"; path = "Resources/Speaker-32-off.png"; sourceTree = ""; }; + 34FD9BBF146ACC05004AB726 /* Speaker-32-on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Speaker-32-on.png"; path = "Resources/Speaker-32-on.png"; sourceTree = ""; }; + 34FD9BC9146ACD76004AB726 /* contact_orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_orange.png; path = Resources/contact_orange.png; sourceTree = ""; }; 70571E1913FABCB000CDD3C2 /* rootca.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rootca.pem; path = Resources/rootca.pem; sourceTree = ""; }; 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 = ""; }; /* 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; };