Merge branch 'charlesmchen/themeQuotedReplies'

7 years ago · 501b5a7c97
parent 7b835bd08e 9e21612298
commit 501b5a7c97
1 changed files with 4 additions and 1 deletions
--- a/SignalMessaging/utils/ConversationStyle.swift
+++ b/SignalMessaging/utils/ConversationStyle.swift
@ -227,7 +227,10 @@ public class ConversationStyle: NSObject {

    @objc
    public func quotedReplyBubbleColor(isIncoming: Bool) -> UIColor {
-        if isIncoming {
+        if Theme.isDarkThemeEnabled {
+            let alpha: CGFloat = (isIncoming ? gi0.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)