From 995857ba923d3281e9c7a6afc0fece71697372b1 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Mon, 24 Sep 2012 11:37:21 +0200 Subject: [PATCH] Improve chat --- Classes/AboutViewController.m | 2 + Classes/AboutViewController.xib | 22 +- Classes/ChatRoomViewController.h | 2 + Classes/ChatRoomViewController.m | 34 ++- Classes/ImagePickerViewController.m | 2 +- Classes/LinphoneUI/UIChatCell.h | 4 +- Classes/LinphoneUI/UIChatCell.m | 25 +- Classes/LinphoneUI/UIChatCell.xib | 258 +++++++++++++----- Classes/LinphoneUI/UIChatRoomCell.h | 2 +- Classes/LinphoneUI/UIChatRoomCell.m | 13 +- Classes/LinphoneUI/UIChatRoomCell.xib | 160 ++++++++--- Classes/LinphoneUI/UILinphone.h | 6 + Classes/LinphoneUI/UILinphone.m | 14 + Classes/LinphoneUI/en.lproj/UICallCell.xib | 112 +++++++- Classes/LinphoneUI/en.lproj/UIMainBar.xib | 113 +------- Classes/LinphoneUI/fr.lproj/UICallCell.xib | 97 ++++++- Classes/LinphoneUI/fr.lproj/UIMainBar.xib | 113 +------- Classes/Model/ChatModel.h | 1 + Classes/Model/ChatModel.m | 30 ++ Classes/Utils/Utils.h | 8 + Classes/Utils/Utils.m | 34 +++ Classes/WizardViewController.m | 28 +- Classes/en.lproj/ChatRoomViewController.xib | 5 +- Classes/en.lproj/WizardViews.xib | 228 +--------------- Classes/fr.lproj/ChatRoomViewController.xib | 4 +- Classes/fr.lproj/WizardViews.xib | 192 +------------ Resources/en.lproj/Localizable.strings | Bin 15620 -> 16184 bytes Resources/fr.lproj/Localizable.strings | Bin 16204 -> 16770 bytes Resources/linphone_logo.png | Bin 0 -> 33590 bytes ....png => linphone_splashscreen-568h@2x.png} | Bin ...shscreen.png => linphone_splashscreen.png} | Bin ...en@2x.png => linphone_splashscreen@2x.png} | Bin linphone-Info.plist | 2 +- linphone.ldb/Contents.plist | 152 +++++++++-- .../{32 => 33}/ChatRoomViewController.xib | 5 +- .../WizardViews/{15 => 16}/WizardViews.xib | 228 +--------------- .../UICallCell/{3 => 4}/UICallCell.xib | 112 +++++++- .../UIMainBar/{7 => 8}/UIMainBar.xib | 113 +------- .../Localizable/1/Localizable.strings | Bin 15620 -> 16184 bytes linphone.xcodeproj/project.pbxproj | 46 ++-- 40 files changed, 970 insertions(+), 1197 deletions(-) create mode 100644 Resources/linphone_logo.png rename Resources/{linphone-splashscreen-568h@2x.png => linphone_splashscreen-568h@2x.png} (100%) rename Resources/{linphone-splashscreen.png => linphone_splashscreen.png} (100%) rename Resources/{linphone-splashscreen@2x.png => linphone_splashscreen@2x.png} (100%) rename linphone.ldb/Resources/Classes/ChatRoomViewController/{32 => 33}/ChatRoomViewController.xib (99%) rename linphone.ldb/Resources/Classes/WizardViews/{15 => 16}/WizardViews.xib (88%) rename linphone.ldb/Resources/LinphoneUI/UICallCell/{3 => 4}/UICallCell.xib (98%) rename linphone.ldb/Resources/LinphoneUI/UIMainBar/{7 => 8}/UIMainBar.xib (86%) 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 78857cfe4a642cf95117267b6da17f00aa1b9005..03fb0ee4b172632ca771c114c5fd95f794a35425 100644 GIT binary patch delta 262 zcmZpv+EKTmn_bzFp^PDwp@<=oAst97F(@$D0?9aI3GZ^xLuo$RN zfuV#U1576aMRFMmfJUSOWr`Uxf&4rqgPeith}1PXfhT&hys*k-Z&t3&^Mz#iRegc( wssI|9%TNl$2-l&APi|n11ggvgT8m93lK5l=<><-&N_>;wDspYUs;Dmw0MRWtD*ylh delta 22 ecmdl{*HX2in|(7U$1|?YD}}xIH@{c*lm-BDb_pB+ diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings index 747e0f27344509e2f5b31e9e4e92a3de1be3c569..4e02e99ae4c3f278f490588ec3808d26f9c15784 100644 GIT binary patch delta 242 zcmX?8*VN3o;TXHTBSRTODnk)NB11ZmR$@?Kumxfz249AJhDwIi$%ewwn~$-d;EvA# z3gj~s0~IMSlrUs~>13ctE<*uOdn!<-m?0C$&qFfA8K^EFC<>AR$)_?@0d?m9EmL4X z)4N$$m{ma47bsN$RGiCD3dG2+K@y+X7ztFE3A72DLL~9Yj4IKSk16wQc2ee&0RV^5 BG9&;1 delta 27 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 literal 0 HcmV?d00001 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 78857cfe4a642cf95117267b6da17f00aa1b9005..03fb0ee4b172632ca771c114c5fd95f794a35425 100644 GIT binary patch delta 262 zcmZpv+EKTmn_bzFp^PDwp@<=oAst97F(@$D0?9aI3GZ^xLuo$RN zfuV#U1576aMRFMmfJUSOWr`Uxf&4rqgPeith}1PXfhT&hys*k-Z&t3&^Mz#iRegc( wssI|9%TNl$2-l&APi|n11ggvgT8m93lK5l=<><-&N_>;wDspYUs;Dmw0MRWtD*ylh delta 22 ecmdl{*HX2in|(7U$1|?YD}}xIH@{c*lm-BDb_pB+ 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; };