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

Reskin: Kill kRiotColorGreen and use RiotDesignValues.colorValues.accent instead

Browse Source
This commit is contained in:
manuroe
2018-11-30 17:10:28 +01:00
parent 9fea29617e
commit a28271afcb
62 changed files with 170 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m
+2 -1
View File
@@ -17,6 +17,7 @@
#import "DeactivateAccountViewController.h"
#import "RiotDesignValues.h"
#import "Riot-Swift.h"
#import "AppDelegate.h"
#pragma mark - Defines & Constants
@@ -165,7 +166,7 @@ static CGFloat const kTextFontSize = 15.0;
self.deactivateAcccountButton.titleLabel.baselineAdjustment = UIBaselineAdjustmentAlignCenters;
self.deactivateAcccountButton.layer.masksToBounds = YES;
self.deactivateAcccountButton.backgroundColor = kRiotColorGreen;
self.deactivateAcccountButton.backgroundColor = RiotDesignValues.colorValues.accent;
[self.deactivateAcccountButton setTitle:NSLocalizedStringFromTable(@"deactivate_account_validate_action", @"Vector", nil) forState:UIControlStateNormal];
[self.deactivateAcccountButton setTitleColor:kRiotAuxiliaryColor forState:UIControlStateDisabled];
}
Riot/Modules/Settings/SettingsViewController.m
+7 -7
View File
@@ -1404,7 +1404,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
[signOutCell.mxkButton setTitle:title forState:UIControlStateNormal];
[signOutCell.mxkButton setTitle:title forState:UIControlStateHighlighted];
[signOutCell.mxkButton setTintColor:kRiotColorGreen];
[signOutCell.mxkButton setTintColor:RiotDesignValues.colorValues.accent];
signOutCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
[signOutCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -1559,7 +1559,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
newEmailTextField = newEmailCell.mxkTextField;
}
UIImage *accessoryViewImage = [MXKTools paintImage:[UIImage imageNamed:@"plus_icon"] withColor:kRiotColorGreen];
UIImage *accessoryViewImage = [MXKTools paintImage:[UIImage imageNamed:@"plus_icon"] withColor:RiotDesignValues.colorValues.accent];
newEmailCell.accessoryView = [[UIImageView alloc] initWithImage:accessoryViewImage];
}
@@ -1652,7 +1652,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
newPhoneNumberCell = newPhoneCell;
}
UIImage *accessoryViewImage = [MXKTools paintImage:[UIImage imageNamed:@"plus_icon"] withColor:kRiotColorGreen];
UIImage *accessoryViewImage = [MXKTools paintImage:[UIImage imageNamed:@"plus_icon"] withColor:RiotDesignValues.colorValues.accent];
newPhoneCell.accessoryView = [[UIImageView alloc] initWithImage:accessoryViewImage];
cell = newPhoneCell;
@@ -1998,7 +1998,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
NSString *btnTitle = NSLocalizedStringFromTable(@"settings_mark_all_as_read", @"Vector", nil);
[markAllBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
[markAllBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
[markAllBtnCell.mxkButton setTintColor:kRiotColorGreen];
[markAllBtnCell.mxkButton setTintColor:RiotDesignValues.colorValues.accent];
markAllBtnCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
[markAllBtnCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -2023,7 +2023,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
NSString *btnTitle = NSLocalizedStringFromTable(@"settings_clear_cache", @"Vector", nil);
[clearCacheBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
[clearCacheBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
[clearCacheBtnCell.mxkButton setTintColor:kRiotColorGreen];
[clearCacheBtnCell.mxkButton setTintColor:RiotDesignValues.colorValues.accent];
clearCacheBtnCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
[clearCacheBtnCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -2048,7 +2048,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
NSString *btnTitle = NSLocalizedStringFromTable(@"settings_report_bug", @"Vector", nil);
[reportBugBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
[reportBugBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
[reportBugBtnCell.mxkButton setTintColor:kRiotColorGreen];
[reportBugBtnCell.mxkButton setTintColor:RiotDesignValues.colorValues.accent];
reportBugBtnCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
[reportBugBtnCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
@@ -2186,7 +2186,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
NSString *btnTitle = NSLocalizedStringFromTable(@"settings_crypto_export", @"Vector", nil);
[exportKeysBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateNormal];
[exportKeysBtnCell.mxkButton setTitle:btnTitle forState:UIControlStateHighlighted];
[exportKeysBtnCell.mxkButton setTintColor:kRiotColorGreen];
[exportKeysBtnCell.mxkButton setTintColor:RiotDesignValues.colorValues.accent];
exportKeysBtnCell.mxkButton.titleLabel.font = [UIFont systemFontOfSize:17];
[exportKeysBtnCell.mxkButton removeTarget:self action:nil forControlEvents:UIControlEventTouchUpInside];
Riot/Modules/Settings/Views/DeviceView.m
+4 -3
View File
@@ -18,6 +18,7 @@
#import "DeviceView.h"
#import "RiotDesignValues.h"
#import "Riot-Swift.h"
@implementation DeviceView
@@ -30,9 +31,9 @@
self.containerView.backgroundColor = kRiotSecondaryBgColor;
self.textView.backgroundColor = kRiotPrimaryBgColor;
self.defaultTextColor = kRiotPrimaryTextColor;
self.cancelButton.tintColor = kRiotColorGreen;
self.deleteButton.tintColor = kRiotColorGreen;
self.renameButton.tintColor = kRiotColorGreen;
self.cancelButton.tintColor = RiotDesignValues.colorValues.accent;
self.deleteButton.tintColor = RiotDesignValues.colorValues.accent;
self.renameButton.tintColor = RiotDesignValues.colorValues.accent;
}
@end