From 8fe289feec87763cd774f6796f3848bb1c28a66d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 9 Apr 2018 15:13:07 -0400 Subject: [PATCH] Tweak design of quoted replies. --- .../ConversationView/Cells/OWSQuotedMessageView.m | 5 ++++- .../ConversationView/ConversationViewController.m | 2 +- Signal/translations/en.lproj/Localizable.strings | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m index 0e2cb5bfa..2b6dd8ec0 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m @@ -281,9 +281,12 @@ NS_ASSUME_NONNULL_BEGIN } else if ([MIMETypeUtil isVideo:contentType]) { return NSLocalizedString( @"QUOTED_REPLY_TYPE_VIDEO", @"Indicates this message is a quoted reply to a video file."); - } else if ([MIMETypeUtil isImage:contentType] || [MIMETypeUtil isAnimated:contentType]) { + } else if ([MIMETypeUtil isImage:contentType]) { return NSLocalizedString( @"QUOTED_REPLY_TYPE_IMAGE", @"Indicates this message is a quoted reply to an image file."); + } else if ([MIMETypeUtil isAnimated:contentType]) { + return NSLocalizedString( + @"QUOTED_REPLY_TYPE_GIF", @"Indicates this message is a quoted reply to animated GIF file."); } return nil; } diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 77c2fd8a9..ef1de1c83 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -4500,7 +4500,7 @@ typedef enum : NSUInteger { = (interactionType == lastInteractionType && recipientStatus == lastRecipientStatus); } - shouldHideBubbleTail = (interactionType == lastInteractionType && recipientStatus == lastRecipientStatus); + shouldHideBubbleTail = interactionType == lastInteractionType; lastRecipientStatus = recipientStatus; } else if (interactionType == OWSInteractionType_IncomingMessage) { diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 5ce351ba6..ac512867d 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1414,6 +1414,9 @@ /* Indicates this message is a quoted reply to an audio file. */ "QUOTED_REPLY_TYPE_AUDIO" = "Audio"; +/* Indicates this message is a quoted reply to animated GIF file. */ +"QUOTED_REPLY_TYPE_GIF" = "GIF"; + /* Indicates this message is a quoted reply to an image file. */ "QUOTED_REPLY_TYPE_IMAGE" = "Image";