Theme: Remove non needed reaction colors

This commit is contained in:
SBiOSoftWhare 2019-05-21 01:09:42 +02:00
parent 321811283a
commit 3117c4322c
4 changed files with 3 additions and 12 deletions

View file

@ -46,9 +46,6 @@ import UIKit
var noticeColor: UIColor { get }
var noticeSecondaryColor: UIColor { get }
var reactionButtonSelectedBackgroundColor: UIColor { get }
var reactionButtonSelectedBorderColor: UIColor { get }
/// Color for errors or warnings
var warningColor: UIColor { get }

View file

@ -39,15 +39,12 @@ class DarkTheme: NSObject, Theme {
var textSecondaryColor: UIColor = UIColor(rgb: 0xA1B2D1)
var tintColor: UIColor = UIColor(rgb: 0x03B381)
var tintBackgroundColor: UIColor = UIColor(rgb: 0xe9fff9)
var tintBackgroundColor: UIColor = UIColor(rgb: 0x1F6954)
var unreadRoomIndentColor: UIColor = UIColor(rgb: 0x2E3648)
var lineBreakColor: UIColor = UIColor(rgb: 0x61708B)
var noticeColor: UIColor = UIColor(rgb: 0xFF4B55)
var noticeSecondaryColor: UIColor = UIColor(rgb: 0x61708B)
var reactionButtonSelectedBackgroundColor: UIColor = UIColor(rgb: 0x1F6954)
var reactionButtonSelectedBorderColor: UIColor = UIColor(rgb: 0x03B381)
var warningColor: UIColor = UIColor(rgb: 0xFF4B55)

View file

@ -45,9 +45,6 @@ class DefaultTheme: NSObject, Theme {
var noticeColor: UIColor = UIColor(rgb: 0xFF4B55)
var noticeSecondaryColor: UIColor = UIColor(rgb: 0x61708B)
var reactionButtonSelectedBackgroundColor: UIColor = UIColor(rgb: 0xE9FFF9)
var reactionButtonSelectedBorderColor: UIColor = UIColor(rgb: 0x03B381)
var warningColor: UIColor = UIColor(rgb: 0xFF4B55)

View file

@ -81,7 +81,7 @@ final class BubbleReactionViewCell: UICollectionViewCell, NibReusable, Themable
func update(theme: Theme) {
self.theme = theme
self.reactionBackgroundView.layer.borderColor = self.theme?.reactionButtonSelectedBorderColor.cgColor
self.reactionBackgroundView.layer.borderColor = self.theme?.tintColor.cgColor
self.countLabel.textColor = self.theme?.textPrimaryColor
self.updateViews()
}
@ -94,7 +94,7 @@ final class BubbleReactionViewCell: UICollectionViewCell, NibReusable, Themable
let reactionBackgroundBorderWidth: CGFloat
if self.isReactionSelected {
reactionBackgroundColor = self.theme?.reactionButtonSelectedBackgroundColor
reactionBackgroundColor = self.theme?.tintBackgroundColor
reactionBackgroundBorderWidth = Constants.selectedBorderWidth
} else {
reactionBackgroundColor = self.theme?.headerBackgroundColor