Skip to content

Commit ca2905b

Browse files
wanghenghengwanghengheng
committed
还是颜色
1 parent ed660fe commit ca2905b

16 files changed

+23
-27
lines changed

‎Coding_iOS/AppDelegate.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,15 +250,15 @@ - (void)customizeInterface {
250250

251251
UINavigationBar *navigationBarAppearance = [UINavigationBar appearance];
252252
[navigationBarAppearance setBackgroundImage:[UIImage imageWithColor:[NSObject baseURLStrIsProduction]? kColorNavBG: kColorBrandGreen] forBarMetrics:UIBarMetricsDefault];
253-
[navigationBarAppearance setTintColor:[UIColor colorWithHexString:@"0x3bbc79"]];//返回按钮的箭头颜色
253+
[navigationBarAppearance setTintColor:kColorBrandGreen];//返回按钮的箭头颜色
254254
NSDictionary *textAttributes = @{
255255
NSFontAttributeName: [UIFont systemFontOfSize:kNavTitleFontSize],
256256
NSForegroundColorAttributeName: kColorNavTitle,
257257
};
258258
[navigationBarAppearance setTitleTextAttributes:textAttributes];
259259

260-
[[UITextField appearance] setTintColor:[UIColor colorWithHexString:@"0x3bbc79"]];//设置UITextField的光标颜色
261-
[[UITextView appearance] setTintColor:[UIColor colorWithHexString:@"0x3bbc79"]];//设置UITextView的光标颜色
260+
[[UITextField appearance] setTintColor:kColorBrandGreen];//设置UITextField的光标颜色
261+
[[UITextView appearance] setTintColor:kColorBrandGreen];//设置UITextView的光标颜色
262262
[[UISearchBar appearance] setBackgroundImage:[UIImage imageWithColor:kColorTableSectionBg] forBarPosition:0 barMetrics:UIBarMetricsDefault];
263263
}
264264

‎Coding_iOS/Coding_iOS-Prefix.pch.example

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,16 @@
119119

120120
#define kDefaultLastId [NSNumber numberWithInteger:99999999]
121121

122+
#define kColorNavBG [UIColor colorWithHexString:@"0xFAFAFA"]
123+
#define kColorNavTitle [UIColor colorWithHexString:@"0x323A45"]
124+
#define kColorTableBG [UIColor colorWithHexString:@"0xFFFFFF"]
125+
#define kColorTableSectionBg [UIColor colorWithHexString:@"0xF2F4F6"]
122126
#define kColor222 [UIColor colorWithHexString:@"0x222222"]
123127
#define kColor666 [UIColor colorWithHexString:@"0x666666"]
124128
#define kColor999 [UIColor colorWithHexString:@"0x999999"]
125129
#define kColorDDD [UIColor colorWithHexString:@"0xDDDDDD"]
126-
#define kColorTableBG [UIColor colorWithHexString:@"0xFFFFFF"]
127-
#define kColorTableSectionBg [UIColor colorWithHexString:@"0xF2F4F6"]
128130
#define kColorBrandGreen [UIColor colorWithHexString:@"0x3BBD79"]
129-
#define kColorNavBG [UIColor colorWithHexString:@"0xFAFAFA"]
130-
#define kColorNavTitle [UIColor colorWithHexString:@"0x323A45"]
131+
#define kColorBrandRed [UIColor colorWithHexString:@"0xFF5846"]
131132

132133
#define kPlaceholderMonkeyRoundWidth(_width_) [UIImage imageNamed:[NSString stringWithFormat:@"placeholder_monkey_round_%.0f", _width_]]
133134
#define kPlaceholderMonkeyRoundView(_view_) [UIImage imageNamed:[NSString stringWithFormat:@"placeholder_monkey_round_%.0f", CGRectGetWidth(_view_.frame)]]

‎Coding_iOS/Controllers/EditLabelViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ - (NSArray *)rightButtons
221221
{
222222
NSMutableArray *rightUtilityButtons = [NSMutableArray new];
223223
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
224-
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
224+
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
225225
return rightUtilityButtons;
226226
}
227227

