From a92fca5c13577cf70122c9f3b8ad42379e5cc1eb Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 21 Aug 2018 16:11:51 -0400 Subject: [PATCH 1/3] Theme quoted replies. --- SignalMessaging/utils/ConversationStyle.swift | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SignalMessaging/utils/ConversationStyle.swift b/SignalMessaging/utils/ConversationStyle.swift index 13c48594d5..8828e272bd 100644 --- a/SignalMessaging/utils/ConversationStyle.swift +++ b/SignalMessaging/utils/ConversationStyle.swift @@ -227,10 +227,13 @@ public class ConversationStyle: NSObject { @objc public func quotedReplyBubbleColor(isIncoming: Bool) -> UIColor { - if isIncoming { + if Theme.isDarkThemeEnabled { + let alpha: CGFloat = (isIncoming ?0.6 :0.5) + return UIColor.white.blend(with: bubbleColorOutgoingSent, alpha: alpha) + } else if isIncoming { return bubbleColorOutgoingSent.withAlphaComponent(0.25) } else { - return ConversationStyle.defaultBubbleColorIncoming.withAlphaComponent(0.75) + return UIColor.white.withAlphaComponent(0.75) } } From 6dd474d794046513951377207079b9cc9449619e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 21 Aug 2018 16:13:12 -0400 Subject: [PATCH 2/3] Theme quoted replies. --- SignalMessaging/utils/ConversationStyle.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalMessaging/utils/ConversationStyle.swift b/SignalMessaging/utils/ConversationStyle.swift index 8828e272bd..bf96249ebe 100644 --- a/SignalMessaging/utils/ConversationStyle.swift +++ b/SignalMessaging/utils/ConversationStyle.swift @@ -233,7 +233,7 @@ public class ConversationStyle: NSObject { } else if isIncoming { return bubbleColorOutgoingSent.withAlphaComponent(0.25) } else { - return UIColor.white.withAlphaComponent(0.75) + return ConversationStyle.defaultBubbleColorIncoming.withAlphaComponent(0.75) } } From 9e21612298fdda17d458eec3f569f4b8fe593f57 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 21 Aug 2018 16:35:25 -0400 Subject: [PATCH 3/3] Respond to CR. --- SignalMessaging/utils/ConversationStyle.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalMessaging/utils/ConversationStyle.swift b/SignalMessaging/utils/ConversationStyle.swift index bf96249ebe..aa3a8dad4e 100644 --- a/SignalMessaging/utils/ConversationStyle.swift +++ b/SignalMessaging/utils/ConversationStyle.swift @@ -228,7 +228,7 @@ public class ConversationStyle: NSObject { @objc public func quotedReplyBubbleColor(isIncoming: Bool) -> UIColor { if Theme.isDarkThemeEnabled { - let alpha: CGFloat = (isIncoming ?0.6 :0.5) + let alpha: CGFloat = (isIncoming ? gi0.6 :0.5) return UIColor.white.blend(with: bubbleColorOutgoingSent, alpha: alpha) } else if isIncoming { return bubbleColorOutgoingSent.withAlphaComponent(0.25)