reskin: Rename RiotDesignValues -> ThemeService

This commit is contained in:
manuroe
2019-01-11 10:32:56 +01:00
parent eef759a8fa
commit 712a632120
123 changed files with 992 additions and 1004 deletions
@@ -17,7 +17,7 @@
#import "ContactsDataSource.h"
#import "ContactTableViewCell.h"
#import "RiotDesignValues.h"
#import "ThemeService.h"
#import "Riot-Swift.h"
#define CONTACTSDATASOURCE_LOCALCONTACTS_BITWISE 0x01
@@ -595,7 +595,7 @@
if (!tableViewCell)
{
tableViewCell = [[MXKTableViewCell alloc] init];
tableViewCell.textLabel.textColor = RiotDesignValues.theme.textSecondaryColor;
tableViewCell.textLabel.textColor = ThemeService.theme.textSecondaryColor;
tableViewCell.textLabel.font = [UIFont systemFontOfSize:15.0];
tableViewCell.selectionStyle = UITableViewCellSelectionStyleNone;
}
@@ -742,10 +742,10 @@
NSString *roomCount = [NSString stringWithFormat:roomCountFormat, count];
NSMutableAttributedString *mutableSectionTitle = [[NSMutableAttributedString alloc] initWithString:title
attributes:@{NSForegroundColorAttributeName : RiotDesignValues.theme.headerTextPrimaryColor,
attributes:@{NSForegroundColorAttributeName : ThemeService.theme.headerTextPrimaryColor,
NSFontAttributeName: [UIFont boldSystemFontOfSize:15.0]}];
[mutableSectionTitle appendAttributedString:[[NSMutableAttributedString alloc] initWithString:roomCount
attributes:@{NSForegroundColorAttributeName : RiotDesignValues.theme.headerTextSecondaryColor,
attributes:@{NSForegroundColorAttributeName : ThemeService.theme.headerTextSecondaryColor,
NSFontAttributeName: [UIFont boldSystemFontOfSize:15.0]}]];
sectionTitle = mutableSectionTitle;
@@ -753,7 +753,7 @@
else if (title)
{
sectionTitle = [[NSAttributedString alloc] initWithString:title
attributes:@{NSForegroundColorAttributeName : RiotDesignValues.theme.headerTextPrimaryColor,
attributes:@{NSForegroundColorAttributeName : ThemeService.theme.headerTextPrimaryColor,
NSFontAttributeName: [UIFont boldSystemFontOfSize:15.0]}];
}
@@ -767,7 +767,7 @@
NSInteger sectionBitwise = 0;
sectionHeader = [[UIView alloc] initWithFrame:frame];
sectionHeader.backgroundColor = RiotDesignValues.theme.headerBackgroundColor;
sectionHeader.backgroundColor = ThemeService.theme.headerBackgroundColor;
frame.origin.x = 20;
frame.origin.y = 5;
@@ -970,7 +970,7 @@
}
// Apply UI theme
checkboxLabel.textColor = RiotDesignValues.theme.textPrimaryColor;
checkboxLabel.textColor = ThemeService.theme.textPrimaryColor;
// Set the right value of the tick box
localContactsCheckbox.image = hideNonMatrixEnabledContacts ? [UIImage imageNamed:@"selection_tick"] : [UIImage imageNamed:@"selection_untick"];