Rework conversation message bubble colors; add "conversation colors" class.

pull/1/head
Matthew Chen 7 years ago
parent b3ad6e27dc
commit 3adc03fa2c

@ -162,7 +162,7 @@ public class ConversationStyle: NSObject {
if isIncoming { if isIncoming {
return ConversationStyle.defaultBubbleColorIncoming return ConversationStyle.defaultBubbleColorIncoming
} else { } else {
return conversationColors.themeColor return conversationColors.defaultColor
} }
} }
@ -204,17 +204,15 @@ public class ConversationStyle: NSObject {
public func quotedReplyBubbleColor(isIncoming: Bool) -> UIColor { public func quotedReplyBubbleColor(isIncoming: Bool) -> UIColor {
if Theme.isDarkThemeEnabled { if Theme.isDarkThemeEnabled {
return conversationColors.shadeColor return conversationColors.shadeColor
} else if isIncoming {
return conversationColors.tintColor
} else { } else {
return ConversationStyle.defaultBubbleColorIncoming.withAlphaComponent(0.75) return conversationColors.tintColor
} }
} }
@objc @objc
public func quotedReplyStripeColor(isIncoming: Bool) -> UIColor { public func quotedReplyStripeColor(isIncoming: Bool) -> UIColor {
if isIncoming { if isIncoming {
return conversationColors.themeColor return conversationColors.defaultColor
} else { } else {
return Theme.backgroundColor return Theme.backgroundColor
} }
@ -228,12 +226,16 @@ public class ConversationStyle: NSObject {
@objc @objc
public func quotedReplyAuthorColor() -> UIColor { public func quotedReplyAuthorColor() -> UIColor {
return UIColor.ows_gray90 return quotedReplyTextColor()
} }
@objc @objc
public func quotedReplyTextColor() -> UIColor { public func quotedReplyTextColor() -> UIColor {
return UIColor.ows_gray90 if Theme.isDarkThemeEnabled {
return UIColor.ows_gray05
} else {
return UIColor.ows_gray90
}
} }
@objc @objc

Loading…
Cancel
Save