diff --git a/Classes/LinphoneUI/Base.lproj/UIChatBubblePhotoCell.xib b/Classes/LinphoneUI/Base.lproj/UIChatBubblePhotoCell.xib index 630e65a06..e1728d2ee 100644 --- a/Classes/LinphoneUI/Base.lproj/UIChatBubblePhotoCell.xib +++ b/Classes/LinphoneUI/Base.lproj/UIChatBubblePhotoCell.xib @@ -130,7 +130,7 @@ diff --git a/Classes/LinphoneUI/Base.lproj/UIChatBubbleTextCell.xib b/Classes/LinphoneUI/Base.lproj/UIChatBubbleTextCell.xib index 7b6f67246..48534c67b 100644 --- a/Classes/LinphoneUI/Base.lproj/UIChatBubbleTextCell.xib +++ b/Classes/LinphoneUI/Base.lproj/UIChatBubbleTextCell.xib @@ -87,7 +87,7 @@ diff --git a/Classes/LinphoneUI/UIChatBubbleTextCell.m b/Classes/LinphoneUI/UIChatBubbleTextCell.m index 61579c45a..604c541fd 100644 --- a/Classes/LinphoneUI/UIChatBubbleTextCell.m +++ b/Classes/LinphoneUI/UIChatBubbleTextCell.m @@ -252,19 +252,20 @@ static void message_status(LinphoneChatMessage *msg, LinphoneChatMessageState st - (void)displayImdmStatus:(LinphoneChatMessageState)state { if (state == LinphoneChatMessageStateDeliveredToUser) { - [_imdmIcon setImage:[UIImage imageNamed:@"valid_disabled"]]; + [_imdmIcon setImage:[UIImage imageNamed:@"chat_delivered"]]; [_imdmLabel setText:NSLocalizedString(@"Delivered", nil)]; - [_imdmLabel setTextColor:[UIColor orangeColor]]; + [_imdmLabel setTextColor:[UIColor grayColor]]; [_imdmIcon setHidden:FALSE]; [_imdmLabel setHidden:FALSE]; } else if (state == LinphoneChatMessageStateDisplayed) { - [_imdmIcon setImage:[UIImage imageNamed:@"valid_default"]]; + [_imdmIcon setImage:[UIImage imageNamed:@"chat_read"]]; [_imdmLabel setText:NSLocalizedString(@"Displayed", nil)]; - [_imdmLabel setTextColor:[UIColor orangeColor]]; + [_imdmLabel + setTextColor:([UIColor colorWithRed:(24 / 255.0) green:(167 / 255.0) blue:(175 / 255.0) alpha:1.0])]; [_imdmIcon setHidden:FALSE]; [_imdmLabel setHidden:FALSE]; } else if (state == LinphoneChatMessageStateNotDelivered || state == LinphoneChatMessageStateFileTransferError) { - [_imdmIcon setImage:[UIImage imageNamed:@"chat_message_not_delivered"]]; + [_imdmIcon setImage:[UIImage imageNamed:@"chat_error"]]; [_imdmLabel setText:NSLocalizedString(@"Resend", nil)]; [_imdmLabel setTextColor:[UIColor redColor]]; [_imdmIcon setHidden:FALSE]; diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index 5530befac..27ff2b32b 100644 Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 7605a05ed..cfa88f172 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -35,6 +35,9 @@ 22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B68012A3E0BE001AE361 /* libresolv.dylib */; }; 22E0A822111C44E100B04932 /* AboutView.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81C111C44E100B04932 /* AboutView.m */; }; 22F2508E107141E100AC9B3F /* DialerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F2508C107141E100AC9B3F /* DialerView.m */; }; + 244523A31E816C4C0037A187 /* chat_delivered.png in Resources */ = {isa = PBXBuildFile; fileRef = 244523A01E816C4C0037A187 /* chat_delivered.png */; }; + 244523A41E816C4C0037A187 /* chat_error.png in Resources */ = {isa = PBXBuildFile; fileRef = 244523A11E816C4C0037A187 /* chat_error.png */; }; + 244523A51E816C4C0037A187 /* chat_read.png in Resources */ = {isa = PBXBuildFile; fileRef = 244523A21E816C4C0037A187 /* chat_read.png */; }; 24A3459E1D95797700881A5C /* UIShopTableCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 24A3459D1D95797700881A5C /* UIShopTableCell.xib */; }; 24A345A61D95798A00881A5C /* UIShopTableCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 24A345A51D95798A00881A5C /* UIShopTableCell.m */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; @@ -928,6 +931,9 @@ 22E0A81D111C44E100B04932 /* AboutView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutView.h; sourceTree = ""; }; 22F2508B107141E100AC9B3F /* DialerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DialerView.h; sourceTree = ""; }; 22F2508C107141E100AC9B3F /* DialerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = DialerView.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; + 244523A01E816C4C0037A187 /* chat_delivered.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_delivered.png; path = ../../../svgToPng/chat_delivered.png; sourceTree = ""; }; + 244523A11E816C4C0037A187 /* chat_error.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_error.png; path = ../../../svgToPng/chat_error.png; sourceTree = ""; }; + 244523A21E816C4C0037A187 /* chat_read.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_read.png; path = ../../../svgToPng/chat_read.png; sourceTree = ""; }; 24A3459D1D95797700881A5C /* UIShopTableCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIShopTableCell.xib; sourceTree = ""; }; 24A345A51D95798A00881A5C /* UIShopTableCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIShopTableCell.m; sourceTree = ""; }; 24A345A71D95799900881A5C /* UIShopTableCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIShopTableCell.h; sourceTree = ""; }; @@ -2564,6 +2570,9 @@ 633FEC531D3CD5570014B822 /* chat_attachment_disabled@2x.png */, 633FEC541D3CD5570014B822 /* chat_attachment_over.png */, 633FEC551D3CD5570014B822 /* chat_attachment_over@2x.png */, + 244523A01E816C4C0037A187 /* chat_delivered.png */, + 244523A11E816C4C0037A187 /* chat_error.png */, + 244523A21E816C4C0037A187 /* chat_read.png */, 633FEC561D3CD5570014B822 /* chat_list_indicator~ipad.png */, 633FEC571D3CD5570014B822 /* chat_list_indicator~ipad@2x.png */, 633FEC581D3CD5570014B822 /* chat_message_not_delivered.png */, @@ -3303,6 +3312,7 @@ 633FEDC41D3CD5590014B822 /* call_hangup_disabled.png in Resources */, 633FEDA81D3CD5590014B822 /* backspace_default.png in Resources */, 636316D11A1DEBCB0009B839 /* AboutView.xib in Resources */, + 244523A31E816C4C0037A187 /* chat_delivered.png in Resources */, 633FEF481D3CD55A0014B822 /* speaker_selected.png in Resources */, 633FEED91D3CD55A0014B822 /* numpad_7~ipad.png in Resources */, 633FEE2B1D3CD5590014B822 /* color_C.png in Resources */, @@ -3431,6 +3441,7 @@ 633FEF301D3CD55A0014B822 /* route_speaker_disabled.png in Resources */, 639CEAFD1A1DF4D9004DE38F /* StatusBarView.xib in Resources */, 633FEDE91D3CD5590014B822 /* call_status_missed~ipad@2x.png in Resources */, + 244523A51E816C4C0037A187 /* chat_read.png in Resources */, 639E9CAC1C0DB80300019A75 /* UIContactDetailsCell.xib in Resources */, 633FEE511D3CD5590014B822 /* deselect_all@2x.png in Resources */, F088488A19FF8C41007FFCF3 /* UIContactCell.xib in Resources */, @@ -3512,6 +3523,7 @@ 633FEE211D3CD5590014B822 /* chat_start_body_disabled~ipad@2x.png in Resources */, 63AADC011B6A0FF200AA16FD /* assistant_linphone_existing.rc in Resources */, 633FEE5A1D3CD5590014B822 /* edit_default.png in Resources */, + 244523A41E816C4C0037A187 /* chat_error.png in Resources */, 633FEDD11D3CD5590014B822 /* call_quality_indicator_2@2x.png in Resources */, 633FEDBC1D3CD5590014B822 /* call_audio_start_disabled.png in Resources */, 633FEE481D3CD5590014B822 /* delete_default.png in Resources */,