‎Coding_iOS/Controllers/FileListViewController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,12 +567,12 @@ - (NSArray *)rightButtonsWithObj:(id)obj{
567567
ProjectFolder *folder = (ProjectFolder *)obj;
568568
if (![folder isDefaultFolder]) {
569569
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
570-
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
570+
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
571571
}
572572
}else{
573573
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorDDD icon:[UIImage imageNamed:@"icon_file_cell_move"]];
574574
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
575-
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
575+
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
576576
}
577577
return rightUtilityButtons;
578578
}

‎Coding_iOS/Controllers/FileVersionsViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ - (NSArray *)rightButtonsWithObj:(NSIndexPath *)indexPath{
131131
NSMutableArray *rightUtilityButtons = [NSMutableArray new];
132132
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
133133
if (indexPath.row != 0) {//当前版本不能删除
134-
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
134+
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
135135
}
136136
return rightUtilityButtons;
137137
}

‎Coding_iOS/Controllers/ProjectMemberListViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ - (NSArray *)rightButtonsWithObj:(ProjectMember *)mem{
330330
}
331331
if (canDelete) {
332332
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xF0F0F0"] icon:[UIImage imageNamed:@"member_cell_edit_type"]];
333-
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"member_cell_edit_remove"]];
333+
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"member_cell_edit_remove"]];
334334
}
335335
return rightUtilityButtons;
336336
}

‎Coding_iOS/Controllers/Shop/ExchangeGoodsViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ - (void)viewDidLoad {
101101
UIView *footView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(_myTableView.frame), 136/2)];
102102
_shopOrderBtn = ({
103103
UIButton *orderBtn = [UIButton buttonWithType:UIButtonTypeCustom];
104-
[orderBtn setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithHexString:@"0xFF3BBD79"]] forState:UIControlStateNormal];
104+
[orderBtn setBackgroundImage:[UIImage imageWithColor:kColorBrandGreen] forState:UIControlStateNormal];
105105
[orderBtn addTarget:self action:@selector(orderCommitAction:) forControlEvents:UIControlEventTouchUpInside];
106106
[orderBtn setTitle:@"提交订单" forState:UIControlStateNormal];
107107
[orderBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];

