From ce0c706f715f518015e51e0bb56f1eb4a9452611 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 2 Jul 2018 16:53:24 -0600 Subject: [PATCH] icon tint --- .../ConversationView/ConversationInputToolbar.m | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index 9c6ece9cf..96b43b06f 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -159,8 +159,11 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5; [self.attachmentButton addTarget:self action:@selector(attachmentButtonPressed) forControlEvents:UIControlEventTouchUpInside]; - [self.attachmentButton setImage:[UIImage imageNamed:@"btnAttachments--blue"] forState:UIControlStateNormal]; + UIImage *attachmentImage = [UIImage imageNamed:@"btnAttachments--blue"]; + [self.attachmentButton setImage:[attachmentImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] + forState:UIControlStateNormal]; self.attachmentButton.contentEdgeInsets = UIEdgeInsetsMake(0, 3, 0, 3); + self.attachmentButton.tintColor = UIColor.ows_navbarIconColor; [self.leftButtonWrapper addSubview:self.attachmentButton]; // TODO: Fix layout in this class. @@ -179,7 +182,7 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5; _voiceMemoButton = [UIButton buttonWithType:UIButtonTypeCustom]; [self.voiceMemoButton setImage:[voiceMemoIcon imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forState:UIControlStateNormal]; - self.voiceMemoButton.imageView.tintColor = [UIColor ows_materialBlueColor]; + self.voiceMemoButton.imageView.tintColor = UIColor.ows_navbarIconColor; [self.rightButtonWrapper addSubview:self.voiceMemoButton]; // We want to be permissive about the voice message gesture, so we hang