Merge pull request #492 from Adamant-im/dev/trello.com/c/yFdWu00S

IanaaDvlp · web-flow · commit 7b56bafa0539 · 2024-06-07T14:24:48.000+03:00
[trello.com/c/yFdWu00S] Fixed: reaction background color
diff --git a/Adamant/Modules/Chat/View/Subviews/ChatBaseMessage/ChatMessageCell.swift b/Adamant/Modules/Chat/View/Subviews/ChatBaseMessage/ChatMessageCell.swift
@@ -172,10 +172,7 @@ final class ChatMessageCell: TextMessageCell, ChatModelView {
     
     func updateOwnReaction() {
         ownReactionLabel.text = getReaction(for: model.address)
-        ownReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(
-            infusion: .lightGray,
-            alpha: 0.15
-        )
+        ownReactionLabel.backgroundColor = .adamant.pickedReactionBackground
     }
     
     func updateOpponentReaction() {
@@ -206,10 +203,7 @@ final class ChatMessageCell: TextMessageCell, ChatModelView {
         }
         
         opponentReactionLabel.attributedText = fullString
-        opponentReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(
-            infusion: .lightGray,
-            alpha: 0.15
-        )
+        opponentReactionLabel.backgroundColor = .adamant.pickedReactionBackground
     }
     
     func getSenderPublicKeyInReaction(for senderAddress: String) -> String? {
diff --git a/Adamant/Modules/Chat/View/Subviews/ChatReply/ChatMessageReplyCell.swift b/Adamant/Modules/Chat/View/Subviews/ChatReply/ChatMessageReplyCell.swift
@@ -250,10 +250,7 @@ final class ChatMessageReplyCell: MessageContentCell, ChatModelView {
     
     func updateOwnReaction() {
         ownReactionLabel.text = getReaction(for: model.address)
-        ownReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(
-            infusion: .lightGray,
-            alpha: 0.15
-        )
+        ownReactionLabel.backgroundColor = .adamant.pickedReactionBackground
     }
     
     func updateOpponentReaction() {
@@ -284,10 +281,7 @@ final class ChatMessageReplyCell: MessageContentCell, ChatModelView {
         }
         
         opponentReactionLabel.attributedText = fullString
-        opponentReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(
-            infusion: .lightGray,
-            alpha: 0.15
-        )
+        opponentReactionLabel.backgroundColor = .adamant.pickedReactionBackground
     }
     
     func getSenderPublicKeyInReaction(for senderAddress: String) -> String? {
diff --git a/Adamant/Modules/Chat/View/Subviews/ChatTransaction/Container/ChatTransactionContainerView.swift b/Adamant/Modules/Chat/View/Subviews/ChatTransaction/Container/ChatTransactionContainerView.swift
@@ -205,10 +205,7 @@ private extension ChatTransactionContainerView {
     
     func updateOwnReaction() {
         ownReactionLabel.text = getReaction(for: model.address)
-        ownReactionLabel.backgroundColor = model.content.backgroundColor.uiColor.mixin(
-            infusion: .lightGray,
-            alpha: 0.15
-        )
+        ownReactionLabel.backgroundColor = .adamant.pickedReactionBackground
     }
     
     func updateOpponentReaction() {
@@ -239,10 +236,7 @@ private extension ChatTransactionContainerView {
         }
         
         opponentReactionLabel.attributedText = fullString
-        opponentReactionLabel.backgroundColor = model.content.backgroundColor.uiColor.mixin(
-            infusion: .lightGray,
-            alpha: 0.15
-        )
+        opponentReactionLabel.backgroundColor = .adamant.pickedReactionBackground
     }
     
     func getSenderPublicKeyInReaction(for senderAddress: String) -> String? {
diff --git a/CommonKit/Sources/CommonKit/Helpers/UIHelpers/UIColor+adamant.swift b/CommonKit/Sources/CommonKit/Helpers/UIHelpers/UIColor+adamant.swift
@@ -119,8 +119,8 @@ extension UIColor {
         
         /// Picked reaction background color
         public static var pickedReactionBackground: UIColor {
-            let colorWhiteTheme  = UIColor(red: 0.88, green: 0.88, blue: 0.88, alpha: 1.0)
-            let colorDarkTheme   = UIColor(red: 0.278, green: 0.278, blue: 0.278, alpha: 1.0)
+            let colorWhiteTheme  = UIColor(red: 0.92, green: 0.925, blue: 0.93, alpha: 0.85)
+            let colorDarkTheme   = UIColor(red: 0.329, green: 0.329, blue: 0.329, alpha: 1.0)
             return returnColorByTheme(colorWhiteTheme: colorWhiteTheme, colorDarkTheme: colorDarkTheme)
         }
         

Original file line number	Diff line number	Diff line change
`@@ -172,10 +172,7 @@ final class ChatMessageCell: TextMessageCell, ChatModelView {`
`172`	`172`
`173`	`173`	`func updateOwnReaction() {`
`174`	`174`	`ownReactionLabel.text = getReaction(for: model.address)`
`175`		`- ownReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(`
`176`		`- infusion: .lightGray,`
`177`		`- alpha: 0.15`
`178`		`- )`
	`175`	`+ ownReactionLabel.backgroundColor = .adamant.pickedReactionBackground`
`179`	`176`	`}`
`180`	`177`
`181`	`178`	`func updateOpponentReaction() {`
`@@ -206,10 +203,7 @@ final class ChatMessageCell: TextMessageCell, ChatModelView {`
`206`	`203`	`}`
`207`	`204`
`208`	`205`	`opponentReactionLabel.attributedText = fullString`
`209`		`- opponentReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(`
`210`		`- infusion: .lightGray,`
`211`		`- alpha: 0.15`
`212`		`- )`
	`206`	`+ opponentReactionLabel.backgroundColor = .adamant.pickedReactionBackground`
`213`	`207`	`}`
`214`	`208`
`215`	`209`	`func getSenderPublicKeyInReaction(for senderAddress: String) -> String? {`
Original file line number	Diff line number	Diff line change
`@@ -250,10 +250,7 @@ final class ChatMessageReplyCell: MessageContentCell, ChatModelView {`
`250`	`250`
`251`	`251`	`func updateOwnReaction() {`
`252`	`252`	`ownReactionLabel.text = getReaction(for: model.address)`
`253`		`- ownReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(`
`254`		`- infusion: .lightGray,`
`255`		`- alpha: 0.15`
`256`		`- )`
	`253`	`+ ownReactionLabel.backgroundColor = .adamant.pickedReactionBackground`
`257`	`254`	`}`
`258`	`255`
`259`	`256`	`func updateOpponentReaction() {`
`@@ -284,10 +281,7 @@ final class ChatMessageReplyCell: MessageContentCell, ChatModelView {`
`284`	`281`	`}`
`285`	`282`
`286`	`283`	`opponentReactionLabel.attributedText = fullString`
`287`		`- opponentReactionLabel.backgroundColor = model.backgroundColor.uiColor.mixin(`
`288`		`- infusion: .lightGray,`
`289`		`- alpha: 0.15`
`290`		`- )`
	`284`	`+ opponentReactionLabel.backgroundColor = .adamant.pickedReactionBackground`
`291`	`285`	`}`
`292`	`286`
`293`	`287`	`func getSenderPublicKeyInReaction(for senderAddress: String) -> String? {`
Original file line number	Diff line number	Diff line change
`@@ -205,10 +205,7 @@ private extension ChatTransactionContainerView {`
`205`	`205`
`206`	`206`	`func updateOwnReaction() {`
`207`	`207`	`ownReactionLabel.text = getReaction(for: model.address)`
`208`		`- ownReactionLabel.backgroundColor = model.content.backgroundColor.uiColor.mixin(`
`209`		`- infusion: .lightGray,`
`210`		`- alpha: 0.15`
`211`		`- )`
	`208`	`+ ownReactionLabel.backgroundColor = .adamant.pickedReactionBackground`
`212`	`209`	`}`
`213`	`210`
`214`	`211`	`func updateOpponentReaction() {`
`@@ -239,10 +236,7 @@ private extension ChatTransactionContainerView {`
`239`	`236`	`}`
`240`	`237`
`241`	`238`	`opponentReactionLabel.attributedText = fullString`
`242`		`- opponentReactionLabel.backgroundColor = model.content.backgroundColor.uiColor.mixin(`
`243`		`- infusion: .lightGray,`
`244`		`- alpha: 0.15`
`245`		`- )`
	`239`	`+ opponentReactionLabel.backgroundColor = .adamant.pickedReactionBackground`
`246`	`240`	`}`
`247`	`241`
`248`	`242`	`func getSenderPublicKeyInReaction(for senderAddress: String) -> String? {`
Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,8 @@ extension UIColor {`
`119`	`119`
`120`	`120`	`/// Picked reaction background color`
`121`	`121`	`public static var pickedReactionBackground: UIColor {`
`122`		`- let colorWhiteTheme = UIColor(red: 0.88, green: 0.88, blue: 0.88, alpha: 1.0)`
`123`		`- let colorDarkTheme = UIColor(red: 0.278, green: 0.278, blue: 0.278, alpha: 1.0)`
	`122`	`+ let colorWhiteTheme = UIColor(red: 0.92, green: 0.925, blue: 0.93, alpha: 0.85)`
	`123`	`+ let colorDarkTheme = UIColor(red: 0.329, green: 0.329, blue: 0.329, alpha: 1.0)`
`124`	`124`	`return returnColorByTheme(colorWhiteTheme: colorWhiteTheme, colorDarkTheme: colorDarkTheme)`
`125`	`125`	`}`
`126`	`126`