From de29b5a6ee7a6f812b1eb810f42a7f71d4a4d731 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 27 Sep 2017 22:05:01 -0400 Subject: [PATCH] Rework message metadata view. // FREEBIE --- .../MessageMetadataViewController.swift | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/Signal/src/ViewControllers/MessageMetadataViewController.swift b/Signal/src/ViewControllers/MessageMetadataViewController.swift index b48fb4e6e..eed5b07a4 100644 --- a/Signal/src/ViewControllers/MessageMetadataViewController.swift +++ b/Signal/src/ViewControllers/MessageMetadataViewController.swift @@ -270,13 +270,29 @@ class MessageMetadataViewController: OWSViewController { if messageBody.characters.count > 0 { self.messageBody = messageBody + 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 + bodyLabel.numberOfLines = 10 bodyLabel.lineBreakMode = .byWordWrapping - rows.append(bodyLabel) + + let bubbleView = UIView() + bubbleView.backgroundColor = isIncoming ? UIColor.gray : UIColor.ows_materialBlue() + bubbleView.layer.cornerRadius = 10 + bubbleView.addSubview(bodyLabel) + bodyLabel.autoPinLeadingToSuperView(withMargin:10) + bodyLabel.autoPinTrailingToSuperView(withMargin:10) + bodyLabel.autoPinHeightToSuperview(withMargin:10) + + let row = UIView() + row.addSubview(bubbleView) + bubbleView.autoPinLeadingToSuperView(withMargin:10) + bubbleView.autoPinTrailingToSuperView(withMargin:10) + bubbleView.autoPinHeightToSuperview() + rows.append(row) } else { // Neither attachment nor body. owsFail("\(self.TAG) Message has neither attachment nor body.")