reskin: ColorValues: suffix UIColor properties names with "Color"

This commit is contained in:
manuroe
2019-01-10 15:23:22 +01:00
parent 5147648085
commit a7fa1134cc
76 changed files with 218 additions and 217 deletions
@@ -27,7 +27,7 @@
[super customizeTableViewCellRendering];
self.userNameLabel.textColor = kRiotPrimaryTextColor;
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
@end
@@ -28,9 +28,9 @@
self.userNameLabel.textColor = kRiotPrimaryTextColor;
self.paginationLabel.textColor = RiotDesignValues.colorValues.accent;
self.paginationSeparatorView.backgroundColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.paginationLabel.textColor = RiotDesignValues.colorValues.tintColor;
self.paginationSeparatorView.backgroundColor = RiotDesignValues.colorValues.tintColor;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
- (void)render:(MXKCellData *)cellData
@@ -26,7 +26,7 @@
{
[super customizeTableViewCellRendering];
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
@end
@@ -27,7 +27,7 @@
[super customizeTableViewCellRendering];
self.userNameLabel.textColor = kRiotPrimaryTextColor;
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
@end
@@ -28,9 +28,9 @@
self.userNameLabel.textColor = kRiotPrimaryTextColor;
self.paginationLabel.textColor = RiotDesignValues.colorValues.accent;
self.paginationSeparatorView.backgroundColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.paginationLabel.textColor = RiotDesignValues.colorValues.tintColor;
self.paginationSeparatorView.backgroundColor = RiotDesignValues.colorValues.tintColor;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
- (void)render:(MXKCellData *)cellData
@@ -26,7 +26,7 @@
{
[super customizeTableViewCellRendering];
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
@end
@@ -26,7 +26,7 @@
{
[super customizeTableViewCellRendering];
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
@end
@@ -26,7 +26,7 @@
{
[super customizeTableViewCellRendering];
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
@end
@@ -41,7 +41,7 @@
{
[super customizeTableViewCellRendering];
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
- (void)prepareForReuse
@@ -30,7 +30,7 @@
{
[super customizeTableViewCellRendering];
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
- (void)layoutSubviews
@@ -27,8 +27,8 @@
{
[super customizeTableViewCellRendering];
self.paginationLabel.textColor = RiotDesignValues.colorValues.accent;
self.paginationSeparatorView.backgroundColor = RiotDesignValues.colorValues.accent;
self.paginationLabel.textColor = RiotDesignValues.colorValues.tintColor;
self.paginationSeparatorView.backgroundColor = RiotDesignValues.colorValues.tintColor;
}
- (void)render:(MXKCellData *)cellData
@@ -40,7 +40,7 @@ NSString *const kRoomMembershipExpandedBubbleCellTapOnCollapseButton = @"kRoomMe
self.separatorView.backgroundColor = kRiotSecondaryBgColor;
[self.collapseButton setTintColor:RiotDesignValues.colorValues.accent];
[self.collapseButton setTintColor:RiotDesignValues.colorValues.tintColor];
self.collapseButton.titleLabel.font = [UIFont systemFontOfSize:14];
}
@@ -27,8 +27,8 @@
{
[super customizeTableViewCellRendering];
self.paginationLabel.textColor = RiotDesignValues.colorValues.accent;
self.paginationSeparatorView.backgroundColor = RiotDesignValues.colorValues.accent;
self.paginationLabel.textColor = RiotDesignValues.colorValues.tintColor;
self.paginationSeparatorView.backgroundColor = RiotDesignValues.colorValues.tintColor;
}
- (void)render:(MXKCellData *)cellData
@@ -27,8 +27,8 @@
{
[super customizeTableViewCellRendering];
self.paginationLabel.textColor = RiotDesignValues.colorValues.accent;
self.paginationSeparatorView.backgroundColor = RiotDesignValues.colorValues.accent;
self.paginationLabel.textColor = RiotDesignValues.colorValues.tintColor;
self.paginationSeparatorView.backgroundColor = RiotDesignValues.colorValues.tintColor;
}
- (void)render:(MXKCellData *)cellData
@@ -27,7 +27,7 @@
[super customizeTableViewCellRendering];
self.userNameLabel.textColor = kRiotPrimaryTextColor;
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
- (void)render:(MXKCellData *)cellData
@@ -28,9 +28,9 @@
self.userNameLabel.textColor = kRiotPrimaryTextColor;
self.paginationLabel.textColor = RiotDesignValues.colorValues.accent;
self.paginationSeparatorView.backgroundColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.paginationLabel.textColor = RiotDesignValues.colorValues.tintColor;
self.paginationSeparatorView.backgroundColor = RiotDesignValues.colorValues.tintColor;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
- (void)render:(MXKCellData *)cellData
@@ -26,7 +26,7 @@
{
[super customizeTableViewCellRendering];
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
- (void)render:(MXKCellData *)cellData
@@ -27,7 +27,7 @@
[super customizeTableViewCellRendering];
self.userNameLabel.textColor = kRiotPrimaryTextColor;
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
@end
@@ -26,8 +26,8 @@
{
[super customizeTableViewCellRendering];
self.paginationLabel.textColor = RiotDesignValues.colorValues.accent;
self.paginationSeparatorView.backgroundColor = RiotDesignValues.colorValues.accent;
self.paginationLabel.textColor = RiotDesignValues.colorValues.tintColor;
self.paginationSeparatorView.backgroundColor = RiotDesignValues.colorValues.tintColor;
}
- (void)render:(MXKCellData *)cellData
@@ -26,7 +26,7 @@
{
[super customizeTableViewCellRendering];
self.messageTextView.tintColor = RiotDesignValues.colorValues.accent;
self.messageTextView.tintColor = RiotDesignValues.colorValues.tintColor;
}
@end
@@ -28,8 +28,8 @@
self.backgroundColor = kRiotSecondaryBgColor;
self.textView.backgroundColor = kRiotPrimaryBgColor;
self.textView.textColor = kRiotPrimaryTextColor;
self.redactButton.tintColor = RiotDesignValues.colorValues.accent;
self.closeButton.tintColor = RiotDesignValues.colorValues.accent;
self.redactButton.tintColor = RiotDesignValues.colorValues.tintColor;
self.closeButton.tintColor = RiotDesignValues.colorValues.tintColor;
}
@end
@@ -52,7 +52,7 @@
self.disabledReasonTextView.font = [UIFont systemFontOfSize:15];
self.disabledReasonTextView.textColor = kRiotPrimaryTextColor;
self.disabledReasonTextView.tintColor = RiotDesignValues.colorValues.accent;
self.disabledReasonTextView.tintColor = RiotDesignValues.colorValues.tintColor;
self.disabledReasonTextView.editable = NO;
self.disabledReasonTextView.scrollEnabled = NO;
}
@@ -72,8 +72,8 @@
self.rightInputToolbarButton.hidden = YES;
[self.rightInputToolbarButton setTitleColor:RiotDesignValues.colorValues.accent forState:UIControlStateNormal];
[self.rightInputToolbarButton setTitleColor:RiotDesignValues.colorValues.accent forState:UIControlStateHighlighted];
[self.rightInputToolbarButton setTitleColor:RiotDesignValues.colorValues.tintColor forState:UIControlStateNormal];
[self.rightInputToolbarButton setTitleColor:RiotDesignValues.colorValues.tintColor forState:UIControlStateHighlighted];
self.isEncryptionEnabled = _isEncryptionEnabled;
}
@@ -96,7 +96,7 @@
growingTextView.font = [UIFont systemFontOfSize:15];
growingTextView.textColor = kRiotPrimaryTextColor;
growingTextView.tintColor = RiotDesignValues.colorValues.accent;
growingTextView.tintColor = RiotDesignValues.colorValues.tintColor;
growingTextView.internalTextView.keyboardAppearance = kRiotKeyboard;
}
@@ -40,7 +40,7 @@
[super layoutSubviews];
self.membersListIcon.image = [MXKTools paintImage:self.membersListIcon.image
withColor:RiotDesignValues.colorValues.accent];
withColor:RiotDesignValues.colorValues.tintColor];
// TODO: paintImage does not work here because addParticipantIcon has 2 colors
// self.addParticipantIcon.image = [MXKTools paintImage:self.addParticipantIcon.image
@@ -52,7 +52,7 @@
[super customizeViewRendering];
self.roomTopic.textColor = kRiotTopicTextColor;
self.roomMembers.textColor = RiotDesignValues.colorValues.accent;
self.roomMembers.textColor = RiotDesignValues.colorValues.tintColor;
}
- (void)refreshDisplay
@@ -69,7 +69,7 @@
self.roomTopic.textColor = kRiotTopicTextColor;
self.roomMembers.textColor = RiotDesignValues.colorValues.accent;
self.roomMembers.textColor = RiotDesignValues.colorValues.tintColor;
self.previewLabel.textColor = kRiotTopicTextColor;
self.previewLabel.numberOfLines = 0;
@@ -81,11 +81,11 @@
[self.leftButton.layer setCornerRadius:5];
self.leftButton.clipsToBounds = YES;
self.leftButton.backgroundColor = RiotDesignValues.colorValues.accent;
self.leftButton.backgroundColor = RiotDesignValues.colorValues.tintColor;
[self.rightButton.layer setCornerRadius:5];
self.rightButton.clipsToBounds = YES;
self.rightButton.backgroundColor = RiotDesignValues.colorValues.accent;
self.rightButton.backgroundColor = RiotDesignValues.colorValues.tintColor;
}
- (void)refreshDisplay
@@ -103,7 +103,7 @@
toFitViewSize:self.roomAvatar.frame.size
withMethod:MXThumbnailingMethodCrop
previewImage:[MXKTools paintImage:[UIImage imageNamed:@"placeholder"]
withColor:RiotDesignValues.colorValues.accent]
withColor:RiotDesignValues.colorValues.tintColor]
mediaManager:self.mxRoom.mxSession.mediaManager];
}
else
@@ -73,7 +73,7 @@
[super layoutSubviews];
self.roomDetailsIconImageView.image = [MXKTools paintImage:self.roomDetailsIconImageView.image
withColor:RiotDesignValues.colorValues.accent];
withColor:RiotDesignValues.colorValues.tintColor];
if (self.superview)
{