diff --git a/Classes/Swift/Chat/Views/MultilineMessageCell.swift b/Classes/Swift/Chat/Views/MultilineMessageCell.swift index ae0778ab1..6f9194d6c 100644 --- a/Classes/Swift/Chat/Views/MultilineMessageCell.swift +++ b/Classes/Swift/Chat/Views/MultilineMessageCell.swift @@ -75,11 +75,11 @@ class MultilineMessageCell: SwipeCollectionViewCell, UICollectionViewDataSource, var forwardView = UIView() var forwardIcon = UIImageView(image: UIImage(named: "menu_forward_default")) - var forwardLabel = StyledLabel(VoipTheme.chat_conversation_forward_label) + var forwardLabel = StyledLabel(VoipTheme.chat_conversation_black_text) var replyView = UIView() var replyIcon = UIImageView(image: UIImage(named: "menu_reply_default")) - var replyLabel = StyledLabel(VoipTheme.chat_conversation_forward_label) + var replyLabel = StyledLabel(VoipTheme.chat_conversation_black_text) var replyContent = UIView() var replyColorContent = UIView() var replyLabelContent = StyledLabel(VoipTheme.chat_conversation_forward_label) @@ -468,6 +468,7 @@ class MultilineMessageCell: SwipeCollectionViewCell, UICollectionViewDataSource, //Text label.numberOfLines = 0 label.lineBreakMode = .byWordWrapping + label.textColor = .black contentViewBubble.addSubview(label) label.translatesAutoresizingMaskIntoConstraints = false @@ -702,10 +703,8 @@ class MultilineMessageCell: SwipeCollectionViewCell, UICollectionViewDataSource, eventMessageLabel = StyledLabel(VoipTheme.chat_conversation_forward_label) forwardView = UIView() forwardIcon = UIImageView(image: UIImage(named: "menu_forward_default")) - forwardLabel = StyledLabel(VoipTheme.chat_conversation_forward_label) replyView = UIView() replyIcon = UIImageView(image: UIImage(named: "menu_reply_default")) - replyLabel = StyledLabel(VoipTheme.chat_conversation_forward_label) replyContent = UIView() replyColorContent = UIView() replyLabelContent = StyledLabel(VoipTheme.chat_conversation_forward_label) @@ -825,7 +824,7 @@ class MultilineMessageCell: SwipeCollectionViewCell, UICollectionViewDataSource, contactDateLabel.size(w: 200, h: 0).done() } - bubble.backgroundColor = UIColor("D").withAlphaComponent(0.2) + bubble.backgroundColor = VoipTheme.gray_light_color//.withAlphaComponent(0.2) }else{ constraintLeadingBubble?.isActive = false constraintTrailingBubble?.isActive = true @@ -843,7 +842,7 @@ class MultilineMessageCell: SwipeCollectionViewCell, UICollectionViewDataSource, contactDateLabel.size(w: 200, h: 0).done() } - bubble.backgroundColor = UIColor("A").withAlphaComponent(0.2) + bubble.backgroundColor = VoipTheme.primary_light_color//.withAlphaComponent(0.2) displayImdnStatus(message: event.chatMessage!, state: event.chatMessage!.state) } diff --git a/Classes/Swift/Voip/Theme/VoipTheme.swift b/Classes/Swift/Voip/Theme/VoipTheme.swift index 30fbc2d75..ef507964c 100644 --- a/Classes/Swift/Voip/Theme/VoipTheme.swift +++ b/Classes/Swift/Voip/Theme/VoipTheme.swift @@ -45,6 +45,8 @@ import UIKit // General colors (used by VoIP) @objc static let primary_color = UIColor(hex:"#ff5e00") + @objc static let primary_light_color = UIColor(hex:"#ffdfcc") + @objc static let gray_light_color = UIColor(hex:"#e1e1e1") static let primary_dark_color = UIColor(hex:"#e65000") static let green_color = UIColor(hex:"#96c11f") static let dark_green_color = UIColor(hex:"#7d9f21") @@ -56,8 +58,8 @@ import UIKit static let voip_conference_invite_out = UIColor(hex:"ffeee5") static let voip_conference_invite_in = header_background_color static let voip_conference_updated = UIColor(hex:"#EFAE00") - static let voip_conference_cancelled_bg_color = UIColor(hex:"#FFE6E6") - static let voip_dark_color5 = UIColor(hex:"#353B3F") + static let voip_conference_cancelled_bg_color = UIColor(hex:"#FFE6E6") + static let voip_dark_color5 = UIColor(hex:"#353B3F") @@ -152,6 +154,7 @@ import UIKit static let chat_conversation_reply_content = TextStyle(fgColor: LightDarkColor(voip_dark_gray,.white), bgColor: LightDarkColor(.clear,.clear), allCaps: false, align: .left, font: fontName+"-Regular", size: 14.0) static let chat_conversation_recording_duration = TextStyle(fgColor: LightDarkColor(voip_dark_gray,.white), bgColor: LightDarkColor(.clear,.clear), allCaps: false, align: .left, font: fontName+"-Regular", size: 18.0) static let chat_conversation_forward_label = TextStyle(fgColor: LightDarkColor(voip_dark_gray,.white), bgColor: LightDarkColor(.clear,.clear), allCaps: false, align: .left, font: fontName+"-Regular", size: 12.0) + static let chat_conversation_black_text = TextStyle(fgColor: LightDarkColor(.black,.black), bgColor: LightDarkColor(.clear,.clear), allCaps: false, align: .left, font: fontName+"-Regular", size: 12.0) static let chat_conversation_download_button = TextStyle(fgColor: LightDarkColor(voip_dark_gray,.white), bgColor: LightDarkColor(.clear,.clear), allCaps: false, align: .center, font: fontName+"-Regular", size: 14.0) static let chat_conversation_download_progress_text = TextStyle(fgColor: LightDarkColor(voip_dark_gray,.white), bgColor: LightDarkColor(.clear,.clear), allCaps: false, align: .center, font: fontName+"-Regular", size: 12.0)