felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-23 01:52:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

reskin: kill riotColorRed & riotColorPinkRed

Browse Source 
Merge them into Theme.warningColor

Part of #2174
This commit is contained in:
manuroe
2019-01-18 13:40:09 +01:00
parent bee50c3c45
commit ad1969fbc8
15 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
+11 -11
View File
@@ -113,7 +113,7 @@
[super customizeViewRendering];
self.separatorView.backgroundColor = ThemeService.shared.theme.headerBackgroundColor;
if (self.messageLabel.textColor != ThemeService.shared.riotColorPinkRed)
if (self.messageLabel.textColor != ThemeService.shared.theme.warningColor)
{
self.messageLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
}
@@ -145,18 +145,18 @@
[tappableNotif addAttribute:NSLinkAttributeName value:@"onCancelLink" range:range];
NSRange wholeString = NSMakeRange(0, tappableNotif.length);
[tappableNotif addAttribute:NSForegroundColorAttributeName value:ThemeService.shared.riotColorPinkRed range:wholeString];
[tappableNotif addAttribute:NSForegroundColorAttributeName value:ThemeService.shared.theme.warningColor range:wholeString];
[tappableNotif addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:15] range:wholeString];
self.messageTextView.attributedText = tappableNotif;
self.messageTextView.tintColor = ThemeService.shared.riotColorPinkRed;
self.messageTextView.tintColor = ThemeService.shared.theme.warningColor;
self.messageTextView.hidden = NO;
self.messageTextView.backgroundColor = [UIColor clearColor];
}
else
{
self.messageLabel.text = notification;
self.messageLabel.textColor = ThemeService.shared.riotColorPinkRed;
self.messageLabel.textColor = ThemeService.shared.theme.warningColor;
self.messageLabel.hidden = NO;
}
@@ -187,7 +187,7 @@
{
self.iconImageView.image = [UIImage imageNamed:@"error"];
self.messageLabel.text = labelText;
self.messageLabel.textColor = ThemeService.shared.riotColorPinkRed;
self.messageLabel.textColor = ThemeService.shared.theme.warningColor;
self.iconImageView.hidden = NO;
self.messageLabel.hidden = NO;
@@ -261,15 +261,15 @@
// Display the string in white on pink red
NSRange wholeString = NSMakeRange(0, onGoingConferenceCallAttibutedString.length);
[onGoingConferenceCallAttibutedString addAttribute:NSForegroundColorAttributeName value:ThemeService.shared.theme.backgroundColor range:wholeString];
[onGoingConferenceCallAttibutedString addAttribute:NSBackgroundColorAttributeName value:ThemeService.shared.riotColorPinkRed range:wholeString];
[onGoingConferenceCallAttibutedString addAttribute:NSBackgroundColorAttributeName value:ThemeService.shared.theme.warningColor range:wholeString];
[onGoingConferenceCallAttibutedString addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:15] range:wholeString];
self.messageTextView.attributedText = onGoingConferenceCallAttibutedString;
self.messageTextView.tintColor = ThemeService.shared.theme.backgroundColor;
self.messageTextView.hidden = NO;
self.backgroundColor = ThemeService.shared.riotColorPinkRed;
self.messageTextView.backgroundColor = ThemeService.shared.riotColorPinkRed;
self.backgroundColor = ThemeService.shared.theme.warningColor;
self.messageTextView.backgroundColor = ThemeService.shared.theme.warningColor;
// Hide the separator to display correctly the red pink conf call banner
self.separatorView.hidden = YES;
@@ -295,7 +295,7 @@
notification = NSLocalizedStringFromTable(@"room_new_message_notification", @"Vector", nil);
}
self.messageLabel.text = [NSString stringWithFormat:notification, newMessagesCount];
self.messageLabel.textColor = ThemeService.shared.riotColorPinkRed;
self.messageLabel.textColor = ThemeService.shared.theme.warningColor;
self.messageLabel.hidden = NO;
}
else
@@ -487,8 +487,8 @@
if (hardLimit)
{
self.backgroundColor = ThemeService.shared.riotColorPinkRed;
self.messageTextView.backgroundColor = ThemeService.shared.riotColorPinkRed;
self.backgroundColor = ThemeService.shared.theme.warningColor;
self.messageTextView.backgroundColor = ThemeService.shared.theme.warningColor;
}
else
{