keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'charlesmchen/reworkMessageMetadataView'

Browse Source
pull/1/head
Matthew Chen 8 years ago
parent ca76af1feb 2dce0e9b1b
commit 147f99f1ba
5 changed files with 249 additions and 138 deletions
Show Stats Download Patch File Download Diff File

322
Signal/src/ViewControllers/MessageMetadataViewController.swift
Unescape Escape View File

@ -9,10 +9,19 @@ class MessageMetadataViewController: OWSViewController {
static let TAG = "[MessageMetadataViewController]"
let TAG = "[MessageMetadataViewController]"
enum MessageRecipientState {
case uploading
case sending
case sent
case delivered
case read
case failed
}
// MARK: Properties
let contactsManager: OWSContactsManager
let databaseConnection: YapDatabaseConnection
var message: TSMessage
@ -22,6 +31,7 @@ class MessageMetadataViewController: OWSViewController {
var scrollView: UIScrollView?
var contentView: UIView?
var attachment: TSAttachment?
var dataSource: DataSource?
var attachmentStream: TSAttachmentStream?
var messageBody: String?
@ -135,6 +145,9 @@ class MessageMetadataViewController: OWSViewController {
let contactsManager = Environment.getCurrent().contactsManager!
let thread = message.thread
// Content
rows += contentRows()
// Sender?
if let incomingMessage = message as? TSIncomingMessage {
let senderId = incomingMessage.authorId
@ -147,32 +160,65 @@ class MessageMetadataViewController: OWSViewController {
// Recipient(s)
if let outgoingMessage = message as? TSOutgoingMessage {
// TODO: It'd be nice to inset these dividers from the edge of the screen.
let addDivider = {
let divider = UIView()
divider.backgroundColor = UIColor(white:0.9, alpha:1.0)
divider.autoSetDimension(.height, toSize:0.5)
rows.append(divider)
}
addDivider()
for recipientId in thread.recipientIdentifiers {
let recipientStatus = self.recipientStatus(forOutgoingMessage: outgoingMessage, recipientId: recipientId)
let cell = ContactTableViewCell()
cell.configure(withRecipientId: recipientId, contactsManager: self.contactsManager)
let statusLabel = UILabel()
statusLabel.text = recipientStatus
statusLabel.textColor = UIColor.ows_darkGray()
statusLabel.font = UIFont.ows_footnote()
statusLabel.sizeToFit()
cell.accessoryView = statusLabel
cell.autoSetDimension(.height, toSize:ContactTableViewCell.rowHeight())
cell.setContentHuggingLow()
rows.append(cell)
addDivider()
let recipientStatusGroups: [MessageRecipientState] = [
.read,
.uploading,
.delivered,
.sent,
.sending,
.failed
]
for recipientStatusGroup in recipientStatusGroups {
var groupRows = [UIView]()
// TODO: It'd be nice to inset these dividers from the edge of the screen.
let addDivider = {
let divider = UIView()
divider.backgroundColor = UIColor(white:0.9, alpha:1.0)
divider.autoSetDimension(.height, toSize:0.5)
groupRows.append(divider)
}
for recipientId in thread.recipientIdentifiers {
let (recipientStatus, statusMessage) = self.recipientStatus(outgoingMessage: outgoingMessage, recipientId: recipientId)
guard recipientStatus == recipientStatusGroup else {
continue
}
if groupRows.count < 1 {
groupRows.append(valueRow(name: MessageRecipientStateName(recipientStatusGroup),
value:""))
addDivider()
}
let cell = ContactTableViewCell()
cell.configure(withRecipientId: recipientId, contactsManager: self.contactsManager)
let statusLabel = UILabel()
statusLabel.text = statusMessage
statusLabel.textColor = UIColor.ows_darkGray()
statusLabel.font = UIFont.ows_footnote()
statusLabel.sizeToFit()
cell.accessoryView = statusLabel
cell.autoSetDimension(.height, toSize:ContactTableViewCell.rowHeight())
cell.setContentHuggingLow()
groupRows.append(cell)
}
if groupRows.count > 0 {
addDivider()
let spacer = UIView()
spacer.autoSetDimension(.height, toSize:10)
groupRows.append(spacer)
}
Logger.verbose("\(groupRows.count) rows for \(recipientStatusGroup)")
guard groupRows.count > 0 else {
continue
}
rows += groupRows
}
}
@ -180,14 +226,42 @@ class MessageMetadataViewController: OWSViewController {
comment: "Label for the 'sent date & time' field of the 'message metadata' view."),
value:DateUtil.formatPastTimestampRelativeToNow(message.timestamp)))
if let _ = message as? TSIncomingMessage {
if message as? TSIncomingMessage != nil {
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_RECEIVED_DATE_TIME",
comment: "Label for the 'received date & time' field of the 'message metadata' view."),
value:DateUtil.formatPastTimestampRelativeToNow(message.timestampForSorting())))
}
rows += addAttachmentMetadataRows()
// TODO: We could include the "disappearing messages" state here.
var lastRow: UIView?
for row in rows {
contentView.addSubview(row)
row.autoPinLeadingToSuperView()
row.autoPinTrailingToSuperView()
if let lastRow = lastRow {
row.autoPinEdge(.top, to:.bottom, of:lastRow, withOffset:5)
} else {
row.autoPinEdge(toSuperviewEdge:.top, withInset:20)
}
lastRow = row
}
if let lastRow = lastRow {
lastRow.autoPinEdge(toSuperviewEdge:.bottom, withInset:20)
}
if let mediaMessageView = mediaMessageView {
mediaMessageView.autoPinToSquareAspectRatio()
}
}
private func contentRows() -> [UIView] {
var rows = [UIView]()
if message.attachmentIds.count > 0 {
rows += addAttachmentRows()
} else if let messageBody = message.body {
@ -196,17 +270,47 @@ class MessageMetadataViewController: OWSViewController {
if messageBody.characters.count > 0 {
self.messageBody = messageBody
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_BODY_LABEL",
comment: "Label for the message body in the 'message metadata' view."),
value:""))
let isIncoming = self.message as? TSIncomingMessage != nil
let bodyLabel = UILabel()
bodyLabel.textColor = UIColor.black
bodyLabel.font = UIFont.ows_regularFont(withSize:14)
bodyLabel.textColor = isIncoming ? UIColor.black : UIColor.white
bodyLabel.font = UIFont.ows_regularFont(withSize:16)
bodyLabel.text = messageBody
bodyLabel.numberOfLines = 0
// Only show the first N lines.
bodyLabel.numberOfLines = 10
bodyLabel.lineBreakMode = .byWordWrapping
rows.append(bodyLabel)
let bubbleView = UIView()
bubbleView.backgroundColor = isIncoming ? UIColor.jsq_messageBubbleLightGray() : UIColor.ows_materialBlue()
bubbleView.layer.cornerRadius = 10
bubbleView.addSubview(bodyLabel)
bodyLabel.autoPinLeadingToSuperView(withMargin:10)
bodyLabel.autoPinTrailingToSuperView(withMargin:10)
bodyLabel.autoPinHeightToSuperview(withMargin:10)
let bubbleSpacer = UIView()
let row = UIView()
row.addSubview(bubbleView)
row.addSubview(bubbleSpacer)
bubbleView.autoPinHeightToSuperview()
bubbleView.setContentHuggingHorizontalHigh()
bubbleView.setCompressionResistanceHigh()
bubbleSpacer.autoPinHeightToSuperview()
bubbleSpacer.setContentHuggingLow()
if isIncoming {
bubbleView.autoPinLeadingToSuperView(withMargin:10)
bubbleSpacer.autoPinLeading(toTrailingOf:bubbleView)
bubbleSpacer.autoPinTrailingToSuperView(withMargin:10)
} else {
bubbleSpacer.autoPinLeadingToSuperView(withMargin:10)
bubbleView.autoPinLeading(toTrailingOf:bubbleSpacer)
bubbleView.autoPinTrailingToSuperView(withMargin:10)
}
rows.append(row)
} else {
// Neither attachment nor body.
owsFail("\(self.TAG) Message has neither attachment nor body.")
@ -216,27 +320,11 @@ class MessageMetadataViewController: OWSViewController {
}
}
var lastRow: UIView?
for row in rows {
contentView.addSubview(row)
row.autoPinLeadingToSuperView()
row.autoPinTrailingToSuperView()
let spacer = UIView()
spacer.autoSetDimension(.height, toSize:15)
rows.append(spacer)
if let lastRow = lastRow {
row.autoPinEdge(.top, to:.bottom, of:lastRow, withOffset:5)
} else {
row.autoPinEdge(toSuperviewEdge:.top, withInset:20)
}
lastRow = row
}
if let lastRow = lastRow {
lastRow.autoPinEdge(toSuperviewEdge:.bottom, withInset:20)
}
if let mediaMessageView = mediaMessageView {
mediaMessageView.autoPinToSquareAspectRatio()
}
return rows
}
private func addAttachmentRows() -> [UIView] {
@ -251,17 +339,7 @@ class MessageMetadataViewController: OWSViewController {
owsFail("Missing attachment")
return rows
}
let contentType = attachment.contentType
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_ATTACHMENT_MIME_TYPE",
comment: "Label for the MIME type of attachments in the 'message metadata' view."),
value:contentType))
if let sourceFilename = attachment.sourceFilename {
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_SOURCE_FILENAME",
comment: "Label for the original filename of any attachment in the 'message metadata' view."),
value:sourceFilename))
}
self.attachment = attachment
guard let attachmentStream = attachment as? TSAttachmentStream else {
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_ATTACHMENT_NOT_YET_DOWNLOADED",
@ -282,21 +360,8 @@ class MessageMetadataViewController: OWSViewController {
return rows
}
let fileSize = dataSource.dataLength()
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_ATTACHMENT_FILE_SIZE",
comment: "Label for file size of attachments in the 'message metadata' view."),
value:ViewControllerUtils.formatFileSize(UInt(fileSize))))
let contentType = attachment.contentType
if let dataUTI = MIMETypeUtil.utiType(forMIMEType:contentType) {
if attachment.isVoiceMessage() {
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_VOICE_MESSAGE",
comment: "Label for voice messages of the 'message metadata' view."),
value:""))
} else {
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_MEDIA",
comment: "Label for media messages of the 'message metadata' view."),
value:""))
}
let attachment = SignalAttachment(dataSource : dataSource, dataUTI: dataUTI)
let mediaMessageView = MediaMessageView(attachment:attachment)
self.mediaMessageView = mediaMessageView
@ -305,50 +370,83 @@ class MessageMetadataViewController: OWSViewController {
return rows
}
private func recipientStatus(forOutgoingMessage message: TSOutgoingMessage, recipientId: String) -> String {
private func addAttachmentMetadataRows() -> [UIView] {
var rows = [UIView]()
if let attachment = self.attachment {
let contentType = attachment.contentType
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_ATTACHMENT_MIME_TYPE",
comment: "Label for the MIME type of attachments in the 'message metadata' view."),
value:contentType))
if let sourceFilename = attachment.sourceFilename {
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_SOURCE_FILENAME",
comment: "Label for the original filename of any attachment in the 'message metadata' view."),
value:sourceFilename))
}
}
if let dataSource = self.dataSource {
let fileSize = dataSource.dataLength()
rows.append(valueRow(name: NSLocalizedString("MESSAGE_METADATA_VIEW_ATTACHMENT_FILE_SIZE",
comment: "Label for file size of attachments in the 'message metadata' view."),
value:ViewControllerUtils.formatFileSize(UInt(fileSize))))
}
return rows
}
private func recipientStatus(outgoingMessage: TSOutgoingMessage, recipientId: String) -> (MessageRecipientState, String) {
// Legacy messages don't have "recipient read" state or "per-recipient delivery" state,
// so we fall back to `TSOutgoingMessageState` which is not per-recipient and therefore
// might be misleading.
let recipientReadMap = message.recipientReadMap
let recipientReadMap = outgoingMessage.recipientReadMap
if let readTimestamp = recipientReadMap[recipientId] {
assert(message.messageState == .sentToService)
return NSLocalizedString("MESSAGE_STATUS_READ", comment:"message footer for read messages").rtlSafeAppend(" ", referenceView:self.view)
.rtlSafeAppend(
DateUtil.formatPastTimestampRelativeToNow(readTimestamp.uint64Value), referenceView:self.view)
assert(outgoingMessage.messageState == .sentToService)
let statusMessage = NSLocalizedString("MESSAGE_STATUS_READ", comment:"message footer for read messages").rtlSafeAppend(" ", referenceView:self.view)
.rtlSafeAppend(
DateUtil.formatPastTimestampRelativeToNow(readTimestamp.uint64Value), referenceView:self.view)
return (.read, statusMessage)
}
let recipientDeliveryMap = message.recipientDeliveryMap
let recipientDeliveryMap = outgoingMessage.recipientDeliveryMap
if let deliveryTimestamp = recipientDeliveryMap[recipientId] {
assert(message.messageState == .sentToService)
return NSLocalizedString("MESSAGE_STATUS_DELIVERED",
assert(outgoingMessage.messageState == .sentToService)
let statusMessage = NSLocalizedString("MESSAGE_STATUS_DELIVERED",
comment:"message status for message delivered to their recipient.").rtlSafeAppend(" ", referenceView:self.view)
.rtlSafeAppend(
DateUtil.formatPastTimestampRelativeToNow(deliveryTimestamp.uint64Value), referenceView:self.view)
return (.delivered, statusMessage)
}
if message.wasDelivered {
return NSLocalizedString("MESSAGE_STATUS_DELIVERED",
if outgoingMessage.wasDelivered {
let statusMessage = NSLocalizedString("MESSAGE_STATUS_DELIVERED",
comment:"message status for message delivered to their recipient.")
return (.delivered, statusMessage)
}
if message.messageState == .unsent {
return NSLocalizedString("MESSAGE_STATUS_FAILED", comment:"message footer for failed messages")
} else if (message.messageState == .sentToService ||
message.wasSent(toRecipient:recipientId)) {
return
if outgoingMessage.messageState == .unsent {
let statusMessage = NSLocalizedString("MESSAGE_STATUS_FAILED", comment:"message footer for failed messages")
return (.failed, statusMessage)
} else if outgoingMessage.messageState == .sentToService ||
message.wasSent(toRecipient:recipientId) {
let statusMessage =
NSLocalizedString("MESSAGE_STATUS_SENT",
comment:"message footer for sent messages")
return (.sent, statusMessage)
} else if message.hasAttachments() {
assert(message.messageState == .attemptingOut)
assert(outgoingMessage.messageState == .attemptingOut)
return NSLocalizedString("MESSAGE_STATUS_UPLOADING",
let statusMessage = NSLocalizedString("MESSAGE_STATUS_UPLOADING",
comment:"message footer while attachment is uploading")
return (.uploading, statusMessage)
} else {
assert(message.messageState == .attemptingOut)
assert(outgoingMessage.messageState == .attemptingOut)
return NSLocalizedString("MESSAGE_STATUS_SENDING",
let statusMessage = NSLocalizedString("MESSAGE_STATUS_SENDING",
comment:"message status while message is sending.")
return (.sending, statusMessage)
}
}
@ -453,7 +551,6 @@ class MessageMetadataViewController: OWSViewController {
}
internal func yapDatabaseModified(notification: NSNotification) {
// Logger.info("\(TAG) in \(#function)")
AssertIsOnMainThread()
let notifications = self.databaseConnection.beginLongLivedReadTransaction()
@ -469,4 +566,27 @@ class MessageMetadataViewController: OWSViewController {
updateContent()
}
private func MessageRecipientStateName(_ value: MessageRecipientState) -> String {
switch value {
case .uploading:
return NSLocalizedString("MESSAGE_METADATA_VIEW_MESSAGE_STATUS_UPLOADING",
comment: "Status label for messages which are uploading.")
case .sending:
return NSLocalizedString("MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SENDING",
comment: "Status label for messages which are sending.")
case .sent:
return NSLocalizedString("MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SENT",
comment: "Status label for messages which are sent.")
case .delivered:
return NSLocalizedString("MESSAGE_METADATA_VIEW_MESSAGE_STATUS_DELIVERED",
comment: "Status label for messages which are delivered.")
case .read:
return NSLocalizedString("MESSAGE_METADATA_VIEW_MESSAGE_STATUS_READ",
comment: "Status label for messages which are read.")
case .failed:
return NSLocalizedString("MESSAGE_METADATA_VIEW_MESSAGE_STATUS_FAILED",
comment: "Status label for messages which are failed.")
}
}
}

7
Signal/src/util/DateUtil.m
Unescape Escape View File

@ -70,13 +70,10 @@ static NSString *const DATE_FORMAT_WEEKDAY = @"EEEE";
OWSCAssert(pastTimestamp > 0);
uint64_t nowTimestamp = [NSDate ows_millisecondTimeStamp];
if (pastTimestamp >= nowTimestamp) {
OWSFail(@"%@ Unexpected timestamp", self.tag);
return NSLocalizedString(@"TIME_NOW", @"Indicates that the event happened now.");
}
BOOL isFutureTimestamp = pastTimestamp >= nowTimestamp;
NSDate *pastDate = [NSDate ows_dateWithMillisecondsSince1970:pastTimestamp];
if ([self dateIsToday:pastDate]) {
if (isFutureTimestamp || [self dateIsToday:pastDate]) {
return [[self timeFormatter] stringFromDate:pastDate];
} else if (![self dateIsOlderThanOneWeek:pastDate]) {
return [[self weekdayFormatter] stringFromDate:pastDate];

4
Signal/src/util/NSString+OWS.h
Unescape Escape View File

@ -2,6 +2,8 @@
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
NS_ASSUME_NONNULL_BEGIN
@interface NSString (OWS)
- (NSString *)ows_stripped;
@ -9,3 +11,5 @@
- (NSString *)rtlSafeAppend:(NSString *)string referenceView:(UIView *)referenceView;
@end
NS_ASSUME_NONNULL_END

4
Signal/src/util/NSString+OWS.m
Unescape Escape View File

@ -5,6 +5,8 @@
#import "NSString+OWS.h"
#import "UIView+OWS.h"
NS_ASSUME_NONNULL_BEGIN
@implementation NSString (OWS)
- (NSString *)ows_stripped
@ -25,3 +27,5 @@
}
@end
NS_ASSUME_NONNULL_END

50
Signal/translations/en.lproj/Localizable.strings
Unescape Escape View File

@ -796,24 +796,33 @@
/* Label for 'not yet downloaded' attachments in the 'message metadata' view. */
"MESSAGE_METADATA_VIEW_ATTACHMENT_NOT_YET_DOWNLOADED" = "Not yet downloaded";
/* Label for the message body in the 'message metadata' view. */
"MESSAGE_METADATA_VIEW_BODY_LABEL" = "Message";
/* Label for the 'group name' field of the 'message metadata' view. */
"MESSAGE_METADATA_VIEW_GROUP_NAME" = "Group";
/* Label for media messages of the 'message metadata' view. */
"MESSAGE_METADATA_VIEW_MEDIA" = "Media";
/* Delivered */
"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_DELIVERED" = "Delivered";
/* Failed */
"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_FAILED" = "Failed";
/* Read */
"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_READ" = "Read";
/* Sending */
"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SENDING" = "Sending";
/* Sent */
"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_SENT" = "Sent";
/* Uploading */
"MESSAGE_METADATA_VIEW_MESSAGE_STATUS_UPLOADING" = "Uploading";
/* Label for messages without a body or attachment in the 'message metadata' view. */
"MESSAGE_METADATA_VIEW_NO_ATTACHMENT_OR_BODY" = "Message has no content or attachment.";
/* Label for the 'received date & time' field of the 'message metadata' view. */
"MESSAGE_METADATA_VIEW_RECEIVED_DATE_TIME" = "Received";
/* Label for the 'recipient' field of the 'message metadata' view. */
"MESSAGE_METADATA_VIEW_RECIPIENT" = "Recipient";
/* Label for the 'sender' field of the 'message metadata' view. */
"MESSAGE_METADATA_VIEW_SENDER" = "Sender";
@ -1442,9 +1451,6 @@
/* An explanation of the 'read receipts' setting. */
"SETTINGS_READ_RECEIPTS_SECTION_FOOTER" = "Read receipts let you see when others have read your message - and let them see when you have read their messages.";
/* Title of the 'read receipts' settings section. */
"SETTINGS_READ_RECEIPTS_SECTION_TITLE" = "Read Receipts";
/* No comment provided by engineer. */
"SETTINGS_SCREEN_SECURITY" = "Enable Screen Security";
@ -1517,9 +1523,6 @@
/* {{number of weeks}}, embedded in strings, e.g. 'Alice updated disappearing messages expiration to {{5 weeks}}'. See other *_TIME_AMOUNT strings */
"TIME_AMOUNT_WEEKS" = "%@ weeks";
/* Indicates that the event happened now. */
"TIME_NOW" = "Now";
/* Label for the cancel button in an alert or action sheet. */
"TXT_CANCEL_TITLE" = "Cancel";
@ -1663,20 +1666,3 @@
/* Info message embedding a {{time amount}}, see the *_TIME_AMOUNT strings for context. */
"YOU_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "You set disappearing message time to %@.";
// Strings Copied in from JSQMessagesViewController
"load_earlier_messages" = "Load Earlier Messages";
"send" = "Send";
"new_message" = "New Message";
"text_message_accessibility_label" = "%@: %@";
"media_message_accessibility_label" = "%@: media message";
"accessory_button_accessibility_label" = "Share media";
"new_message_received_accessibility_announcement" = "New message received";

Write Preview
Loading…
Cancel
Save