From 4893b019078b06ec7171a3370e3f07c82a1fb382 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 9 Jul 2018 10:31:54 -0400 Subject: [PATCH] Retweak colors. --- .../Cells/OWSMessageFooterView.m | 4 +++ SignalMessaging/utils/ConversationStyle.swift | 30 ------------------- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m index 2d866fd10..acb2daaed 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m @@ -120,7 +120,11 @@ NS_ASSUME_NONNULL_BEGIN self.statusIndicatorImageView.image = [statusIndicatorImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; // TODO: How to indicate read status for transitional colors? + // if (messageStatus == MessageReceiptStatusRead) { + // self.statusIndicatorImageView.tintColor = [UIColor ows_signalBlueColor]; + // } else { self.statusIndicatorImageView.tintColor = textColor; + // } self.statusIndicatorImageView.hidden = NO; } else { self.statusIndicatorImageView.image = nil; diff --git a/SignalMessaging/utils/ConversationStyle.swift b/SignalMessaging/utils/ConversationStyle.swift index 120ebbb4a..3c00479e1 100644 --- a/SignalMessaging/utils/ConversationStyle.swift +++ b/SignalMessaging/utils/ConversationStyle.swift @@ -134,36 +134,6 @@ public class ConversationStyle: NSObject { return color } -// @objc -// public static let bubbleColorIncoming = UIColor.ows_messageBubbleLightGray -// -// @objc -// public static let bubbleColorOutgoingUnsent = UIColor.gray -// -// @objc -// public static let bubbleColorOutgoingSending = UIColor.ows_fadedBlue -// -// @objc -// public static let bubbleColorOutgoingSent = UIColor.ows_materialBlue -// -// @objc -// public func bubbleColor(message: TSMessage) -> UIColor { -// if message is TSIncomingMessage { -// return OWSMessagesBubbleImageFactory.bubbleColorIncoming -// } else if let outgoingMessage = message as? TSOutgoingMessage { -// switch outgoingMessage.messageState { -// case .failed: -// return OWSMessagesBubbleImageFactory.bubbleColorOutgoingUnsent -// case .sending: -// return OWSMessagesBubbleImageFactory.bubbleColorOutgoingSending -// default: -// return OWSMessagesBubbleImageFactory.bubbleColorOutgoingSent -// } -// } else { -// owsFail("Unexpected message type: \(message)") -// return UIColor.ows_materialBlue -// } -// } private static let defaultBubbleColorIncoming = UIColor.ows_messageBubbleLightGray @objc