‎Coding_iOS/Controllers/Shop/LocationViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ - (void)viewDidLoad{
3232
tableView.dataSource = self;
3333
[tableView registerClass:[LocationCell class] forCellReuseIdentifier:kCellIdentifier_LocationCell];
3434
tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine;
35-
tableView.separatorColor = [UIColor colorWithHexString:@"0xFFDDDDDD"];
35+
tableView.separatorColor = [UIColor colorWithHexString:@"0xDDDDDD"];
3636
tableView.separatorInset = UIEdgeInsetsMake(0, 12, 0, 12);
3737
[self.view addSubview:tableView];
3838
[tableView mas_makeConstraints:^(MASConstraintMaker *make) {

‎Coding_iOS/Util/OC_Category/UIButton+Bootstrap.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ -(void)primaryStyle{
3737
-(void)successStyle{
3838
[self bootstrapStyle];
3939
self.layer.borderColor = [[UIColor clearColor] CGColor];
40-
[self setBackgroundImage:[self buttonImageFromColor:[UIColor colorWithHexString:@"0x3bbc79"]] forState:UIControlStateNormal];
40+
[self setBackgroundImage:[self buttonImageFromColor:kColorBrandGreen] forState:UIControlStateNormal];
4141
[self setBackgroundImage:[self buttonImageFromColor:[UIColor colorWithHexString:@"0x3bbc79" andAlpha:0.5]] forState:UIControlStateDisabled];
4242
[self setBackgroundImage:[self buttonImageFromColor:[UIColor colorWithHexString:@"0x32a067"]] forState:UIControlStateHighlighted];
4343
[self setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];

‎Coding_iOS/Util/OC_Category/UIViewController+Swizzle.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ - (UIBarButtonItem *)backButton{
4747
if ([temporaryBarButtonItem respondsToSelector:@selector(setTitleTextAttributes:forState:)]){
4848
textAttributes = @{
4949
NSFontAttributeName: [UIFont systemFontOfSize:kBackButtonFontSize],
50-
NSForegroundColorAttributeName: [UIColor colorWithHexString:@"0x3bbc79"],
50+
NSForegroundColorAttributeName: kColorBrandGreen,
5151
};
5252

5353
[[UIBarButtonItem appearance] setTitleTextAttributes:textAttributes forState:UIControlStateNormal];
@@ -71,4 +71,4 @@ void swizzleAllViewController()
7171
Swizzle([UIViewController class], @selector(viewDidAppear:), @selector(customViewDidAppear:));
7272
Swizzle([UIViewController class], @selector(viewWillDisappear:), @selector(customViewWillDisappear:));
7373
Swizzle([UIViewController class], @selector(viewWillAppear:), @selector(customviewWillAppear:));
74-
}
74+
}

‎Coding_iOS/Vendor/AGEmojiKeyboard/AGEmojiKeyBoardView.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ - (void)setSelectedIndex:(NSInteger)selectedIndex{
453453
UIButton *tabButton = self.tabButtons[i];
454454
if (i==selectedIndex) {
455455
[tabButton setImage:self.selectedImages[i] forState:UIControlStateNormal];
456-
[tabButton setBackgroundColor:[UIColor colorWithHexString:@"0xe5e5e5"]];
456+
[tabButton setBackgroundColor:kColorTableSectionBg];
457457
}else{
458458
[tabButton setImage:self.unSelectedImages[i] forState:UIControlStateNormal];
459459
[tabButton setBackgroundColor:[UIColor clearColor]];

‎Coding_iOS/Vendor/KxMenu/KxMenu.m

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -537,13 +537,8 @@ - (UIView *) mkContentView
537537
}
538538

539539
if (itemNum < _menuItems.count - 1) {
540-
// UIView *lineView=[UIView new];
541-
// lineView.backgroundColor=[UIColor colorWithHexString:@"0xffffff" andAlpha:0.2];
542-
// lineView.frame=CGRectMake(0, maxItemHeight + 0.3, 160, 0.5);
543-
// [itemView addSubview:lineView];
544540
itemY += 2;
545541
}
546-
547542
itemY += maxItemHeight;
548543
++itemNum;
549544
}

‎Coding_iOS/Views/Cell/LocalFileCell.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
5151
}];
5252

5353
NSMutableArray *rightUtilityButtons = [NSMutableArray new];
54-
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
54+
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
5555
[self setRightUtilityButtons:rightUtilityButtons WithButtonWidth:[LocalFileCell cellHeight]];
5656
}
5757
return self;

‎Coding_iOS/Views/Cell/LocalFolderCell.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
4444
make.height.mas_equalTo(30);
4545
}];
4646
NSMutableArray *rightUtilityButtons = [NSMutableArray new];
47-
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
47+
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
4848
[self setRightUtilityButtons:rightUtilityButtons WithButtonWidth:[LocalFolderCell cellHeight]];
4949
}
5050
return self;

‎Coding_iOS/Views/CodingShareView.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ - (instancetype)init
5757
}
5858
if (!_contentView) {
5959
_contentView = [UIView new];
60-
_contentView.backgroundColor = [UIColor colorWithHexString:@"0xF0F0F0"];
60+
_contentView.backgroundColor = kColorTableSectionBg;
6161
if (!_titleL) {
6262
_titleL = ({
6363
UILabel *label = [UILabel new];

‎Coding_iOS/Views/TableListView/ProjectFolderListView.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ - (NSArray *)rightButtonsWithObj:(id)obj{
115115
ProjectFolder *folder = (ProjectFolder *)obj;
116116
if (![folder isDefaultFolder]) {
117117
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
118-
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
118+
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
119119
}
120120
}
121121
return rightUtilityButtons;

0 commit comments

Comments
 (0)