From 223e44c86233bdffd527a5446331c24b7b2ce1fb Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Mon, 10 Sep 2012 14:27:18 +0200 Subject: [PATCH] Fix Chat screen rotation Small fixes --- Classes/ChatRoomViewController.m | 117 ++++++---- Classes/ChatRoomViewController.xib | 100 +++------ Classes/FirstLoginViewController.m | 2 +- Classes/LinphoneManager.m | 33 +-- Classes/LinphoneUI/UIChatCell.m | 18 +- Classes/LinphoneUI/UIChatRoomCell.m | 2 +- Classes/LinphoneUI/UIChatRoomCell.xib | 108 +++++----- .../LinphoneUI/UICompositeViewController.m | 2 + Classes/LinphoneUI/UIMainBar.xib | 158 ++------------ Classes/LinphoneUI/UIMainBar~ipad.xib | 203 +++--------------- linphone.xcodeproj/project.pbxproj | 12 +- 11 files changed, 235 insertions(+), 520 deletions(-) diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m index a144d846c..3dfdfb7bb 100644 --- a/Classes/ChatRoomViewController.m +++ b/Classes/ChatRoomViewController.m @@ -73,7 +73,7 @@ static UICompositeViewDescription *compositeDescription = nil; content:@"ChatRoomViewController" stateBar:nil stateBarEnabled:false - tabBar:@"UIMainBar" + tabBar:/*@"UIMainBar"*/nil tabBarEnabled:false /*to keep room for chat*/ fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] @@ -167,11 +167,20 @@ static UICompositeViewDescription *compositeDescription = nil; NSString *displayName = nil; UIImage *image = nil; - LinphoneAddress* linphoneAddress =linphone_core_interpret_url([LinphoneManager getLc],[_remoteAddress cStringUsingEncoding: NSUTF8StringEncoding]); - if (linphoneAddress==NULL) - return ; - char *tmp=linphone_address_as_string_uri_only(linphoneAddress); - NSString *normalizedSipAddress=[NSString stringWithUTF8String:tmp]; + LinphoneAddress* linphoneAddress = linphone_core_interpret_url([LinphoneManager getLc], [_remoteAddress UTF8String]); + if (linphoneAddress == NULL) { + [[PhoneMainView instance] popCurrentView]; + UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Invalid SIP address",nil) + message:NSLocalizedString(@"Either configure a SIP proxy server from settings prior to send a message or use a valid SIP address (I.E sip:john@example.net)",nil) + delegate:nil + cancelButtonTitle:NSLocalizedString(@"Continue",nil) + otherButtonTitles:nil]; + [error show]; + [error release]; + return; + } + char *tmp = linphone_address_as_string_uri_only(linphoneAddress); + NSString *normalizedSipAddress = [NSString stringWithUTF8String:tmp]; ms_free(tmp); ABRecordRef acontact = [[[LinphoneManager instance] fastAddressBook] getContact:normalizedSipAddress]; @@ -180,7 +189,8 @@ static UICompositeViewDescription *compositeDescription = nil; image = [FastAddressBook getContactImage:acontact thumbnail:true]; } [_remoteAddress release]; - _remoteAddress =[normalizedSipAddress retain]; + _remoteAddress = [normalizedSipAddress retain]; + // Display name if(displayName == nil) { displayName = [NSString stringWithUTF8String:linphone_address_get_username(linphoneAddress)]; @@ -192,14 +202,15 @@ static UICompositeViewDescription *compositeDescription = nil; image = [UIImage imageNamed:@"avatar_unknown_small.png"]; } [avatarImage setImage:image]; - linphone_address_destroy(linphoneAddress); + + linphone_address_destroy(linphoneAddress); } static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState state,void* ud) { - ChatRoomViewController* thiz=(ChatRoomViewController*)ud; + ChatRoomViewController* thiz = (ChatRoomViewController*)ud; ChatModel *chat = (ChatModel *)linphone_chat_message_get_user_data(msg); [LinphoneLogger log:LinphoneLoggerLog - format:@"Delivery status for [%@] is [%s]",chat.message,linphone_chat_message_state_to_string(state)]; + format:@"Delivery status for [%@] is [%s]", chat.message, linphone_chat_message_state_to_string(state)]; [chat setState:[NSNumber numberWithInt:state]]; [chat update]; [thiz.tableController updateChatEntry:chat]; @@ -215,10 +226,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta return FALSE; } if(chatRoom == NULL) { - - chatRoom = linphone_core_create_chat_room([LinphoneManager getLc], [_remoteAddress UTF8String]); - } // Save message in database @@ -233,9 +241,9 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta [chat create]; [tableController addChatEntry:chat]; [chat release]; - LinphoneChatMessage* msg = linphone_chat_room_create_message(chatRoom,[message UTF8String]); - linphone_chat_message_set_user_data(msg,chat); - linphone_chat_room_send_message2(chatRoom, msg,message_status,self); + LinphoneChatMessage* msg = linphone_chat_room_create_message(chatRoom, [message UTF8String]); + linphone_chat_message_set_user_data(msg, chat); + linphone_chat_room_send_message2(chatRoom, msg, message_status, self); return TRUE; } @@ -302,7 +310,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta - (void)keyboardWillHide:(NSNotification *)notif { //CGRect beginFrame = [[[notif userInfo] objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue]; - CGRect endFrame = [[[notif userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]; + //CGRect endFrame = [[[notif userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]; UIViewAnimationCurve curve = [[[notif userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] intValue]; NSTimeInterval duration = [[[notif userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue]; [UIView beginAnimations:@"resize" context:nil]; @@ -310,16 +318,27 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta [UIView setAnimationCurve:curve]; [UIView setAnimationBeginsFromCurrentState:TRUE]; - // Move view - CGRect frame = [[self chatView/*view*/] frame]; - frame.origin.y = frame.origin.y + endFrame.size.height /*0*/; - [[self /*view*/chatView] setFrame:frame]; + // Resize chat view + { + CGRect chatFrame = [[self chatView] frame]; + chatFrame.size.height = [[self view] frame].size.height - chatFrame.origin.y; + [[self chatView] setFrame:chatFrame]; + } - // Resize table view - CGRect tableFrame = [tableController.view frame]; - tableFrame.origin.y = [headerView frame].origin.y + [headerView frame].size.height; - tableFrame.size.height = [footerView frame].origin.y - tableFrame.origin.y; - [tableController.view setFrame:tableFrame]; + // Move header view + { + CGRect headerFrame = [headerView frame]; + headerFrame.origin.y = 0; + [headerView setFrame:headerFrame]; + } + + // Resize & Move table view + { + CGRect tableFrame = [tableController.view frame]; + tableFrame.origin.y = [headerView frame].origin.y + [headerView frame].size.height; + tableFrame.size.height = [footerView frame].origin.y - tableFrame.origin.y; + [tableController.view setFrame:tableFrame]; + } [UIView commitAnimations]; } @@ -340,30 +359,36 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta endFrame.size.width = width; } - // Move view + // Resize chat view { - CGRect frame = [[self chatView/*view*/] frame]; - // CGRect rect = [PhoneMainView instance].view.bounds; - - // CGPoint pos = {frame.size.width, frame.size.height}; - // CGPoint gPos = [self.view convertPoint:pos toView:[UIApplication sharedApplication].keyWindow.rootViewController.view]; // Bypass IOS bug on landscape mode - frame.origin.y = /*(rect.size.height - gPos.y*/ frame.origin.y - endFrame.size.height; - if(frame.origin.y > 0) frame.origin.y = 0; - [[self chatView] setFrame:frame]; - } - - // Resize table view - { - /*CGPoint pos = {0, 0}; - CGPoint gPos = [[self.view superview] convertPoint:pos toView:self.view];*/ - CGRect tableFrame = [tableController.view frame]; - tableFrame.origin.y += endFrame.size.height - headerView.frame.size.height/*gPos.y*/; - tableFrame.size.height = tableFrame.size.height - endFrame.size.height+headerView.frame.size.height; - [tableController.view setFrame:tableFrame]; + CGRect viewFrame = [[self view] frame]; + CGRect rect = [PhoneMainView instance].view.bounds; + CGPoint pos = {viewFrame.size.width, viewFrame.size.height}; + CGPoint gPos = [self.view convertPoint:pos toView:[UIApplication sharedApplication].keyWindow.rootViewController.view]; // Bypass IOS bug on landscape mode + float diff = (rect.size.height - gPos.y - endFrame.size.height); + if(diff > 0) diff = 0; + CGRect chatFrame = [[self chatView] frame]; + chatFrame.size.height = viewFrame.size.height - chatFrame.origin.y + diff; + [[self chatView] setFrame:chatFrame]; } + // Move header view + { + CGRect headerFrame = [headerView frame]; + headerFrame.origin.y = -headerFrame.size.height; + [headerView setFrame:headerFrame]; + } + + // Resize & Move table view + { + CGRect tableFrame = [tableController.view frame]; + tableFrame.origin.y = [headerView frame].origin.y + [headerView frame].size.height; + tableFrame.size.height = [footerView frame].origin.y - tableFrame.origin.y; + [tableController.view setFrame:tableFrame]; + } + // Scroll - int lastSection = [tableController.tableView numberOfSections] -1; + int lastSection = [tableController.tableView numberOfSections] - 1; if(lastSection >= 0) { int lastRow = [tableController.tableView numberOfRowsInSection:lastSection] - 1; if(lastRow >=0) { diff --git a/Classes/ChatRoomViewController.xib b/Classes/ChatRoomViewController.xib index fa18a7f31..83160fc92 100644 --- a/Classes/ChatRoomViewController.xib +++ b/Classes/ChatRoomViewController.xib @@ -3,23 +3,22 @@ 1296 11E53 - 2182 + 2549 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1181 + 1498 - IBUIView + IBProxyObject + IBUIButton IBUIImageView IBUILabel - IBProxyObject - IBUITextField - IBUITableViewController IBUITableView + IBUITableViewController IBUITextView - IBUIButton + IBUIView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -154,7 +153,6 @@ {{250, 0}, {70, 59}} - _NS:9 NO @@ -198,7 +196,7 @@ {250, 59} - + _NS:9 NO IBCocoaTouchFramework @@ -207,46 +205,9 @@ chat_field.png - - - -2147483390 - {{10, 10}, {230, 39}} - - - - _NS:9 - NO - YES - IBCocoaTouchFramework - 0 - - Type your message here - - 3 - MAA - - 2 - - - 17 - - 2 - 2 - IBCocoaTouchFramework - - - 1 - 18 - - - Helvetica - 18 - 16 - - - 292 + 258 {{10, 10}, {230, 39}} @@ -258,14 +219,22 @@ IBCocoaTouchFramework - YES - + YES + NO + This is a message 2 IBCocoaTouchFramework - - + + 1 + 18 + + + Helvetica + 18 + 16 + {{0, 357}, {320, 59}} @@ -273,11 +242,7 @@ _NS:9 - - 3 - MQA - - + IBCocoaTouchFramework @@ -286,11 +251,7 @@ _NS:9 - - 3 - MQA - - + IBCocoaTouchFramework @@ -378,11 +339,7 @@ _NS:9 - - 3 - MQA - - + IBCocoaTouchFramework @@ -661,7 +618,6 @@ - @@ -686,12 +642,6 @@ messageField - - 19 - - - messageFieldOld - @@ -705,7 +655,6 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin ChatRoomTableViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -720,6 +669,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -856,6 +806,6 @@ {140, 117} {5, 117} - 1181 + 1498 diff --git a/Classes/FirstLoginViewController.m b/Classes/FirstLoginViewController.m index 014cf0c35..e8d137a8b 100644 --- a/Classes/FirstLoginViewController.m +++ b/Classes/FirstLoginViewController.m @@ -180,7 +180,7 @@ static UICompositeViewDescription *compositeDescription = nil; linphone_core_clear_proxy_config([LinphoneManager getLc]); LinphoneProxyConfig* proxyCfg = linphone_core_create_proxy_config([LinphoneManager getLc]); /*default domain is supposed to be preset from linphonerc*/ - NSString* identity = [NSString stringWithFormat:@"sip:%@@%@",usernameField.text,linphone_proxy_config_get_addr(proxyCfg)]; + NSString* identity = [NSString stringWithFormat:@"sip:%@@%s",usernameField.text, linphone_proxy_config_get_addr(proxyCfg)]; linphone_proxy_config_set_identity(proxyCfg,[identity UTF8String]); LinphoneAuthInfo* auth_info =linphone_auth_info_new([usernameField.text UTF8String] ,[usernameField.text UTF8String] diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index c44183b4a..6cc0405f3 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -737,20 +737,21 @@ static LinphoneCoreVTable linphonec_vtable = { } - (void)waitForRegisterToArrive{ - int i; - UIBackgroundTaskIdentifier bgid; - stopWaitingRegisters=FALSE; - [LinphoneLogger logc:LinphoneLoggerLog format:"Starting long running task for registering"]; - bgid=[[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler: ^{ - [LinphoneManager instance]->stopWaitingRegisters=TRUE; - [LinphoneLogger logc:LinphoneLoggerLog format:"Expiration handler called"]; - }]; - for(i=0;i<100 && (!stopWaitingRegisters);i++){ - linphone_core_iterate(theLinphoneCore); - usleep(20000); - } - [LinphoneLogger logc:LinphoneLoggerLog format:"Ending long running task for registering"]; - [[UIApplication sharedApplication] endBackgroundTask:bgid]; + if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] + && [UIApplication sharedApplication].applicationState == UIApplicationStateBackground) { + stopWaitingRegisters = FALSE; + [LinphoneLogger logc:LinphoneLoggerLog format:"Starting long running task for registering"]; + UIBackgroundTaskIdentifier bgid = [[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler: ^{ + [LinphoneManager instance]->stopWaitingRegisters=TRUE; + [LinphoneLogger logc:LinphoneLoggerLog format:"Expiration handler called"]; + }]; + for(int i=0;i<100 && (!stopWaitingRegisters);i++){ + linphone_core_iterate(theLinphoneCore); + usleep(20000); + } + [LinphoneLogger logc:LinphoneLoggerLog format:"Ending long running task for registering"]; + [[UIApplication sharedApplication] endBackgroundTask:bgid]; + } } - (BOOL)enterBackgroundMode { @@ -913,8 +914,8 @@ static LinphoneCoreVTable linphonec_vtable = { } linphone_address_destroy(linphoneAddress); } else if (proxyCfg==nil){ - UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Invalid sip address",nil) - message:NSLocalizedString(@"Either configure a SIP proxy server from settings prior to place a call or use a valid sip address (I.E sip:john@example.net)",nil) + UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Invalid SIP address",nil) + message:NSLocalizedString(@"Either configure a SIP proxy server from settings prior to place a call or use a valid SIP address (I.E sip:john@example.net)",nil) delegate:nil cancelButtonTitle:NSLocalizedString(@"Continue",nil) otherButtonTitles:nil]; diff --git a/Classes/LinphoneUI/UIChatCell.m b/Classes/LinphoneUI/UIChatCell.m index b6ad2bd80..dc6100161 100644 --- a/Classes/LinphoneUI/UIChatCell.m +++ b/Classes/LinphoneUI/UIChatCell.m @@ -77,13 +77,14 @@ [LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot update chat cell: null chat"]; return; } - LinphoneAddress* linphoneAddress =linphone_core_interpret_url([LinphoneManager getLc],[[chat remoteContact] cStringUsingEncoding: NSUTF8StringEncoding]); - if (linphoneAddress==NULL) - return ; - char *tmp=linphone_address_as_string_uri_only(linphoneAddress); - NSString *normalizedSipAddress=[NSString stringWithUTF8String:tmp]; + LinphoneAddress* linphoneAddress = linphone_core_interpret_url([LinphoneManager getLc], [[chat remoteContact] UTF8String]); + if (linphoneAddress == NULL) + return; + char *tmp = linphone_address_as_string_uri_only(linphoneAddress); + NSString *normalizedSipAddress = [NSString stringWithUTF8String:tmp]; ms_free(tmp); - ABRecordRef contact =[[[LinphoneManager instance] fastAddressBook] getContact:normalizedSipAddress]; + + ABRecordRef contact = [[[LinphoneManager instance] fastAddressBook] getContact:normalizedSipAddress]; if(contact != nil) { displayName = [FastAddressBook getContactDisplayName:contact]; image = [FastAddressBook getContactImage:contact thumbnail:true]; @@ -91,7 +92,7 @@ // Display name if(displayName == nil) { - displayName = [NSString stringWithCString:linphone_address_get_username(linphoneAddress) encoding:NSUTF8StringEncoding]; + displayName = [NSString stringWithUTF8String:linphone_address_get_username(linphoneAddress)]; } [addressLabel setText:displayName]; @@ -103,7 +104,8 @@ // Message [chatContentLabel setText:[chat message]]; - linphone_address_destroy(linphoneAddress); + + linphone_address_destroy(linphoneAddress); } - (void)layoutSubviews { diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m index badd8088f..d432f37f8 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.m +++ b/Classes/LinphoneUI/UIChatRoomCell.m @@ -38,7 +38,7 @@ static const CGFloat CELL_MIN_HEIGHT = 40.0f; static const CGFloat CELL_MIN_WIDTH = 150.0f; static const CGFloat CELL_MAX_WIDTH = 320.0f; static const CGFloat CELL_MESSAGE_X_MARGIN = 26.0f; -static const CGFloat CELL_MESSAGE_Y_MARGIN = 33.0f; +static const CGFloat CELL_MESSAGE_Y_MARGIN = 36.0f; static const CGFloat CELL_FONT_SIZE = 17.0f; static UIFont *CELL_FONT = nil; diff --git a/Classes/LinphoneUI/UIChatRoomCell.xib b/Classes/LinphoneUI/UIChatRoomCell.xib index e8127e89c..647825af5 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.xib +++ b/Classes/LinphoneUI/UIChatRoomCell.xib @@ -3,19 +3,19 @@ 1296 11E53 - 2182 + 2549 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1181 + 1498 + IBProxyObject IBUIButton IBUIImageView - IBUIView IBUILabel - IBProxyObject + IBUIView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -59,11 +59,15 @@ 274 - {294, 107} + {294, 104} _NS:9 + + 3 + MCAwAA + NO YES 7 @@ -77,7 +81,7 @@ 0 10 - 100000 + 0 1 17 @@ -89,60 +93,25 @@ NO - - - 289 - {{250, 0}, {44, 44}} - - - - _NS:9 - NO - IBCocoaTouchFramework - 0 - 0 - NO - 2 - 20 - 20 - 2 - - 3 - MC41AA - - - NSImage - list_delete_over.png - - - NSImage - list_delete_default.png - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - 265 - {{14, 107}, {260, 7}} + {{0, 104}, {280, 10}} _NS:9 + NO YES 7 NO IBCocoaTouchFramework 09/09/2009 at 09:09 - + + 3 + MC41AA + 0 8 @@ -173,16 +142,49 @@ chat_message_not_delivered.png + + + 289 + {{250, 0}, {44, 44}} + + + + _NS:9 + NO + IBCocoaTouchFramework + 0 + 0 + NO + 2 + 20 + 20 + 2 + + + NSImage + list_delete_over.png + + + NSImage + list_delete_default.png + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + {{13, 13}, {294, 114}} _NS:9 - - 3 - MCAwAA - + YES IBCocoaTouchFramework @@ -356,8 +358,8 @@ - + @@ -488,6 +490,6 @@ {45, 45} {45, 45} - 1181 + 1498 diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m index 68e2037f0..ea0953c9a 100644 --- a/Classes/LinphoneUI/UICompositeViewController.m +++ b/Classes/LinphoneUI/UICompositeViewController.m @@ -425,11 +425,13 @@ [contentView.layer removeAnimationForKey:@"transition"]; [contentView.layer addAnimation:viewTransition forKey:@"transition"]; if(oldViewDescription.stateBar != currentViewDescription.stateBar || + oldViewDescription.stateBarEnabled != currentViewDescription.stateBarEnabled || [stateBarView.layer animationForKey:@"transition"] != nil) { [stateBarView.layer removeAnimationForKey:@"transition"]; [stateBarView.layer addAnimation:viewTransition forKey:@"transition"]; } if(oldViewDescription.tabBar != currentViewDescription.tabBar || + oldViewDescription.tabBarEnabled != currentViewDescription.tabBarEnabled || [tabBarView.layer animationForKey:@"transition"] != nil) { [tabBarView.layer removeAnimationForKey:@"transition"]; [tabBarView.layer addAnimation:viewTransition forKey:@"transition"]; diff --git a/Classes/LinphoneUI/UIMainBar.xib b/Classes/LinphoneUI/UIMainBar.xib index d1f14bc5f..4276bf294 100644 --- a/Classes/LinphoneUI/UIMainBar.xib +++ b/Classes/LinphoneUI/UIMainBar.xib @@ -37,27 +37,11 @@ 292 - - - 290 - {{0, 77}, {320, 2000}} - - - - _NS:9 - - 1 - MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA - - 28 - IBCocoaTouchFramework - -2147483356 {{0, 11}, {320, 66}} - _NS:9 @@ -71,12 +55,25 @@ NO IBCocoaTouchFramework + + + 290 + {{0, 77}, {320, 2000}} + + + _NS:9 + + 1 + MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA + + 28 + IBCocoaTouchFramework + 292 {64, 77} - _NS:9 NO @@ -122,7 +119,6 @@ 274 {21, 21} - _NS:9 NO @@ -137,7 +133,6 @@ 256 {{2, 2}, {17, 17}} - _NS:9 NO @@ -167,7 +162,6 @@ {{38, 1}, {21, 21}} - _NS:9 @@ -183,7 +177,6 @@ 292 {{64, 0}, {64, 77}} - _NS:9 NO @@ -215,7 +208,6 @@ 292 {{192, 0}, {64, 77}} - _NS:9 NO @@ -247,7 +239,6 @@ 292 {{128, 0}, {64, 77}} - _NS:9 NO @@ -279,7 +270,6 @@ 292 {{256, 0}, {64, 77}} - _NS:9 NO @@ -315,7 +305,6 @@ 274 {21, 21} - _NS:9 NO @@ -327,8 +316,6 @@ 256 {{2, 2}, {17, 17}} - - _NS:9 NO YES @@ -347,7 +334,6 @@ {{261, 1}, {21, 21}} - _NS:9 @@ -358,7 +344,6 @@ {320, 77} - _NS:9 @@ -532,10 +517,10 @@ - + @@ -661,118 +646,7 @@ 45 - - - - TPMultiLayoutViewController - UIViewController - - UIView - UIView - - - - landscapeView - UIView - - - portraitView - UIView - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - UIMainBar - TPMultiLayoutViewController - - id - id - id - id - id - - - - onChatClick: - id - - - onContactsClick: - id - - - onDialerClick: - id - - - onHistoryClick: - id - - - onSettingsClick: - id - - - - UIButton - UILabel - UIView - UIButton - UIButton - UIButton - UILabel - UIView - UIButton - - - - chatButton - UIButton - - - chatNotificationLabel - UILabel - - - chatNotificationView - UIView - - - contactsButton - UIButton - - - dialerButton - UIButton - - - historyButton - UIButton - - - historyNotificationLabel - UILabel - - - historyNotificationView - UIView - - - settingsButton - UIButton - - - - IBProjectSource - ./Classes/UIMainBar.h - - - - + 0 IBCocoaTouchFramework diff --git a/Classes/LinphoneUI/UIMainBar~ipad.xib b/Classes/LinphoneUI/UIMainBar~ipad.xib index 559a0e4b0..dd2648b97 100644 --- a/Classes/LinphoneUI/UIMainBar~ipad.xib +++ b/Classes/LinphoneUI/UIMainBar~ipad.xib @@ -37,27 +37,11 @@ 292 - - - 290 - {{0, 77}, {768, 2000}} - - - - _NS:9 - - 1 - MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA - - 28 - IBIPadFramework - -2147483356 {{0, 11}, {768, 66}} - _NS:9 @@ -71,12 +55,25 @@ NO IBIPadFramework + + + 290 + {{0, 77}, {768, 2000}} + + + _NS:9 + + 1 + MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA + + 28 + IBIPadFramework + 292 {175, 77} - _NS:9 NO @@ -123,7 +120,6 @@ 274 {21, 21} - _NS:9 NO @@ -138,7 +134,6 @@ 256 {{2, 2}, {17, 17}} - _NS:9 NO @@ -168,7 +163,6 @@ {{140, 1}, {21, 21}} - _NS:9 @@ -185,7 +179,6 @@ 292 {{175, 0}, {175, 77}} - _NS:9 NO @@ -218,7 +211,6 @@ 288 {{350, -1}, {68, 80}} - _NS:9 NO @@ -251,7 +243,6 @@ 292 {{418, 0}, {175, 77}} - _NS:9 NO @@ -284,7 +275,6 @@ 292 {{593, 0}, {175, 77}} - _NS:9 NO @@ -321,7 +311,6 @@ 274 {21, 21} - _NS:9 NO @@ -333,8 +322,6 @@ 256 {{2, 2}, {17, 17}} - - _NS:9 NO YES @@ -353,7 +340,6 @@ {{605, 1}, {21, 21}} - _NS:9 @@ -365,7 +351,6 @@ {768, 77} - _NS:9 @@ -379,27 +364,11 @@ 292 - - - 290 - {{0, 86}, {1024, 2000}} - - - - _NS:9 - - 1 - MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA - - 28 - IBIPadFramework - -2147483356 {{0, 19}, {1024, 67}} - _NS:9 @@ -413,12 +382,25 @@ NO IBIPadFramework + + + 290 + {{0, 86}, {1024, 2000}} + + + _NS:9 + + 1 + MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA + + 28 + IBIPadFramework + 292 {240, 86} - _NS:9 NO @@ -455,7 +437,6 @@ 274 {21, 21} - _NS:9 NO @@ -467,7 +448,6 @@ 256 {{2, 2}, {17, 17}} - _NS:9 NO @@ -487,7 +467,6 @@ {{208, 1}, {21, 21}} - _NS:9 @@ -501,7 +480,6 @@ 292 {{240, 0}, {240, 86}} - _NS:9 NO @@ -534,7 +512,6 @@ 288 {{480, 8}, {68, 80}} - _NS:9 NO @@ -558,7 +535,6 @@ 292 {{544, 0}, {240, 86}} - _NS:9 NO @@ -591,7 +567,6 @@ 292 {{784, 0}, {240, 86}} - _NS:9 NO @@ -628,7 +603,6 @@ 274 {21, 21} - _NS:9 NO @@ -640,8 +614,6 @@ 256 {{2, 2}, {17, 17}} - - _NS:9 NO YES @@ -660,7 +632,6 @@ {{792, 1}, {21, 21}} - _NS:9 @@ -672,7 +643,6 @@ {1024, 86} - _NS:9 @@ -852,12 +822,12 @@ - + @@ -950,12 +920,12 @@ - + @@ -1108,118 +1078,7 @@ 62 - - - - TPMultiLayoutViewController - UIViewController - - UIView - UIView - - - - landscapeView - UIView - - - portraitView - UIView - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - UIMainBar - TPMultiLayoutViewController - - id - id - id - id - id - - - - onChatClick: - id - - - onContactsClick: - id - - - onDialerClick: - id - - - onHistoryClick: - id - - - onSettingsClick: - id - - - - UIButton - UILabel - UIView - UIButton - UIButton - UIButton - UILabel - UIView - UIButton - - - - chatButton - UIButton - - - chatNotificationLabel - UILabel - - - chatNotificationView - UIView - - - contactsButton - UIButton - - - dialerButton - UIButton - - - historyButton - UIButton - - - historyNotificationLabel - UILabel - - - historyNotificationView - UIView - - - settingsButton - UIButton - - - - IBProjectSource - ./Classes/UIMainBar.h - - - - + 0 IBIPadFramework diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 6a3eca7ba..c9f2309a0 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -2662,12 +2662,6 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( - 57F005C615EE2D9200914747 /* linphonerc-factory */, - 57F005C715EE2D9200914747 /* linphonerc-factory~ipad */, - 57F005C315EE2CCF00914747 /* linphonerc */, - 2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */, - 2234C8E715EE2F7F00E18E83 /* chat_message_delivered.png */, - 2234C8E815EE2F7F00E18E83 /* chat_message_not_delivered.png */, D3F83F741582253100336684 /* accept_default.png */, D3F83F751582253100336684 /* accept_over.png */, D3D6A39B159B0EEF005F692C /* add_call_default.png */, @@ -2748,6 +2742,9 @@ D3A74F5A15C6AA0B001500B9 /* chat_field.9.png */, D3A74F5D15C6ADA9001500B9 /* chat_field.9@2x.png */, D3B9A3DA15A58C440096EA4E /* chat_field.png */, + 2234C8E715EE2F7F00E18E83 /* chat_message_delivered.png */, + 2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */, + 2234C8E815EE2F7F00E18E83 /* chat_message_not_delivered.png */, D3B9A3DB15A58C440096EA4E /* chat_ok_default.png */, D3B9A3DC15A58C440096EA4E /* chat_ok_over.png */, D38327FF158100E400FA0D23 /* chat_over.png */, @@ -2864,6 +2861,9 @@ D33CF34815D3A03400CD4B85 /* linphone_icon_57@2x.png */, 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */, D33CF34915D3A03400CD4B85 /* linphone_icon_72@2x.png */, + 57F005C315EE2CCF00914747 /* linphonerc */, + 57F005C615EE2D9200914747 /* linphonerc-factory */, + 57F005C715EE2D9200914747 /* linphonerc-factory~ipad */, D321FF9815E628CB0098B5F4 /* linphonerc~ipad */, D3EA5416159858A80037DC6B /* list_delete_default.png */, D3EA5417159858A80037DC6B /* list_delete_over.png */,