diff --git a/Classes/AboutViewController.m b/Classes/AboutViewController.m index 048cf0ced..3b1b14d1d 100644 --- a/Classes/AboutViewController.m +++ b/Classes/AboutViewController.m @@ -67,6 +67,8 @@ [linphoneIphoneVersionLabel setText:[NSString stringWithFormat:@"Linphone iPhone %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]]]; [linphoneCoreVersionLabel setText:[NSString stringWithFormat:@"Linphone Core %s", linphone_core_get_version()]]; + + [LinphoneUtils adjustFontSize:self.view mult:2.22f]; } diff --git a/Classes/AboutViewController.xib b/Classes/AboutViewController.xib index b5157bef8..f19ee71bd 100644 --- a/Classes/AboutViewController.xib +++ b/Classes/AboutViewController.xib @@ -42,6 +42,7 @@ {320, 460} + _NS:9 YES YES @@ -56,7 +57,7 @@ YES - 293 + 311 {{124, 20}, {72, 72}} @@ -66,12 +67,12 @@ IBCocoaTouchFramework NSImage - linphone_icon_72.png + linphone_logo.png - 293 + 319 {{20, 100}, {280, 50}} @@ -103,7 +104,7 @@ - 293 + 319 {{20, 187}, {280, 44}} @@ -132,7 +133,7 @@ - 293 + 319 {{20, 138}, {280, 21}} @@ -161,7 +162,7 @@ - 293 + 319 {{20, 158}, {280, 21}} @@ -183,10 +184,11 @@ - 293 + 319 {{20, 269}, {280, 21}} + NO YES 7 @@ -207,7 +209,7 @@ - 293 + 319 {{20, 225}, {280, 36}} @@ -517,8 +519,8 @@ YES 3 - linphone_icon_72.png - {72, 72} + linphone_logo.png + {512, 512} 1926 diff --git a/Classes/ChatRoomViewController.h b/Classes/ChatRoomViewController.h index b79d4102a..8765da496 100644 --- a/Classes/ChatRoomViewController.h +++ b/Classes/ChatRoomViewController.h @@ -26,12 +26,14 @@ #import "ChatModel.h" #import "ImagePickerViewController.h" #import "ImageSharing.h" +#import "OrderedDictionary.h" #include "linphonecore.h" @interface ChatRoomViewController : UIViewController { LinphoneChatRoom *chatRoom; ImageSharing *imageSharing; + OrderedDictionary *imageQualities; } @property (nonatomic, retain) IBOutlet ChatRoomTableViewController* tableController; diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m index 5fd63c4ec..4ff616865 100644 --- a/Classes/ChatRoomViewController.m +++ b/Classes/ChatRoomViewController.m @@ -20,9 +20,11 @@ #import "ChatRoomViewController.h" #import "PhoneMainView.h" #import "DTActionSheet.h" +#import "UILinphone.h" #import #import +#import "Utils.h" @implementation ChatRoomViewController @@ -53,6 +55,10 @@ self->chatRoom = NULL; self->imageSharing = NULL; self->listTapGestureRecognizer = [[UITapGestureRecognizer alloc] init]; + self->imageQualities = [[OrderedDictionary alloc] initWithObjectsAndKeys: + [NSNumber numberWithFloat:1.0], NSLocalizedString(@"Minimum", nil), + [NSNumber numberWithFloat:0.5], NSLocalizedString(@"Average", nil), + [NSNumber numberWithFloat:0.0], NSLocalizedString(@"Maximum", nil), nil]; } return self; } @@ -78,6 +84,8 @@ [imageTransferProgressBar release]; [cancelTransferButton release]; + [imageQualities release]; + [super dealloc]; } @@ -317,6 +325,25 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta return TRUE; } +- (void)chooseImageQuality:(UIImage*)image url:(NSURL*)url { + DTActionSheet *sheet = [[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Choose the compression", nil)]; + for(NSString *key in [imageQualities allKeys]) { + NSAutoreleasePool *p = [[NSAutoreleasePool alloc] init]; + NSNumber *number = [imageQualities objectForKey:key]; + NSData *data = UIImageJPEGRepresentation(image, [number floatValue]); + NSNumber *size = [NSNumber numberWithInteger:[data length]]; + + NSString *text = [NSString stringWithFormat:@"%@ (%@)", key, [size toHumanReadableSize]]; + [sheet addButtonWithTitle:text block:^(){ + NSData *data = UIImageJPEGRepresentation(image, [number floatValue]); + [self chatRoomStartImageUpload:[UIImage imageWithData:data] url:url]; + }]; + + [p drain]; + } + [sheet showInView:[PhoneMainView instance].view]; +} + #pragma mark - Event Functions @@ -528,7 +555,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta [LinphoneLogger log:LinphoneLoggerError format:@"Cannot save image data downloaded [%@]", [error localizedDescription]]; UIAlertView* errorAlert = [UIAlertView alloc]; - [errorAlert initWithTitle:NSLocalizedString(@"Transfer error", nil) + [errorAlert initWithTitle:NSLocalizedString(@"Transfer error", nil) message:NSLocalizedString(@"Cannot write image to photo library", nil) delegate:nil cancelButtonTitle:NSLocalizedString(@"Ok",nil) @@ -549,9 +576,10 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta #pragma mark ImagePickerDelegate - (void)imagePickerDelegateImage:(UIImage*)image info:(NSDictionary *)info { + image = [image normalizedImage]; NSURL *url = [info valueForKey:UIImagePickerControllerReferenceURL]; if(url != nil) { - [self chatRoomStartImageUpload:image url:url]; + [self chooseImageQuality:image url:url]; } else { [[LinphoneManager instance].photoLibrary writeImageToSavedPhotosAlbum:image.CGImage metadata:nil @@ -570,7 +598,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta return; } [LinphoneLogger log:LinphoneLoggerLog format:@"Image saved to [%@]", [assetURL absoluteString]]; - [self chatRoomStartImageUpload:image url:assetURL]; + [self chooseImageQuality:image url:assetURL]; }]; } } diff --git a/Classes/ImagePickerViewController.m b/Classes/ImagePickerViewController.m index c31e48906..dcf16330b 100644 --- a/Classes/ImagePickerViewController.m +++ b/Classes/ImagePickerViewController.m @@ -63,7 +63,7 @@ static UICompositeViewDescription *compositeDescription = nil; tabBar:@"UIMainBar" tabBarEnabled:true fullscreen:false - landscapeMode:[LinphoneManager runningOnIpad] + landscapeMode:false portraitMode:true]; } return compositeDescription; diff --git a/Classes/LinphoneUI/UIChatCell.h b/Classes/LinphoneUI/UIChatCell.h index 7d7a1d7cf..1cc731e93 100644 --- a/Classes/LinphoneUI/UIChatCell.h +++ b/Classes/LinphoneUI/UIChatCell.h @@ -28,12 +28,12 @@ @property (nonatomic, retain) IBOutlet UIImageView *avatarImage; @property (nonatomic, retain) IBOutlet UILabel* addressLabel; @property (nonatomic, retain) IBOutlet UILabel* chatContentLabel; -@property (nonatomic, retain) IBOutlet UIButton *detailsButton; @property (nonatomic, retain) IBOutlet UIButton * deleteButton; +@property (nonatomic, retain) IBOutlet UIView * unreadMessageView; +@property (nonatomic, retain) IBOutlet UILabel * unreadMessageLabel; - (id)initWithIdentifier:(NSString*)identifier; -- (IBAction)onDetailsClick:(id)event; - (IBAction)onDeleteClick:(id)event; @end diff --git a/Classes/LinphoneUI/UIChatCell.m b/Classes/LinphoneUI/UIChatCell.m index 04b1e63c7..6a049f5d7 100644 --- a/Classes/LinphoneUI/UIChatCell.m +++ b/Classes/LinphoneUI/UIChatCell.m @@ -27,8 +27,9 @@ @synthesize avatarImage; @synthesize addressLabel; @synthesize chatContentLabel; -@synthesize detailsButton; @synthesize deleteButton; +@synthesize unreadMessageLabel; +@synthesize unreadMessageView; @synthesize chat; @@ -51,8 +52,9 @@ [addressLabel release]; [chatContentLabel release]; [avatarImage release]; - [detailsButton release]; [deleteButton release]; + [unreadMessageLabel release]; + [unreadMessageView release]; [chat release]; @@ -116,6 +118,14 @@ [chatContentLabel setText:[chat message]]; } + int count = [ChatModel unreadMessages:[chat remoteContact]]; + if(count > 0) { + [unreadMessageView setHidden:FALSE]; + [unreadMessageLabel setText:[NSString stringWithFormat:@"%i", count]]; + } else { + [unreadMessageView setHidden:TRUE]; + } + linphone_address_destroy(linphoneAddress); } @@ -160,9 +170,7 @@ } if(editing) { [deleteButton setAlpha:1.0f]; - [detailsButton setAlpha:0.0f]; } else { - [detailsButton setAlpha:1.0f]; [deleteButton setAlpha:0.0f]; } if(animated) { @@ -170,15 +178,8 @@ } } -#pragma mark - Action Functions -- (IBAction)onDetailsClick: (id) event { - // Go to Chat room view - ChatRoomViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ChatRoomViewController compositeViewDescription] push:TRUE], ChatRoomViewController); - if(controller !=nil) { - [controller setRemoteAddress:[chat remoteContact]]; - } -} +#pragma mark - Action Functions - (IBAction)onDeleteClick: (id) event { if(chat != NULL) { diff --git a/Classes/LinphoneUI/UIChatCell.xib b/Classes/LinphoneUI/UIChatCell.xib index 1dc63ea7f..92d29fb24 100644 --- a/Classes/LinphoneUI/UIChatCell.xib +++ b/Classes/LinphoneUI/UIChatCell.xib @@ -42,6 +42,7 @@ 292 {{10, 8}, {27, 27}} + _NS:9 NO @@ -56,6 +57,7 @@ 274 {{45, 0}, {60, 44}} + _NS:328 NO @@ -92,7 +94,8 @@ 274 {{110, 0}, {170, 44}} - + + _NS:328 NO YES @@ -119,49 +122,13 @@ NO - - - 257 - {{276, 0}, {44, 44}} - - - _NS:9 - NO - IBCocoaTouchFramework - 0 - 0 - NO - 11 - 11 - 11 - 11 - - 3 - MC41AA - - - NSImage - list_details_over.png - - - NSImage - list_details_default.png - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - 257 {{276, 0}, {44, 44}} + + _NS:9 NO IBCocoaTouchFramework @@ -172,7 +139,10 @@ 11 11 11 - + + 3 + MC41AA + NSImage list_delete_over.png @@ -181,18 +151,88 @@ NSImage list_delete_default.png - - + + 2 + 15 + + + Helvetica-Bold + 15 + 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} + _NS:9 - - 3 - MCAwAA - + IBCocoaTouchFramework @@ -222,14 +262,6 @@ 34 - - - detailsButton - - - - 35 - addressLabel @@ -239,13 +271,20 @@ 38 - - onDetailsClick: - - - 7 + + unreadMessageLabel + + - 36 + 42 + + + + unreadMessageView + + + + 43 @@ -280,20 +319,14 @@ 17 - + - - 18 - - - detailsButton - 19 @@ -318,6 +351,28 @@ deleteButton + + 39 + + + + + + + unreadMessageView + + + 40 + + + unreadMessageImage + + + 41 + + + unreadMessageLabel + @@ -326,23 +381,79 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 38 + 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 @@ -353,10 +464,9 @@ 3 {131, 131} + {47, 40} {45, 45} {45, 45} - {45, 45} - {45, 45} 1926 diff --git a/Classes/LinphoneUI/UIChatRoomCell.h b/Classes/LinphoneUI/UIChatRoomCell.h index 94261b982..660149e87 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.h +++ b/Classes/LinphoneUI/UIChatRoomCell.h @@ -30,7 +30,7 @@ @property (nonatomic, retain) IBOutlet UIView *innerView; @property (nonatomic, retain) IBOutlet UIView *bubbleView; @property (nonatomic, retain) IBOutlet UIImageView* backgroundImage; -@property (nonatomic, retain) IBOutlet UILabel *messageLabel; +@property (nonatomic, retain) IBOutlet UITextView *messageText; @property (nonatomic, retain) IBOutlet UIImageView *messageImageView; @property (nonatomic, retain) IBOutlet UIButton *deleteButton; @property (nonatomic, retain) IBOutlet UILabel *dateLabel; diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m index cb6027ad5..856c43e64 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.m +++ b/Classes/LinphoneUI/UIChatRoomCell.m @@ -33,7 +33,7 @@ @synthesize bubbleView; @synthesize backgroundImage; @synthesize messageImageView; -@synthesize messageLabel; +@synthesize messageText; @synthesize deleteButton; @synthesize dateLabel; @synthesize chat; @@ -63,6 +63,7 @@ static UIFont *CELL_FONT = nil; [messageImageView addGestureRecognizer:imageTapGestureRecognizer]; [self addSubview:innerView]; [deleteButton setAlpha:0.0f]; + [messageText setContentInset:UIEdgeInsetsMake(-11, -8, 0, 0)]; } return self; } @@ -72,7 +73,7 @@ static UIFont *CELL_FONT = nil; [backgroundImage release]; [innerView release]; [bubbleView release]; - [messageLabel release]; + [messageText release]; [messageImageView release]; [deleteButton release]; [dateLabel release]; @@ -107,14 +108,14 @@ static UIFont *CELL_FONT = nil; } if([chat isExternalImage]) { - [messageLabel setHidden:TRUE]; + [messageText setHidden:TRUE]; [messageImageView setImage:nil]; [messageImageView setHidden:TRUE]; [downloadButton setHidden:FALSE]; } else if([chat isInternalImage]) { - [messageLabel setHidden:TRUE]; + [messageText setHidden:TRUE]; [[LinphoneManager instance].photoLibrary assetForURL:[NSURL URLWithString:[chat message]] resultBlock:^(ALAsset *asset) { dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, (unsigned long)NULL), ^(void) { @@ -131,8 +132,8 @@ static UIFont *CELL_FONT = nil; [messageImageView setHidden:FALSE]; [downloadButton setHidden:TRUE]; } else { - [messageLabel setHidden:FALSE]; - [messageLabel setText:[chat message]]; + [messageText setHidden:FALSE]; + [messageText setText:[chat message]]; [messageImageView setImage:nil]; [messageImageView setHidden:TRUE]; diff --git a/Classes/LinphoneUI/UIChatRoomCell.xib b/Classes/LinphoneUI/UIChatRoomCell.xib index 37dc84cbc..a8fbc4394 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.xib +++ b/Classes/LinphoneUI/UIChatRoomCell.xib @@ -15,6 +15,7 @@ IBUIButton IBUIImageView IBUILabel + IBUITextView IBUIView @@ -42,6 +43,7 @@ 274 {{5, 5}, {310, 130}} + _NS:9 NO @@ -64,37 +66,42 @@ 274 {294, 104} - + + _NS:9 1 IBCocoaTouchFramework - + 274 {294, 104} + _NS:9 3 MCAwAA - NO YES - 7 - NO + YES IBCocoaTouchFramework + NO + NO + NO + NO They who can give up essential liberty to obtain a little temporary safety, deserve neither liberty nor safety. - 3 - MC4zMzMzMzMzMzMzAA + 2 + MC4zNTY4NjI3NTM2IDAuMzk2MDc4NDM3NiAwLjQzNTI5NDEyMTUAA - - 0 - 10 - 0 + + 2 + IBCocoaTouchFramework + + 2 1 17 @@ -104,14 +111,13 @@ 17 16 - NO - 294 301 {{81, 33}, {132, 37}} + _NS:9 NO @@ -144,6 +150,7 @@ {294, 104} + _NS:9 @@ -155,6 +162,7 @@ 265 {{0, 104}, {280, 10}} + _NS:9 @@ -185,6 +193,7 @@ 265 {{284, 104}, {10, 10}} + _NS:9 NO IBCocoaTouchFramework @@ -198,6 +207,7 @@ 289 {{250, 0}, {44, 44}} + _NS:9 NO @@ -224,6 +234,7 @@ {{13, 13}, {294, 114}} + _NS:9 @@ -233,6 +244,7 @@ {320, 140} + _NS:9 @@ -245,6 +257,7 @@ 274 {100, 100} + _NS:9 IBCocoaTouchFramework @@ -254,6 +267,7 @@ 274 {100, 100} + _NS:9 IBCocoaTouchFramework @@ -317,14 +331,6 @@ 27 - - - messageLabel - - - - 17 - bubbleView @@ -349,6 +355,14 @@ 34 + + + messageText + + + + 44 + onDeleteClick: @@ -449,9 +463,9 @@ 29 - + messageView @@ -463,18 +477,18 @@ messageImageView - - 15 - - - messageLabel - 33 downloadButton + + 43 + + + messageText + @@ -482,7 +496,6 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -494,6 +507,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -501,9 +515,93 @@ - 42 + 44 + + + + + UIChatRoomCell + UITableViewCell + + id + id + id + + + + onDeleteClick: + id + + + onDownloadClick: + id + + + onImageClick: + id + + + + UIImageView + UIView + UILabel + UIButton + UIButton + UITapGestureRecognizer + UIView + UIImageView + UITextView + UIImageView + + + + backgroundImage + UIImageView + + + bubbleView + UIView + + + dateLabel + UILabel + + + deleteButton + UIButton + + + downloadButton + UIButton + + + imageTapGestureRecognizer + UITapGestureRecognizer + + + innerView + UIView + + + messageImageView + UIImageView + + + messageText + UITextView + + + statusImage + UIImageView + + + + IBProjectSource + ./Classes/UIChatRoomCell.h + + + - 0 IBCocoaTouchFramework diff --git a/Classes/LinphoneUI/UILinphone.h b/Classes/LinphoneUI/UILinphone.h index 6a9cefe02..4f0fc380b 100644 --- a/Classes/LinphoneUI/UILinphone.h +++ b/Classes/LinphoneUI/UILinphone.h @@ -34,3 +34,9 @@ @end + +@interface UIImage (NormalizedImage) + +- (UIImage *)normalizedImage; + +@end diff --git a/Classes/LinphoneUI/UILinphone.m b/Classes/LinphoneUI/UILinphone.m index 6449e4a59..73571255f 100644 --- a/Classes/LinphoneUI/UILinphone.m +++ b/Classes/LinphoneUI/UILinphone.m @@ -92,3 +92,17 @@ } @end + +@implementation UIImage (NormalizedImage) + +- (UIImage *)normalizedImage { + if (self.imageOrientation == UIImageOrientationUp) return self; + + UIGraphicsBeginImageContextWithOptions(self.size, NO, self.scale); + [self drawInRect:(CGRect){0, 0, self.size}]; + UIImage *normalizedImage = UIGraphicsGetImageFromCurrentImageContext(); + UIGraphicsEndImageContext(); + return normalizedImage; +} + +@end diff --git a/Classes/LinphoneUI/en.lproj/UICallCell.xib b/Classes/LinphoneUI/en.lproj/UICallCell.xib index 1a70be243..5d5c2fe24 100644 --- a/Classes/LinphoneUI/en.lproj/UICallCell.xib +++ b/Classes/LinphoneUI/en.lproj/UICallCell.xib @@ -46,6 +46,7 @@ 290 {{0, 63}, {320, 250}} + _NS:9 @@ -86,6 +87,7 @@ 293 {{0, 48}, {320, 262}} + _NS:9 @@ -101,6 +103,7 @@ 293 {{80, 65}, {160, 170}} + _NS:9 @@ -119,6 +122,7 @@ {320, 300} + _NS:9 @@ -134,6 +138,7 @@ 290 {320, 63} + _NS:9 NO @@ -148,6 +153,7 @@ 290 {320, 63} + _NS:9 0.0 @@ -159,6 +165,7 @@ 290 {{10, 0}, {206, 51}} + _NS:9 NO @@ -4580,6 +4587,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 289 {{224, 14}, {25, 25}} + _NS:9 NO @@ -4595,6 +4603,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE -2147483359 {{216, 6}, {41, 41}} + _NS:9 NO @@ -4627,6 +4636,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE -2147483359 {{216, 6}, {41, 41}} + _NS:9 NO @@ -4663,6 +4673,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 289 {{262, 12}, {50, 29}} + _NS:9 NO YES @@ -4694,6 +4705,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 290 {{0, 5}, {200, 40}} + _NS:9 NO @@ -4712,6 +4724,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 63} + _NS:9 @@ -4720,6 +4733,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 300} + _NS:9 @@ -4730,6 +4744,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 292 {320, 460} + _NS:9 NO @@ -5013,7 +5028,102 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 75 - + + + + UICallCell + UITableViewCell + + id + id + + + + doHeaderClick: + id + + + doRemoveClick: + id + + + + UILabel + UIImageView + UIView + UIImageView + UIImageView + UIView + UIPauseButton + UIButton + UIImageView + UILabel + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + avatarView + UIView + + + headerBackgroundHighlightImage + UIImageView + + + headerBackgroundImage + UIImageView + + + headerView + UIView + + + pauseButton + UIPauseButton + + + removeButton + UIButton + + + stateImage + UIImageView + + + stateLabel + UILabel + + + + IBProjectSource + ./Classes/UICallCell.h + + + + UIPauseButton + UIToggleButton + + IBProjectSource + ./Classes/UIPauseButton.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + 0 IBCocoaTouchFramework diff --git a/Classes/LinphoneUI/en.lproj/UIMainBar.xib b/Classes/LinphoneUI/en.lproj/UIMainBar.xib index 9b06cec18..da3794cab 100644 --- a/Classes/LinphoneUI/en.lproj/UIMainBar.xib +++ b/Classes/LinphoneUI/en.lproj/UIMainBar.xib @@ -699,118 +699,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/fr.lproj/UICallCell.xib b/Classes/LinphoneUI/fr.lproj/UICallCell.xib index daf569dc7..e9bd40047 100644 --- a/Classes/LinphoneUI/fr.lproj/UICallCell.xib +++ b/Classes/LinphoneUI/fr.lproj/UICallCell.xib @@ -5011,7 +5011,102 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 75 - + + + + UICallCell + UITableViewCell + + id + id + + + + doHeaderClick: + id + + + doRemoveClick: + id + + + + UILabel + UIImageView + UIView + UIImageView + UIImageView + UIView + UIPauseButton + UIButton + UIImageView + UILabel + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + avatarView + UIView + + + headerBackgroundHighlightImage + UIImageView + + + headerBackgroundImage + UIImageView + + + headerView + UIView + + + pauseButton + UIPauseButton + + + removeButton + UIButton + + + stateImage + UIImageView + + + stateLabel + UILabel + + + + IBProjectSource + ./Classes/UICallCell.h + + + + UIPauseButton + UIToggleButton + + IBProjectSource + ./Classes/UIPauseButton.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + 0 IBCocoaTouchFramework diff --git a/Classes/LinphoneUI/fr.lproj/UIMainBar.xib b/Classes/LinphoneUI/fr.lproj/UIMainBar.xib index e813e9190..35a724808 100644 --- a/Classes/LinphoneUI/fr.lproj/UIMainBar.xib +++ b/Classes/LinphoneUI/fr.lproj/UIMainBar.xib @@ -698,118 +698,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/Model/ChatModel.h b/Classes/Model/ChatModel.h index 90d9b566e..dad59d221 100644 --- a/Classes/Model/ChatModel.h +++ b/Classes/Model/ChatModel.h @@ -53,6 +53,7 @@ + (NSMutableArray *)listMessages:(NSString *)contact; + (void)removeConversation:(NSString *)contact; + (int)unreadMessages; ++ (int)unreadMessages:(NSString *)contact; + (void)readConversation:(NSString *)contact; @end diff --git a/Classes/Model/ChatModel.m b/Classes/Model/ChatModel.m index b952df9de..2c5767ba6 100644 --- a/Classes/Model/ChatModel.m +++ b/Classes/Model/ChatModel.m @@ -320,6 +320,36 @@ return count; } ++ (int)unreadMessages:(NSString *)contact { + int count = -1; + sqlite3* database = [[LinphoneManager instance] database]; + if(database == NULL) { + [LinphoneLogger logc:LinphoneLoggerError format:"Database not ready"]; + return count; + } + + const char *sql = "SELECT count(*) FROM chat WHERE read=0 AND remoteContact=@REMOTECONTACT"; + sqlite3_stmt *sqlStatement; + if (sqlite3_prepare_v2(database, sql, -1, &sqlStatement, NULL) != SQLITE_OK) { + [LinphoneLogger logc:LinphoneLoggerError format:"Can't prepare the query: %s (%s)", sql, sqlite3_errmsg(database)]; + return count; + } + + // Prepare statement + sqlite3_bind_text(sqlStatement, 1, [contact UTF8String], -1, SQLITE_STATIC); + + if (sqlite3_step(sqlStatement) != SQLITE_ROW) { + [LinphoneLogger logc:LinphoneLoggerError format:"Error during execution of query: %s (%s)", sql, sqlite3_errmsg(database)]; + sqlite3_finalize(sqlStatement); + return count; + } + + count = sqlite3_column_int(sqlStatement, 0); + + sqlite3_finalize(sqlStatement); + return count; +} + + (void)readConversation:(NSString *)contact { sqlite3* database = [[LinphoneManager instance] database]; if(database == NULL) { diff --git a/Classes/Utils/Utils.h b/Classes/Utils/Utils.h index 0863afd9d..4f1e9f0a8 100644 --- a/Classes/Utils/Utils.h +++ b/Classes/Utils/Utils.h @@ -46,6 +46,8 @@ typedef enum _LinphoneLoggerSeverity { @interface LinphoneUtils : NSObject { } + ++ (void)adjustFontSize:(UIView*)view mult:(float)mult; + (void)buttonFixStates:(UIButton*)button; + (void)buttonFixStatesForTabs:(UIButton*)button; + (void)buttonMultiViewAddAttributes:(NSMutableDictionary*)attributes button:(UIButton*)button; @@ -53,4 +55,10 @@ typedef enum _LinphoneLoggerSeverity { @end +@interface NSNumber (HumanReadableSize) + +- (NSString*)toHumanReadableSize; + +@end + #endif diff --git a/Classes/Utils/Utils.m b/Classes/Utils/Utils.m index b1045e3a1..3c93afb03 100644 --- a/Classes/Utils/Utils.m +++ b/Classes/Utils/Utils.m @@ -63,6 +63,22 @@ @implementation LinphoneUtils ++ (void)adjustFontSize:(UIView*)view mult:(float)mult{ + if([view isKindOfClass:[UILabel class]]) { + UILabel *label = (UILabel*)view; + UIFont *font = [label font]; + [label setFont:[UIFont fontWithName:font.fontName size:font.pointSize * mult]]; + } else if([view isKindOfClass:[UITextField class]]) { + UITextField *label = (UITextField*)view; + UIFont *font = [label font]; + [label setFont:[UIFont fontWithName:font.fontName size:font.pointSize * mult]]; + } else { + for(UIView *subView in [view subviews]) { + [LinphoneUtils adjustFontSize:subView mult:mult]; + } + } +} + + (void)buttonFixStates:(UIButton*)button { // Set selected+over title: IB lack ! [button setTitle:[button titleForState:UIControlStateSelected] @@ -185,5 +201,23 @@ return nil; } +@end + +@implementation NSNumber (HumanReadableSize) + +- (NSString*)toHumanReadableSize { + float floatSize = [self floatValue]; + if (floatSize < 1023) + return([NSString stringWithFormat:@"%1.0f bytes",floatSize]); + floatSize = floatSize / 1024; + if (floatSize < 1023) + return([NSString stringWithFormat:@"%1.1f KB",floatSize]); + floatSize = floatSize / 1024; + if (floatSize < 1023) + return([NSString stringWithFormat:@"%1.1f MB",floatSize]); + floatSize = floatSize / 1024; + + return([NSString stringWithFormat:@"%1.1f GB",floatSize]); +} @end diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m index 6dc810dd6..5b70fbe01 100644 --- a/Classes/WizardViewController.m +++ b/Classes/WizardViewController.m @@ -149,34 +149,18 @@ static UICompositeViewDescription *compositeDescription = nil; [super viewDidLoad]; if([LinphoneManager runningOnIpad]) { - [WizardViewController adjustFontSize:welcomeView mult:2.22f]; - [WizardViewController adjustFontSize:choiceView mult:2.22f]; - [WizardViewController adjustFontSize:createAccountView mult:2.22f]; - [WizardViewController adjustFontSize:connectAccountView mult:2.22f]; - [WizardViewController adjustFontSize:externalAccountView mult:2.22f]; - [WizardViewController adjustFontSize:validateAccountView mult:2.22f]; + [LinphoneUtils adjustFontSize:welcomeView mult:2.22f]; + [LinphoneUtils adjustFontSize:choiceView mult:2.22f]; + [LinphoneUtils adjustFontSize:createAccountView mult:2.22f]; + [LinphoneUtils adjustFontSize:connectAccountView mult:2.22f]; + [LinphoneUtils adjustFontSize:externalAccountView mult:2.22f]; + [LinphoneUtils adjustFontSize:validateAccountView mult:2.22f]; } } #pragma mark - -+ (void)adjustFontSize:(UIView*)view mult:(float)mult{ - if([view isKindOfClass:[UILabel class]]) { - UILabel *label = (UILabel*)view; - UIFont *font = [label font]; - [label setFont:[UIFont fontWithName:font.fontName size:font.pointSize * mult]]; - } else if([view isKindOfClass:[UITextField class]]) { - UITextField *label = (UITextField*)view; - UIFont *font = [label font]; - [label setFont:[UIFont fontWithName:font.fontName size:font.pointSize * mult]]; - } else { - for(UIView *subView in [view subviews]) { - [WizardViewController adjustFontSize:subView mult:mult]; - } - } -} - + (void)cleanTextField:(UIView*)view { if([view isKindOfClass:[UITextField class]]) { [(UITextField*)view setText:@""]; diff --git a/Classes/en.lproj/ChatRoomViewController.xib b/Classes/en.lproj/ChatRoomViewController.xib index 7056bfce7..a11bc6f83 100644 --- a/Classes/en.lproj/ChatRoomViewController.xib +++ b/Classes/en.lproj/ChatRoomViewController.xib @@ -170,7 +170,7 @@ IBCocoaTouchFramework NSImage - chat_background.png + chat_progressbar_background.png @@ -267,6 +267,7 @@ {{262, 0}, {58, 57}} + _NS:9 NO @@ -1108,7 +1109,6 @@ {131, 131} {320, 88} {320, 88} - {16, 16} {116, 115} {116, 115} {320, 88} @@ -1118,6 +1118,7 @@ {71, 115} {71, 115} {71, 115} + {524, 115} {117, 115} {117, 115} {117, 115} diff --git a/Classes/en.lproj/WizardViews.xib b/Classes/en.lproj/WizardViews.xib index 3c21a990c..4f88a1172 100644 --- a/Classes/en.lproj/WizardViews.xib +++ b/Classes/en.lproj/WizardViews.xib @@ -43,7 +43,6 @@ 311 {{60, 80}, {201, 129}} - _NS:9 1 @@ -63,7 +62,6 @@ 319 {{31, 230}, {258, 40}} - _NS:9 NO @@ -104,7 +102,6 @@ 282 {{40, 290}, {240, 44}} - _NS:9 NO YES @@ -133,7 +130,6 @@ {320, 394} - _NS:9 @@ -151,7 +147,6 @@ 311 {{31, 34}, {258, 40}} - _NS:9 NO @@ -178,7 +173,6 @@ 319 {{33, 141}, {255, 50}} - _NS:9 NO @@ -226,7 +220,6 @@ 319 {{33, 205}, {255, 50}} - _NS:9 NO @@ -252,7 +245,6 @@ 319 {{33, 269}, {255, 50}} - _NS:9 NO @@ -275,7 +267,6 @@ {320, 394} - _NS:9 @@ -290,7 +281,6 @@ 311 {{31, 34}, {258, 40}} - _NS:9 NO @@ -317,7 +307,6 @@ 314 {{39, 80}, {240, 44}} - _NS:9 NO @@ -343,7 +332,6 @@ 319 {{32, 140}, {255, 31}} - _NS:9 NO @@ -387,7 +375,6 @@ 319 {{32, 185}, {255, 31}} - _NS:9 NO @@ -420,7 +407,6 @@ 319 {{32, 230}, {255, 31}} - _NS:9 NO @@ -453,7 +439,6 @@ 319 {{32, 275}, {255, 31}} - _NS:9 NO @@ -485,7 +470,6 @@ 287 {{33, 330}, {255, 50}} - _NS:9 NO @@ -514,7 +498,6 @@ {320, 394} - _NS:9 @@ -529,7 +512,6 @@ 311 {{31, 34}, {258, 40}} - _NS:9 NO @@ -556,7 +538,6 @@ 314 {{40, 80}, {240, 44}} - _NS:9 NO @@ -582,7 +563,6 @@ 319 {{32, 185}, {255, 31}} - _NS:9 NO @@ -615,7 +595,6 @@ 319 {{32, 140}, {255, 31}} - _NS:9 NO @@ -647,7 +626,6 @@ 287 {{32, 330}, {255, 50}} - _NS:9 NO @@ -669,7 +647,6 @@ {320, 394} - _NS:9 @@ -684,7 +661,6 @@ 311 {{31, 34}, {258, 40}} - _NS:9 NO @@ -711,7 +687,6 @@ 314 {{40, 80}, {240, 44}} - _NS:9 NO @@ -737,7 +712,6 @@ 319 {{33, 140}, {255, 31}} - _NS:9 NO @@ -769,7 +743,6 @@ 319 {{33, 185}, {255, 31}} - _NS:9 NO @@ -802,7 +775,6 @@ 319 {{33, 230}, {255, 31}} - _NS:9 NO @@ -834,7 +806,6 @@ 287 {{34, 330}, {255, 50}} - _NS:9 NO @@ -856,7 +827,6 @@ {320, 394} - _NS:9 @@ -871,7 +841,6 @@ 311 {{31, 34}, {258, 40}} - _NS:9 NO @@ -898,7 +867,6 @@ 314 {{40, 80}, {240, 44}} - _NS:9 NO @@ -924,7 +892,6 @@ -2147483329 {{32, 185}, {255, 31}} - _NS:9 NO @@ -957,7 +924,6 @@ -2147483329 {{32, 140}, {255, 31}} - _NS:9 NO @@ -989,7 +955,6 @@ 287 {{32, 330}, {255, 50}} - _NS:9 NO @@ -1011,7 +976,6 @@ {320, 394} - _NS:9 @@ -1571,197 +1535,7 @@ 127 - - - - TPMultiLayoutViewController - UIViewController - - UIView - UIView - - - - landscapeView - UIView - - - portraitView - UIView - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - TUNinePatch - NSObject - - IBProjectSource - ./Classes/TUNinePatch.h - - - - UILinphoneButton - UIButton - - TUNinePatch - TUNinePatch - - - - backgroundNinePatch - TUNinePatch - - - backgroundOverNinePatch - TUNinePatch - - - - IBProjectSource - ./Classes/UILinphoneButton.h - - - - UILinphoneTextField - UITextField - - backgroundNinePatch - TUNinePatch - - - backgroundNinePatch - - backgroundNinePatch - TUNinePatch - - - - IBProjectSource - ./Classes/UILinphoneTextField.h - - - - WizardViewController - TPMultiLayoutViewController - - id - id - id - id - id - id - id - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onCheckValidationClick: - id - - - onConnectAccountClick: - id - - - onCreateAccountClick: - id - - - onExternalAccountClick: - id - - - onRegisterClick: - id - - - onSignInClick: - id - - - onSignInExternalClick: - id - - - onStartClick: - id - - - - UIButton - UIView - UIView - UIScrollView - UIView - UIView - UIButton - UIView - UIView - UIView - - - - backButton - UIButton - - - choiceView - UIView - - - connectAccountView - UIView - - - contentView - UIScrollView - - - createAccountView - UIView - - - externalAccountView - UIView - - - startButton - UIButton - - - validateAccountView - UIView - - - waitView - UIView - - - welcomeView - UIView - - - - IBProjectSource - ./Classes/WizardViewController.h - - - - + 0 IBCocoaTouchFramework diff --git a/Classes/fr.lproj/ChatRoomViewController.xib b/Classes/fr.lproj/ChatRoomViewController.xib index 75fe63822..79555b8b6 100644 --- a/Classes/fr.lproj/ChatRoomViewController.xib +++ b/Classes/fr.lproj/ChatRoomViewController.xib @@ -164,7 +164,7 @@ IBCocoaTouchFramework NSImage - chat_background.png + chat_progressbar_background.png @@ -1087,7 +1087,6 @@ {131, 131} {320, 88} {320, 88} - {16, 16} {116, 115} {116, 115} {320, 88} @@ -1097,6 +1096,7 @@ {71, 115} {71, 115} {71, 115} + {524, 115} {117, 115} {117, 115} {117, 115} diff --git a/Classes/fr.lproj/WizardViews.xib b/Classes/fr.lproj/WizardViews.xib index 44020e50f..80063c6d8 100644 --- a/Classes/fr.lproj/WizardViews.xib +++ b/Classes/fr.lproj/WizardViews.xib @@ -1523,197 +1523,7 @@ 127 - - - - TPMultiLayoutViewController - UIViewController - - UIView - UIView - - - - landscapeView - UIView - - - portraitView - UIView - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - TUNinePatch - NSObject - - IBProjectSource - ./Classes/TUNinePatch.h - - - - UILinphoneButton - UIButton - - TUNinePatch - TUNinePatch - - - - backgroundNinePatch - TUNinePatch - - - backgroundOverNinePatch - TUNinePatch - - - - IBProjectSource - ./Classes/UILinphoneButton.h - - - - UILinphoneTextField - UITextField - - backgroundNinePatch - TUNinePatch - - - backgroundNinePatch - - backgroundNinePatch - TUNinePatch - - - - IBProjectSource - ./Classes/UILinphoneTextField.h - - - - WizardViewController - TPMultiLayoutViewController - - id - id - id - id - id - id - id - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onCheckValidationClick: - id - - - onConnectAccountClick: - id - - - onCreateAccountClick: - id - - - onExternalAccountClick: - id - - - onRegisterClick: - id - - - onSignInClick: - id - - - onSignInExternalClick: - id - - - onStartClick: - id - - - - UIButton - UIView - UIView - UIScrollView - UIView - UIView - UIButton - UIView - UIView - UIView - - - - backButton - UIButton - - - choiceView - UIView - - - connectAccountView - UIView - - - contentView - UIScrollView - - - createAccountView - UIView - - - externalAccountView - UIView - - - startButton - UIButton - - - validateAccountView - UIView - - - waitView - UIView - - - welcomeView - UIView - - - - IBProjectSource - ./Classes/WizardViewController.h - - - - + 0 IBCocoaTouchFramework diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index 78857cfe4..03fb0ee4b 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 747e0f273..4e02e99ae 100644 Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ diff --git a/Resources/linphone_logo.png b/Resources/linphone_logo.png new file mode 100644 index 000000000..f3695de8b Binary files /dev/null and b/Resources/linphone_logo.png differ diff --git a/Resources/linphone-splashscreen-568h@2x.png b/Resources/linphone_splashscreen-568h@2x.png similarity index 100% rename from Resources/linphone-splashscreen-568h@2x.png rename to Resources/linphone_splashscreen-568h@2x.png diff --git a/Resources/linphone-splashscreen.png b/Resources/linphone_splashscreen.png similarity index 100% rename from Resources/linphone-splashscreen.png rename to Resources/linphone_splashscreen.png diff --git a/Resources/linphone-splashscreen@2x.png b/Resources/linphone_splashscreen@2x.png similarity index 100% rename from Resources/linphone-splashscreen@2x.png rename to Resources/linphone_splashscreen@2x.png diff --git a/linphone-Info.plist b/linphone-Info.plist index ed59b192b..0571fa27c 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -72,7 +72,7 @@ audio UILaunchImageFile~iphone - linphone-splashscreen + linphone_splashscreen UIRequiredDeviceCapabilities wifi diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index 95b60cde3..eb6f6667c 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -337,17 +337,17 @@ backup - 32 + 33 class BLWrapperHandle name - Classes/ChatRoomViewController/32/ChatRoomViewController.xib + Classes/ChatRoomViewController/33/ChatRoomViewController.xib change date - 2012-09-21T15:04:45Z + 2012-09-24T07:54:14Z changed values class @@ -357,7 +357,7 @@ flags 0 hash - f3544e098ca4aed56e114bf9cb69da01 + 9cea2c5bb3cda145b0c819b0f48baf7c name ChatRoomViewController.xib @@ -793,9 +793,9 @@ versions en - 32 + 33 fr - 32 + 33 @@ -5103,17 +5103,17 @@ backup - 15 + 16 class BLWrapperHandle name - Classes/WizardViews/15/WizardViews.xib + Classes/WizardViews/16/WizardViews.xib change date - 2012-09-21T14:23:27Z + 2012-09-24T07:27:30Z changed values class @@ -5123,7 +5123,7 @@ flags 0 hash - 28b7a6024bd7d81255243ef32288a7d6 + b68ffd1e89d760c822e0a9f66e9caa06 name WizardViews.xib @@ -6555,9 +6555,9 @@ versions en - 15 + 16 fr - 15 + 16 @@ -9440,17 +9440,17 @@ backup - 7 + 8 class BLWrapperHandle name - LinphoneUI/UIMainBar/7/UIMainBar.xib + LinphoneUI/UIMainBar/8/UIMainBar.xib change date - 2012-09-21T12:33:09Z + 2012-09-24T09:24:19Z changed values class @@ -9460,7 +9460,7 @@ flags 0 hash - 3673d2d68bd62db4ac766f71230406cb + 3f33781c8e9039686dc8bbece53c3962 name UIMainBar.xib @@ -9795,9 +9795,9 @@ versions en - 7 + 8 fr - 7 + 8 @@ -10568,17 +10568,17 @@ backup - 3 + 4 class BLWrapperHandle name - LinphoneUI/UICallCell/3/UICallCell.xib + LinphoneUI/UICallCell/4/UICallCell.xib change date - 2012-09-20T15:21:45Z + 2012-09-24T09:24:18Z changed values class @@ -10588,7 +10588,7 @@ flags 0 hash - 00d461a22aedf4b4195a0d82fe11becb + e86bebbcdf5309f743354e41c3fdd8c3 name UICallCell.xib @@ -10823,9 +10823,9 @@ versions en - 3 + 4 fr - 3 + 4 @@ -10870,7 +10870,7 @@ change date - 2012-09-21T09:33:54Z + 2012-09-24T08:35:08Z changed values class @@ -10880,7 +10880,7 @@ flags 0 hash - 3b7db2782a575d521f2505fe1d391964 + aaac1683c5a04165fb53e6ece2921dbe name Localizable.strings @@ -11189,6 +11189,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 + Average + localizations + + en + Average + fr + Moyen + + snapshots + + change date 2001-01-01T00:00:00Z @@ -11514,6 +11539,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 + Choose the compression + localizations + + en + Choose the compression + fr + Choisissez la compression + + snapshots + + change date 2001-01-01T00:00:00Z @@ -12012,6 +12062,56 @@ 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 + Maximum + localizations + + en + Maximum + fr + Maximum + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Minimum + localizations + + en + Minimum + fr + Minimum + + snapshots + + change date 2001-01-01T00:00:00Z diff --git a/linphone.ldb/Resources/Classes/ChatRoomViewController/32/ChatRoomViewController.xib b/linphone.ldb/Resources/Classes/ChatRoomViewController/33/ChatRoomViewController.xib similarity index 99% rename from linphone.ldb/Resources/Classes/ChatRoomViewController/32/ChatRoomViewController.xib rename to linphone.ldb/Resources/Classes/ChatRoomViewController/33/ChatRoomViewController.xib index 7056bfce7..a11bc6f83 100644 --- a/linphone.ldb/Resources/Classes/ChatRoomViewController/32/ChatRoomViewController.xib +++ b/linphone.ldb/Resources/Classes/ChatRoomViewController/33/ChatRoomViewController.xib @@ -170,7 +170,7 @@ IBCocoaTouchFramework NSImage - chat_background.png + chat_progressbar_background.png @@ -267,6 +267,7 @@ {{262, 0}, {58, 57}} + _NS:9 NO @@ -1108,7 +1109,6 @@ {131, 131} {320, 88} {320, 88} - {16, 16} {116, 115} {116, 115} {320, 88} @@ -1118,6 +1118,7 @@ {71, 115} {71, 115} {71, 115} + {524, 115} {117, 115} {117, 115} {117, 115} diff --git a/linphone.ldb/Resources/Classes/WizardViews/15/WizardViews.xib b/linphone.ldb/Resources/Classes/WizardViews/16/WizardViews.xib similarity index 88% rename from linphone.ldb/Resources/Classes/WizardViews/15/WizardViews.xib rename to linphone.ldb/Resources/Classes/WizardViews/16/WizardViews.xib index 3c21a990c..4f88a1172 100644 --- a/linphone.ldb/Resources/Classes/WizardViews/15/WizardViews.xib +++ b/linphone.ldb/Resources/Classes/WizardViews/16/WizardViews.xib @@ -43,7 +43,6 @@ 311 {{60, 80}, {201, 129}} - _NS:9 1 @@ -63,7 +62,6 @@ 319 {{31, 230}, {258, 40}} - _NS:9 NO @@ -104,7 +102,6 @@ 282 {{40, 290}, {240, 44}} - _NS:9 NO YES @@ -133,7 +130,6 @@ {320, 394} - _NS:9 @@ -151,7 +147,6 @@ 311 {{31, 34}, {258, 40}} - _NS:9 NO @@ -178,7 +173,6 @@ 319 {{33, 141}, {255, 50}} - _NS:9 NO @@ -226,7 +220,6 @@ 319 {{33, 205}, {255, 50}} - _NS:9 NO @@ -252,7 +245,6 @@ 319 {{33, 269}, {255, 50}} - _NS:9 NO @@ -275,7 +267,6 @@ {320, 394} - _NS:9 @@ -290,7 +281,6 @@ 311 {{31, 34}, {258, 40}} - _NS:9 NO @@ -317,7 +307,6 @@ 314 {{39, 80}, {240, 44}} - _NS:9 NO @@ -343,7 +332,6 @@ 319 {{32, 140}, {255, 31}} - _NS:9 NO @@ -387,7 +375,6 @@ 319 {{32, 185}, {255, 31}} - _NS:9 NO @@ -420,7 +407,6 @@ 319 {{32, 230}, {255, 31}} - _NS:9 NO @@ -453,7 +439,6 @@ 319 {{32, 275}, {255, 31}} - _NS:9 NO @@ -485,7 +470,6 @@ 287 {{33, 330}, {255, 50}} - _NS:9 NO @@ -514,7 +498,6 @@ {320, 394} - _NS:9 @@ -529,7 +512,6 @@ 311 {{31, 34}, {258, 40}} - _NS:9 NO @@ -556,7 +538,6 @@ 314 {{40, 80}, {240, 44}} - _NS:9 NO @@ -582,7 +563,6 @@ 319 {{32, 185}, {255, 31}} - _NS:9 NO @@ -615,7 +595,6 @@ 319 {{32, 140}, {255, 31}} - _NS:9 NO @@ -647,7 +626,6 @@ 287 {{32, 330}, {255, 50}} - _NS:9 NO @@ -669,7 +647,6 @@ {320, 394} - _NS:9 @@ -684,7 +661,6 @@ 311 {{31, 34}, {258, 40}} - _NS:9 NO @@ -711,7 +687,6 @@ 314 {{40, 80}, {240, 44}} - _NS:9 NO @@ -737,7 +712,6 @@ 319 {{33, 140}, {255, 31}} - _NS:9 NO @@ -769,7 +743,6 @@ 319 {{33, 185}, {255, 31}} - _NS:9 NO @@ -802,7 +775,6 @@ 319 {{33, 230}, {255, 31}} - _NS:9 NO @@ -834,7 +806,6 @@ 287 {{34, 330}, {255, 50}} - _NS:9 NO @@ -856,7 +827,6 @@ {320, 394} - _NS:9 @@ -871,7 +841,6 @@ 311 {{31, 34}, {258, 40}} - _NS:9 NO @@ -898,7 +867,6 @@ 314 {{40, 80}, {240, 44}} - _NS:9 NO @@ -924,7 +892,6 @@ -2147483329 {{32, 185}, {255, 31}} - _NS:9 NO @@ -957,7 +924,6 @@ -2147483329 {{32, 140}, {255, 31}} - _NS:9 NO @@ -989,7 +955,6 @@ 287 {{32, 330}, {255, 50}} - _NS:9 NO @@ -1011,7 +976,6 @@ {320, 394} - _NS:9 @@ -1571,197 +1535,7 @@ 127 - - - - TPMultiLayoutViewController - UIViewController - - UIView - UIView - - - - landscapeView - UIView - - - portraitView - UIView - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - TUNinePatch - NSObject - - IBProjectSource - ./Classes/TUNinePatch.h - - - - UILinphoneButton - UIButton - - TUNinePatch - TUNinePatch - - - - backgroundNinePatch - TUNinePatch - - - backgroundOverNinePatch - TUNinePatch - - - - IBProjectSource - ./Classes/UILinphoneButton.h - - - - UILinphoneTextField - UITextField - - backgroundNinePatch - TUNinePatch - - - backgroundNinePatch - - backgroundNinePatch - TUNinePatch - - - - IBProjectSource - ./Classes/UILinphoneTextField.h - - - - WizardViewController - TPMultiLayoutViewController - - id - id - id - id - id - id - id - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onCheckValidationClick: - id - - - onConnectAccountClick: - id - - - onCreateAccountClick: - id - - - onExternalAccountClick: - id - - - onRegisterClick: - id - - - onSignInClick: - id - - - onSignInExternalClick: - id - - - onStartClick: - id - - - - UIButton - UIView - UIView - UIScrollView - UIView - UIView - UIButton - UIView - UIView - UIView - - - - backButton - UIButton - - - choiceView - UIView - - - connectAccountView - UIView - - - contentView - UIScrollView - - - createAccountView - UIView - - - externalAccountView - UIView - - - startButton - UIButton - - - validateAccountView - UIView - - - waitView - UIView - - - welcomeView - UIView - - - - IBProjectSource - ./Classes/WizardViewController.h - - - - + 0 IBCocoaTouchFramework diff --git a/linphone.ldb/Resources/LinphoneUI/UICallCell/3/UICallCell.xib b/linphone.ldb/Resources/LinphoneUI/UICallCell/4/UICallCell.xib similarity index 98% rename from linphone.ldb/Resources/LinphoneUI/UICallCell/3/UICallCell.xib rename to linphone.ldb/Resources/LinphoneUI/UICallCell/4/UICallCell.xib index 1a70be243..5d5c2fe24 100644 --- a/linphone.ldb/Resources/LinphoneUI/UICallCell/3/UICallCell.xib +++ b/linphone.ldb/Resources/LinphoneUI/UICallCell/4/UICallCell.xib @@ -46,6 +46,7 @@ 290 {{0, 63}, {320, 250}} + _NS:9 @@ -86,6 +87,7 @@ 293 {{0, 48}, {320, 262}} + _NS:9 @@ -101,6 +103,7 @@ 293 {{80, 65}, {160, 170}} + _NS:9 @@ -119,6 +122,7 @@ {320, 300} + _NS:9 @@ -134,6 +138,7 @@ 290 {320, 63} + _NS:9 NO @@ -148,6 +153,7 @@ 290 {320, 63} + _NS:9 0.0 @@ -159,6 +165,7 @@ 290 {{10, 0}, {206, 51}} + _NS:9 NO @@ -4580,6 +4587,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 289 {{224, 14}, {25, 25}} + _NS:9 NO @@ -4595,6 +4603,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE -2147483359 {{216, 6}, {41, 41}} + _NS:9 NO @@ -4627,6 +4636,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE -2147483359 {{216, 6}, {41, 41}} + _NS:9 NO @@ -4663,6 +4673,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 289 {{262, 12}, {50, 29}} + _NS:9 NO YES @@ -4694,6 +4705,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 290 {{0, 5}, {200, 40}} + _NS:9 NO @@ -4712,6 +4724,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 63} + _NS:9 @@ -4720,6 +4733,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE {320, 300} + _NS:9 @@ -4730,6 +4744,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 292 {320, 460} + _NS:9 NO @@ -5013,7 +5028,102 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 75 - + + + + UICallCell + UITableViewCell + + id + id + + + + doHeaderClick: + id + + + doRemoveClick: + id + + + + UILabel + UIImageView + UIView + UIImageView + UIImageView + UIView + UIPauseButton + UIButton + UIImageView + UILabel + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + avatarView + UIView + + + headerBackgroundHighlightImage + UIImageView + + + headerBackgroundImage + UIImageView + + + headerView + UIView + + + pauseButton + UIPauseButton + + + removeButton + UIButton + + + stateImage + UIImageView + + + stateLabel + UILabel + + + + IBProjectSource + ./Classes/UICallCell.h + + + + UIPauseButton + UIToggleButton + + IBProjectSource + ./Classes/UIPauseButton.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + 0 IBCocoaTouchFramework diff --git a/linphone.ldb/Resources/LinphoneUI/UIMainBar/7/UIMainBar.xib b/linphone.ldb/Resources/LinphoneUI/UIMainBar/8/UIMainBar.xib similarity index 86% rename from linphone.ldb/Resources/LinphoneUI/UIMainBar/7/UIMainBar.xib rename to linphone.ldb/Resources/LinphoneUI/UIMainBar/8/UIMainBar.xib index 9b06cec18..da3794cab 100644 --- a/linphone.ldb/Resources/LinphoneUI/UIMainBar/7/UIMainBar.xib +++ b/linphone.ldb/Resources/LinphoneUI/UIMainBar/8/UIMainBar.xib @@ -699,118 +699,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/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings index 78857cfe4..03fb0ee4b 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 de7af2a1d..5b3cd4243 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -150,6 +150,10 @@ C9C8254915AE204D00D493FA /* transfer_call_over.png in Resources */ = {isa = PBXBuildFile; fileRef = C9C8254215AE204D00D493FA /* transfer_call_over.png */; }; C9C8254C15AE207B00D493FA /* options_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = C9C8254B15AE207B00D493FA /* options_selected.png */; }; C9C8254F15AE256100D493FA /* transfer_call_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = C9C8254E15AE256100D493FA /* transfer_call_disabled.png */; }; + D3012CC41610467D007CD926 /* linphone_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = D3012CC31610467D007CD926 /* linphone_logo.png */; }; + D3012CC51610467D007CD926 /* linphone_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = D3012CC31610467D007CD926 /* linphone_logo.png */; }; + D3012CC616105ECF007CD926 /* bubble.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8D91609A86700D3DA1A /* bubble.png */; }; + D3012CC716105ECF007CD926 /* bubble.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8D91609A86700D3DA1A /* bubble.png */; }; 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 */; }; D3119E7215B6A4710005D4A4 /* contacts_back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3119E7015B6A4710005D4A4 /* contacts_back_default.png */; }; @@ -609,10 +613,10 @@ D350F22C15A43D3400149E54 /* setup_welcome_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21B15A43D3400149E54 /* setup_welcome_logo.png */; }; D35406F715A47E9E007E7E81 /* button_background_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D35406F515A47E9E007E7E81 /* button_background_default.png */; }; D35406F915A47E9E007E7E81 /* button_background_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D35406F615A47E9E007E7E81 /* button_background_over.png */; }; - D354944C160B615A0027E44E /* linphone-splashscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944A160B615A0027E44E /* linphone-splashscreen.png */; }; - D354944D160B615A0027E44E /* linphone-splashscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944A160B615A0027E44E /* linphone-splashscreen.png */; }; - D354944E160B615A0027E44E /* linphone-splashscreen@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944B160B615A0027E44E /* linphone-splashscreen@2x.png */; }; - D354944F160B615A0027E44E /* linphone-splashscreen@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944B160B615A0027E44E /* linphone-splashscreen@2x.png */; }; + D354944C160B615A0027E44E /* linphone_splashscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944A160B615A0027E44E /* linphone_splashscreen.png */; }; + D354944D160B615A0027E44E /* linphone_splashscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944A160B615A0027E44E /* linphone_splashscreen.png */; }; + D354944E160B615A0027E44E /* linphone_splashscreen@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944B160B615A0027E44E /* linphone_splashscreen@2x.png */; }; + D354944F160B615A0027E44E /* linphone_splashscreen@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944B160B615A0027E44E /* linphone_splashscreen@2x.png */; }; D35497FE15875372000081D8 /* ContactsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsViewController.m */; }; D35497FF15875372000081D8 /* ContactsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsViewController.m */; }; D354980615875534000081D8 /* contacts_all_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980215875534000081D8 /* contacts_all_selected.png */; }; @@ -809,8 +813,8 @@ D389363B15A6D53200A3A3AA /* chat_bubble_outgoing.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */; }; D38D14AF15A30B3D008497E8 /* cell_call_first_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */; }; D38D14B115A30B3D008497E8 /* cell_call_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AE15A30B3D008497E8 /* cell_call_highlight.png */; }; - D38F46F2160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D38F46F1160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png */; }; - D38F46F3160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D38F46F1160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png */; }; + D38F46F2160C5CC8002D4C4A /* linphone_splashscreen-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D38F46F1160C5CC8002D4C4A /* linphone_splashscreen-568h@2x.png */; }; + D38F46F3160C5CC8002D4C4A /* linphone_splashscreen-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D38F46F1160C5CC8002D4C4A /* linphone_splashscreen-568h@2x.png */; }; D3998D0416031937009DD22C /* background_alt.png in Resources */ = {isa = PBXBuildFile; fileRef = D3998D0316031937009DD22C /* background_alt.png */; }; D3998D0516031937009DD22C /* background_alt.png in Resources */ = {isa = PBXBuildFile; fileRef = D3998D0316031937009DD22C /* background_alt.png */; }; D3A55FBC15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; }; @@ -1601,6 +1605,7 @@ C9C8254215AE204D00D493FA /* transfer_call_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = transfer_call_over.png; path = Resources/transfer_call_over.png; sourceTree = ""; }; C9C8254B15AE207B00D493FA /* options_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = options_selected.png; path = Resources/options_selected.png; sourceTree = ""; }; C9C8254E15AE256100D493FA /* transfer_call_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = transfer_call_disabled.png; path = Resources/transfer_call_disabled.png; sourceTree = ""; }; + D3012CC31610467D007CD926 /* linphone_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_logo.png; path = Resources/linphone_logo.png; 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 = ""; }; D3119E7015B6A4710005D4A4 /* contacts_back_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_back_default.png; path = Resources/contacts_back_default.png; sourceTree = ""; }; @@ -1738,8 +1743,8 @@ D350F21B15A43D3400149E54 /* setup_welcome_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = setup_welcome_logo.png; path = Resources/setup_welcome_logo.png; sourceTree = ""; }; D35406F515A47E9E007E7E81 /* button_background_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = button_background_default.png; path = Resources/button_background_default.png; sourceTree = ""; }; D35406F615A47E9E007E7E81 /* button_background_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = button_background_over.png; path = Resources/button_background_over.png; sourceTree = ""; }; - D354944A160B615A0027E44E /* linphone-splashscreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-splashscreen.png"; path = "Resources/linphone-splashscreen.png"; sourceTree = ""; }; - D354944B160B615A0027E44E /* linphone-splashscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-splashscreen@2x.png"; path = "Resources/linphone-splashscreen@2x.png"; sourceTree = ""; }; + D354944A160B615A0027E44E /* linphone_splashscreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_splashscreen.png; path = Resources/linphone_splashscreen.png; sourceTree = ""; }; + D354944B160B615A0027E44E /* linphone_splashscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone_splashscreen@2x.png"; path = "Resources/linphone_splashscreen@2x.png"; sourceTree = ""; }; D35497FB15875372000081D8 /* ContactsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactsViewController.h; sourceTree = ""; }; D35497FC15875372000081D8 /* ContactsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ContactsViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; D354980215875534000081D8 /* contacts_all_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_all_selected.png; path = Resources/contacts_all_selected.png; sourceTree = ""; }; @@ -1922,7 +1927,7 @@ D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_bubble_outgoing.9.png; path = Resources/chat_bubble_outgoing.9.png; sourceTree = ""; }; D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cell_call_first_highlight.png; path = Resources/cell_call_first_highlight.png; sourceTree = ""; }; D38D14AE15A30B3D008497E8 /* cell_call_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cell_call_highlight.png; path = Resources/cell_call_highlight.png; sourceTree = ""; }; - D38F46F1160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-splashscreen-568h@2x.png"; path = "Resources/linphone-splashscreen-568h@2x.png"; sourceTree = ""; }; + D38F46F1160C5CC8002D4C4A /* linphone_splashscreen-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone_splashscreen-568h@2x.png"; path = "Resources/linphone_splashscreen-568h@2x.png"; sourceTree = ""; }; D3998D0316031937009DD22C /* background_alt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background_alt.png; path = Resources/background_alt.png; sourceTree = ""; }; D3A55FBA15877E5E003FD403 /* UIContactCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIContactCell.h; sourceTree = ""; }; D3A55FBB15877E5E003FD403 /* UIContactCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIContactCell.m; sourceTree = ""; }; @@ -3091,13 +3096,14 @@ D3432A6F158A45AF001C6B0B /* led_inprogress.png */, 225CB2F911ABB76400628906 /* linphone-banner.png */, 8D1107310486CEB800E47090 /* linphone-Info.plist */, - D38F46F1160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png */, - D354944A160B615A0027E44E /* linphone-splashscreen.png */, - D354944B160B615A0027E44E /* linphone-splashscreen@2x.png */, 22058C70116E305000B08DDD /* linphone_icon_57.png */, D33CF34815D3A03400CD4B85 /* linphone_icon_57@2x.png */, 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */, D33CF34915D3A03400CD4B85 /* linphone_icon_72@2x.png */, + D3012CC31610467D007CD926 /* linphone_logo.png */, + D38F46F1160C5CC8002D4C4A /* linphone_splashscreen-568h@2x.png */, + D354944A160B615A0027E44E /* linphone_splashscreen.png */, + D354944B160B615A0027E44E /* linphone_splashscreen@2x.png */, 57F005C315EE2CCF00914747 /* linphonerc */, 57F005C615EE2D9200914747 /* linphonerc-factory */, 57F005C715EE2D9200914747 /* linphonerc-factory~ipad */, @@ -4092,15 +4098,17 @@ D3328648160B5BC300E6435D /* dialer_alt_disabled_landscape~ipad.png in Resources */, D332864A160B5BC300E6435D /* dialer_alt_disabled.png in Resources */, D332864C160B5BC300E6435D /* dialer_alt_disabled~ipad.png in Resources */, - D354944C160B615A0027E44E /* linphone-splashscreen.png in Resources */, - D354944E160B615A0027E44E /* linphone-splashscreen@2x.png in Resources */, - D38F46F2160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png in Resources */, + D354944C160B615A0027E44E /* linphone_splashscreen.png in Resources */, + D354944E160B615A0027E44E /* linphone_splashscreen@2x.png in Resources */, + D38F46F2160C5CC8002D4C4A /* linphone_splashscreen-568h@2x.png in Resources */, D35E91EA160CA0BD0023116B /* field_background.9@2x.png in Resources */, D35E91EE160CA0C70023116B /* button_background_default.9@2x.png in Resources */, D35E91F0160CA0C70023116B /* button_background_over.9@2x.png in Resources */, D35E9209160CAA1F0023116B /* field_background.9.png in Resources */, D35E920D160CABD70023116B /* button_background_default.9.png in Resources */, D35E920F160CABD70023116B /* button_background_over.9.png in Resources */, + D3012CC41610467D007CD926 /* linphone_logo.png in Resources */, + D3012CC616105ECF007CD926 /* bubble.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4582,15 +4590,17 @@ D3328649160B5BC300E6435D /* dialer_alt_disabled_landscape~ipad.png in Resources */, D332864B160B5BC300E6435D /* dialer_alt_disabled.png in Resources */, D332864D160B5BC300E6435D /* dialer_alt_disabled~ipad.png in Resources */, - D354944D160B615A0027E44E /* linphone-splashscreen.png in Resources */, - D354944F160B615A0027E44E /* linphone-splashscreen@2x.png in Resources */, - D38F46F3160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png in Resources */, + D354944D160B615A0027E44E /* linphone_splashscreen.png in Resources */, + D354944F160B615A0027E44E /* linphone_splashscreen@2x.png in Resources */, + D38F46F3160C5CC8002D4C4A /* linphone_splashscreen-568h@2x.png in Resources */, D35E91EB160CA0BD0023116B /* field_background.9@2x.png in Resources */, D35E91EF160CA0C70023116B /* button_background_default.9@2x.png in Resources */, D35E91F1160CA0C70023116B /* button_background_over.9@2x.png in Resources */, D35E920A160CAA1F0023116B /* field_background.9.png in Resources */, D35E920E160CABD70023116B /* button_background_default.9.png in Resources */, D35E9210160CABD70023116B /* button_background_over.9.png in Resources */, + D3012CC51610467D007CD926 /* linphone_logo.png in Resources */, + D3012CC716105ECF007CD926 /* bubble.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };