diff --git a/Classes/CallHistoryTableViewController.h b/Classes/CallHistoryTableViewController.h index 334c5d3d1..21b4abac5 100644 --- a/Classes/CallHistoryTableViewController.h +++ b/Classes/CallHistoryTableViewController.h @@ -16,14 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + #import -#import "GenericTabViewController.h" - -@interface CallHistoryTableViewController : GenericTabViewController { - UIButton* clear; +@interface CallHistoryTableViewController : UITableViewController { } --(void) doAction:(id) sender; - -@property (nonatomic, retain) IBOutlet UIButton* clear; @end diff --git a/Classes/CallHistoryTableViewController.m b/Classes/CallHistoryTableViewController.m index 72633984f..a55c5ffd6 100644 --- a/Classes/CallHistoryTableViewController.m +++ b/Classes/CallHistoryTableViewController.m @@ -22,9 +22,6 @@ @implementation CallHistoryTableViewController - -@synthesize clear; - /* - (id)initWithStyle:(UITableViewStyle)style { // Override initWithStyle: if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. @@ -33,19 +30,11 @@ return self; } */ - - +/* - (void)viewDidLoad { [super viewDidLoad]; - - UIBarButtonItem* clearButton = [[UIBarButtonItem alloc] - initWithBarButtonSystemItem:UIBarButtonSystemItemTrash - target:self - action:@selector(doAction:)]; - [self.navigationItem setRightBarButtonItem:clearButton]; - [clearButton release]; } - +*/ /* - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; @@ -243,7 +232,6 @@ } */ - - (void)dealloc { [super dealloc]; } diff --git a/Classes/CallHistoryTableViewController.xib b/Classes/CallHistoryTableViewController.xib deleted file mode 100644 index ceb06857e..000000000 --- a/Classes/CallHistoryTableViewController.xib +++ /dev/null @@ -1,201 +0,0 @@ - - - - 784 - 9L31a - 680 - 949.54 - 353.00 - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - YES - - YES - - - YES - - - - YES - - IBFilesOwner - - - IBFirstResponder - - - - 292 - {320, 460} - - - 3 - MQA - - NO - YES - NO - - NO - 1 - 0 - YES - 4.400000e+01 - 4.400000e+01 - 2.200000e+01 - - - - - YES - - - view - - - - 5 - - - - dataSource - - - - 6 - - - - delegate - - - - 7 - - - - - YES - - 0 - - YES - - - - - - -1 - - - RmlsZSdzIE93bmVyA - - - -2 - - - - - 4 - - - - - - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 4.IBEditorWindowLastContentRect - 4.IBPluginDependency - - - YES - CallHistoryTableViewController - UIResponder - {{163, 500}, {320, 480}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - YES - - - YES - - - - - YES - - YES - - - YES - - - - 13 - - - - YES - - CallHistoryTableViewController - GenericTabViewController - - doAction: - id - - - clear - UIButton - - - IBProjectSource - Classes/CallHistoryTableViewController.h - - - - GenericTabViewController - UITableViewController - - YES - - YES - header - linphoneDelegate - phoneControllerDelegate - - - YES - UIView - id - id - - - - IBProjectSource - Classes/GenericTabViewController.h - - - - - 0 - ../linphone.xcodeproj - 3 - 3.1 - - diff --git a/Classes/GenericTabViewController.h b/Classes/ContactTableViewController.h similarity index 73% rename from Classes/GenericTabViewController.h rename to Classes/ContactTableViewController.h index 206a3bb6a..5b4bd1a2b 100644 --- a/Classes/GenericTabViewController.h +++ b/Classes/ContactTableViewController.h @@ -1,6 +1,6 @@ -/* GenericTabViewController.h +/* ContactTableViewController.h * - * Copyright (C) 2009 Belledonne Comunications, Grenoble, France + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,14 +18,13 @@ */ #import -#include "linphonecore.h" -#import "PhoneViewController.h" -#import "linphoneAppDelegate.h" +#import +#import -@interface GenericTabViewController : UITableViewController { - LinphoneCore* myLinphoneCore; - IBOutlet UIView* header; +@interface ContactTableViewController : UITableViewController { + NSMutableDictionary* addressBookMap; + + ABAddressBookRef addressBook; } -@property (nonatomic, retain) IBOutlet UIView* header; -@end +@end diff --git a/Classes/ContactTableViewController.m b/Classes/ContactTableViewController.m new file mode 100644 index 000000000..11b639d9f --- /dev/null +++ b/Classes/ContactTableViewController.m @@ -0,0 +1,103 @@ +/* ContactTableViewController.m + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "ContactTableViewController.h" +#import "LinphoneManager.h" +#import "FastAddressBook.h" +#import "ContactCell.h" + +@implementation ContactTableViewController + +#pragma mark Table view methods +NSString *contactTOC = @"ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + +void sync_toc_address_book (ABAddressBookRef addressBook, CFDictionaryRef info, void *context) { + ContactTableViewController* controller = (ContactTableViewController*)context; + NSMutableDictionary* lAddressBookMap = controller->addressBookMap; + @synchronized (lAddressBookMap) { + + // Reset Address book + [lAddressBookMap removeAllObjects]; + + for(int i = 0; i < [contactTOC length]; i++) { + [lAddressBookMap setObject: [[NSMutableDictionary alloc] init] forKey:[contactTOC substringWithRange:NSMakeRange(i, 1)]]; + } + + NSArray *lContacts = (NSArray *)ABAddressBookCopyArrayOfAllPeople(addressBook); + for (id lPerson in lContacts) { + CFStringRef lValue = ABRecordCopyValue((ABRecordRef)lPerson, kABPersonFirstNameProperty); + CFStringRef lLocalizedLabel = ABAddressBookCopyLocalizedLabel(lValue); + + // Put in correct subDic + NSString *firstChar = [[(NSString *)lLocalizedLabel substringToIndex:1] uppercaseString]; + NSMutableDictionary *subDic =[lAddressBookMap objectForKey: firstChar]; + if(subDic == nil) { + subDic = [[NSMutableDictionary alloc] init]; + [lAddressBookMap setObject: subDic forKey:firstChar]; + } + [subDic setObject:lPerson forKey:[(NSString *)lLocalizedLabel retain]]; + + if (lLocalizedLabel) CFRelease(lLocalizedLabel); + CFRelease(lValue); + } + CFRelease(lContacts); + } + [controller.view reloadData]; +} + +- (void) viewDidLoad { + addressBookMap = [[NSMutableDictionary alloc] init]; + addressBook = ABAddressBookCreate(); + ABAddressBookRegisterExternalChangeCallback (addressBook, sync_toc_address_book, self); + sync_toc_address_book(addressBook, nil, self); +} + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + return [contactTOC length]; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + return [(NSMutableDictionary *)[addressBookMap objectForKey: [contactTOC substringWithRange:NSMakeRange(section, 1)]] count]; +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + ContactCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ContactCell"]; + if (cell == nil) { + cell = [[ContactCell alloc] init]; + } + + NSMutableDictionary *subDic = [addressBookMap objectForKey: [contactTOC substringWithRange:NSMakeRange([indexPath section], 1)]]; + + [cell.label setText: (NSString *)[[subDic allKeys] objectAtIndex:[indexPath row]]]; + return cell; +} + +- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section { + return [contactTOC substringWithRange:NSMakeRange(section, 1)]; +} + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { +} + +- (void)dealloc { + [super dealloc]; + [addressBookMap removeAllObjects]; +} + +@end diff --git a/Classes/GenericTabViewController.m b/Classes/ContactsController.h similarity index 62% rename from Classes/GenericTabViewController.m rename to Classes/ContactsController.h index e3dc5a208..2676c9d1b 100644 --- a/Classes/GenericTabViewController.m +++ b/Classes/ContactsController.h @@ -1,6 +1,6 @@ -/* GenericTabViewController.c +/* HistoryController.h * - * Copyright (C) 2009 Belledonne Comunications, Grenoble, France + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,31 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ + */ -#import "GenericTabViewController.h" +#import - -@implementation GenericTabViewController -@synthesize header; - - -- (void)viewDidLoad { - [super viewDidLoad]; - self.tableView.tableHeaderView=header; +@interface ContactsController : UIViewController { + UITableViewController *tableController; + UIButton *allButton; + UIButton *linphoneButton; } - -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; - [self.tableView reloadData]; -} - - - -- (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath { - - [self tableView:tableView didSelectRowAtIndexPath:indexPath]; -} - +@property (nonatomic, retain) IBOutlet UITableViewController* tableController; +@property (nonatomic, retain) IBOutlet UIButton* allButton; +@property (nonatomic, retain) IBOutlet UIButton* linphoneButton; +-(IBAction) onAllClick: (id) event; +-(IBAction) onLinphoneClick: (id) event; @end - diff --git a/Classes/ContactsController.m b/Classes/ContactsController.m new file mode 100644 index 000000000..515784419 --- /dev/null +++ b/Classes/ContactsController.m @@ -0,0 +1,64 @@ +/* HistoryController.m + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + + +#import "ContactsController.h" +#import "AddressBook/ABPerson.h" + +@implementation ContactsController + +@synthesize tableController; +@synthesize allButton; +@synthesize linphoneButton; + +typedef enum _HistoryView { + History_All, + History_Linphone, + History_MAX +} HistoryView; + + +- (void) changeView: (HistoryView) view { + if(view == History_All) { + allButton.selected = TRUE; + } else { + allButton.selected = FALSE; + } + + if(view == History_Linphone) { + linphoneButton.selected = TRUE; + } else { + linphoneButton.selected = FALSE; + } +} + +- (void) viewDidLoad { + [super viewDidLoad]; + [self changeView: History_All]; +} + +-(IBAction) onAllClick: (id) event { + [self changeView: History_All]; +} + +-(IBAction) onLinphoneClick: (id) event { + [self changeView: History_Linphone]; +} + +@end diff --git a/Classes/ContactsController.xib b/Classes/ContactsController.xib new file mode 100644 index 000000000..4273e7de4 --- /dev/null +++ b/Classes/ContactsController.xib @@ -0,0 +1,444 @@ + + + + 1296 + 11E53 + 2182 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1181 + + + IBUIButton + IBUITableView + IBUIView + IBUITableViewController + IBProxyObject + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 274 + + + + 292 + {106, 58} + + + + _NS:9 + NO + + All + + IBCocoaTouchFramework + 0 + 0 + NO + + 3 + MC41AA + + + NSImage + all-contacts-selectionne.png + + + NSImage + all-contacts-actif.png + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + + 292 + {{106, 0}, {106, 58}} + + + + _NS:9 + NO + + Linphone + + IBCocoaTouchFramework + 0 + 0 + NO + + + NSImage + linphone-selectionne.png + + + NSImage + linphone-actif.png + + + + + + + 292 + {{212, 0}, {108, 58}} + + + + _NS:9 + NO + + Add contact + + IBCocoaTouchFramework + 0 + 0 + NO + + + NSImage + add-contact-depuis-detail-over.png + + + NSImage + add-contact-depuis-detail-actif.png + + + + + + {320, 58} + + + + _NS:9 + + 3 + MQA + + 2 + + + IBCocoaTouchFramework + + + + 274 + {{0, 58}, {320, 402}} + + + _NS:10 + + 3 + MQA + + NO + YES + NO + IBCocoaTouchFramework + YES + YES + NO + 1 + 0 + YES + 44 + 22 + 22 + + + {320, 460} + + + + _NS:9 + + 3 + MQA + + + IBCocoaTouchFramework + + + + + 1 + 1 + + IBCocoaTouchFramework + NO + + + + + + + view + + + + 16 + + + + allButton + + + + 27 + + + + linphoneButton + + + + 31 + + + + tableController + + + + 83 + + + + onAllClick: + + + 7 + + 29 + + + + onLinphoneClick: + + + 7 + + 47 + + + + dataSource + + + + 81 + + + + delegate + + + + 82 + + + + view + + + + 80 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 2 + + + + + + + + + 3 + + + + + + + + header + + + 4 + + + all + + + 5 + + + linphone + + + 6 + + + addContact + + + 69 + + + tableView + + + 76 + + + + tableController + + + + + ContactsController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + ContactTableViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 83 + + + + + ContactTableViewController + UITableViewController + + IBProjectSource + ./Classes/ContactTableViewController.h + + + + ContactsController + UIViewController + + id + id + + + + onAllClick: + id + + + onLinphoneClick: + id + + + + UIButton + UIButton + UITableViewController + + + + allButton + UIButton + + + linphoneButton + UIButton + + + tableController + UITableViewController + + + + IBProjectSource + ./Classes/ContactsController.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + + {214, 117} + {214, 117} + {213, 117} + {213, 117} + {213, 117} + {213, 117} + + 1181 + + diff --git a/Classes/HistoryController.h b/Classes/HistoryController.h new file mode 100644 index 000000000..265f608ed --- /dev/null +++ b/Classes/HistoryController.h @@ -0,0 +1,33 @@ +/* HistoryController.h + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import +#import "CallHistoryTableViewController.h" + +@interface HistoryController : UIViewController { + CallHistoryTableViewController *tableController; + UIButton *allButton; + UIButton *missedButton; +} +@property (nonatomic, retain) IBOutlet CallHistoryTableViewController* tableController; +@property (nonatomic, retain) IBOutlet UIButton* allButton; +@property (nonatomic, retain) IBOutlet UIButton* missedButton; +-(IBAction) onAllClick: (id) event; +-(IBAction) onMissedClick: (id) event; +@end diff --git a/Classes/HistoryController.m b/Classes/HistoryController.m new file mode 100644 index 000000000..cdd746907 --- /dev/null +++ b/Classes/HistoryController.m @@ -0,0 +1,63 @@ +/* HistoryController.m + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + + +#import "HistoryController.h" + + +@implementation HistoryController +@synthesize tableController; +@synthesize allButton; +@synthesize missedButton; + +typedef enum _HistoryView { + History_All, + History_Missed, + History_MAX +} HistoryView; + + +- (void) changeView: (HistoryView) view { + if(view == History_All) { + allButton.selected = TRUE; + } else { + allButton.selected = FALSE; + } + + if(view == History_Missed) { + missedButton.selected = TRUE; + } else { + missedButton.selected = FALSE; + } +} + +- (void) viewDidLoad { + [super viewDidLoad]; + [self changeView: History_All]; +} + +-(IBAction) onAllClick: (id) event { + [self changeView: History_All]; +} + +-(IBAction) onMissedClick: (id) event { + [self changeView: History_Missed]; +} + +@end diff --git a/Classes/HistoryController.xib b/Classes/HistoryController.xib new file mode 100644 index 000000000..3f23429e4 --- /dev/null +++ b/Classes/HistoryController.xib @@ -0,0 +1,441 @@ + + + + 1296 + 11E53 + 2182 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1181 + + + IBUIButton + IBUITableView + IBUIView + IBUITableViewController + IBProxyObject + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 274 + + + + 292 + {106, 58} + + + + _NS:9 + NO + + All + + IBCocoaTouchFramework + 0 + 0 + NO + + 3 + MC41AA + + + NSImage + all-call-selectionne.png + + + NSImage + all-call-actif.png + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + + 292 + {{106, 0}, {106, 58}} + + + + _NS:9 + NO + + Missed + + IBCocoaTouchFramework + 0 + 0 + NO + + + NSImage + missed-selectionne.png + + + NSImage + missed-actif.png + + + + + + + 292 + {{212, 0}, {108, 58}} + + + + _NS:9 + NO + + Edit + + IBCocoaTouchFramework + 0 + 0 + NO + + + NSImage + edit-history-over.png + + + NSImage + edit-history-actif.png + + + + + + {320, 58} + + + + _NS:9 + + 3 + MQA + + 2 + + + IBCocoaTouchFramework + + + + 274 + {{0, 58}, {320, 402}} + + + + _NS:9 + + 3 + MQA + + YES + IBCocoaTouchFramework + YES + 1 + 0 + YES + 44 + 22 + 22 + + + {320, 460} + + + + _NS:9 + + 3 + MQA + + + IBCocoaTouchFramework + + + + + 1 + 1 + + IBCocoaTouchFramework + NO + + + + + + + view + + + + 16 + + + + tableController + + + + 26 + + + + allButton + + + + 27 + + + + missedButton + + + + 28 + + + + onAllClick: + + + 7 + + 29 + + + + onMissedClick: + + + 7 + + 30 + + + + dataSource + + + + 23 + + + + delegate + + + + 24 + + + + view + + + + 25 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 2 + + + + + + + + + 3 + + + + + + + + header + + + 4 + + + all + + + 5 + + + missed + + + 6 + + + edit + + + 17 + + + tableView + + + 18 + + + + tableController + + + + + HistoryController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + CallHistoryTableViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + + 30 + + + + + CallHistoryTableViewController + UITableViewController + + IBProjectSource + ./Classes/CallHistoryTableViewController.h + + + + HistoryController + UIViewController + + id + id + + + + onAllClick: + id + + + onMissedClick: + id + + + + UIButton + UIButton + CallHistoryTableViewController + + + + allButton + UIButton + + + missedButton + UIButton + + + tableController + CallHistoryTableViewController + + + + IBProjectSource + ./Classes/HistoryController.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + + {213, 117} + {213, 117} + {214, 117} + {214, 117} + {213, 117} + {213, 117} + + 1181 + + diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index bd89a845c..468a68302 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -28,7 +28,6 @@ #import "ConsoleViewController.h" #import "MoreViewController.h" -#include "CallHistoryTableViewController.h" #include "LinphoneManager.h" #include "linphonecore.h" diff --git a/Classes/StatusSubViewController.h b/Classes/LinphoneUI/ContactCell.h similarity index 67% rename from Classes/StatusSubViewController.h rename to Classes/LinphoneUI/ContactCell.h index 72e4997eb..fafb4d8cd 100644 --- a/Classes/StatusSubViewController.h +++ b/Classes/LinphoneUI/ContactCell.h @@ -1,6 +1,6 @@ -/* StatusSubViewController.h +/* ContactCell.h * - * Copyright (C) 2011 Belledonne Comunications, Grenoble, France + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,20 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ -#import -#include "linphonecore.h" + */ -@interface StatusSubViewController : UIViewController { - UIImageView* image; - UIActivityIndicatorView* spinner; - UILabel* label; +#import + +@interface ContactCell : UITableViewCell { + UILabel *label; } -@property (nonatomic, retain) IBOutlet UIImageView* image; -@property (nonatomic, retain) IBOutlet UIActivityIndicatorView* spinner; @property (nonatomic, retain) IBOutlet UILabel* label; - --(BOOL) updateWithRegistrationState:(LinphoneRegistrationState)state message:(NSString*) message; - @end diff --git a/Classes/LinphoneUI/ContactCell.m b/Classes/LinphoneUI/ContactCell.m new file mode 100644 index 000000000..cbc0288b0 --- /dev/null +++ b/Classes/LinphoneUI/ContactCell.m @@ -0,0 +1,37 @@ +/* ContactCell.m + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import "ContactCell.h" + +@implementation ContactCell + +@synthesize label; +- (id) init { + if((self = [super init]) != nil) { + NSArray *arrayOfViews = [[NSBundle mainBundle] loadNibNamed:@"ContactCell" + owner:self + options:nil]; + + if ([arrayOfViews count] >= 1){ + [self addSubview:[[arrayOfViews objectAtIndex:0] retain]]; + } + } + return self; +} +@end diff --git a/Classes/LinphoneUI/ContactCell.xib b/Classes/LinphoneUI/ContactCell.xib new file mode 100644 index 000000000..98886f8ae --- /dev/null +++ b/Classes/LinphoneUI/ContactCell.xib @@ -0,0 +1,195 @@ + + + + 1296 + 11E53 + 2182 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1181 + + + IBProxyObject + IBUILabel + IBUITableViewCell + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 256 + + + + 274 + {{10, 0}, {310, 39}} + + + _NS:328 + NO + YES + 7 + 2 + NO + IBCocoaTouchFramework + Texte de test + + 1 + MCAwIDAAA + + + 1 + 10 + + 1 + 25 + + + Helvetica + 25 + 16 + + + + {320, 39} + + + + _NS:395 + + 3 + MCAwAA + + NO + YES + 4 + YES + IBCocoaTouchFramework + + + {320, 40} + + + + _NS:384 + IBCocoaTouchFramework + + ConferenceDetailCellIdentifier + + + + + + + + label + + + + 9 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 4 + + + + + + cell + + + 6 + + + label + + + + + ContactCell + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 9 + + + + + ContactCell + UITableViewCell + + label + UILabel + + + label + + label + UILabel + + + + IBProjectSource + ./Classes/ContactCell.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + 1181 + + diff --git a/Classes/LinphoneUI/LinphoneMainBar.h b/Classes/LinphoneUI/LinphoneMainBar.h index c0edcf6f9..a059fa8a8 100644 --- a/Classes/LinphoneUI/LinphoneMainBar.h +++ b/Classes/LinphoneUI/LinphoneMainBar.h @@ -21,10 +21,20 @@ @interface LinphoneMainBar : UIViewController { UIButton *historyButton; + UIButton *contactsButton; UIButton *dialerButton; + UIButton *settingsButton; + UIButton *chatButton; } @property (nonatomic, retain) IBOutlet UIButton* historyButton; +@property (nonatomic, retain) IBOutlet UIButton* contactsButton; @property (nonatomic, retain) IBOutlet UIButton* dialerButton; +@property (nonatomic, retain) IBOutlet UIButton* settingsButton; +@property (nonatomic, retain) IBOutlet UIButton* chatButton; -(IBAction) onHistoryClick: (id) event; +-(IBAction) onContactsClick: (id) event; +-(IBAction) onDialerClick: (id) event; +-(IBAction) onSettingsClick: (id) event; +-(IBAction) onChatClick: (id) event; @end diff --git a/Classes/LinphoneUI/LinphoneMainBar.m b/Classes/LinphoneUI/LinphoneMainBar.m index 51d0bdf68..3ff7e3060 100644 --- a/Classes/LinphoneUI/LinphoneMainBar.m +++ b/Classes/LinphoneUI/LinphoneMainBar.m @@ -23,8 +23,10 @@ @implementation LinphoneMainBar @synthesize historyButton; +@synthesize contactsButton; @synthesize dialerButton; - +@synthesize settingsButton; +@synthesize chatButton; - (void) viewDidLoad { [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLinphoneMainViewChangeEvent:) name:@"LinphoneMainViewChange" object:nil]; @@ -32,26 +34,64 @@ - (void) receiveLinphoneMainViewChangeEvent: (NSNotification*) notif { PhoneView view = [[notif.userInfo objectForKey: @"PhoneView"] intValue]; - if(view == PhoneView_Main) { - dialerButton.selected = TRUE; - } else { - dialerButton.selected = FALSE; - } - if(view == PhoneView_CallHistory) { + if(view == PhoneView_History) { historyButton.selected = TRUE; } else { historyButton.selected = FALSE; } + if(view == PhoneView_Contacts) { + contactsButton.selected = TRUE; + } else { + contactsButton.selected = FALSE; + } + if(view == PhoneView_Dialer) { + dialerButton.selected = TRUE; + } else { + dialerButton.selected = FALSE; + } + if(view == PhoneView_Settings) { + settingsButton.selected = TRUE; + } else { + settingsButton.selected = FALSE; + } + if(view == PhoneView_Chat) { + chatButton.selected = TRUE; + } else { + chatButton.selected = FALSE; + } +} + +- (void) viewDidUnload { + [[NSNotificationCenter defaultCenter] removeObserver:self]; } - (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; [super dealloc]; + [[NSNotificationCenter defaultCenter] removeObserver:self]; } - (IBAction) onHistoryClick: (id) sender { - // Change to default view - NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_CallHistory] forKey:@"PhoneView"]; + NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_History] forKey:@"PhoneView"]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict]; +} + +-(IBAction) onContactsClick: (id) event { + NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_Contacts] forKey:@"PhoneView"]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict]; +} + +-(IBAction) onDialerClick: (id) event { + NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_Dialer] forKey:@"PhoneView"]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict]; +} + +-(IBAction) onSettingsClick: (id) event { + NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_Settings] forKey:@"PhoneView"]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict]; +} + +-(IBAction) onChatClick: (id) event { + NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_Chat] forKey:@"PhoneView"]; [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict]; } diff --git a/Classes/LinphoneUI/LinphoneMainBar.xib b/Classes/LinphoneUI/LinphoneMainBar.xib index ae4a512fa..e22c6d913 100644 --- a/Classes/LinphoneUI/LinphoneMainBar.xib +++ b/Classes/LinphoneUI/LinphoneMainBar.xib @@ -215,7 +215,7 @@ _NS:9 NO - Tchat + Chat IBCocoaTouchFramework 0 @@ -258,14 +258,6 @@ - - - dialerButton - - - - 12 - historyButton @@ -274,6 +266,14 @@ 13 + + + dialerButton + + + + 12 + view @@ -282,14 +282,74 @@ 14 + + + contactsButton + + + + 27 + + + + chatButton + + + + 28 + + + + settingsButton + + + + 29 + + + + onChatClick: + + + 7 + + 26 + onHistoryClick: - 1 + 7 - 15 + 22 + + + + onDialerClick: + + + 7 + + 24 + + + + onContactsClick: + + + 7 + + 23 + + + + onSettingsClick: + + + 7 + + 25 @@ -326,22 +386,16 @@ mainTabBar - 9 - + 4 + - settings + mask - 8 - + 5 + - contacts - - - 7 - - - dialer + chat 6 @@ -350,16 +404,22 @@ history - 5 - + 7 + - tchat + dialer - 4 - + 8 + - mask + contacts + + + 9 + + + settings @@ -386,29 +446,58 @@ - 16 + 29 LinphoneMainBar UIViewController - - onHistoryClick: - id - - - onHistoryClick: - + + id + id + id + id + id + + + + onChatClick: + id + + + onContactsClick: + id + + + onDialerClick: + id + + onHistoryClick: id - + + onSettingsClick: + id + + + UIButton + UIButton UIButton UIButton + UIButton + + chatButton + UIButton + + + contactsButton + UIButton + dialerButton UIButton @@ -417,6 +506,10 @@ historyButton UIButton + + settingsButton + UIButton + IBProjectSource diff --git a/Classes/LinphoneUI/LinphoneStatusBar.h b/Classes/LinphoneUI/LinphoneStatusBar.h index a041cb37e..bbd2d02c2 100644 --- a/Classes/LinphoneUI/LinphoneStatusBar.h +++ b/Classes/LinphoneUI/LinphoneStatusBar.h @@ -1,6 +1,6 @@ -/* LinphoneStatusBar.h +/* StatusSubViewController.h * - * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * Copyright (C) 2011 Belledonne Comunications, Grenoble, France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,13 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - + */ #import +#include "linphonecore.h" -@interface LinphoneStatusBar : UIView { - UIView *test; +@interface LinphoneStatusBar : UIViewController { + UIImageView* image; + UIActivityIndicatorView* spinner; + UILabel* label; } -@property (nonatomic, retain) IBOutlet UIView* test; +@property (nonatomic, retain) IBOutlet UIImageView* image; +@property (nonatomic, retain) IBOutlet UIActivityIndicatorView* spinner; +@property (nonatomic, retain) IBOutlet UILabel* label; + @end diff --git a/Classes/LinphoneUI/LinphoneStatusBar.m b/Classes/LinphoneUI/LinphoneStatusBar.m index 21057ad58..f721064a5 100644 --- a/Classes/LinphoneUI/LinphoneStatusBar.m +++ b/Classes/LinphoneUI/LinphoneStatusBar.m @@ -1,6 +1,6 @@ -/* LinphoneStatusBar.m +/* StatusSubViewController.h * - * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * Copyright (C) 2011 Belledonne Comunications, Grenoble, France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,20 +15,69 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ + */ #import "LinphoneStatusBar.h" @implementation LinphoneStatusBar -@synthesize test; -- (id) awakeAfterUsingCoder:(NSCoder*)aDecoder { - NSArray *arrayOfViews = [[NSBundle mainBundle] loadNibNamed:@"LinphoneStatusBar" - owner:nil - options:nil]; + +@synthesize image; +@synthesize spinner; +@synthesize label; + +- (void)viewDidLoad +{ + [super viewDidLoad]; - if ([arrayOfViews count] >= 1){ - [self addSubview:[[arrayOfViews objectAtIndex:0] retain]]; - } - return self; + // Set observer + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(registrationStateChange:) name:@"LinphoneRegistrationStateChange" object:nil]; } + +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation +{ + return (interfaceOrientation == UIInterfaceOrientationPortrait); +} + +- (void) registrationStateChange: (NSNotification*) notif { + LinphoneRegistrationState state = [[notif.userInfo objectForKey: @"state"] intValue]; + NSString* message = [notif.userInfo objectForKey: @"message"]; + label.hidden = NO; + switch(state) { + case LinphoneRegistrationCleared: +/* image.hidden = NO; + [image setImage:[UIImage imageNamed:@"status_orange.png"]]; + [spinner stopAnimating]; + [label setText:message != nil ? message : NSLocalizedString(@"No SIP account defined", nil)];*/ + case LinphoneRegistrationFailed: + image.hidden = NO; + [image setImage:[UIImage imageNamed:@"status_red.png"]]; + [spinner stopAnimating]; + [label setText:message]; + case LinphoneRegistrationNone: + image.hidden = NO; + [image setImage:[UIImage imageNamed:@"status_gray.png"]]; + [spinner stopAnimating]; + [label setText:message]; + case LinphoneRegistrationProgress: + image.hidden = YES; + spinner.hidden = NO; + [spinner startAnimating]; + [label setText:message]; + case LinphoneRegistrationOk: + image.hidden = NO; + [image setImage:[UIImage imageNamed:@"status_green.png"]]; + [spinner stopAnimating]; + [label setText:message]; + } +} + +- (void) viewDidUnload { + [[NSNotificationCenter defaultCenter] removeObserver:self]; +} + +- (void) dealloc { + [super dealloc]; + [[NSNotificationCenter defaultCenter] removeObserver:self]; +} + @end diff --git a/Classes/LinphoneUI/LinphoneStatusBar.xib b/Classes/LinphoneUI/LinphoneStatusBar.xib index 7cd51fd02..11c18af81 100644 --- a/Classes/LinphoneUI/LinphoneStatusBar.xib +++ b/Classes/LinphoneUI/LinphoneStatusBar.xib @@ -11,9 +11,11 @@ 1181 - IBProxyObject - IBUIView IBUIImageView + IBUIActivityIndicatorView + IBUIView + IBUILabel + IBProxyObject com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -31,16 +33,17 @@ IBFirstResponder IBCocoaTouchFramework - + 292 - - - 274 + + + 292 {320, 23} - + + _NS:9 NO IBCocoaTouchFramework @@ -49,24 +52,112 @@ barre-noire-top.png + + + -2147483356 + {{0, -1}, {25, 23}} + + + + _NS:567 + NO + IBCocoaTouchFramework + + NSImage + status_gray.png + + + + + -2147483356 + {{0, 1}, {20, 20}} + + + + _NS:1030 + NO + IBCocoaTouchFramework + 2 + + + + -2147483356 + {{28, 0}, {280, 21}} + + + + _NS:328 + NO + YES + 7 + NO + IBCocoaTouchFramework + CARAMBA + + 3 + MC42NjY2NjY2NjY3AA + + + 1 + 10 + + 1 + 17 + + + Helvetica + 17 + 16 + + {320, 23} - - _NS:9 + + _NS:196 3 - MQA - - 2 - + MCAwAA IBCocoaTouchFramework - + + + + image + + + + 8 + + + + label + + + + 9 + + + + spinner + + + + 10 + + + + view + + + + 11 + + @@ -87,17 +178,38 @@ - 3 - + 4 + - + + + + - 4 - - + 7 + + + spin + + + 6 + + + label + + + 5 + + + image + + + 12 + + background @@ -107,31 +219,42 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 4 + 12 LinphoneStatusBar - UIView - - test - UIView - - - test - - test - UIView + UIViewController + + UIImageView + UILabel + UIActivityIndicatorView + + + + image + UIImageView - + + label + UILabel + + + spinner + UIActivityIndicatorView + + IBProjectSource ./Classes/LinphoneStatusBar.h @@ -147,10 +270,10 @@ YES 3 - - barre-noire-top.png - {640, 46} - + + {640, 46} + {25, 23} + 1181 diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h index d4ad66c97..82531de79 100644 --- a/Classes/PhoneMainView.h +++ b/Classes/PhoneMainView.h @@ -20,8 +20,11 @@ #import typedef enum _PhoneView { - PhoneView_Main, - PhoneView_CallHistory, + PhoneView_Dialer, + PhoneView_History, + PhoneView_Settings, + PhoneView_Chat, + PhoneView_Contacts, PhoneView_END } PhoneView; @@ -35,7 +38,8 @@ typedef enum _PhoneView { NSMutableDictionary *viewDescriptions; NSArray *views; UIView *callTabBar; - UIViewController *mainTabBar; + UIViewController *statusBarController; + UIViewController *mainTabBarController; UIView *incomingTabBar; UIView *addCallTabBar; @@ -45,7 +49,8 @@ typedef enum _PhoneView { @property (nonatomic, retain) IBOutlet UIView* tabBarView; @property (nonatomic, retain) IBOutlet UIView* callTabBar; -@property (nonatomic, retain) IBOutlet UIViewController* mainTabBar; +@property (nonatomic, retain) IBOutlet UIViewController* statusBarController; +@property (nonatomic, retain) IBOutlet UIViewController* mainTabBarController; @property (nonatomic, retain) IBOutlet UIView* incomingTabBar; @property (nonatomic, retain) IBOutlet UIView* addCallTabBar; diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index a442a3209..555802c57 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -18,7 +18,10 @@ */ #import "PhoneMainView.h" -#import "CallHistoryTableViewController.h" +#import "PhoneViewController.h" +#import "HistoryController.h" +#import "ContactsController.h" + typedef enum _TabBar { TabBar_Main, TabBar_END @@ -42,23 +45,27 @@ typedef enum _TabBar { @synthesize tabBarView; @synthesize callTabBar; -@synthesize mainTabBar; +@synthesize statusBarController; +@synthesize mainTabBarController; @synthesize incomingTabBar; @synthesize addCallTabBar; - (void) changeView: (NSNotification*) notif { PhoneView view = [[notif.userInfo objectForKey: @"PhoneView"] intValue]; ViewsDescription *description = [viewDescriptions objectForKey:[NSNumber numberWithInt: view]]; + for (UIView *view in contentView.subviews) { [view removeFromSuperview]; } for (UIView *view in tabBarView.subviews) { [view removeFromSuperview]; } + if(description == nil) + return; [contentView addSubview: description->content.view]; - CGRect contentFrame = contentView.frame; + CGRect contentFrame = contentView.frame; if(description->statusEnabled) { statusBarView.hidden = false; contentFrame.origin.y = statusBarView.frame.size.height + statusBarView.frame.origin.y; @@ -80,11 +87,11 @@ typedef enum _TabBar { for (UIView *view in description->tabBar.view.subviews) { if(view.tag == -1) { contentFrame.size.height = tabFrame.origin.y - contentFrame.origin.y + view.frame.origin.y; + break; } } - - // contentView.frame = contentFrame; + contentView.frame = contentFrame; [tabBarView addSubview: description->tabBar.view]; } @@ -96,40 +103,62 @@ typedef enum _TabBar { viewDescriptions = [[NSMutableDictionary alloc] init]; // Load Bars - dumb = mainTabBar.view; + dumb = mainTabBarController.view; + + // Status Bar + [statusBarView addSubview: statusBarController.view]; // Main View PhoneViewController* myPhoneViewController = [[PhoneViewController alloc] initWithNibName:@"PhoneViewController" bundle:[NSBundle mainBundle]]; - [myPhoneViewController loadView]; + //[myPhoneViewController loadView]; ViewsDescription *mainViewDescription = [ViewsDescription alloc]; mainViewDescription->content = myPhoneViewController; - mainViewDescription->tabBar = mainTabBar; + mainViewDescription->tabBar = mainTabBarController; mainViewDescription->statusEnabled = true; - [viewDescriptions setObject:mainViewDescription forKey:[NSNumber numberWithInt: PhoneView_Main]]; + [viewDescriptions setObject:mainViewDescription forKey:[NSNumber numberWithInt: PhoneView_Dialer]]; + + // Contacts View + ContactsController* myContactsController = [[ContactsController alloc] + initWithNibName:@"ContactsController" + bundle:[NSBundle mainBundle]]; + //[myContactsController loadView]; + ViewsDescription *contactsDescription = [ViewsDescription alloc]; + contactsDescription->content = myContactsController; + contactsDescription->tabBar = mainTabBarController; + contactsDescription->statusEnabled = false; + [viewDescriptions setObject:contactsDescription forKey:[NSNumber numberWithInt: PhoneView_Contacts]]; // Call History View - CallHistoryTableViewController* myCallHistoryTableViewController = [[CallHistoryTableViewController alloc] - initWithNibName:@"CallHistoryTableViewController" + HistoryController* myHistoryController = [[HistoryController alloc] + initWithNibName:@"HistoryController" bundle:[NSBundle mainBundle]]; - [myCallHistoryTableViewController loadView]; - ViewsDescription *callHistoryDescription = [ViewsDescription alloc]; - callHistoryDescription->content = myCallHistoryTableViewController; - callHistoryDescription->tabBar = mainTabBar; - callHistoryDescription->statusEnabled = true; - [viewDescriptions setObject:callHistoryDescription forKey:[NSNumber numberWithInt: PhoneView_CallHistory]]; + //[myHistoryController loadView]; + ViewsDescription *historyDescription = [ViewsDescription alloc]; + historyDescription->content = myHistoryController; + historyDescription->tabBar = mainTabBarController; + historyDescription->statusEnabled = false; + [viewDescriptions setObject:historyDescription forKey:[NSNumber numberWithInt: PhoneView_History]]; // Set observer [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeView:) name:@"LinphoneMainViewChange" object:nil]; // Change to default view - NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_Main] forKey:@"PhoneView"]; + NSDictionary* dict = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt:PhoneView_Dialer] forKey:@"PhoneView"]; [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneMainViewChange" object:self userInfo:dict]; } -- (void)dealloc { +- (void) viewDidUnload { + [[NSNotificationCenter defaultCenter] removeObserver:self]; +} + +- (void) dealloc { [super dealloc]; + [viewDescriptions dealloc]; + [statusBarView dealloc]; + [statusBarController dealloc]; + [mainTabBarController dealloc]; [[NSNotificationCenter defaultCenter] removeObserver:self]; } @end \ No newline at end of file diff --git a/Classes/PhoneMainView.xib b/Classes/PhoneMainView.xib index 7ee290cec..378c59c86 100644 --- a/Classes/PhoneMainView.xib +++ b/Classes/PhoneMainView.xib @@ -40,7 +40,7 @@ 292 YES - + 274 {320, 23} @@ -79,7 +79,6 @@ {{0, 400}, {320, 60}} - _NS:9 1 @@ -92,7 +91,7 @@ {320, 460} - + _NS:9 3 @@ -346,7 +345,6 @@ {{215, 67}, {105, 68}} - _NS:9 NO @@ -446,7 +444,6 @@ {{160, 0}, {160, 77}} - _NS:9 NO @@ -545,7 +542,6 @@ {{192, 0}, {128, 72}} - _NS:9 NO @@ -592,7 +588,7 @@ MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - + NSImage dialer-over.png @@ -600,7 +596,7 @@ NSImage dialer-actif.png - + @@ -617,7 +613,17 @@ NO IBCocoaTouchFramework - + + NO + + + 1 + 1 + + IBCocoaTouchFramework + NO + + NO @@ -683,17 +689,25 @@ statusBarView - + 176 - mainTabBar + mainTabBarController - + - 180 + 192 + + + + statusBarController + + + + 193 @@ -827,7 +841,7 @@ YES - + root @@ -885,15 +899,21 @@ 175 - + statusBar 178 - + - LinphoneMainBar + mainBarController + + + 190 + + + statusBarController @@ -937,10 +957,11 @@ 169.IBPluginDependency 170.IBPluginDependency 172.IBPluginDependency - 175.CustomClassName 175.IBPluginDependency 178.CustomClassName 178.IBPluginDependency + 190.CustomClassName + 190.IBPluginDependency 53.IBPluginDependency @@ -981,10 +1002,11 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - LinphoneStatusBar com.apple.InterfaceBuilder.IBCocoaTouchPlugin LinphoneMainBar com.apple.InterfaceBuilder.IBCocoaTouchPlugin + LinphoneStatusBar + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1000,7 +1022,7 @@ - 181 + 193 @@ -1008,28 +1030,98 @@ LinphoneMainBar UIViewController + + YES + + YES + onChatClick: + onContactsClick: + onDialerClick: + onHistoryClick: + onSettingsClick: + + + YES + id + id + id + id + id + + + + YES + + YES + onChatClick: + onContactsClick: + onDialerClick: + onHistoryClick: + onSettingsClick: + + + YES + + onChatClick: + id + + + onContactsClick: + id + + + onDialerClick: + id + + + onHistoryClick: + id + + + onSettingsClick: + id + + + YES YES + chatButton + contactsButton dialerButton historyButton + settingsButton YES UIButton UIButton + UIButton + UIButton + UIButton YES YES + chatButton + contactsButton dialerButton historyButton + settingsButton YES + + chatButton + UIButton + + + contactsButton + UIButton + dialerButton UIButton @@ -1038,6 +1130,10 @@ historyButton UIButton + + settingsButton + UIButton + @@ -1047,16 +1143,44 @@ LinphoneStatusBar - UIView + UIViewController - test - UIView + YES + + YES + image + label + spinner + + + YES + UIImageView + UILabel + UIActivityIndicatorView + - test - - test - UIView + YES + + YES + image + label + spinner + + + YES + + image + UIImageView + + + label + UILabel + + + spinner + UIActivityIndicatorView + @@ -1075,7 +1199,8 @@ callTabBar contentView incomingTabBar - mainTabBar + mainTabBarController + statusBarController statusBarView tabBarView @@ -1086,6 +1211,7 @@ UIView UIView UIViewController + UIViewController UIView UIView @@ -1098,7 +1224,8 @@ callTabBar contentView incomingTabBar - mainTabBar + mainTabBarController + statusBarController statusBarView tabBarView @@ -1121,7 +1248,11 @@ UIView - mainTabBar + mainTabBarController + UIViewController + + + statusBarController UIViewController diff --git a/Classes/PhoneViewController.h b/Classes/PhoneViewController.h index 27b93562c..7d76898f3 100644 --- a/Classes/PhoneViewController.h +++ b/Classes/PhoneViewController.h @@ -21,7 +21,6 @@ #import "linphonecore.h" #import "UILinphone.h" #import "CallDelegate.h" -#import "StatusSubViewController.h" @class MainScreenWithVideoPreview; @class IncallViewController; @@ -64,7 +63,6 @@ FirstLoginViewController* myFirstLoginViewController; IncallViewController* mIncallViewController; MainScreenWithVideoPreview* mMainScreenWithVideoPreview; - StatusSubViewController* statusSubViewController; UIButton* switchCamera; } diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m index 91872a2c4..a97e57584 100644 --- a/Classes/PhoneViewController.m +++ b/Classes/PhoneViewController.m @@ -93,7 +93,9 @@ } } - enableCallButtons = [statusSubViewController updateWithRegistrationState:s message:m]; + // Change to registration state + NSDictionary* dict = [[NSDictionary alloc] initWithObjectsAndKeys: [NSNumber numberWithInt:s], @"state", m, @"message", nil]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"LinphoneRegistrationStatusChange" object:self userInfo:dict]; [callLarge setEnabled:enableCallButtons]; [callShort setEnabled:enableCallButtons]; @@ -169,11 +171,11 @@ mIncallViewController = [[IncallViewController alloc] initWithNibName:[LinphoneManager runningOnIpad]?@"InCallViewController-ipad":@"IncallViewController" bundle:[NSBundle mainBundle]]; - if (statusSubViewController == nil) { + /*if (statusSubViewController == nil) { statusSubViewController = [[StatusSubViewController alloc] initWithNibName:@"StatusSubViewController" bundle:[NSBundle mainBundle]]; [statusViewHolder addSubview:statusSubViewController.view]; - } + }*/ [self updateCallAndBackButtons]; } diff --git a/Classes/StatusSubViewController.m b/Classes/StatusSubViewController.m deleted file mode 100644 index dd2a5e569..000000000 --- a/Classes/StatusSubViewController.m +++ /dev/null @@ -1,99 +0,0 @@ -/* StatusSubViewController.h - * - * Copyright (C) 2011 Belledonne Comunications, Grenoble, France - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#import "StatusSubViewController.h" - -@implementation StatusSubViewController - -@synthesize image; -@synthesize spinner; -@synthesize label; - -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil -{ - self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; - if (self) { - // Custom initialization - } - return self; -} - -- (void)didReceiveMemoryWarning -{ - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -#pragma mark - View lifecycle - -- (void)viewDidLoad -{ - [super viewDidLoad]; -} - -- (void)viewDidUnload -{ - [super viewDidUnload]; -} - -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation -{ - return (interfaceOrientation == UIInterfaceOrientationPortrait); -} - --(BOOL) updateWithRegistrationState:(LinphoneRegistrationState)state message:(NSString*) message { - label.hidden = NO; - switch(state) { - case LinphoneRegistrationCleared: -/* image.hidden = NO; - [image setImage:[UIImage imageNamed:@"status_orange.png"]]; - [spinner stopAnimating]; - [label setText:message != nil ? message : NSLocalizedString(@"No SIP account defined", nil)]; - return YES;*/ - case LinphoneRegistrationFailed: - image.hidden = NO; - [image setImage:[UIImage imageNamed:@"status_red.png"]]; - [spinner stopAnimating]; - [label setText:message]; - return NO; - case LinphoneRegistrationNone: - image.hidden = NO; - [image setImage:[UIImage imageNamed:@"status_gray.png"]]; - [spinner stopAnimating]; - [label setText:message]; - return NO; - case LinphoneRegistrationProgress: - image.hidden = YES; - spinner.hidden = NO; - [spinner startAnimating]; - [label setText:message]; - return NO; - case LinphoneRegistrationOk: - image.hidden = NO; - [image setImage:[UIImage imageNamed:@"status_green.png"]]; - [spinner stopAnimating]; - [label setText:message]; - return YES; - } - return NO; -} - -@end diff --git a/Classes/StatusSubViewController.xib b/Classes/StatusSubViewController.xib deleted file mode 100644 index 9ce474c3b..000000000 --- a/Classes/StatusSubViewController.xib +++ /dev/null @@ -1,252 +0,0 @@ - - - - 1280 - 11C74 - 1938 - 1138.23 - 567.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 - - - IBUIImageView - IBUIActivityIndicatorView - IBUIView - IBUILabel - IBProxyObject - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 292 - - - - -2147483356 - {{0, -1}, {25, 23}} - - - - _NS:567 - NO - IBCocoaTouchFramework - - NSImage - status_gray.png - - - - - -2147483356 - {{0, 1}, {20, 20}} - - - - _NS:1030 - NO - IBCocoaTouchFramework - 2 - - - - -2147483356 - {{28, 0}, {280, 21}} - - - _NS:328 - NO - YES - 7 - NO - IBCocoaTouchFramework - CARAMBA - - 3 - MC42NjY2NjY2NjY3AA - - - 1 - 10 - - 1 - 17 - - - Helvetica - 17 - 16 - - - - {255, 23} - - - - _NS:196 - - 3 - MCAwAA - - IBCocoaTouchFramework - - - - - - - image - - - - 8 - - - - label - - - - 9 - - - - spinner - - - - 10 - - - - view - - - - 11 - - - - - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - - - - status_view - - - 7 - - - status_spin - - - 6 - - - status_label - - - 5 - - - status_image - - - - - StatusSubViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 11 - - - - - StatusSubViewController - UIViewController - - UIImageView - UILabel - UIActivityIndicatorView - - - - image - UIImageView - - - label - UILabel - - - spinner - UIActivityIndicatorView - - - - IBProjectSource - ./Classes/StatusSubViewController.h - - - - - 0 - IBCocoaTouchFramework - YES - 3 - - status_gray.png - {25, 23} - - 933 - - diff --git a/Resources/add-contact-depuis-detail-actif.png b/Resources/add-contact-depuis-detail-actif.png new file mode 100644 index 000000000..786389930 Binary files /dev/null and b/Resources/add-contact-depuis-detail-actif.png differ diff --git a/Resources/add-contact-depuis-detail-over.png b/Resources/add-contact-depuis-detail-over.png new file mode 100644 index 000000000..247777430 Binary files /dev/null and b/Resources/add-contact-depuis-detail-over.png differ diff --git a/Resources/all-call-actif.png b/Resources/all-call-actif.png new file mode 100644 index 000000000..fe9f61f2f Binary files /dev/null and b/Resources/all-call-actif.png differ diff --git a/Resources/all-call-selectionne.png b/Resources/all-call-selectionne.png new file mode 100644 index 000000000..9790cc945 Binary files /dev/null and b/Resources/all-call-selectionne.png differ diff --git a/Resources/all-contacts-actif.png b/Resources/all-contacts-actif.png new file mode 100644 index 000000000..18e7eebd4 Binary files /dev/null and b/Resources/all-contacts-actif.png differ diff --git a/Resources/all-contacts-selectionne.png b/Resources/all-contacts-selectionne.png new file mode 100644 index 000000000..d062ce11c Binary files /dev/null and b/Resources/all-contacts-selectionne.png differ diff --git a/Resources/bouton-detail-contact-actif.png b/Resources/bouton-detail-contact-actif.png new file mode 100644 index 000000000..a4856294d Binary files /dev/null and b/Resources/bouton-detail-contact-actif.png differ diff --git a/Resources/bouton-detail-contact-over.png b/Resources/bouton-detail-contact-over.png new file mode 100644 index 000000000..9cecd5e59 Binary files /dev/null and b/Resources/bouton-detail-contact-over.png differ diff --git a/Resources/edit-history-actif.png b/Resources/edit-history-actif.png new file mode 100644 index 000000000..da43affc2 Binary files /dev/null and b/Resources/edit-history-actif.png differ diff --git a/Resources/edit-history-over.png b/Resources/edit-history-over.png new file mode 100644 index 000000000..032bc901d Binary files /dev/null and b/Resources/edit-history-over.png differ diff --git a/Resources/linphone-actif.png b/Resources/linphone-actif.png new file mode 100644 index 000000000..9d240afeb Binary files /dev/null and b/Resources/linphone-actif.png differ diff --git a/Resources/linphone-selectionne.png b/Resources/linphone-selectionne.png new file mode 100644 index 000000000..0a75d15f0 Binary files /dev/null and b/Resources/linphone-selectionne.png differ diff --git a/Resources/missed-actif.png b/Resources/missed-actif.png new file mode 100644 index 000000000..0f2f99b4e Binary files /dev/null and b/Resources/missed-actif.png differ diff --git a/Resources/missed-selectionne.png b/Resources/missed-selectionne.png new file mode 100644 index 000000000..cb413d997 Binary files /dev/null and b/Resources/missed-selectionne.png differ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 772028bb3..a2b3c88fe 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -73,7 +73,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 */; }; - 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 */; }; 224567C2107B968500F10948 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 224567C1107B968500F10948 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; @@ -97,8 +96,6 @@ 2274401A106F31BD006EC466 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22744019106F31BD006EC466 /* CoreAudio.framework */; }; 2274402F106F335E006EC466 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2274402E106F335E006EC466 /* AudioToolbox.framework */; }; 2274550810700509006EC466 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 2274550710700509006EC466 /* linphonerc */; }; - 227BCDC210D4004600FBFD76 /* CallHistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 227BCDC010D4004600FBFD76 /* CallHistoryTableViewController.m */; }; - 227BCDC310D4004600FBFD76 /* CallHistoryTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 227BCDC110D4004600FBFD76 /* CallHistoryTableViewController.xib */; }; 228697C411AC29B800E9E0CA /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 228697C311AC29B800E9E0CA /* CFNetwork.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 228B19AF130290C500F154D3 /* iTunesArtwork in Resources */ = {isa = PBXBuildFile; fileRef = 228B19AE130290C500F154D3 /* iTunesArtwork */; }; 22968A5F12F875C600588287 /* UISpeakerButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22968A5E12F875C600588287 /* UISpeakerButton.m */; }; @@ -118,7 +115,6 @@ 22D8F121147548E2008C97DB /* ringback.wav in Resources */ = {isa = PBXBuildFile; fileRef = 22F254801073D99800AC9B3F /* ringback.wav */; }; 22D8F124147548E2008C97DB /* untitled.plist in Resources */ = {isa = PBXBuildFile; fileRef = 22F51EF5107FA66500F98953 /* untitled.plist */; }; 22D8F125147548E2008C97DB /* oldphone-mono.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2237D4081084D7A9001383EE /* oldphone-mono.wav */; }; - 22D8F126147548E2008C97DB /* CallHistoryTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 227BCDC110D4004600FBFD76 /* CallHistoryTableViewController.xib */; }; 22D8F127147548E2008C97DB /* in_call.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91410D66BF300E9963F /* in_call.png */; }; 22D8F128147548E2008C97DB /* out_call.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91510D66BF300E9963F /* out_call.png */; }; 22D8F12D147548E2008C97DB /* ConsoleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */; }; @@ -143,8 +139,6 @@ 22D8F145147548E2008C97DB /* LinphoneAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */; }; 22D8F146147548E2008C97DB /* PhoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F2508C107141E100AC9B3F /* PhoneViewController.m */; }; 22D8F147147548E2008C97DB /* ContactPickerDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 22B5EFE410CE5E5800777D97 /* ContactPickerDelegate.m */; }; - 22D8F148147548E2008C97DB /* CallHistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 227BCDC010D4004600FBFD76 /* CallHistoryTableViewController.m */; }; - 22D8F149147548E2008C97DB /* GenericTabViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2242D9C810D691F900E9963F /* GenericTabViewController.m */; }; 22D8F14A147548E2008C97DB /* MoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81C111C44E100B04932 /* MoreViewController.m */; }; 22D8F14B147548E2008C97DB /* ConsoleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81F111C44E100B04932 /* ConsoleViewController.m */; }; 22D8F14C147548E2008C97DB /* UIDigitButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */; }; @@ -216,10 +210,6 @@ 340A75B114C0670B006AA708 /* ConferenceCallDetailView-ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 340A75AF14C0670A006AA708 /* ConferenceCallDetailView-ipad.xib */; }; 3418843714C58BB100EA48C7 /* nowebcamCIF.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3418843614C58BB100EA48C7 /* nowebcamCIF.jpg */; }; 3418843814C58BB100EA48C7 /* nowebcamCIF.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3418843614C58BB100EA48C7 /* nowebcamCIF.jpg */; }; - 3418844814C6CAD300EA48C7 /* StatusSubViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3418844614C6CAD300EA48C7 /* StatusSubViewController.m */; }; - 3418844914C6CAD300EA48C7 /* StatusSubViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3418844614C6CAD300EA48C7 /* StatusSubViewController.m */; }; - 3418844A14C6CAD300EA48C7 /* StatusSubViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3418844714C6CAD300EA48C7 /* StatusSubViewController.xib */; }; - 3418844B14C6CAD300EA48C7 /* StatusSubViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3418844714C6CAD300EA48C7 /* StatusSubViewController.xib */; }; 3418844D14C6D1CE00EA48C7 /* startcall-gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418844C14C6D1CE00EA48C7 /* startcall-gray.png */; }; 3418844E14C6D1CE00EA48C7 /* startcall-gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418844C14C6D1CE00EA48C7 /* startcall-gray.png */; }; 3418845314C6F66F00EA48C7 /* status_green.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418844F14C6F66E00EA48C7 /* status_green.png */; }; @@ -271,6 +261,32 @@ D347347A1580DDF1003C7B8C /* PhoneMainView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D34734791580DDF1003C7B8C /* PhoneMainView.xib */; }; D347347E1580E5F8003C7B8C /* history-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D347347C1580E5F8003C7B8C /* history-actif.png */; }; D347347F1580E5F8003C7B8C /* history-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D347347D1580E5F8003C7B8C /* history-selectionne.png */; }; + D35497FE15875372000081D8 /* ContactsController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsController.m */; }; + D35497FF15875372000081D8 /* ContactsController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsController.m */; }; + D354980015875372000081D8 /* ContactsController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35497FD15875372000081D8 /* ContactsController.xib */; }; + D354980115875372000081D8 /* ContactsController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35497FD15875372000081D8 /* ContactsController.xib */; }; + D354980615875534000081D8 /* all-contacts-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980215875534000081D8 /* all-contacts-actif.png */; }; + D354980715875534000081D8 /* all-contacts-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980215875534000081D8 /* all-contacts-actif.png */; }; + D354980815875534000081D8 /* all-contacts-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980315875534000081D8 /* all-contacts-selectionne.png */; }; + D354980915875534000081D8 /* all-contacts-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980315875534000081D8 /* all-contacts-selectionne.png */; }; + D354980A15875534000081D8 /* linphone-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980415875534000081D8 /* linphone-actif.png */; }; + D354980B15875534000081D8 /* linphone-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980415875534000081D8 /* linphone-actif.png */; }; + D354980C15875534000081D8 /* linphone-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980515875534000081D8 /* linphone-selectionne.png */; }; + D354980D15875534000081D8 /* linphone-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980515875534000081D8 /* linphone-selectionne.png */; }; + D354981015875608000081D8 /* add-contact-depuis-detail-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980E15875608000081D8 /* add-contact-depuis-detail-actif.png */; }; + D354981115875608000081D8 /* add-contact-depuis-detail-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980E15875608000081D8 /* add-contact-depuis-detail-actif.png */; }; + D354981215875608000081D8 /* add-contact-depuis-detail-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980F15875608000081D8 /* add-contact-depuis-detail-over.png */; }; + D354981315875608000081D8 /* add-contact-depuis-detail-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980F15875608000081D8 /* add-contact-depuis-detail-over.png */; }; + D3549816158761D0000081D8 /* ContactTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3549815158761D0000081D8 /* ContactTableViewController.m */; }; + D3549817158761D0000081D8 /* ContactTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3549815158761D0000081D8 /* ContactTableViewController.m */; }; + D354981A15876FE7000081D8 /* bouton-detail-contact-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D354981815876FE7000081D8 /* bouton-detail-contact-actif.png */; }; + D354981B15876FE7000081D8 /* bouton-detail-contact-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D354981815876FE7000081D8 /* bouton-detail-contact-actif.png */; }; + D354981C15876FE7000081D8 /* bouton-detail-contact-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D354981915876FE7000081D8 /* bouton-detail-contact-over.png */; }; + D354981D15876FE7000081D8 /* bouton-detail-contact-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D354981915876FE7000081D8 /* bouton-detail-contact-over.png */; }; + D35498211587716B000081D8 /* LinphoneStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D354981F1587716B000081D8 /* LinphoneStatusBar.m */; }; + D35498221587716B000081D8 /* LinphoneStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D354981F1587716B000081D8 /* LinphoneStatusBar.m */; }; + D35498231587716B000081D8 /* LinphoneStatusBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35498201587716B000081D8 /* LinphoneStatusBar.xib */; }; + D35498241587716B000081D8 /* LinphoneStatusBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35498201587716B000081D8 /* LinphoneStatusBar.xib */; }; D38327F31580FE3A00FA0D23 /* contacts-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327EB1580FE3A00FA0D23 /* contacts-actif.png */; }; D38327F41580FE3A00FA0D23 /* contacts-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327EC1580FE3A00FA0D23 /* contacts-selectionne.png */; }; D38327F51580FE3A00FA0D23 /* dialer-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327ED1580FE3A00FA0D23 /* dialer-actif.png */; }; @@ -283,16 +299,16 @@ D3832801158100E400FA0D23 /* history-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327FD158100E400FA0D23 /* history-over.png */; }; D3832802158100E400FA0D23 /* settings-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327FE158100E400FA0D23 /* settings-over.png */; }; D3832803158100E400FA0D23 /* tchat-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327FF158100E400FA0D23 /* tchat-over.png */; }; + D3A55FBC15877E5E003FD403 /* ContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* ContactCell.m */; }; + D3A55FBD15877E5E003FD403 /* ContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* ContactCell.m */; }; + D3A55FBF15877E69003FD403 /* ContactCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A55FBE15877E69003FD403 /* ContactCell.xib */; }; + D3A55FC015877E69003FD403 /* ContactCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A55FBE15877E69003FD403 /* ContactCell.xib */; }; D3ED3E411585FB4A006C0DE4 /* fond-clavier.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E401585FB4A006C0DE4 /* fond-clavier.png */; }; D3ED3E421585FB4A006C0DE4 /* fond-clavier.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E401585FB4A006C0DE4 /* fond-clavier.png */; }; D3ED3E451585FB8C006C0DE4 /* champ-saisie-numero.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E441585FB8C006C0DE4 /* champ-saisie-numero.png */; }; D3ED3E461585FB8C006C0DE4 /* champ-saisie-numero.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E441585FB8C006C0DE4 /* champ-saisie-numero.png */; }; D3ED3E521585FFFD006C0DE4 /* barre-noire-top.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E511585FFFD006C0DE4 /* barre-noire-top.png */; }; D3ED3E531585FFFD006C0DE4 /* barre-noire-top.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E511585FFFD006C0DE4 /* barre-noire-top.png */; }; - D3ED3E61158603F5006C0DE4 /* LinphoneStatusBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E60158603F5006C0DE4 /* LinphoneStatusBar.xib */; }; - D3ED3E62158603F5006C0DE4 /* LinphoneStatusBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E60158603F5006C0DE4 /* LinphoneStatusBar.xib */; }; - D3ED3E6515860404006C0DE4 /* LinphoneStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3E6415860404006C0DE4 /* LinphoneStatusBar.m */; }; - D3ED3E6615860404006C0DE4 /* LinphoneStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3E6415860404006C0DE4 /* LinphoneStatusBar.m */; }; D3ED3E6A15861A53006C0DE4 /* add-contact-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E6715861A53006C0DE4 /* add-contact-actif.png */; }; D3ED3E6B15861A53006C0DE4 /* add-contact-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E6715861A53006C0DE4 /* add-contact-actif.png */; }; D3ED3E6C15861A53006C0DE4 /* add-contact-inactif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E6815861A53006C0DE4 /* add-contact-inactif.png */; }; @@ -311,6 +327,24 @@ D3ED3E881586291E006C0DE4 /* LinphoneMainBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3E851586291B006C0DE4 /* LinphoneMainBar.m */; }; D3ED3E891586291E006C0DE4 /* LinphoneMainBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E861586291C006C0DE4 /* LinphoneMainBar.xib */; }; D3ED3E8A1586291E006C0DE4 /* LinphoneMainBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E861586291C006C0DE4 /* LinphoneMainBar.xib */; }; + D3ED3E9815872EF1006C0DE4 /* all-call-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9215872EF1006C0DE4 /* all-call-actif.png */; }; + D3ED3E9915872EF1006C0DE4 /* all-call-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9215872EF1006C0DE4 /* all-call-actif.png */; }; + D3ED3E9A15872EF1006C0DE4 /* all-call-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9315872EF1006C0DE4 /* all-call-selectionne.png */; }; + D3ED3E9B15872EF1006C0DE4 /* all-call-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9315872EF1006C0DE4 /* all-call-selectionne.png */; }; + D3ED3E9C15872EF1006C0DE4 /* edit-history-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9415872EF1006C0DE4 /* edit-history-actif.png */; }; + D3ED3E9D15872EF1006C0DE4 /* edit-history-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9415872EF1006C0DE4 /* edit-history-actif.png */; }; + D3ED3E9E15872EF1006C0DE4 /* edit-history-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9515872EF1006C0DE4 /* edit-history-over.png */; }; + D3ED3E9F15872EF1006C0DE4 /* edit-history-over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9515872EF1006C0DE4 /* edit-history-over.png */; }; + D3ED3EA015872EF1006C0DE4 /* missed-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9615872EF1006C0DE4 /* missed-actif.png */; }; + D3ED3EA115872EF1006C0DE4 /* missed-actif.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9615872EF1006C0DE4 /* missed-actif.png */; }; + D3ED3EA215872EF1006C0DE4 /* missed-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9715872EF1006C0DE4 /* missed-selectionne.png */; }; + D3ED3EA315872EF1006C0DE4 /* missed-selectionne.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3E9715872EF1006C0DE4 /* missed-selectionne.png */; }; + D3ED3EA71587334E006C0DE4 /* CallHistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3EA51587334C006C0DE4 /* CallHistoryTableViewController.m */; }; + D3ED3EA81587334E006C0DE4 /* CallHistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3EA51587334C006C0DE4 /* CallHistoryTableViewController.m */; }; + D3ED3EB3158738FB006C0DE4 /* HistoryController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3EB2158738FA006C0DE4 /* HistoryController.xib */; }; + D3ED3EB4158738FB006C0DE4 /* HistoryController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ED3EB2158738FA006C0DE4 /* HistoryController.xib */; }; + D3ED3EB81587392C006C0DE4 /* HistoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3EB615873929006C0DE4 /* HistoryController.m */; }; + D3ED3EB91587392C006C0DE4 /* HistoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3ED3EB615873929006C0DE4 /* HistoryController.m */; }; D3F83EEC1582021700336684 /* InCallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F83EEA1582021700336684 /* InCallViewController.m */; }; D3F83EED1582021700336684 /* InCallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F83EEA1582021700336684 /* InCallViewController.m */; }; D3F83EEE1582021700336684 /* InCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3F83EEB1582021700336684 /* InCallViewController.xib */; }; @@ -618,8 +652,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 = ""; }; - 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 = ""; }; 2245671C107699F700F10948 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = ""; }; 224567C1107B968500F10948 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; @@ -647,9 +679,6 @@ 22744043106F33FC006EC466 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 22744056106F9BC9006EC466 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; 2274550710700509006EC466 /* linphonerc */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; path = linphonerc; sourceTree = ""; }; - 227BCDBF10D4004600FBFD76 /* CallHistoryTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallHistoryTableViewController.h; sourceTree = ""; }; - 227BCDC010D4004600FBFD76 /* CallHistoryTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallHistoryTableViewController.m; sourceTree = ""; }; - 227BCDC110D4004600FBFD76 /* CallHistoryTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CallHistoryTableViewController.xib; sourceTree = ""; }; 228697C311AC29B800E9E0CA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 228B19AE130290C500F154D3 /* iTunesArtwork */ = {isa = PBXFileReference; lastKnownFileType = text; name = iTunesArtwork; path = Resources/iTunesArtwork; sourceTree = ""; }; 22968A5D12F875C600588287 /* UISpeakerButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UISpeakerButton.h; sourceTree = ""; }; @@ -768,9 +797,6 @@ 340751E6150F38FD00B89C47 /* UIToggleVideoButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIToggleVideoButton.m; sourceTree = ""; }; 340A75AF14C0670A006AA708 /* ConferenceCallDetailView-ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "ConferenceCallDetailView-ipad.xib"; sourceTree = ""; }; 3418843614C58BB100EA48C7 /* nowebcamCIF.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = nowebcamCIF.jpg; path = submodules/linphone/mediastreamer2/src/nowebcamCIF.jpg; sourceTree = ""; }; - 3418844514C6CAD300EA48C7 /* StatusSubViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatusSubViewController.h; sourceTree = ""; }; - 3418844614C6CAD300EA48C7 /* StatusSubViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatusSubViewController.m; sourceTree = ""; }; - 3418844714C6CAD300EA48C7 /* StatusSubViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = StatusSubViewController.xib; sourceTree = ""; }; 3418844C14C6D1CE00EA48C7 /* startcall-gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "startcall-gray.png"; path = "Resources/startcall-gray.png"; sourceTree = ""; }; 3418844F14C6F66E00EA48C7 /* status_green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_green.png; path = Resources/status_green.png; sourceTree = ""; }; 3418845114C6F66F00EA48C7 /* status_orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_orange.png; path = Resources/status_orange.png; sourceTree = ""; }; @@ -808,6 +834,22 @@ D34734791580DDF1003C7B8C /* PhoneMainView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PhoneMainView.xib; sourceTree = ""; }; D347347C1580E5F8003C7B8C /* history-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "history-actif.png"; path = "Resources/history-actif.png"; sourceTree = ""; }; D347347D1580E5F8003C7B8C /* history-selectionne.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "history-selectionne.png"; path = "Resources/history-selectionne.png"; sourceTree = ""; }; + D35497FB15875372000081D8 /* ContactsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactsController.h; sourceTree = ""; }; + D35497FC15875372000081D8 /* ContactsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactsController.m; sourceTree = ""; }; + D35497FD15875372000081D8 /* ContactsController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContactsController.xib; sourceTree = ""; }; + D354980215875534000081D8 /* all-contacts-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "all-contacts-actif.png"; path = "Resources/all-contacts-actif.png"; sourceTree = ""; }; + D354980315875534000081D8 /* all-contacts-selectionne.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "all-contacts-selectionne.png"; path = "Resources/all-contacts-selectionne.png"; sourceTree = ""; }; + D354980415875534000081D8 /* linphone-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-actif.png"; path = "Resources/linphone-actif.png"; sourceTree = ""; }; + D354980515875534000081D8 /* linphone-selectionne.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-selectionne.png"; path = "Resources/linphone-selectionne.png"; sourceTree = ""; }; + D354980E15875608000081D8 /* add-contact-depuis-detail-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "add-contact-depuis-detail-actif.png"; path = "Resources/add-contact-depuis-detail-actif.png"; sourceTree = ""; }; + D354980F15875608000081D8 /* add-contact-depuis-detail-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "add-contact-depuis-detail-over.png"; path = "Resources/add-contact-depuis-detail-over.png"; sourceTree = ""; }; + D3549814158761CF000081D8 /* ContactTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactTableViewController.h; sourceTree = ""; }; + D3549815158761D0000081D8 /* ContactTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactTableViewController.m; sourceTree = ""; }; + D354981815876FE7000081D8 /* bouton-detail-contact-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bouton-detail-contact-actif.png"; path = "Resources/bouton-detail-contact-actif.png"; sourceTree = ""; }; + D354981915876FE7000081D8 /* bouton-detail-contact-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bouton-detail-contact-over.png"; path = "Resources/bouton-detail-contact-over.png"; sourceTree = ""; }; + D354981E1587716B000081D8 /* LinphoneStatusBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneStatusBar.h; sourceTree = ""; }; + D354981F1587716B000081D8 /* LinphoneStatusBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneStatusBar.m; sourceTree = ""; }; + D35498201587716B000081D8 /* LinphoneStatusBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LinphoneStatusBar.xib; sourceTree = ""; }; D38327EB1580FE3A00FA0D23 /* contacts-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "contacts-actif.png"; path = "Resources/contacts-actif.png"; sourceTree = ""; }; D38327EC1580FE3A00FA0D23 /* contacts-selectionne.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "contacts-selectionne.png"; path = "Resources/contacts-selectionne.png"; sourceTree = ""; }; D38327ED1580FE3A00FA0D23 /* dialer-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialer-actif.png"; path = "Resources/dialer-actif.png"; sourceTree = ""; }; @@ -820,12 +862,12 @@ D38327FD158100E400FA0D23 /* history-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "history-over.png"; path = "Resources/history-over.png"; sourceTree = ""; }; D38327FE158100E400FA0D23 /* settings-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "settings-over.png"; path = "Resources/settings-over.png"; sourceTree = ""; }; D38327FF158100E400FA0D23 /* tchat-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "tchat-over.png"; path = "Resources/tchat-over.png"; sourceTree = ""; }; + D3A55FBA15877E5E003FD403 /* ContactCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactCell.h; sourceTree = ""; }; + D3A55FBB15877E5E003FD403 /* ContactCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactCell.m; sourceTree = ""; }; + D3A55FBE15877E69003FD403 /* ContactCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContactCell.xib; sourceTree = ""; }; D3ED3E401585FB4A006C0DE4 /* fond-clavier.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fond-clavier.png"; path = "Resources/fond-clavier.png"; sourceTree = ""; }; D3ED3E441585FB8C006C0DE4 /* champ-saisie-numero.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "champ-saisie-numero.png"; path = "Resources/champ-saisie-numero.png"; sourceTree = ""; }; D3ED3E511585FFFD006C0DE4 /* barre-noire-top.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "barre-noire-top.png"; path = "Resources/barre-noire-top.png"; sourceTree = ""; }; - D3ED3E60158603F5006C0DE4 /* LinphoneStatusBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LinphoneStatusBar.xib; sourceTree = ""; }; - D3ED3E6315860404006C0DE4 /* LinphoneStatusBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneStatusBar.h; sourceTree = ""; }; - D3ED3E6415860404006C0DE4 /* LinphoneStatusBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneStatusBar.m; sourceTree = ""; }; D3ED3E6715861A53006C0DE4 /* add-contact-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "add-contact-actif.png"; path = "Resources/add-contact-actif.png"; sourceTree = ""; }; D3ED3E6815861A53006C0DE4 /* add-contact-inactif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "add-contact-inactif.png"; path = "Resources/add-contact-inactif.png"; sourceTree = ""; }; D3ED3E6915861A53006C0DE4 /* add-contact-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "add-contact-over.png"; path = "Resources/add-contact-over.png"; sourceTree = ""; }; @@ -836,6 +878,17 @@ D3ED3E841586291B006C0DE4 /* LinphoneMainBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneMainBar.h; sourceTree = ""; }; D3ED3E851586291B006C0DE4 /* LinphoneMainBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneMainBar.m; sourceTree = ""; }; D3ED3E861586291C006C0DE4 /* LinphoneMainBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LinphoneMainBar.xib; sourceTree = ""; }; + D3ED3E9215872EF1006C0DE4 /* all-call-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "all-call-actif.png"; path = "Resources/all-call-actif.png"; sourceTree = ""; }; + D3ED3E9315872EF1006C0DE4 /* all-call-selectionne.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "all-call-selectionne.png"; path = "Resources/all-call-selectionne.png"; sourceTree = ""; }; + D3ED3E9415872EF1006C0DE4 /* edit-history-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "edit-history-actif.png"; path = "Resources/edit-history-actif.png"; sourceTree = ""; }; + D3ED3E9515872EF1006C0DE4 /* edit-history-over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "edit-history-over.png"; path = "Resources/edit-history-over.png"; sourceTree = ""; }; + D3ED3E9615872EF1006C0DE4 /* missed-actif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "missed-actif.png"; path = "Resources/missed-actif.png"; sourceTree = ""; }; + D3ED3E9715872EF1006C0DE4 /* missed-selectionne.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "missed-selectionne.png"; path = "Resources/missed-selectionne.png"; sourceTree = ""; }; + D3ED3EA41587334B006C0DE4 /* CallHistoryTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallHistoryTableViewController.h; sourceTree = ""; }; + D3ED3EA51587334C006C0DE4 /* CallHistoryTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallHistoryTableViewController.m; sourceTree = ""; }; + D3ED3EB2158738FA006C0DE4 /* HistoryController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HistoryController.xib; sourceTree = ""; }; + D3ED3EB515873928006C0DE4 /* HistoryController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryController.h; sourceTree = ""; }; + D3ED3EB615873929006C0DE4 /* HistoryController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryController.m; sourceTree = ""; }; D3F83EE91582021700336684 /* InCallViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InCallViewController.h; sourceTree = ""; }; D3F83EEA1582021700336684 /* InCallViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InCallViewController.m; sourceTree = ""; }; D3F83EEB1582021700336684 /* InCallViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = InCallViewController.xib; sourceTree = ""; }; @@ -999,9 +1052,8 @@ children = ( 340751E4150E4D0200B89C47 /* CallDelegate.h */, 2211DBBB14769C8200DEE054 /* CallDelegate.m */, - 227BCDBF10D4004600FBFD76 /* CallHistoryTableViewController.h */, - 227BCDC010D4004600FBFD76 /* CallHistoryTableViewController.m */, - 227BCDC110D4004600FBFD76 /* CallHistoryTableViewController.xib */, + D3ED3EA41587334B006C0DE4 /* CallHistoryTableViewController.h */, + D3ED3EA51587334C006C0DE4 /* CallHistoryTableViewController.m */, 344ABD79147FD32B007420B6 /* ConferenceCallDetailCell.xib */, 340A75AF14C0670A006AA708 /* ConferenceCallDetailView-ipad.xib */, 344ABD75147FCB68007420B6 /* ConferenceCallDetailView.h */, @@ -1012,11 +1064,17 @@ 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */, 22B5EFE310CE5E5800777D97 /* ContactPickerDelegate.h */, 22B5EFE410CE5E5800777D97 /* ContactPickerDelegate.m */, + D35497FB15875372000081D8 /* ContactsController.h */, + D35497FC15875372000081D8 /* ContactsController.m */, + D35497FD15875372000081D8 /* ContactsController.xib */, + D3549814158761CF000081D8 /* ContactTableViewController.h */, + D3549815158761D0000081D8 /* ContactTableViewController.m */, 2218A92212FBE1340088A667 /* FirstLoginViewController.h */, 2218A92312FBE1340088A667 /* FirstLoginViewController.m */, 2218A92412FBE1340088A667 /* FirstLoginViewController.xib */, - 2242D9C710D691F900E9963F /* GenericTabViewController.h */, - 2242D9C810D691F900E9963F /* GenericTabViewController.m */, + D3ED3EB515873928006C0DE4 /* HistoryController.h */, + D3ED3EB615873929006C0DE4 /* HistoryController.m */, + D3ED3EB2158738FA006C0DE4 /* HistoryController.xib */, 3422AA4F14975EC9000D4E8A /* InCallViewController-ipad.xib */, D3F83EE91582021700336684 /* InCallViewController.h */, D3F83EEA1582021700336684 /* InCallViewController.m */, @@ -1038,9 +1096,6 @@ 22F2508B107141E100AC9B3F /* PhoneViewController.h */, 22F2508C107141E100AC9B3F /* PhoneViewController.m */, 22F2508D107141E100AC9B3F /* PhoneViewController.xib */, - 3418844514C6CAD300EA48C7 /* StatusSubViewController.h */, - 3418844614C6CAD300EA48C7 /* StatusSubViewController.m */, - 3418844714C6CAD300EA48C7 /* StatusSubViewController.xib */, 34CA8534148F669900503C01 /* VideoViewController-ipad.xib */, 22E028B413B4CCBD0068A713 /* VideoViewController.h */, 22E028B513B4CCBD0068A713 /* VideoViewController.m */, @@ -1259,6 +1314,9 @@ 2214EB7012F84668002A5394 /* LinphoneUI */ = { isa = PBXGroup; children = ( + D3A55FBA15877E5E003FD403 /* ContactCell.h */, + D3A55FBB15877E5E003FD403 /* ContactCell.m */, + D3A55FBE15877E69003FD403 /* ContactCell.xib */, 223963151393CFAE001DE689 /* FastAddressBook.h */, 223963161393CFAF001DE689 /* FastAddressBook.m */, D3ED3E841586291B006C0DE4 /* LinphoneMainBar.h */, @@ -1266,9 +1324,9 @@ D3ED3E861586291C006C0DE4 /* LinphoneMainBar.xib */, 2248E99D12F801C200220D9C /* LinphoneManager.h */, 2248E99E12F801C200220D9C /* LinphoneManager.m */, - D3ED3E6315860404006C0DE4 /* LinphoneStatusBar.h */, - D3ED3E6415860404006C0DE4 /* LinphoneStatusBar.m */, - D3ED3E60158603F5006C0DE4 /* LinphoneStatusBar.xib */, + D354981E1587716B000081D8 /* LinphoneStatusBar.h */, + D354981F1587716B000081D8 /* LinphoneStatusBar.m */, + D35498201587716B000081D8 /* LinphoneStatusBar.xib */, 2218A5C412F9597B0088A667 /* LinphoneUIDelegates.h */, 2218A5CE12F973450088A667 /* LogView.h */, 22C7555E1317E59C007BC101 /* UIBluetoothButton.h */, @@ -1476,14 +1534,22 @@ D3F83EF0158205A100336684 /* add-call-actif.png */, D3F83EF1158205A100336684 /* add-call-over.png */, D3ED3E6715861A53006C0DE4 /* add-contact-actif.png */, + D354980E15875608000081D8 /* add-contact-depuis-detail-actif.png */, + D354980F15875608000081D8 /* add-contact-depuis-detail-over.png */, D3ED3E6815861A53006C0DE4 /* add-contact-inactif.png */, D3ED3E6915861A53006C0DE4 /* add-contact-over.png */, 2211DBCA1476BE7300DEE054 /* ajouter.png */, + D3ED3E9215872EF1006C0DE4 /* all-call-actif.png */, + D3ED3E9315872EF1006C0DE4 /* all-call-selectionne.png */, + D354980215875534000081D8 /* all-contacts-actif.png */, + D354980315875534000081D8 /* all-contacts-selectionne.png */, D3ED3E7015861ABD006C0DE4 /* appeler-actif.png */, D3ED3E7115861ABD006C0DE4 /* appeler-over.png */, D3ED3E7615861B1B006C0DE4 /* backspace-actif.png */, D3ED3E7715861B1B006C0DE4 /* backspace-over.png */, D3ED3E511585FFFD006C0DE4 /* barre-noire-top.png */, + D354981815876FE7000081D8 /* bouton-detail-contact-actif.png */, + D354981915876FE7000081D8 /* bouton-detail-contact-over.png */, D3F83F801582278D00336684 /* cancel-actif.png */, D3F83F811582278D00336684 /* cancel-over.png */, D3ED3E441585FB8C006C0DE4 /* champ-saisie-numero.png */, @@ -1507,6 +1573,8 @@ D38327EE1580FE3A00FA0D23 /* dialer-over.png */, D3F83F401582223B00336684 /* diese-actif.png */, D3F83F411582223B00336684 /* diese-over.png */, + D3ED3E9415872EF1006C0DE4 /* edit-history-actif.png */, + D3ED3E9515872EF1006C0DE4 /* edit-history-over.png */, 2211DBCD1476BE7300DEE054 /* effacer.png */, D3F83F421582223B00336684 /* etoile-actif.png */, D3F83F431582223B00336684 /* etoile-over.png */, @@ -1523,8 +1591,10 @@ 2242D91410D66BF300E9963F /* in_call.png */, 3485649D152C423F003FE041 /* in_call_video.png */, 228B19AE130290C500F154D3 /* iTunesArtwork */, + D354980415875534000081D8 /* linphone-actif.png */, 225CB2F911ABB76400628906 /* linphone-banner.png */, 8D1107310486CEB800E47090 /* linphone-Info.plist */, + D354980515875534000081D8 /* linphone-selectionne.png */, 2274550710700509006EC466 /* linphonerc */, 341FCA8D149798210084BC26 /* linphonerc-ipad */, D3F83EF4158205A100336684 /* micro-OFF-actif.png */, @@ -1533,6 +1603,8 @@ D3F83EF7158205A100336684 /* micro-ON-over.png */, 2211DBD21476BE7300DEE054 /* micro.png */, 2211DBD11476BE7300DEE054 /* micro_inverse.png */, + D3ED3E9615872EF1006C0DE4 /* missed-actif.png */, + D3ED3E9715872EF1006C0DE4 /* missed-selectionne.png */, 22E19E47138A67A000FBFE87 /* missed_call.png */, 3418843614C58BB100EA48C7 /* nowebcamCIF.jpg */, 2242E312125235120061DDCE /* oldphone-mono-30s.caf */, @@ -1670,7 +1742,6 @@ 2245671D107699F700F10948 /* Settings.bundle in Resources */, 22F51EF6107FA66500F98953 /* untitled.plist in Resources */, 2237D4091084D7A9001383EE /* oldphone-mono.wav in Resources */, - 227BCDC310D4004600FBFD76 /* CallHistoryTableViewController.xib in Resources */, 2242D91610D66BF300E9963F /* in_call.png in Resources */, 2242D91710D66BF300E9963F /* out_call.png in Resources */, 22E0A823111C44E100B04932 /* ConsoleViewController.xib in Resources */, @@ -1718,7 +1789,6 @@ 1AE0A4A214AC5C64002C99BD /* stat_sys_signal_4.png in Resources */, 340A75B014C0670B006AA708 /* ConferenceCallDetailView-ipad.xib in Resources */, 3418843714C58BB100EA48C7 /* nowebcamCIF.jpg in Resources */, - 3418844A14C6CAD300EA48C7 /* StatusSubViewController.xib in Resources */, 3418844D14C6D1CE00EA48C7 /* startcall-gray.png in Resources */, 3418845314C6F66F00EA48C7 /* status_green.png in Resources */, 3418845714C6F66F00EA48C7 /* status_orange.png in Resources */, @@ -1802,7 +1872,6 @@ D3ED3E411585FB4A006C0DE4 /* fond-clavier.png in Resources */, D3ED3E451585FB8C006C0DE4 /* champ-saisie-numero.png in Resources */, D3ED3E521585FFFD006C0DE4 /* barre-noire-top.png in Resources */, - D3ED3E61158603F5006C0DE4 /* LinphoneStatusBar.xib in Resources */, D3ED3E6A15861A53006C0DE4 /* add-contact-actif.png in Resources */, D3ED3E6C15861A53006C0DE4 /* add-contact-inactif.png in Resources */, D3ED3E6E15861A53006C0DE4 /* add-contact-over.png in Resources */, @@ -1811,6 +1880,24 @@ D3ED3E7815861B1B006C0DE4 /* backspace-actif.png in Resources */, D3ED3E7A15861B1B006C0DE4 /* backspace-over.png in Resources */, D3ED3E891586291E006C0DE4 /* LinphoneMainBar.xib in Resources */, + D3ED3E9815872EF1006C0DE4 /* all-call-actif.png in Resources */, + D3ED3E9A15872EF1006C0DE4 /* all-call-selectionne.png in Resources */, + D3ED3E9C15872EF1006C0DE4 /* edit-history-actif.png in Resources */, + D3ED3E9E15872EF1006C0DE4 /* edit-history-over.png in Resources */, + D3ED3EA015872EF1006C0DE4 /* missed-actif.png in Resources */, + D3ED3EA215872EF1006C0DE4 /* missed-selectionne.png in Resources */, + D3ED3EB3158738FB006C0DE4 /* HistoryController.xib in Resources */, + D354980015875372000081D8 /* ContactsController.xib in Resources */, + D354980615875534000081D8 /* all-contacts-actif.png in Resources */, + D354980815875534000081D8 /* all-contacts-selectionne.png in Resources */, + D354980A15875534000081D8 /* linphone-actif.png in Resources */, + D354980C15875534000081D8 /* linphone-selectionne.png in Resources */, + D354981015875608000081D8 /* add-contact-depuis-detail-actif.png in Resources */, + D354981215875608000081D8 /* add-contact-depuis-detail-over.png in Resources */, + D354981A15876FE7000081D8 /* bouton-detail-contact-actif.png in Resources */, + D354981C15876FE7000081D8 /* bouton-detail-contact-over.png in Resources */, + D35498231587716B000081D8 /* LinphoneStatusBar.xib in Resources */, + D3A55FBF15877E69003FD403 /* ContactCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1823,7 +1910,6 @@ 22D8F121147548E2008C97DB /* ringback.wav in Resources */, 22D8F124147548E2008C97DB /* untitled.plist in Resources */, 22D8F125147548E2008C97DB /* oldphone-mono.wav in Resources */, - 22D8F126147548E2008C97DB /* CallHistoryTableViewController.xib in Resources */, 22D8F127147548E2008C97DB /* in_call.png in Resources */, 22D8F128147548E2008C97DB /* out_call.png in Resources */, 22D8F12D147548E2008C97DB /* ConsoleViewController.xib in Resources */, @@ -1871,7 +1957,6 @@ 1AE0A4A314AC5C64002C99BD /* stat_sys_signal_4.png in Resources */, 340A75B114C0670B006AA708 /* ConferenceCallDetailView-ipad.xib in Resources */, 3418843814C58BB100EA48C7 /* nowebcamCIF.jpg in Resources */, - 3418844B14C6CAD300EA48C7 /* StatusSubViewController.xib in Resources */, 3418844E14C6D1CE00EA48C7 /* startcall-gray.png in Resources */, 3418845414C6F66F00EA48C7 /* status_green.png in Resources */, 3418845814C6F66F00EA48C7 /* status_orange.png in Resources */, @@ -1936,7 +2021,6 @@ D3ED3E421585FB4A006C0DE4 /* fond-clavier.png in Resources */, D3ED3E461585FB8C006C0DE4 /* champ-saisie-numero.png in Resources */, D3ED3E531585FFFD006C0DE4 /* barre-noire-top.png in Resources */, - D3ED3E62158603F5006C0DE4 /* LinphoneStatusBar.xib in Resources */, D3ED3E6B15861A53006C0DE4 /* add-contact-actif.png in Resources */, D3ED3E6D15861A53006C0DE4 /* add-contact-inactif.png in Resources */, D3ED3E6F15861A53006C0DE4 /* add-contact-over.png in Resources */, @@ -1945,6 +2029,24 @@ D3ED3E7915861B1B006C0DE4 /* backspace-actif.png in Resources */, D3ED3E7B15861B1B006C0DE4 /* backspace-over.png in Resources */, D3ED3E8A1586291E006C0DE4 /* LinphoneMainBar.xib in Resources */, + D3ED3E9915872EF1006C0DE4 /* all-call-actif.png in Resources */, + D3ED3E9B15872EF1006C0DE4 /* all-call-selectionne.png in Resources */, + D3ED3E9D15872EF1006C0DE4 /* edit-history-actif.png in Resources */, + D3ED3E9F15872EF1006C0DE4 /* edit-history-over.png in Resources */, + D3ED3EA115872EF1006C0DE4 /* missed-actif.png in Resources */, + D3ED3EA315872EF1006C0DE4 /* missed-selectionne.png in Resources */, + D3ED3EB4158738FB006C0DE4 /* HistoryController.xib in Resources */, + D354980115875372000081D8 /* ContactsController.xib in Resources */, + D354980715875534000081D8 /* all-contacts-actif.png in Resources */, + D354980915875534000081D8 /* all-contacts-selectionne.png in Resources */, + D354980B15875534000081D8 /* linphone-actif.png in Resources */, + D354980D15875534000081D8 /* linphone-selectionne.png in Resources */, + D354981115875608000081D8 /* add-contact-depuis-detail-actif.png in Resources */, + D354981315875608000081D8 /* add-contact-depuis-detail-over.png in Resources */, + D354981B15876FE7000081D8 /* bouton-detail-contact-actif.png in Resources */, + D354981D15876FE7000081D8 /* bouton-detail-contact-over.png in Resources */, + D35498241587716B000081D8 /* LinphoneStatusBar.xib in Resources */, + D3A55FC015877E69003FD403 /* ContactCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1959,8 +2061,6 @@ 1D3623260D0F684500981E51 /* LinphoneAppDelegate.m in Sources */, 22F2508E107141E100AC9B3F /* PhoneViewController.m in Sources */, 22B5EFE510CE5E5800777D97 /* ContactPickerDelegate.m in Sources */, - 227BCDC210D4004600FBFD76 /* CallHistoryTableViewController.m in Sources */, - 2242D9C910D691F900E9963F /* GenericTabViewController.m in Sources */, 22E0A822111C44E100B04932 /* MoreViewController.m in Sources */, 22E0A824111C44E100B04932 /* ConsoleViewController.m in Sources */, 2248E90E12F7E4CF00220D9C /* UIDigitButton.m in Sources */, @@ -1980,13 +2080,17 @@ 2211DBBE14769C8300DEE054 /* CallDelegate.m in Sources */, 344ABD77147FCB68007420B6 /* ConferenceCallDetailView.m in Sources */, 34CA8539148F692A00503C01 /* MainScreenWithVideoPreview.m in Sources */, - 3418844814C6CAD300EA48C7 /* StatusSubViewController.m in Sources */, 340751E7150F38FD00B89C47 /* UIToggleVideoButton.m in Sources */, 34216F401547EBCD00EA9777 /* VideoZoomHandler.m in Sources */, D3F83EEC1582021700336684 /* InCallViewController.m in Sources */, D3F83F8E15822ABE00336684 /* PhoneMainView.m in Sources */, - D3ED3E6515860404006C0DE4 /* LinphoneStatusBar.m in Sources */, D3ED3E871586291E006C0DE4 /* LinphoneMainBar.m in Sources */, + D3ED3EA71587334E006C0DE4 /* CallHistoryTableViewController.m in Sources */, + D3ED3EB81587392C006C0DE4 /* HistoryController.m in Sources */, + D35497FE15875372000081D8 /* ContactsController.m in Sources */, + D3549816158761D0000081D8 /* ContactTableViewController.m in Sources */, + D35498211587716B000081D8 /* LinphoneStatusBar.m in Sources */, + D3A55FBC15877E5E003FD403 /* ContactCell.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1998,8 +2102,6 @@ 22D8F145147548E2008C97DB /* LinphoneAppDelegate.m in Sources */, 22D8F146147548E2008C97DB /* PhoneViewController.m in Sources */, 22D8F147147548E2008C97DB /* ContactPickerDelegate.m in Sources */, - 22D8F148147548E2008C97DB /* CallHistoryTableViewController.m in Sources */, - 22D8F149147548E2008C97DB /* GenericTabViewController.m in Sources */, 22D8F14A147548E2008C97DB /* MoreViewController.m in Sources */, 22D8F14B147548E2008C97DB /* ConsoleViewController.m in Sources */, 22D8F14C147548E2008C97DB /* UIDigitButton.m in Sources */, @@ -2019,13 +2121,17 @@ 2211DBBF14769C8300DEE054 /* CallDelegate.m in Sources */, 344ABD78147FCB68007420B6 /* ConferenceCallDetailView.m in Sources */, 34CA853A148F692A00503C01 /* MainScreenWithVideoPreview.m in Sources */, - 3418844914C6CAD300EA48C7 /* StatusSubViewController.m in Sources */, 340751E8150F38FD00B89C47 /* UIToggleVideoButton.m in Sources */, 34216F411547EBCD00EA9777 /* VideoZoomHandler.m in Sources */, D3F83EED1582021700336684 /* InCallViewController.m in Sources */, D3F83F8F15822ABE00336684 /* PhoneMainView.m in Sources */, - D3ED3E6615860404006C0DE4 /* LinphoneStatusBar.m in Sources */, D3ED3E881586291E006C0DE4 /* LinphoneMainBar.m in Sources */, + D3ED3EA81587334E006C0DE4 /* CallHistoryTableViewController.m in Sources */, + D3ED3EB91587392C006C0DE4 /* HistoryController.m in Sources */, + D35497FF15875372000081D8 /* ContactsController.m in Sources */, + D3549817158761D0000081D8 /* ContactTableViewController.m in Sources */, + D35498221587716B000081D8 /* LinphoneStatusBar.m in Sources */, + D3A55FBD15877E5E003FD403 /* ContactCell.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };