diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m index e390f6ff8..552be969f 100644 --- a/Classes/ChatRoomViewController.m +++ b/Classes/ChatRoomViewController.m @@ -376,6 +376,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta [self saveAndSend:[UIImage imageWithData:data] url:url]; }]; } + [sheet addCancelButtonWithTitle:NSLocalizedString(@"Cancel", nil)]; dispatch_async(dispatch_get_main_queue(), ^{ [waitView setHidden:TRUE]; [sheet showInView:[PhoneMainView instance].view]; @@ -392,10 +393,14 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta LinphoneAddress *from = [[[notif userInfo] objectForKey:@"from"] pointerValue]; ChatModel *chat = [[notif userInfo] objectForKey:@"chat"]; - if(from != NULL && chat != NULL) { - char *fromStr = linphone_address_as_string_uri_only(from); - if(fromStr != NULL) { - if([[NSString stringWithUTF8String:fromStr] + if(from == NULL || chat == NULL) { + return; + } + char *fromStr = linphone_address_as_string_uri_only(from); + if(fromStr != NULL) { + if (![[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] + || [UIApplication sharedApplication].applicationState == UIApplicationStateActive) { + if([[NSString stringWithUTF8String:fromStr] caseInsensitiveCompare:remoteAddress] == NSOrderedSame) { [chat setRead:[NSNumber numberWithInt:1]]; [chat update]; @@ -403,10 +408,8 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta [tableController addChatEntry:chat]; [tableController scrollToLastUnread:TRUE]; } - ms_free(fromStr); } - } else { - [LinphoneLogger logc:LinphoneLoggerWarning format:"Invalid textReceivedEvent"]; + ms_free(fromStr); } } diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m index 117b47506..94d36acf0 100644 --- a/Classes/ContactsViewController.m +++ b/Classes/ContactsViewController.m @@ -138,7 +138,18 @@ static UICompositeViewDescription *compositeDescription = nil; [super viewDidAppear:animated]; if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) { [tableController viewDidAppear:animated]; - } + } + if(![FastAddressBook isAuthorized]) { + UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Address book",nil) + message:NSLocalizedString(@"You must authorize the application to have access to address book.\n" + "Toggle the application in Settings > Privacy > Contacts",nil) + delegate:nil + cancelButtonTitle:NSLocalizedString(@"Continue",nil) + otherButtonTitles:nil]; + [error show]; + [error release]; + [[PhoneMainView instance] changeCurrentView:[DialerViewController compositeViewDescription]]; + } } - (void)viewDidDisappear:(BOOL)animated { diff --git a/Classes/HistoryDetailsViewController.h b/Classes/HistoryDetailsViewController.h index a9140badd..de8e57b62 100644 --- a/Classes/HistoryDetailsViewController.h +++ b/Classes/HistoryDetailsViewController.h @@ -36,13 +36,17 @@ @property (nonatomic, retain) IBOutlet UILabel *durationHeaderLabel; @property (nonatomic, retain) IBOutlet UILabel *typeLabel; @property (nonatomic, retain) IBOutlet UILabel *typeHeaderLabel; -@property (nonatomic, retain) IBOutlet UIButton *addressButton; +@property (nonatomic, retain) IBOutlet UILabel *plainAddressLabel; +@property (nonatomic, retain) IBOutlet UILabel *plainAddressHeaderLabel; +@property (nonatomic, retain) IBOutlet UIButton *callButton; +@property (nonatomic, retain) IBOutlet UIButton *messageButton; @property (nonatomic, retain) IBOutlet UIButton *addContactButton; @property (nonatomic, assign) LinphoneCallLog *callLog; - (IBAction)onBackClick:(id)event; - (IBAction)onContactClick:(id)event; - (IBAction)onAddContactClick:(id)event; -- (IBAction)onAddressClick:(id)event; +- (IBAction)onCallClick:(id)event; +- (IBAction)onMessageClick:(id)event; @end diff --git a/Classes/HistoryDetailsViewController.m b/Classes/HistoryDetailsViewController.m index 89ea294cf..58b480b51 100644 --- a/Classes/HistoryDetailsViewController.m +++ b/Classes/HistoryDetailsViewController.m @@ -33,7 +33,10 @@ @synthesize durationHeaderLabel; @synthesize typeLabel; @synthesize typeHeaderLabel; -@synthesize addressButton; +@synthesize plainAddressLabel; +@synthesize plainAddressHeaderLabel; +@synthesize callButton; +@synthesize messageButton; @synthesize addContactButton; #pragma mark - LifeCycle Functions @@ -63,7 +66,10 @@ [durationHeaderLabel release]; [typeLabel release]; [typeHeaderLabel release]; - [addressButton release]; + [plainAddressLabel release]; + [plainAddressHeaderLabel release]; + [callButton release]; + [messageButton release]; [addContactButton release]; [super dealloc]; @@ -105,7 +111,9 @@ static UICompositeViewDescription *compositeDescription = nil; [HistoryDetailsViewController adaptSize:dateHeaderLabel field:dateLabel]; [HistoryDetailsViewController adaptSize:durationHeaderLabel field:durationLabel]; [HistoryDetailsViewController adaptSize:typeHeaderLabel field:typeLabel]; - [addressButton.titleLabel setAdjustsFontSizeToFitWidth:TRUE]; // Auto shrink: IB lack! + [HistoryDetailsViewController adaptSize:plainAddressHeaderLabel field:plainAddressLabel]; + [callButton.titleLabel setAdjustsFontSizeToFitWidth:TRUE]; // Auto shrink: IB lack! + [messageButton.titleLabel setAdjustsFontSizeToFitWidth:TRUE]; // Auto shrink: IB lack! } - (void)viewWillAppear:(BOOL)animated { @@ -240,18 +248,24 @@ static UICompositeViewDescription *compositeDescription = nil; int duration = callLog->duration; [durationLabel setText:[NSString stringWithFormat:@"%02i:%02i", (duration/60), duration - 60 * (duration / 60), nil]]; + // contact name + [plainAddressLabel setText:@""]; if (addr != NULL) { - // contact name char* lAddress = linphone_address_as_string_uri_only(addr); if(lAddress != NULL) { - [addressButton setTitle:[NSString stringWithUTF8String:lAddress] forState:UIControlStateNormal]; - [addressButton setHidden:FALSE]; + [plainAddressLabel setText:[NSString stringWithUTF8String:lAddress]]; ms_free(lAddress); } else { - [addressButton setHidden:TRUE]; + } + } + + if (addr != NULL) { + [callButton setHidden:FALSE]; + [messageButton setHidden:FALSE]; } else { - [addressButton setHidden:TRUE]; + [callButton setHidden:TRUE]; + [messageButton setHidden:TRUE]; } } @@ -274,15 +288,28 @@ static UICompositeViewDescription *compositeDescription = nil; } - (IBAction)onAddContactClick:(id)event { - [ContactSelection setSelectionMode:ContactSelectionModeEdit]; - [ContactSelection setAddAddress:[[addressButton titleLabel] text]]; - [ContactSelection setSipFilter:FALSE]; - ContactsViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription] push:TRUE], ContactsViewController); - if(controller != nil) { + LinphoneAddress* addr = NULL; + if (callLog->dir == LinphoneCallIncoming) { + addr = callLog->from; + } else { + addr = callLog->to; + } + if (addr != NULL) { + char* lAddress = linphone_address_as_string_uri_only(addr); + if(lAddress != NULL) { + [ContactSelection setAddAddress:[NSString stringWithUTF8String:lAddress]]; + [ContactSelection setSelectionMode:ContactSelectionModeEdit]; + + [ContactSelection setSipFilter:FALSE]; + ContactsViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription] push:TRUE], ContactsViewController); + if(controller != nil) { + } + ms_free(lAddress); + } } } -- (IBAction)onAddressClick:(id)event { +- (IBAction)onCallClick:(id)event { LinphoneAddress* addr; if (callLog->dir == LinphoneCallIncoming) { addr = callLog->from; @@ -318,4 +345,37 @@ static UICompositeViewDescription *compositeDescription = nil; ms_free(lAddress); } +- (IBAction)onMessageClick:(id)event { + LinphoneAddress* addr; + if (callLog->dir == LinphoneCallIncoming) { + addr = callLog->from; + } else { + addr = callLog->to; + } + + char* lAddress = linphone_address_as_string_uri_only(addr); + if(lAddress == NULL) + return; + + NSString *displayName = nil; + if(contact != nil) { + displayName = [FastAddressBook getContactDisplayName:contact]; + } else { + const char* lDisplayName = linphone_address_get_display_name(addr); + const char* lUserName = linphone_address_get_username(addr); + if (lDisplayName) + displayName = [NSString stringWithUTF8String:lDisplayName]; + else if(lUserName) + displayName = [NSString stringWithUTF8String:lUserName]; + } + + // Go to ChatRoom view + [[PhoneMainView instance] changeCurrentView:[ChatViewController compositeViewDescription]]; + ChatRoomViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ChatRoomViewController compositeViewDescription] push:TRUE], ChatRoomViewController); + if(controller != nil) { + [controller setRemoteAddress:[NSString stringWithUTF8String:lAddress]]; + } + ms_free(lAddress); +} + @end diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index f4254ecbf..1eb1715f1 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -382,6 +382,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); linphone_core_set_default_proxy(lc,proxyCfg); } + [[[LinphoneManager instance] fastAddressBook] reload]; } - (BOOL)synchronize { diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 492854388..b6f101bb7 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -398,7 +398,7 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char char* lAddress = linphone_address_as_string_uri_only(addr); if(lAddress) { NSString *normalizedSipAddress = [FastAddressBook normalizeSipURI:[NSString stringWithUTF8String:lAddress]]; - ABRecordRef contact = [[[LinphoneManager instance] fastAddressBook] getContact:normalizedSipAddress]; + ABRecordRef contact = [fastAddressBook getContact:normalizedSipAddress]; if(contact) { address = [FastAddressBook getContactDisplayName:contact]; useLinphoneAddress = false; @@ -533,6 +533,35 @@ static void linphone_iphone_registration_state(LinphoneCore *lc, LinphoneProxyCo [chat create]; ms_free(fromStr); + + + if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] + && [UIApplication sharedApplication].applicationState != UIApplicationStateActive) { + + NSString* address = [chat remoteContact]; + NSString *normalizedSipAddress = [FastAddressBook normalizeSipURI:address]; + ABRecordRef contact = [fastAddressBook getContact:normalizedSipAddress]; + if(contact) { + address = [FastAddressBook getContactDisplayName:contact]; + } + if(address == nil) { + address = @"Unknown"; + } + + // Create a new notification + UILocalNotification* notif = [[[UILocalNotification alloc] init] autorelease]; + if (notif) { + notif.repeatInterval = 0; + notif.alertBody = [NSString stringWithFormat:NSLocalizedString(@"IM_MSG",nil), address]; + notif.alertAction = NSLocalizedString(@"Show", nil); + notif.soundName = @"msg.caf"; + notif.userInfo = [NSDictionary dictionaryWithObject:[chat remoteContact] forKey:@"chat"]; + + + [[UIApplication sharedApplication] presentLocalNotificationNow:notif]; + } + } + // Post event NSDictionary* dict = [NSDictionary dictionaryWithObjectsAndKeys: [NSValue valueWithPointer:room], @"room", @@ -941,6 +970,12 @@ static int comp_call_state_paused (const LinphoneCall* call, const void* param) } //kick up network cnx, just in case [LinphoneManager kickOffNetworkConnection]; + + [self setupGSMInteraction]; + //to make sure presence status is correct + if ([callCenter currentCalls]==nil) + linphone_core_set_presence_info(theLinphoneCore, 0, nil, LinphoneStatusAltService); + [self refreshRegisters]; linphone_core_iterate(theLinphoneCore); } diff --git a/Classes/LinphoneUI/UIChatCell.m b/Classes/LinphoneUI/UIChatCell.m index f95a2fc56..1ecac8e96 100644 --- a/Classes/LinphoneUI/UIChatCell.m +++ b/Classes/LinphoneUI/UIChatCell.m @@ -44,6 +44,7 @@ if ([arrayOfViews count] >= 1) { [self addSubview:[[arrayOfViews objectAtIndex:0] retain]]; } + [chatContentLabel setAdjustsFontSizeToFitWidth:TRUE]; // Auto shrink: IB lack! } return self; } @@ -129,40 +130,6 @@ linphone_address_destroy(linphoneAddress); } -- (void)layoutSubviews { - [super layoutSubviews]; - // - // Adapt size - // - CGRect displayNameFrame = [addressLabel frame]; - CGRect chatContentFrame = [chatContentLabel frame]; - - // Compute firstName size - CGSize displayNameSize = [[addressLabel text] sizeWithFont:[addressLabel font]]; - CGSize chatContentSize = [[chatContentLabel text] sizeWithFont:[chatContentLabel font]]; - float sum = displayNameSize.width + 5 + chatContentSize.width; - float limit = self.bounds.size.width - 5 - displayNameFrame.origin.x; - if(sum > limit) { - displayNameSize.width *= limit/sum; - chatContentSize.width *= limit/sum; - if(displayNameSize.width > limit/2) { - displayNameSize.width = limit/2; - chatContentSize.width = limit/2; - } - } - - displayNameFrame.size.width = displayNameSize.width; - chatContentFrame.size.width = chatContentSize.width; - - // Compute lastName size & position - chatContentFrame.origin.x = displayNameFrame.origin.x + displayNameFrame.size.width; - if(displayNameFrame.size.width) - chatContentFrame.origin.x += 5; - - [addressLabel setFrame: displayNameFrame]; - [chatContentLabel setFrame: chatContentFrame]; -} - - (void)setEditing:(BOOL)editing { [self setEditing:editing animated:FALSE]; } diff --git a/Classes/LinphoneUI/UIChatCell.xib b/Classes/LinphoneUI/UIChatCell.xib index 78812d464..b3d2fd18f 100644 --- a/Classes/LinphoneUI/UIChatCell.xib +++ b/Classes/LinphoneUI/UIChatCell.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -35,13 +35,14 @@ - 274 + 256 292 - {{10, 8}, {27, 27}} + {{10, 8}, {44, 44}} + _NS:9 NO @@ -54,8 +55,9 @@ 274 - {{45, 0}, {60, 44}} + {{62, 2}, {218, 25}} + _NS:328 NO @@ -90,9 +92,10 @@ 274 - {{110, 0}, {170, 44}} + {{62, 27}, {218, 33}} - + + _NS:328 NO YES @@ -108,6 +111,7 @@ 1 10 + 2 1 12 @@ -118,13 +122,81 @@ 16 NO + 218 + + + + 257 + + + + 274 + {{10, 12}, {24, 20}} + + + + _NS:9 + NO + IBCocoaTouchFramework + + NSImage + bubble.png + + + + + 292 + {{12, 10}, {20, 20}} + + + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + 3 + + 1 + MSAxIDEAA + + 1 + + + + 0 + 9 + 1 + + 1 + 14 + + + Helvetica + 14 + 16 + + + + {{276, 8}, {44, 44}} + + + + _NS:9 + + 3 + MCAwAA + + IBCocoaTouchFramework 257 - {{276, 0}, {44, 44}} + {{276, 8}, {44, 44}} - + + _NS:9 NO IBCocoaTouchFramework @@ -157,71 +229,10 @@ 16 - - - 257 - - - - 274 - {{10, 12}, {24, 20}} - - - _NS:9 - NO - IBCocoaTouchFramework - - NSImage - bubble.png - - - - - 292 - {{12, 10}, {20, 20}} - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - 3 - - 1 - MSAxIDEAA - - 1 - - - - 0 - 9 - 1 - - 1 - 14 - - - Helvetica - 14 - 16 - - - - {{276, 0}, {44, 44}} - - - _NS:9 - - 3 - MCAwAA - - IBCocoaTouchFramework - - {320, 44} + {320, 60} + _NS:9 @@ -314,8 +325,8 @@ - + @@ -389,7 +400,63 @@ 43 - + + + + UIChatCell + UITableViewCell + + onDeleteClick: + id + + + onDeleteClick: + + onDeleteClick: + id + + + + UILabel + UIImageView + UILabel + UIButton + UILabel + UIView + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + chatContentLabel + UILabel + + + deleteButton + UIButton + + + unreadMessageLabel + UILabel + + + unreadMessageView + UIView + + + + IBProjectSource + ./Classes/UIChatCell.h + + + + 0 IBCocoaTouchFramework YES diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index ef7a8108f..ed00dd10f 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -621,32 +621,8 @@ static PhoneMainView* phoneMainViewInstance=nil; #pragma mark - ActionSheet Functions - (void)displayMessage:(ChatModel*)chat { - if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] - && [UIApplication sharedApplication].applicationState != UIApplicationStateActive) { - - NSString* address = [chat remoteContact]; - NSString *normalizedSipAddress = [FastAddressBook normalizeSipURI:address]; - ABRecordRef contact = [[[LinphoneManager instance] fastAddressBook] getContact:normalizedSipAddress]; - if(contact) { - address = [FastAddressBook getContactDisplayName:contact]; - } - if(address == nil) { - address = @"Unknown"; - } - - // Create a new notification - UILocalNotification* notif = [[[UILocalNotification alloc] init] autorelease]; - if (notif) { - notif.repeatInterval = 0; - notif.alertBody = [NSString stringWithFormat:NSLocalizedString(@"IM_MSG",nil), address]; - notif.alertAction = NSLocalizedString(@"Show", nil); - notif.soundName = @"msg.caf"; - notif.userInfo = [NSDictionary dictionaryWithObject:[chat remoteContact] forKey:@"chat"]; - - - [[UIApplication sharedApplication] presentLocalNotificationNow:notif]; - } - } else { + if (![[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] + || [UIApplication sharedApplication].applicationState == UIApplicationStateActive) { if(![self removeInhibitedEvent:kLinphoneTextReceived]) { AudioServicesPlaySystemSound([LinphoneManager instance].sounds.message); } diff --git a/Classes/Utils/FastAddressBook.h b/Classes/Utils/FastAddressBook.h index 5550b373b..d93549dae 100644 --- a/Classes/Utils/FastAddressBook.h +++ b/Classes/Utils/FastAddressBook.h @@ -30,6 +30,8 @@ + (NSString*)getContactDisplayName:(ABRecordRef)contact; + (UIImage*)getContactImage:(ABRecordRef)contact thumbnail:(BOOL)thumbnail; - (ABRecordRef)getContact:(NSString*)address; +- (void)reload; ++ (BOOL)isAuthorized; + (NSString*)appendCountryCodeIfPossible:(NSString*)number; + (NSString*)normalizePhoneNumber:(NSString*)number; + (NSString*)normalizeSipURI:(NSString*)address; diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index ffa5d826a..ab5f0b1a3 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -72,18 +72,17 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf } + (NSString*)normalizeSipURI:(NSString*)address { - NSString* ret = address; - if([address rangeOfString:@"@"].location != NSNotFound) { - if([address rangeOfString:@"sip:" options:NSCaseInsensitiveSearch].location == 0) { - // have to be sure that start with sip: in lower case - ret = [ret substringFromIndex:4]; - } - ret = [@"sip:" stringByAppendingString:ret]; - if([ret hasSuffix:@":5060"]) { - ret = [ret substringToIndex:[ret length] - 5]; + NSString *normalizedSipAddress = nil; + LinphoneAddress* linphoneAddress = linphone_core_interpret_url([LinphoneManager getLc], [address UTF8String]); + if(linphoneAddress != NULL) { + char *tmp = linphone_address_as_string_uri_only(linphoneAddress); + if(tmp != NULL) { + normalizedSipAddress = [NSString stringWithUTF8String:tmp]; + ms_free(tmp); } + linphone_address_destroy(linphoneAddress); } - return ret; + return normalizedSipAddress; } + (NSString*)normalizePhoneNumber:(NSString*)address { @@ -107,24 +106,46 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf return [FastAddressBook appendCountryCodeIfPossible:lNormalizedAddress]; } ++ (BOOL)isAuthorized { + return !ABAddressBookGetAuthorizationStatus || ABAddressBookGetAuthorizationStatus() == kABAuthorizationStatusAuthorized; +} + - (FastAddressBook*)init { if ((self = [super init]) != nil) { addressBookMap = [[NSMutableDictionary alloc] init]; - addressBook = ABAddressBookCreate(); - ABAddressBookRegisterExternalChangeCallback (addressBook, sync_address_book, self); - if (ABAddressBookGetAuthorizationStatus && ABAddressBookGetAuthorizationStatus() != kABAuthorizationStatusNotDetermined) { - ABAddressBookRequestAccessWithCompletion(addressBook, ^(bool granted, CFErrorRef error) { - if (granted) [self loadData]; - }); - } else { - [self loadData]; - } - - + addressBook = nil; + [self reload]; } return self; } +- (void)reload { + if(addressBook != nil) { + ABAddressBookUnregisterExternalChangeCallback(addressBook, sync_address_book, self); + CFRelease(addressBook); + addressBook = nil; + } + NSError *error = nil; + if(ABAddressBookCreateWithOptions) { + addressBook = ABAddressBookCreateWithOptions(NULL, NULL); + } else { + addressBook = ABAddressBookCreate(); + } + if(addressBook != NULL) { + if(ABAddressBookGetAuthorizationStatus) { + ABAddressBookRequestAccessWithCompletion(addressBook, ^(bool granted, CFErrorRef error) { + ABAddressBookRegisterExternalChangeCallback (addressBook, sync_address_book, self); + [self loadData]; + }); + } else { + ABAddressBookRegisterExternalChangeCallback (addressBook, sync_address_book, self); + [self loadData]; + } + } else { + [LinphoneLogger log:LinphoneLoggerError format:@"Create AddressBook: Fail(%@)", [error localizedDescription]]; + } +} + - (void)loadData { ABAddressBookRevert(addressBook); @synchronized (addressBookMap) { @@ -167,7 +188,11 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf if(add) { CFStringRef lValue = CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey); NSString* lNormalizedKey = [FastAddressBook normalizeSipURI:(NSString*)lValue]; - [addressBookMap setObject:lPerson forKey:lNormalizedKey]; + if(lNormalizedKey != NULL) { + [addressBookMap setObject:lPerson forKey:lNormalizedKey]; + } else { + [addressBookMap setObject:lPerson forKey:(NSString*)lValue]; + } } CFRelease(lDict); } diff --git a/Classes/en.lproj/ChatViewController.xib b/Classes/en.lproj/ChatViewController.xib index aae2a8c7b..d524c9766 100644 --- a/Classes/en.lproj/ChatViewController.xib +++ b/Classes/en.lproj/ChatViewController.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -48,6 +48,7 @@ 290 {320, 44} + _NS:9 NO @@ -62,6 +63,7 @@ 292 {160, 44} + _NS:9 NO @@ -112,6 +114,7 @@ 289 {{160, 0}, {160, 44}} + _NS:9 NO @@ -153,6 +156,7 @@ {320, 44} + _NS:9 @@ -169,6 +173,8 @@ 274 {{0, 79}, {320, 381}} + + _NS:9 3 @@ -192,7 +198,7 @@ 0 YES - 44 + 60 22 22 @@ -201,6 +207,7 @@ 290 {{2, 44}, {316, 35}} + _NS:9 @@ -244,6 +251,7 @@ {320, 460} + _NS:9 @@ -450,7 +458,94 @@ 28 - + + + + ChatTableViewController + UITableViewController + + IBProjectSource + ./Classes/ChatTableViewController.h + + + + ChatViewController + UIViewController + + id + id + + + + onAddClick: + id + + + onEditClick: + id + + + + UITextField + UIToggleButton + ChatTableViewController + + + + addressField + UITextField + + + editButton + UIToggleButton + + + tableController + ChatTableViewController + + + + IBProjectSource + ./Classes/ChatViewController.h + + + + TUNinePatch + NSObject + + IBProjectSource + ./Classes/TUNinePatch.h + + + + UILinphoneTextField + UITextField + + backgroundNinePatch + TUNinePatch + + + backgroundNinePatch + + backgroundNinePatch + TUNinePatch + + + + IBProjectSource + ./Classes/UILinphoneTextField.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + 0 IBCocoaTouchFramework YES diff --git a/Classes/en.lproj/ContactDetailsViewController.xib b/Classes/en.lproj/ContactDetailsViewController.xib index 646a59cc9..b17eb8066 100644 --- a/Classes/en.lproj/ContactDetailsViewController.xib +++ b/Classes/en.lproj/ContactDetailsViewController.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -48,6 +48,7 @@ 290 {320, 44} + _NS:9 NO @@ -62,6 +63,7 @@ 292 {160, 44} + _NS:9 NO @@ -108,6 +110,7 @@ -2147483356 {160, 44} + _NS:9 NO @@ -145,6 +148,7 @@ 289 {{160, 0}, {160, 44}} + _NS:9 NO @@ -162,6 +166,10 @@ Ok Edit + + 2 + MC44MDc4NDMxNDg3IDAuODE1Njg2Mjg1NSAwLjgyMzUyOTQyMjMAA + @@ -183,6 +191,7 @@ {320, 44} + _NS:9 @@ -199,6 +208,7 @@ 306 {{0, 44}, {320, 416}} + _NS:9 1 @@ -228,6 +238,7 @@ {320, 460} + 3 @@ -511,7 +522,7 @@ UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -522,7 +533,182 @@ 62 - + + + + ContactDetailsTableViewController + UITableViewController + + id + UIContactDetailsFooter + UIContactDetailsHeader + + + + contactDetailsDelegate + id + + + footerController + UIContactDetailsFooter + + + headerController + UIContactDetailsHeader + + + + IBProjectSource + ./Classes/ContactDetailsTableViewController.h + + + + ContactDetailsViewController + UIViewController + + id + id + id + + + + onBackClick: + id + + + onCancelClick: + id + + + onEditClick: + id + + + + UIButton + UIButton + UIToggleButton + ContactDetailsTableViewController + + + + backButton + UIButton + + + cancelButton + UIButton + + + editButton + UIToggleButton + + + tableController + ContactDetailsTableViewController + + + + IBProjectSource + ./Classes/ContactDetailsViewController.h + + + + UIContactDetailsFooter + UIViewController + + onRemoveClick: + id + + + onRemoveClick: + + onRemoveClick: + id + + + + id + UIButton + + + + contactDetailsDelegate + id + + + removeButton + UIButton + + + + IBProjectSource + ./Classes/UIContactDetailsFooter.h + + + + UIContactDetailsHeader + UIViewController + + onAvatarClick: + id + + + onAvatarClick: + + onAvatarClick: + id + + + + UILabel + UIImageView + id + UIView + UIView + UITableView + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + contactDetailsDelegate + id + + + editView + UIView + + + normalView + UIView + + + tableView + UITableView + + + + IBProjectSource + ./Classes/UIContactDetailsHeader.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + 0 IBCocoaTouchFramework YES diff --git a/Classes/en.lproj/DialerViewController.xib b/Classes/en.lproj/DialerViewController.xib index 1e7b15ea5..ec480cb70 100644 --- a/Classes/en.lproj/DialerViewController.xib +++ b/Classes/en.lproj/DialerViewController.xib @@ -2,9 +2,9 @@ 784 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -651,6 +651,7 @@ {{214, 0}, {106, 69}} + _NS:9 NO @@ -1722,10 +1723,6 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/Classes/en.lproj/FirstLoginViewController.xib b/Classes/en.lproj/FirstLoginViewController.xib index e4232bdce..c6d76bf38 100644 --- a/Classes/en.lproj/FirstLoginViewController.xib +++ b/Classes/en.lproj/FirstLoginViewController.xib @@ -2,9 +2,9 @@ 784 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin diff --git a/Classes/en.lproj/HistoryDetailsViewController.xib b/Classes/en.lproj/HistoryDetailsViewController.xib index cd83816fa..4c36ca270 100644 --- a/Classes/en.lproj/HistoryDetailsViewController.xib +++ b/Classes/en.lproj/HistoryDetailsViewController.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -46,6 +46,7 @@ 290 {320, 44} + _NS:9 NO @@ -60,6 +61,7 @@ 292 {160, 44} + _NS:9 NO @@ -110,6 +112,7 @@ 289 {{160, 0}, {160, 44}} + _NS:9 NO @@ -142,6 +145,7 @@ {320, 44} + _NS:9 @@ -162,6 +166,7 @@ 292 {320, 100} + _NS:9 NO @@ -195,6 +200,7 @@ 292 {{-13, -5}, {131, 107}} + _NS:9 NO @@ -209,6 +215,7 @@ 292 {{20, 6}, {65, 65}} + _NS:9 NO @@ -228,6 +235,7 @@ 290 {{101, 37}, {199, 43}} + _NS:9 NO @@ -259,6 +267,7 @@ {{0, 44}, {320, 100}} + _NS:9 @@ -276,6 +285,7 @@ 292 {49, 21} + _NS:9 NO @@ -305,6 +315,7 @@ 290 {{57, 0}, {223, 21}} + _NS:9 NO @@ -331,8 +342,9 @@ - {{20, 166}, {280, 21}} + {{20, 152}, {280, 21}} + _NS:9 @@ -347,6 +359,7 @@ 292 {80, 21} + _NS:9 NO @@ -369,6 +382,7 @@ 290 {{88, 0}, {192, 21}} + _NS:9 NO @@ -388,8 +402,9 @@ - {{20, 195}, {280, 21}} + {{20, 181}, {280, 21}} + _NS:9 @@ -404,6 +419,7 @@ 292 {57, 21} + _NS:9 NO @@ -426,7 +442,8 @@ 290 {{65, 0}, {215, 21}} - + + _NS:9 NO YES @@ -445,18 +462,81 @@ - {{20, 224}, {280, 21}} + {{20, 210}, {280, 21}} + _NS:9 IBCocoaTouchFramework + + + 295 + + + + 292 + {78, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Address: + + 0 + 10 + + + + + + 290 + {{86, 0}, {194, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Address + + + IBCocoaTouchFramework + 0102030405 + + 0 + 10 + + + + + {{20, 239}, {280, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + 293 - {{33, 323}, {255, 50}} + {{33, 268}, {255, 50}} + + _NS:9 NO @@ -471,30 +551,60 @@ 10 10 10 - 0102030405 + Call - + NSImage button_background_over.png - + NSImage button_background_default.png - + 2 20 - + Helvetica-Bold 20 16 + + + 293 + {{33, 326}, {255, 50}} + + + + _NS:9 + NO + + Send message + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 10 + 10 + 10 + 10 + Send message + + + + + + + {320, 460} + IBCocoaTouchFramework @@ -510,14 +620,6 @@ 10 - - - addressButton - - - - 41 - addressLabel @@ -590,6 +692,38 @@ 52 + + + callButton + + + + 61 + + + + messageButton + + + + 62 + + + + plainAddressHeaderLabel + + + + 63 + + + + plainAddressLabel + + + + 64 + onBackClick: @@ -601,12 +735,12 @@ - onAddressClick: + onCallClick: 7 - 39 + 65 @@ -626,6 +760,15 @@ 53 + + + onMessageClick: + + + 7 + + 66 + @@ -655,7 +798,9 @@ + + @@ -714,12 +859,6 @@ durationView - - 31 - - - durationHeaderLabel - 32 @@ -782,7 +921,7 @@ 37 - addressButton + callButton 38 @@ -796,6 +935,40 @@ addButton + + 54 + + + + + + + plainAddressView + + + 55 + + + plainAddressHeaderLabel + + + 56 + + + plainAddressLabel + + + 59 + + + messageButton + + + 31 + + + durationHeaderLabel + @@ -823,6 +996,11 @@ 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 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -833,9 +1011,118 @@ - 53 + 66 + + + + + HistoryDetailsViewController + UIViewController + + id + id + id + id + id + + + + onAddContactClick: + id + + + onBackClick: + id + + + onCallClick: + id + + + onContactClick: + id + + + onMessageClick: + id + + + + UIButton + UILabel + UIImageView + UIButton + UILabel + UILabel + UILabel + UILabel + UIButton + UILabel + UILabel + UILabel + UILabel + + + + addContactButton + UIButton + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + callButton + UIButton + + + dateHeaderLabel + UILabel + + + dateLabel + UILabel + + + durationHeaderLabel + UILabel + + + durationLabel + UILabel + + + messageButton + UIButton + + + plainAddressHeaderLabel + UILabel + + + plainAddressLabel + UILabel + + + typeHeaderLabel + UILabel + + + typeLabel + UILabel + + + + IBProjectSource + ./Classes/HistoryDetailsViewController.h + + + - 0 IBCocoaTouchFramework YES diff --git a/Classes/fr.lproj/ChatViewController.xib b/Classes/fr.lproj/ChatViewController.xib index a305f9d93..5fd2b5997 100644 --- a/Classes/fr.lproj/ChatViewController.xib +++ b/Classes/fr.lproj/ChatViewController.xib @@ -1,22 +1,22 @@ - 1280 - 11E53 - 1938 - 1138.47 + 1536 + 11G56 + 2840 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 + IBProxyObject IBUIButton IBUIImageView - IBProxyObject - IBUITextField - IBUITableViewController IBUITableView + IBUITableViewController + IBUITextField IBUIView @@ -192,7 +192,7 @@ 0 YES - 44 + 60 22 22 @@ -449,7 +449,94 @@ 28 - + + + + ChatTableViewController + UITableViewController + + IBProjectSource + ./Classes/ChatTableViewController.h + + + + ChatViewController + UIViewController + + id + id + + + + onAddClick: + id + + + onEditClick: + id + + + + UITextField + UIToggleButton + ChatTableViewController + + + + addressField + UITextField + + + editButton + UIToggleButton + + + tableController + ChatTableViewController + + + + IBProjectSource + ./Classes/ChatViewController.h + + + + TUNinePatch + NSObject + + IBProjectSource + ./Classes/TUNinePatch.h + + + + UILinphoneTextField + UITextField + + backgroundNinePatch + TUNinePatch + + + backgroundNinePatch + + backgroundNinePatch + TUNinePatch + + + + IBProjectSource + ./Classes/UILinphoneTextField.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + 0 IBCocoaTouchFramework YES @@ -463,6 +550,6 @@ {542, 88} {5, 88} - 933 + 1926 diff --git a/Classes/fr.lproj/ContactDetailsViewController.xib b/Classes/fr.lproj/ContactDetailsViewController.xib index 667ee6055..dc9831ee7 100644 --- a/Classes/fr.lproj/ContactDetailsViewController.xib +++ b/Classes/fr.lproj/ContactDetailsViewController.xib @@ -1,23 +1,23 @@ - 1280 - 11E53 - 1938 - 1138.47 + 1536 + 11G56 + 2840 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 - IBUIView - IBUIImageView IBProxyObject - IBUIViewController - IBUITableViewController - IBUITableView IBUIButton + IBUIImageView + IBUITableView + IBUITableViewController + IBUIView + IBUIViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -162,6 +162,10 @@ Ok Éditer + + 2 + MC44MDc4NDMxNDg3IDAuODE1Njg2Mjg1NSAwLjgyMzUyOTQyMjMAA + @@ -201,62 +205,8 @@ _NS:9 - 10 - - 549453824 - {512, 1} - - - - - - TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA -AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA -AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI -AAgACAAIAAEAAQABAAE - - - - - - 3 - MCAwAA - - + 1 + MCAwIDAgMAA groupTableViewBackgroundColor YES @@ -282,7 +232,10 @@ AAgACAAIAAEAAQABAAE {320, 460} - + + 3 + MCAwAA + IBCocoaTouchFramework @@ -561,7 +514,7 @@ AAgACAAIAAEAAQABAAE UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -572,7 +525,182 @@ AAgACAAIAAEAAQABAAE 62 - + + + + ContactDetailsTableViewController + UITableViewController + + id + UIContactDetailsFooter + UIContactDetailsHeader + + + + contactDetailsDelegate + id + + + footerController + UIContactDetailsFooter + + + headerController + UIContactDetailsHeader + + + + IBProjectSource + ./Classes/ContactDetailsTableViewController.h + + + + ContactDetailsViewController + UIViewController + + id + id + id + + + + onBackClick: + id + + + onCancelClick: + id + + + onEditClick: + id + + + + UIButton + UIButton + UIToggleButton + ContactDetailsTableViewController + + + + backButton + UIButton + + + cancelButton + UIButton + + + editButton + UIToggleButton + + + tableController + ContactDetailsTableViewController + + + + IBProjectSource + ./Classes/ContactDetailsViewController.h + + + + UIContactDetailsFooter + UIViewController + + onRemoveClick: + id + + + onRemoveClick: + + onRemoveClick: + id + + + + id + UIButton + + + + contactDetailsDelegate + id + + + removeButton + UIButton + + + + IBProjectSource + ./Classes/UIContactDetailsFooter.h + + + + UIContactDetailsHeader + UIViewController + + onAvatarClick: + id + + + onAvatarClick: + + onAvatarClick: + id + + + + UILabel + UIImageView + id + UIView + UIView + UITableView + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + contactDetailsDelegate + id + + + editView + UIView + + + normalView + UIView + + + tableView + UITableView + + + + IBProjectSource + ./Classes/UIContactDetailsHeader.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + 0 IBCocoaTouchFramework YES @@ -587,6 +715,6 @@ AAgACAAIAAEAAQABAAE {320, 88} {5, 88} - 933 + 1926 diff --git a/Classes/fr.lproj/DialerViewController.xib b/Classes/fr.lproj/DialerViewController.xib index 1fb5e7b17..33b83a279 100644 --- a/Classes/fr.lproj/DialerViewController.xib +++ b/Classes/fr.lproj/DialerViewController.xib @@ -2,21 +2,21 @@ 784 - 11E53 - 1938 - 1138.47 + 11G56 + 2840 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 YES + IBProxyObject IBUIButton IBUIImageView - IBUIView IBUITextField - IBProxyObject + IBUIView YES @@ -1275,7 +1275,7 @@ 41.IBPluginDependency 41.IBUIButtonInspectorSelectedStateConfigurationMetadataKey - + YES DialerViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1370,7 +1370,7 @@ onAddressChange: onBackClick: - + YES id id @@ -1385,7 +1385,7 @@ onAddressChange: onBackClick: - + YES onAddContactClick: @@ -1428,7 +1428,7 @@ videoPreview zeroButton - + YES UICallButton UIButton @@ -1481,7 +1481,7 @@ videoPreview zeroButton - + YES addCallButton @@ -1697,10 +1697,6 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -1755,7 +1751,7 @@ transfer_call_disabled.png transfer_call_over.png - + YES {214, 138} {214, 138} @@ -1802,6 +1798,6 @@ {214, 138} - 933 + 1926 diff --git a/Classes/fr.lproj/FirstLoginViewController.xib b/Classes/fr.lproj/FirstLoginViewController.xib index 14f23a56e..c454020bb 100644 --- a/Classes/fr.lproj/FirstLoginViewController.xib +++ b/Classes/fr.lproj/FirstLoginViewController.xib @@ -2,21 +2,21 @@ 784 - 11E53 - 1938 - 1138.47 + 11G56 + 2840 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 YES - IBUIButton - IBUIActivityIndicatorView - IBUIView - IBUITextField IBProxyObject + IBUIActivityIndicatorView + IBUIButton + IBUITextField + IBUIView YES @@ -415,7 +415,7 @@ 64.IBUIButtonInspectorSelectedStateConfigurationMetadataKey 8.IBPluginDependency - + YES FirstLoginViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -466,13 +466,13 @@ button_background_over.png field_background.png - + YES {550, 101} {550, 101} {542, 88} - 933 + 1926 diff --git a/Classes/fr.lproj/HistoryDetailsViewController.xib b/Classes/fr.lproj/HistoryDetailsViewController.xib index d418215d7..2e0c9b45e 100644 --- a/Classes/fr.lproj/HistoryDetailsViewController.xib +++ b/Classes/fr.lproj/HistoryDetailsViewController.xib @@ -1,21 +1,21 @@ - 1280 - 11E53 - 1938 - 1138.47 + 1536 + 11G56 + 2840 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 + IBProxyObject IBUIButton IBUIImageView - IBUIView IBUILabel - IBProxyObject + IBUIView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -331,7 +331,7 @@ - {{20, 166}, {280, 21}} + {{20, 152}, {280, 21}} _NS:9 @@ -388,7 +388,7 @@ - {{20, 195}, {280, 21}} + {{20, 181}, {280, 21}} _NS:9 @@ -426,7 +426,7 @@ 290 {{65, 0}, {215, 21}} - + _NS:9 NO YES @@ -445,18 +445,76 @@ - {{20, 224}, {280, 21}} + {{20, 210}, {280, 21}} _NS:9 IBCocoaTouchFramework + + + 295 + + + + 292 + {78, 21} + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Adresse: + + 0 + 10 + + + + + + 290 + {{86, 0}, {194, 21}} + + + _NS:9 + NO + YES + 7 + NO + + Adresse + + + IBCocoaTouchFramework + 0102030405 + + 0 + 10 + + + + + {{20, 239}, {280, 21}} + + + _NS:9 + + IBCocoaTouchFramework + 293 - {{33, 323}, {255, 50}} + {{33, 268}, {255, 50}} + _NS:9 NO @@ -471,27 +529,54 @@ 10 10 10 - 0102030405 + Call - + NSImage button_background_over.png - + NSImage button_background_default.png - + 2 20 - + Helvetica-Bold 20 16 + + + 293 + {{33, 326}, {255, 50}} + + _NS:9 + NO + + Envoyer un message + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 10 + 10 + 10 + 10 + Envoyer un message + + + + + + + {320, 460} @@ -509,14 +594,6 @@ 10 - - - addressButton - - - - 41 - addressLabel @@ -589,6 +666,38 @@ 52 + + + callButton + + + + 61 + + + + messageButton + + + + 62 + + + + plainAddressHeaderLabel + + + + 63 + + + + plainAddressLabel + + + + 64 + onBackClick: @@ -600,12 +709,12 @@ - onAddressClick: + onCallClick: 7 - 39 + 65 @@ -625,6 +734,15 @@ 53 + + + onMessageClick: + + + 7 + + 66 + @@ -654,7 +772,9 @@ + + @@ -713,12 +833,6 @@ durationView - - 31 - - - durationHeaderLabel - 32 @@ -781,7 +895,7 @@ 37 - addressButton + callButton 38 @@ -795,6 +909,40 @@ addButton + + 54 + + + + + + + plainAddressView + + + 55 + + + plainAddressHeaderLabel + + + 56 + + + plainAddressLabel + + + 59 + + + messageButton + + + 31 + + + durationHeaderLabel + @@ -822,6 +970,11 @@ 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 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -832,9 +985,118 @@ - 53 + 66 + + + + + HistoryDetailsViewController + UIViewController + + id + id + id + id + id + + + + onAddContactClick: + id + + + onBackClick: + id + + + onCallClick: + id + + + onContactClick: + id + + + onMessageClick: + id + + + + UIButton + UILabel + UIImageView + UIButton + UILabel + UILabel + UILabel + UILabel + UIButton + UILabel + UILabel + UILabel + UILabel + + + + addContactButton + UIButton + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + callButton + UIButton + + + dateHeaderLabel + UILabel + + + dateLabel + UILabel + + + durationHeaderLabel + UILabel + + + durationLabel + UILabel + + + messageButton + UIButton + + + plainAddressHeaderLabel + UILabel + + + plainAddressLabel + UILabel + + + typeHeaderLabel + UILabel + + + typeLabel + UILabel + + + + IBProjectSource + ./Classes/HistoryDetailsViewController.h + + + - 0 IBCocoaTouchFramework YES @@ -850,6 +1112,6 @@ {320, 88} {5, 88} - 933 + 1926 diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index d2a597f68..a85e45a15 100644 Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings index 51184f0f6..55e7ada25 100644 Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ diff --git a/Resources/linphone_splashscreen-568h@2x.png b/Resources/linphone_splashscreen-568h@2x.png index ce8263422..168900c1c 100644 Binary files a/Resources/linphone_splashscreen-568h@2x.png and b/Resources/linphone_splashscreen-568h@2x.png differ diff --git a/Resources/linphone_splashscreen-Landscape.png b/Resources/linphone_splashscreen-Landscape.png new file mode 100644 index 000000000..2c6cbb5dd Binary files /dev/null and b/Resources/linphone_splashscreen-Landscape.png differ diff --git a/Resources/linphone_splashscreen-Landscape@2x.png b/Resources/linphone_splashscreen-Landscape@2x.png new file mode 100644 index 000000000..6ef7aa0c1 Binary files /dev/null and b/Resources/linphone_splashscreen-Landscape@2x.png differ diff --git a/Resources/linphone_splashscreen-Portrait.png b/Resources/linphone_splashscreen-Portrait.png new file mode 100644 index 000000000..a804375e9 Binary files /dev/null and b/Resources/linphone_splashscreen-Portrait.png differ diff --git a/Resources/linphone_splashscreen-Portrait@2x.png b/Resources/linphone_splashscreen-Portrait@2x.png new file mode 100644 index 000000000..d70d94ba5 Binary files /dev/null and b/Resources/linphone_splashscreen-Portrait@2x.png differ diff --git a/Resources/linphone_splashscreen.png b/Resources/linphone_splashscreen.png index 1ec650be8..da0882120 100644 Binary files a/Resources/linphone_splashscreen.png and b/Resources/linphone_splashscreen.png differ diff --git a/linphone-Info.plist b/linphone-Info.plist index 6ffe2f7d5..40caba0f3 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -73,6 +73,8 @@ UILaunchImageFile~iphone linphone_splashscreen + UILaunchImageFile~ipad + linphone_splashscreen UIRequiredDeviceCapabilities wifi diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index 5ba8cec7d..5c3c4c0a9 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -24,17 +24,17 @@ backup - 4 + 5 class BLWrapperHandle name - Classes/ContactDetailsViewController/4/ContactDetailsViewController.xib + Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib change date - 2012-09-25T09:16:19Z + 2012-10-12T07:54:44Z changed values class @@ -44,7 +44,7 @@ flags 0 hash - 43882923c210d264214497b3ab945eff + f826110f6bb9c9f39b9191f041a2e184 name ContactDetailsViewController.xib @@ -233,9 +233,9 @@ versions en - 4 + 5 fr - 4 + 5 @@ -803,17 +803,17 @@ backup - 16 + 17 class BLWrapperHandle name - Classes/ChatViewController/16/ChatViewController.xib + Classes/ChatViewController/17/ChatViewController.xib change date - 2012-09-25T09:16:19Z + 2012-10-16T14:43:40Z changed values class @@ -823,7 +823,7 @@ flags 0 hash - 7505ccd2bea1c762e561f35644e6dffe + 7e5a8ab77b42e6a8f401a59751110598 name ChatViewController.xib @@ -1038,9 +1038,9 @@ versions en - 16 + 17 fr - 16 + 17 @@ -1368,17 +1368,17 @@ backup - 5 + 6 class BLWrapperHandle name - Classes/DialerViewController/5/DialerViewController.xib + Classes/DialerViewController/6/DialerViewController.xib change date - 2012-09-26T14:58:35Z + 2012-10-16T12:36:35Z changed values class @@ -1388,7 +1388,7 @@ flags 0 hash - 9e26a5888ff9dabd85d7cca675540636 + db230136d1bdea7fda72ecf324a5a159 name DialerViewController.xib @@ -1902,9 +1902,9 @@ versions en - 5 + 6 fr - 5 + 6 @@ -2481,17 +2481,17 @@ backup - 5 + 6 class BLWrapperHandle name - Classes/FirstLoginViewController/5/FirstLoginViewController.xib + Classes/FirstLoginViewController/6/FirstLoginViewController.xib change date - 2012-09-25T09:16:19Z + 2012-10-16T14:13:48Z changed values class @@ -2501,7 +2501,7 @@ flags 0 hash - 955b765235e9de0f0fc6f830777dae53 + d4cf9755b94184e4eb59331c42b1b4e4 name FirstLoginViewController.xib @@ -2665,9 +2665,9 @@ versions en - 5 + 6 fr - 5 + 6 @@ -2675,17 +2675,17 @@ backup - 5 + 8 class BLWrapperHandle name - Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib + Classes/HistoryDetailsViewController/8/HistoryDetailsViewController.xib change date - 2012-09-25T09:16:19Z + 2012-10-16T14:28:47Z changed values class @@ -2695,7 +2695,7 @@ flags 0 hash - e32663fb7bb499508cfde62e883bded0 + cafa067232a482fd15bc0222fa7c9d45 name HistoryDetailsViewController.xib @@ -3076,17 +3076,19 @@ class BLStringKeyObject comment - Class = "IBUIButton"; normalTitle = "0102030405"; ObjectID = "37"; + Class = "IBUIButton"; normalTitle = "Call"; ObjectID = "37"; errors flags - 2 + 3 key 37.normalTitle localizations en - 0102030405 + Call + fr + Appeler snapshots @@ -3141,6 +3143,129 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "Address:"; ObjectID = "55"; + errors + + flags + 0 + key + 55.text + localizations + + en + Address: + fr + Adresse: + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; accessibilityLabel = "Address"; ObjectID = "56"; + errors + + flags + 0 + key + 56.accessibilityLabel + localizations + + en + Address + fr + Adresse + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUILabel"; text = "0102030405"; ObjectID = "56"; + errors + + flags + 2 + key + 56.text + localizations + + en + 0102030405 + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Send message"; ObjectID = "59"; + errors + + flags + 0 + key + 59.accessibilityLabel + localizations + + en + Send message + fr + Envoyer un message + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Send message"; ObjectID = "59"; + errors + + flags + 0 + key + 59.normalTitle + localizations + + en + Send message + fr + Envoyer un message + + snapshots + + old objects @@ -3149,9 +3274,9 @@ versions en - 5 + 8 fr - 5 + 8 @@ -12050,7 +12175,7 @@ change date - 2012-10-05T12:13:58Z + 2012-10-16T09:25:05Z changed values class @@ -12060,7 +12185,7 @@ flags 0 hash - 1a73bb401d656923b7ded3d958f5bb5b + c50a71e6174b7a7b723ffa38dd90788b name Localizable.strings @@ -12319,6 +12444,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Address book + localizations + + en + Address book + fr + Annuaire + + snapshots + + change date 2001-01-01T00:00:00Z @@ -14283,6 +14433,34 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + You must authorize the application to have access to address book. +Toggle the application in Settings > Privacy > Contacts + localizations + + en + You must authorize the application to have access to address book. +Toggle the application in Settings > Privacy > Contacts + fr + Vous devez autoriser l'application à accéder à l'annuaire. +Activer l'application dans Réglages > Confidentialité > Contacts + + snapshots + + change date 2001-01-01T00:00:00Z diff --git a/linphone.ldb/Resources/Classes/ChatViewController/16/ChatViewController.xib b/linphone.ldb/Resources/Classes/ChatViewController/17/ChatViewController.xib similarity index 82% rename from linphone.ldb/Resources/Classes/ChatViewController/16/ChatViewController.xib rename to linphone.ldb/Resources/Classes/ChatViewController/17/ChatViewController.xib index aae2a8c7b..d524c9766 100644 --- a/linphone.ldb/Resources/Classes/ChatViewController/16/ChatViewController.xib +++ b/linphone.ldb/Resources/Classes/ChatViewController/17/ChatViewController.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -48,6 +48,7 @@ 290 {320, 44} + _NS:9 NO @@ -62,6 +63,7 @@ 292 {160, 44} + _NS:9 NO @@ -112,6 +114,7 @@ 289 {{160, 0}, {160, 44}} + _NS:9 NO @@ -153,6 +156,7 @@ {320, 44} + _NS:9 @@ -169,6 +173,8 @@ 274 {{0, 79}, {320, 381}} + + _NS:9 3 @@ -192,7 +198,7 @@ 0 YES - 44 + 60 22 22 @@ -201,6 +207,7 @@ 290 {{2, 44}, {316, 35}} + _NS:9 @@ -244,6 +251,7 @@ {320, 460} + _NS:9 @@ -450,7 +458,94 @@ 28 - + + + + ChatTableViewController + UITableViewController + + IBProjectSource + ./Classes/ChatTableViewController.h + + + + ChatViewController + UIViewController + + id + id + + + + onAddClick: + id + + + onEditClick: + id + + + + UITextField + UIToggleButton + ChatTableViewController + + + + addressField + UITextField + + + editButton + UIToggleButton + + + tableController + ChatTableViewController + + + + IBProjectSource + ./Classes/ChatViewController.h + + + + TUNinePatch + NSObject + + IBProjectSource + ./Classes/TUNinePatch.h + + + + UILinphoneTextField + UITextField + + backgroundNinePatch + TUNinePatch + + + backgroundNinePatch + + backgroundNinePatch + TUNinePatch + + + + IBProjectSource + ./Classes/UILinphoneTextField.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + 0 IBCocoaTouchFramework YES diff --git a/linphone.ldb/Resources/Classes/ContactDetailsViewController/4/ContactDetailsViewController.xib b/linphone.ldb/Resources/Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib similarity index 74% rename from linphone.ldb/Resources/Classes/ContactDetailsViewController/4/ContactDetailsViewController.xib rename to linphone.ldb/Resources/Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib index 646a59cc9..b17eb8066 100644 --- a/linphone.ldb/Resources/Classes/ContactDetailsViewController/4/ContactDetailsViewController.xib +++ b/linphone.ldb/Resources/Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -48,6 +48,7 @@ 290 {320, 44} + _NS:9 NO @@ -62,6 +63,7 @@ 292 {160, 44} + _NS:9 NO @@ -108,6 +110,7 @@ -2147483356 {160, 44} + _NS:9 NO @@ -145,6 +148,7 @@ 289 {{160, 0}, {160, 44}} + _NS:9 NO @@ -162,6 +166,10 @@ Ok Edit + + 2 + MC44MDc4NDMxNDg3IDAuODE1Njg2Mjg1NSAwLjgyMzUyOTQyMjMAA + @@ -183,6 +191,7 @@ {320, 44} + _NS:9 @@ -199,6 +208,7 @@ 306 {{0, 44}, {320, 416}} + _NS:9 1 @@ -228,6 +238,7 @@ {320, 460} + 3 @@ -511,7 +522,7 @@ UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -522,7 +533,182 @@ 62 - + + + + ContactDetailsTableViewController + UITableViewController + + id + UIContactDetailsFooter + UIContactDetailsHeader + + + + contactDetailsDelegate + id + + + footerController + UIContactDetailsFooter + + + headerController + UIContactDetailsHeader + + + + IBProjectSource + ./Classes/ContactDetailsTableViewController.h + + + + ContactDetailsViewController + UIViewController + + id + id + id + + + + onBackClick: + id + + + onCancelClick: + id + + + onEditClick: + id + + + + UIButton + UIButton + UIToggleButton + ContactDetailsTableViewController + + + + backButton + UIButton + + + cancelButton + UIButton + + + editButton + UIToggleButton + + + tableController + ContactDetailsTableViewController + + + + IBProjectSource + ./Classes/ContactDetailsViewController.h + + + + UIContactDetailsFooter + UIViewController + + onRemoveClick: + id + + + onRemoveClick: + + onRemoveClick: + id + + + + id + UIButton + + + + contactDetailsDelegate + id + + + removeButton + UIButton + + + + IBProjectSource + ./Classes/UIContactDetailsFooter.h + + + + UIContactDetailsHeader + UIViewController + + onAvatarClick: + id + + + onAvatarClick: + + onAvatarClick: + id + + + + UILabel + UIImageView + id + UIView + UIView + UITableView + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + contactDetailsDelegate + id + + + editView + UIView + + + normalView + UIView + + + tableView + UITableView + + + + IBProjectSource + ./Classes/UIContactDetailsHeader.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + 0 IBCocoaTouchFramework YES diff --git a/linphone.ldb/Resources/Classes/DialerViewController/5/DialerViewController.xib b/linphone.ldb/Resources/Classes/DialerViewController/6/DialerViewController.xib similarity index 99% rename from linphone.ldb/Resources/Classes/DialerViewController/5/DialerViewController.xib rename to linphone.ldb/Resources/Classes/DialerViewController/6/DialerViewController.xib index 1e7b15ea5..ec480cb70 100644 --- a/linphone.ldb/Resources/Classes/DialerViewController/5/DialerViewController.xib +++ b/linphone.ldb/Resources/Classes/DialerViewController/6/DialerViewController.xib @@ -2,9 +2,9 @@ 784 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -651,6 +651,7 @@ {{214, 0}, {106, 69}} + _NS:9 NO @@ -1722,10 +1723,6 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib b/linphone.ldb/Resources/Classes/FirstLoginViewController/6/FirstLoginViewController.xib similarity index 99% rename from linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib rename to linphone.ldb/Resources/Classes/FirstLoginViewController/6/FirstLoginViewController.xib index e4232bdce..c6d76bf38 100644 --- a/linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib +++ b/linphone.ldb/Resources/Classes/FirstLoginViewController/6/FirstLoginViewController.xib @@ -2,9 +2,9 @@ 784 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin diff --git a/linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib b/linphone.ldb/Resources/Classes/HistoryDetailsViewController/8/HistoryDetailsViewController.xib similarity index 73% rename from linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib rename to linphone.ldb/Resources/Classes/HistoryDetailsViewController/8/HistoryDetailsViewController.xib index cd83816fa..4c36ca270 100644 --- a/linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib +++ b/linphone.ldb/Resources/Classes/HistoryDetailsViewController/8/HistoryDetailsViewController.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G56 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -46,6 +46,7 @@ 290 {320, 44} + _NS:9 NO @@ -60,6 +61,7 @@ 292 {160, 44} + _NS:9 NO @@ -110,6 +112,7 @@ 289 {{160, 0}, {160, 44}} + _NS:9 NO @@ -142,6 +145,7 @@ {320, 44} + _NS:9 @@ -162,6 +166,7 @@ 292 {320, 100} + _NS:9 NO @@ -195,6 +200,7 @@ 292 {{-13, -5}, {131, 107}} + _NS:9 NO @@ -209,6 +215,7 @@ 292 {{20, 6}, {65, 65}} + _NS:9 NO @@ -228,6 +235,7 @@ 290 {{101, 37}, {199, 43}} + _NS:9 NO @@ -259,6 +267,7 @@ {{0, 44}, {320, 100}} + _NS:9 @@ -276,6 +285,7 @@ 292 {49, 21} + _NS:9 NO @@ -305,6 +315,7 @@ 290 {{57, 0}, {223, 21}} + _NS:9 NO @@ -331,8 +342,9 @@ - {{20, 166}, {280, 21}} + {{20, 152}, {280, 21}} + _NS:9 @@ -347,6 +359,7 @@ 292 {80, 21} + _NS:9 NO @@ -369,6 +382,7 @@ 290 {{88, 0}, {192, 21}} + _NS:9 NO @@ -388,8 +402,9 @@ - {{20, 195}, {280, 21}} + {{20, 181}, {280, 21}} + _NS:9 @@ -404,6 +419,7 @@ 292 {57, 21} + _NS:9 NO @@ -426,7 +442,8 @@ 290 {{65, 0}, {215, 21}} - + + _NS:9 NO YES @@ -445,18 +462,81 @@ - {{20, 224}, {280, 21}} + {{20, 210}, {280, 21}} + _NS:9 IBCocoaTouchFramework + + + 295 + + + + 292 + {78, 21} + + + + _NS:9 + NO + YES + 7 + NO + + + + IBCocoaTouchFramework + Address: + + 0 + 10 + + + + + + 290 + {{86, 0}, {194, 21}} + + + + _NS:9 + NO + YES + 7 + NO + + Address + + + IBCocoaTouchFramework + 0102030405 + + 0 + 10 + + + + + {{20, 239}, {280, 21}} + + + + _NS:9 + + IBCocoaTouchFramework + 293 - {{33, 323}, {255, 50}} + {{33, 268}, {255, 50}} + + _NS:9 NO @@ -471,30 +551,60 @@ 10 10 10 - 0102030405 + Call - + NSImage button_background_over.png - + NSImage button_background_default.png - + 2 20 - + Helvetica-Bold 20 16 + + + 293 + {{33, 326}, {255, 50}} + + + + _NS:9 + NO + + Send message + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 10 + 10 + 10 + 10 + Send message + + + + + + + {320, 460} + IBCocoaTouchFramework @@ -510,14 +620,6 @@ 10 - - - addressButton - - - - 41 - addressLabel @@ -590,6 +692,38 @@ 52 + + + callButton + + + + 61 + + + + messageButton + + + + 62 + + + + plainAddressHeaderLabel + + + + 63 + + + + plainAddressLabel + + + + 64 + onBackClick: @@ -601,12 +735,12 @@ - onAddressClick: + onCallClick: 7 - 39 + 65 @@ -626,6 +760,15 @@ 53 + + + onMessageClick: + + + 7 + + 66 + @@ -655,7 +798,9 @@ + + @@ -714,12 +859,6 @@ durationView - - 31 - - - durationHeaderLabel - 32 @@ -782,7 +921,7 @@ 37 - addressButton + callButton 38 @@ -796,6 +935,40 @@ addButton + + 54 + + + + + + + plainAddressView + + + 55 + + + plainAddressHeaderLabel + + + 56 + + + plainAddressLabel + + + 59 + + + messageButton + + + 31 + + + durationHeaderLabel + @@ -823,6 +996,11 @@ 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 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -833,9 +1011,118 @@ - 53 + 66 + + + + + HistoryDetailsViewController + UIViewController + + id + id + id + id + id + + + + onAddContactClick: + id + + + onBackClick: + id + + + onCallClick: + id + + + onContactClick: + id + + + onMessageClick: + id + + + + UIButton + UILabel + UIImageView + UIButton + UILabel + UILabel + UILabel + UILabel + UIButton + UILabel + UILabel + UILabel + UILabel + + + + addContactButton + UIButton + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + callButton + UIButton + + + dateHeaderLabel + UILabel + + + dateLabel + UILabel + + + durationHeaderLabel + UILabel + + + durationLabel + UILabel + + + messageButton + UIButton + + + plainAddressHeaderLabel + UILabel + + + plainAddressLabel + UILabel + + + typeHeaderLabel + UILabel + + + typeLabel + UILabel + + + + IBProjectSource + ./Classes/HistoryDetailsViewController.h + + + - 0 IBCocoaTouchFramework YES diff --git a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings index d2a597f68..a85e45a15 100644 Binary files a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings and b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings differ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index c728c5ed8..b61ed0583 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -158,6 +158,14 @@ D306459F1611EC2A00BB571E /* UILoadingImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D306459D1611EC2900BB571E /* UILoadingImageView.m */; }; D30BBD1815D402A7000F93DD /* contact_ok_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D30BBD1715D402A7000F93DD /* contact_ok_disabled.png */; }; D30BBD1915D402A7000F93DD /* contact_ok_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D30BBD1715D402A7000F93DD /* contact_ok_disabled.png */; }; + D3103924162C3C5100C00C18 /* linphone_splashscreen-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = D3103920162C3C5100C00C18 /* linphone_splashscreen-Landscape.png */; }; + D3103925162C3C5200C00C18 /* linphone_splashscreen-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = D3103920162C3C5100C00C18 /* linphone_splashscreen-Landscape.png */; }; + D3103926162C3C5200C00C18 /* linphone_splashscreen-Landscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D3103921162C3C5100C00C18 /* linphone_splashscreen-Landscape@2x.png */; }; + D3103927162C3C5200C00C18 /* linphone_splashscreen-Landscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D3103921162C3C5100C00C18 /* linphone_splashscreen-Landscape@2x.png */; }; + D3103928162C3C5200C00C18 /* linphone_splashscreen-Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = D3103922162C3C5100C00C18 /* linphone_splashscreen-Portrait.png */; }; + D3103929162C3C5200C00C18 /* linphone_splashscreen-Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = D3103922162C3C5100C00C18 /* linphone_splashscreen-Portrait.png */; }; + D310392A162C3C5200C00C18 /* linphone_splashscreen-Portrait@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D3103923162C3C5100C00C18 /* linphone_splashscreen-Portrait@2x.png */; }; + D310392B162C3C5200C00C18 /* linphone_splashscreen-Portrait@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D3103923162C3C5100C00C18 /* linphone_splashscreen-Portrait@2x.png */; }; D3119E7215B6A4710005D4A4 /* contacts_back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3119E7015B6A4710005D4A4 /* contacts_back_default.png */; }; D3119E7415B6A4710005D4A4 /* contacts_back_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3119E7115B6A4710005D4A4 /* contacts_back_over.png */; }; D3128FE115AABC7E00A2147A /* ContactDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3128FDF15AABC7E00A2147A /* ContactDetailsViewController.m */; }; @@ -1634,6 +1642,10 @@ D306459D1611EC2900BB571E /* UILoadingImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UILoadingImageView.m; sourceTree = ""; }; D30BBD1215D3EFEB000F93DD /* ContactDetailsDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactDetailsDelegate.h; sourceTree = ""; }; D30BBD1715D402A7000F93DD /* contact_ok_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_ok_disabled.png; path = Resources/contact_ok_disabled.png; sourceTree = ""; }; + D3103920162C3C5100C00C18 /* linphone_splashscreen-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone_splashscreen-Landscape.png"; path = "Resources/linphone_splashscreen-Landscape.png"; sourceTree = ""; }; + D3103921162C3C5100C00C18 /* linphone_splashscreen-Landscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone_splashscreen-Landscape@2x.png"; path = "Resources/linphone_splashscreen-Landscape@2x.png"; sourceTree = ""; }; + D3103922162C3C5100C00C18 /* linphone_splashscreen-Portrait.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone_splashscreen-Portrait.png"; path = "Resources/linphone_splashscreen-Portrait.png"; sourceTree = ""; }; + D3103923162C3C5100C00C18 /* linphone_splashscreen-Portrait@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone_splashscreen-Portrait@2x.png"; path = "Resources/linphone_splashscreen-Portrait@2x.png"; sourceTree = ""; }; D3119E7015B6A4710005D4A4 /* contacts_back_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_back_default.png; path = Resources/contacts_back_default.png; sourceTree = ""; }; D3119E7115B6A4710005D4A4 /* contacts_back_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_back_over.png; path = Resources/contacts_back_over.png; sourceTree = ""; }; D3128FDE15AABC7E00A2147A /* ContactDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactDetailsViewController.h; sourceTree = ""; }; @@ -3153,6 +3165,10 @@ D33CF34915D3A03400CD4B85 /* linphone_icon_72@2x.png */, D3012CC31610467D007CD926 /* linphone_logo.png */, D38F46F1160C5CC8002D4C4A /* linphone_splashscreen-568h@2x.png */, + D3103920162C3C5100C00C18 /* linphone_splashscreen-Landscape.png */, + D3103921162C3C5100C00C18 /* linphone_splashscreen-Landscape@2x.png */, + D3103922162C3C5100C00C18 /* linphone_splashscreen-Portrait.png */, + D3103923162C3C5100C00C18 /* linphone_splashscreen-Portrait@2x.png */, D354944A160B615A0027E44E /* linphone_splashscreen.png */, D354944B160B615A0027E44E /* linphone_splashscreen@2x.png */, 57F005C315EE2CCF00914747 /* linphonerc */, @@ -4181,6 +4197,10 @@ D3D52A891614495300DEB00A /* decline_over_landscape~ipad.png in Resources */, D3D52A8B1614495300DEB00A /* decline_over~ipad.png in Resources */, D37E3ED01619DCC50087659A /* licenses.html in Resources */, + D3103924162C3C5100C00C18 /* linphone_splashscreen-Landscape.png in Resources */, + D3103926162C3C5200C00C18 /* linphone_splashscreen-Landscape@2x.png in Resources */, + D3103928162C3C5200C00C18 /* linphone_splashscreen-Portrait.png in Resources */, + D310392A162C3C5200C00C18 /* linphone_splashscreen-Portrait@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4683,6 +4703,10 @@ D3D52A8A1614495300DEB00A /* decline_over_landscape~ipad.png in Resources */, D3D52A8C1614495300DEB00A /* decline_over~ipad.png in Resources */, D37E3ED11619DCC50087659A /* licenses.html in Resources */, + D3103925162C3C5200C00C18 /* linphone_splashscreen-Landscape.png in Resources */, + D3103927162C3C5200C00C18 /* linphone_splashscreen-Landscape@2x.png in Resources */, + D3103929162C3C5200C00C18 /* linphone_splashscreen-Portrait.png in Resources */, + D310392B162C3C5200C00C18 /* linphone_splashscreen-Portrait@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5660,7 +5684,7 @@ HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = ""; - PROVISIONING_PROFILE = "FFF4AA57-7302-4F48-B969-20CFC1B10BAF"; + PROVISIONING_PROFILE = "79E53132-649F-48B3-A931-24792E466A11"; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/submodules/linphone b/submodules/linphone index bdaa5ae91..aa49870d7 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bdaa5ae91ac1ba1e3844fceb5f611ba37ddde964 +Subproject commit aa49870d7117df201ea56838f34fe651b458d0ee