Tweak design of quoted replies.

pull/1/head
Matthew Chen 7 years ago
parent a810fb6402
commit 8fe289feec

@ -281,9 +281,12 @@ NS_ASSUME_NONNULL_BEGIN
} else if ([MIMETypeUtil isVideo:contentType]) { } else if ([MIMETypeUtil isVideo:contentType]) {
return NSLocalizedString( return NSLocalizedString(
@"QUOTED_REPLY_TYPE_VIDEO", @"Indicates this message is a quoted reply to a video file."); @"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( return NSLocalizedString(
@"QUOTED_REPLY_TYPE_IMAGE", @"Indicates this message is a quoted reply to an image file."); @"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; return nil;
} }

@ -4500,7 +4500,7 @@ typedef enum : NSUInteger {
= (interactionType == lastInteractionType && recipientStatus == lastRecipientStatus); = (interactionType == lastInteractionType && recipientStatus == lastRecipientStatus);
} }
shouldHideBubbleTail = (interactionType == lastInteractionType && recipientStatus == lastRecipientStatus); shouldHideBubbleTail = interactionType == lastInteractionType;
lastRecipientStatus = recipientStatus; lastRecipientStatus = recipientStatus;
} else if (interactionType == OWSInteractionType_IncomingMessage) { } else if (interactionType == OWSInteractionType_IncomingMessage) {

@ -1414,6 +1414,9 @@
/* Indicates this message is a quoted reply to an audio file. */ /* Indicates this message is a quoted reply to an audio file. */
"QUOTED_REPLY_TYPE_AUDIO" = "Audio"; "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. */ /* Indicates this message is a quoted reply to an image file. */
"QUOTED_REPLY_TYPE_IMAGE" = "Image"; "QUOTED_REPLY_TYPE_IMAGE" = "Image";

Loading…
Cancel
Save