diff --git a/Signal/Images.xcassets/message_status_delivered.imageset/Contents.json b/Signal/Images.xcassets/message_status_delivered.imageset/Contents.json index a030518be..51206a36f 100644 --- a/Signal/Images.xcassets/message_status_delivered.imageset/Contents.json +++ b/Signal/Images.xcassets/message_status_delivered.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "double check@1x.png", + "filename" : "delivered-18x12@1x.png", "scale" : "1x" }, { diff --git a/Signal/Images.xcassets/message_status_delivered.imageset/double check@1x.png b/Signal/Images.xcassets/message_status_delivered.imageset/delivered-18x12@1x.png similarity index 100% rename from Signal/Images.xcassets/message_status_delivered.imageset/double check@1x.png rename to Signal/Images.xcassets/message_status_delivered.imageset/delivered-18x12@1x.png diff --git a/Signal/Images.xcassets/message_status_read.imageset/Contents.json b/Signal/Images.xcassets/message_status_read.imageset/Contents.json new file mode 100644 index 000000000..debd3641e --- /dev/null +++ b/Signal/Images.xcassets/message_status_read.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "read-18x12@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "read-18x12@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "read-18x12@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/message_status_read.imageset/read-18x12@1x.png b/Signal/Images.xcassets/message_status_read.imageset/read-18x12@1x.png new file mode 100644 index 000000000..9fefab5c7 Binary files /dev/null and b/Signal/Images.xcassets/message_status_read.imageset/read-18x12@1x.png differ diff --git a/Signal/Images.xcassets/message_status_read.imageset/read-18x12@2x.png b/Signal/Images.xcassets/message_status_read.imageset/read-18x12@2x.png new file mode 100644 index 000000000..40819a6aa Binary files /dev/null and b/Signal/Images.xcassets/message_status_read.imageset/read-18x12@2x.png differ diff --git a/Signal/Images.xcassets/message_status_read.imageset/read-18x12@3x.png b/Signal/Images.xcassets/message_status_read.imageset/read-18x12@3x.png new file mode 100644 index 000000000..af63b1db9 Binary files /dev/null and b/Signal/Images.xcassets/message_status_read.imageset/read-18x12@3x.png differ diff --git a/Signal/Images.xcassets/message_status_sent.imageset/Contents.json b/Signal/Images.xcassets/message_status_sent.imageset/Contents.json index d5934924e..5f32b4e3d 100644 --- a/Signal/Images.xcassets/message_status_sent.imageset/Contents.json +++ b/Signal/Images.xcassets/message_status_sent.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "check@1x.png", + "filename" : "sent-12@1x.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "check@2x.png", + "filename" : "sent-12@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "check@3x.png", + "filename" : "sent-12@3x.png", "scale" : "3x" } ], diff --git a/Signal/Images.xcassets/message_status_sent.imageset/check@1x.png b/Signal/Images.xcassets/message_status_sent.imageset/sent-12@1x.png similarity index 100% rename from Signal/Images.xcassets/message_status_sent.imageset/check@1x.png rename to Signal/Images.xcassets/message_status_sent.imageset/sent-12@1x.png diff --git a/Signal/Images.xcassets/message_status_sent.imageset/check@2x.png b/Signal/Images.xcassets/message_status_sent.imageset/sent-12@2x.png similarity index 100% rename from Signal/Images.xcassets/message_status_sent.imageset/check@2x.png rename to Signal/Images.xcassets/message_status_sent.imageset/sent-12@2x.png diff --git a/Signal/Images.xcassets/message_status_sent.imageset/check@3x.png b/Signal/Images.xcassets/message_status_sent.imageset/sent-12@3x.png similarity index 100% rename from Signal/Images.xcassets/message_status_sent.imageset/check@3x.png rename to Signal/Images.xcassets/message_status_sent.imageset/sent-12@3x.png diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m index 5d491663c..12593870c 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m @@ -107,9 +107,11 @@ NS_ASSUME_NONNULL_BEGIN statusIndicatorImage = [UIImage imageNamed:@"message_status_sent"]; break; case MessageReceiptStatusDelivered: - case MessageReceiptStatusRead: statusIndicatorImage = [UIImage imageNamed:@"message_status_delivered"]; break; + case MessageReceiptStatusRead: + statusIndicatorImage = [UIImage imageNamed:@"message_status_read"]; + break; case MessageReceiptStatusFailed: // No status indicator icon. break; diff --git a/Signal/src/ViewControllers/HomeView/HomeViewCell.m b/Signal/src/ViewControllers/HomeView/HomeViewCell.m index 6d4e9731c..d536afff2 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewCell.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewCell.m @@ -294,8 +294,7 @@ NS_ASSUME_NONNULL_BEGIN statusIndicatorImage = [UIImage imageNamed:@"message_status_delivered"]; break; case MessageReceiptStatusRead: - statusIndicatorImage = [UIImage imageNamed:@"message_status_delivered"]; - messageStatusViewTintColor = [UIColor ows_signalBlueColor]; + statusIndicatorImage = [UIImage imageNamed:@"message_status_read"]; break; case MessageReceiptStatusFailed: statusIndicatorImage = [UIImage imageNamed:@"message_status_failed"];