reskin: kill last customisable kRiotXColors

This commit is contained in:
manuroe
2019-01-10 18:47:49 +01:00
parent 96880a4e2c
commit 109954d667
40 changed files with 136 additions and 137 deletions
@@ -62,7 +62,7 @@
[RiotDesignValues.theme applyStyleOnNavigationBar:self.navigationController.navigationBar];
self.view.backgroundColor = RiotDesignValues.theme.backgroundColor;
self.activityIndicator.backgroundColor = kRiotOverlayColor;
self.activityIndicator.backgroundColor = RiotDesignValues.theme.overlayBackgroundColor;
self.backButton.tintColor = RiotDesignValues.theme.tintColor;
}
@@ -112,7 +112,7 @@
{
[RiotDesignValues.theme applyStyleOnNavigationBar:self.navigationController.navigationBar];
self.activityIndicator.backgroundColor = kRiotOverlayColor;
self.activityIndicator.backgroundColor = RiotDesignValues.theme.overlayBackgroundColor;
// Check the table view style to select its bg color.
self.bubblesTableView.backgroundColor = ((self.bubblesTableView.style == UITableViewStylePlain) ? RiotDesignValues.theme.backgroundColor : RiotDesignValues.theme.headerBackgroundColor);
@@ -196,10 +196,10 @@
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
if (RiotDesignValues.theme.selectedBackgroundColor)
{
cell.selectedBackgroundView = [[UIView alloc] init];
cell.selectedBackgroundView.backgroundColor = kRiotSelectedBgColor;
cell.selectedBackgroundView.backgroundColor = RiotDesignValues.theme.selectedBackgroundColor;
}
else
{
@@ -221,7 +221,7 @@
[RiotDesignValues.theme applyStyleOnNavigationBar:self.navigationController.navigationBar];
self.navigationController.navigationBar.translucent = YES;
self.activityIndicator.backgroundColor = kRiotOverlayColor;
self.activityIndicator.backgroundColor = RiotDesignValues.theme.overlayBackgroundColor;
self.memberHeaderView.backgroundColor = RiotDesignValues.theme.baseColor;
self.roomMemberNameLabel.textColor = RiotDesignValues.theme.textPrimaryColor;
@@ -846,10 +846,10 @@
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
if (RiotDesignValues.theme.selectedBackgroundColor)
{
cell.selectedBackgroundView = [[UIView alloc] init];
cell.selectedBackgroundView.backgroundColor = kRiotSelectedBgColor;
cell.selectedBackgroundView.backgroundColor = RiotDesignValues.theme.selectedBackgroundColor;
}
else
{
@@ -159,7 +159,7 @@
{
[RiotDesignValues.theme applyStyleOnNavigationBar:self.navigationController.navigationBar];
self.activityIndicator.backgroundColor = kRiotOverlayColor;
self.activityIndicator.backgroundColor = RiotDesignValues.theme.overlayBackgroundColor;
[self refreshSearchBarItemsColor:_searchBarView];
@@ -1178,10 +1178,10 @@
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
if (RiotDesignValues.theme.selectedBackgroundColor)
{
cell.selectedBackgroundView = [[UIView alloc] init];
cell.selectedBackgroundView.backgroundColor = kRiotSelectedBgColor;
cell.selectedBackgroundView.backgroundColor = RiotDesignValues.theme.selectedBackgroundColor;
}
else
{
@@ -96,9 +96,9 @@
{
[RiotDesignValues.theme applyStyleOnNavigationBar:self.navigationController.navigationBar];
self.activityIndicator.backgroundColor = kRiotOverlayColor;
self.activityIndicator.backgroundColor = RiotDesignValues.theme.overlayBackgroundColor;
self.overlayView.backgroundColor = kRiotOverlayColor;
self.overlayView.backgroundColor = RiotDesignValues.theme.overlayBackgroundColor;
self.overlayView.alpha = 1.0;
self.titleLabel.textColor = RiotDesignValues.theme.textPrimaryColor;
@@ -243,10 +243,10 @@
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
if (RiotDesignValues.theme.selectedBackgroundColor)
{
cell.selectedBackgroundView = [[UIView alloc] init];
cell.selectedBackgroundView.backgroundColor = kRiotSelectedBgColor;
cell.selectedBackgroundView.backgroundColor = RiotDesignValues.theme.selectedBackgroundColor;
}
else
{
+3 -3
View File
@@ -421,7 +421,7 @@
[RiotDesignValues.theme applyStyleOnNavigationBar:self.navigationController.navigationBar];
self.navigationController.navigationBar.translucent = YES;
self.activityIndicator.backgroundColor = kRiotOverlayColor;
self.activityIndicator.backgroundColor = RiotDesignValues.theme.overlayBackgroundColor;
// Prepare jump to last unread banner
self.jumpToLastUnreadBannerContainer.backgroundColor = RiotDesignValues.theme.backgroundColor;
@@ -3341,10 +3341,10 @@
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
if (RiotDesignValues.theme.selectedBackgroundColor)
{
cell.selectedBackgroundView = [[UIView alloc] init];
cell.selectedBackgroundView.backgroundColor = kRiotSelectedBgColor;
cell.selectedBackgroundView.backgroundColor = RiotDesignValues.theme.selectedBackgroundColor;
}
else
{
@@ -74,7 +74,7 @@
{
[RiotDesignValues.theme applyStyleOnNavigationBar:self.navigationController.navigationBar];
self.activityIndicator.backgroundColor = kRiotOverlayColor;
self.activityIndicator.backgroundColor = RiotDesignValues.theme.overlayBackgroundColor;
// Check the table view style to select its bg color.
self.searchTableView.backgroundColor = ((self.searchTableView.style == UITableViewStylePlain) ? RiotDesignValues.theme.backgroundColor : RiotDesignValues.theme.headerBackgroundColor);
@@ -149,10 +149,10 @@
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
if (RiotDesignValues.theme.selectedBackgroundColor)
{
cell.selectedBackgroundView = [[UIView alloc] init];
cell.selectedBackgroundView.backgroundColor = kRiotSelectedBgColor;
cell.selectedBackgroundView.backgroundColor = RiotDesignValues.theme.selectedBackgroundColor;
}
else
{
@@ -75,7 +75,7 @@
{
[RiotDesignValues.theme applyStyleOnNavigationBar:self.navigationController.navigationBar];
self.activityIndicator.backgroundColor = kRiotOverlayColor;
self.activityIndicator.backgroundColor = RiotDesignValues.theme.overlayBackgroundColor;
// Check the table view style to select its bg color.
self.searchTableView.backgroundColor = ((self.searchTableView.style == UITableViewStylePlain) ? RiotDesignValues.theme.backgroundColor : RiotDesignValues.theme.headerBackgroundColor);
@@ -176,10 +176,10 @@
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
if (RiotDesignValues.theme.selectedBackgroundColor)
{
cell.selectedBackgroundView = [[UIView alloc] init];
cell.selectedBackgroundView.backgroundColor = kRiotSelectedBgColor;
cell.selectedBackgroundView.backgroundColor = RiotDesignValues.theme.selectedBackgroundColor;
}
else
{
@@ -268,7 +268,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
{
[RiotDesignValues.theme applyStyleOnNavigationBar:self.navigationController.navigationBar];
self.activityIndicator.backgroundColor = kRiotOverlayColor;
self.activityIndicator.backgroundColor = RiotDesignValues.theme.overlayBackgroundColor;
// Check the table view style to select its bg color.
self.tableView.backgroundColor = ((self.tableView.style == UITableViewStylePlain) ? RiotDesignValues.theme.backgroundColor : RiotDesignValues.theme.headerBackgroundColor);
@@ -2499,11 +2499,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
addAddressTextField = addAddressCell.mxkTextField;
addAddressTextField.placeholder = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_details_new_address_placeholder", @"Vector", nil), self.mainSession.matrixRestClient.homeserverSuffix];
if (kRiotPlaceholderTextColor)
if (RiotDesignValues.theme.placeholderTextColor)
{
addAddressTextField.attributedPlaceholder = [[NSAttributedString alloc]
initWithString:addAddressTextField.placeholder
attributes:@{NSForegroundColorAttributeName: kRiotPlaceholderTextColor}];
attributes:@{NSForegroundColorAttributeName: RiotDesignValues.theme.placeholderTextColor}];
}
addAddressTextField.userInteractionEnabled = YES;
addAddressTextField.text = currentValue;
@@ -2590,11 +2590,11 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
addGroupTextField = addCommunityCell.mxkTextField;
addGroupTextField.placeholder = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_details_new_flair_placeholder", @"Vector", nil), self.mainSession.matrixRestClient.homeserverSuffix];
if (kRiotPlaceholderTextColor)
if (RiotDesignValues.theme.placeholderTextColor)
{
addGroupTextField.attributedPlaceholder = [[NSAttributedString alloc]
initWithString:addGroupTextField.placeholder
attributes:@{NSForegroundColorAttributeName: kRiotPlaceholderTextColor}];
attributes:@{NSForegroundColorAttributeName: RiotDesignValues.theme.placeholderTextColor}];
}
addGroupTextField.userInteractionEnabled = YES;
addGroupTextField.text = currentValue;
@@ -2825,10 +2825,10 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
cell.backgroundColor = RiotDesignValues.theme.backgroundColor;
// Update the selected background view
if (kRiotSelectedBgColor)
if (RiotDesignValues.theme.selectedBackgroundColor)
{
cell.selectedBackgroundView = [[UIView alloc] init];
cell.selectedBackgroundView.backgroundColor = kRiotSelectedBgColor;
cell.selectedBackgroundView.backgroundColor = RiotDesignValues.theme.selectedBackgroundColor;
}
else
{