Skip to content

Commit 5956d07

Browse files
wanghenghengwanghengheng
committed
换颜色。。换图
1 parent 788b47e commit 5956d07

File tree

14 files changed

+15
-18
lines changed

14 files changed

+15
-18
lines changed

‎Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,6 @@
943943
8EA6D18019E240C40076D59C /* sex_man_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CF9819E240C40076D59C /* sex_man_icon@2x.png */; };
944944
8EA6D18119E240C40076D59C /* sex_woman_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CF9919E240C40076D59C /* sex_woman_icon@2x.png */; };
945945
8EA6D18219E240C40076D59C /* splitlineImg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CF9A19E240C40076D59C /* splitlineImg@2x.png */; };
946-
8EA6D18D19E240C40076D59C /* tabbar_background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CFA619E240C40076D59C /* tabbar_background@2x.png */; };
947946
8EA6D18F19E240C40076D59C /* tasks_all@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CFA819E240C40076D59C /* tasks_all@2x.png */; };
948947
8EA6D19119E240C40076D59C /* timeline_icon_read@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CFAB19E240C40076D59C /* timeline_icon_read@2x.png */; };
949948
8EA6D19219E240C40076D59C /* timeline_icon_unread@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CFAC19E240C40076D59C /* timeline_icon_unread@2x.png */; };
@@ -2551,7 +2550,6 @@
25512550
8EA6CF9819E240C40076D59C /* sex_man_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sex_man_icon@2x.png"; sourceTree = "<group>"; };
25522551
8EA6CF9919E240C40076D59C /* sex_woman_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sex_woman_icon@2x.png"; sourceTree = "<group>"; };
25532552
8EA6CF9A19E240C40076D59C /* splitlineImg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "splitlineImg@2x.png"; sourceTree = "<group>"; };
2554-
8EA6CFA619E240C40076D59C /* tabbar_background@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tabbar_background@2x.png"; sourceTree = "<group>"; };
25552553
8EA6CFA819E240C40076D59C /* tasks_all@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tasks_all@2x.png"; sourceTree = "<group>"; };
25562554
8EA6CFAB19E240C40076D59C /* timeline_icon_read@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "timeline_icon_read@2x.png"; sourceTree = "<group>"; };
25572555
8EA6CFAC19E240C40076D59C /* timeline_icon_unread@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "timeline_icon_unread@2x.png"; sourceTree = "<group>"; };
@@ -4900,7 +4898,6 @@
49004898
8EA6CF9819E240C40076D59C /* sex_man_icon@2x.png */,
49014899
8EA6CF9919E240C40076D59C /* sex_woman_icon@2x.png */,
49024900
8EA6CF9A19E240C40076D59C /* splitlineImg@2x.png */,
4903-
8EA6CFA619E240C40076D59C /* tabbar_background@2x.png */,
49044901
8EA6CFA819E240C40076D59C /* tasks_all@2x.png */,
49054902
8EA6CFBE19E240C40076D59C /* tweet_comment_btn@2x.png */,
49064903
8E872CFF19EFEFF7002C8F34 /* tweet_more_comment_icon@2x.png */,
@@ -6277,7 +6274,6 @@
62776274
4E09DCAA1C15662E001C9392 /* share_Nav@3x.png in Resources */,
62786275
4E2BF3D01B96CDF800A5A0A8 /* share_btn_copylink@2x.png in Resources */,
62796276
4EF17ED41B3C3112003CDD2D /* intro_icon_2@3x.png in Resources */,
6280-
8EA6D18D19E240C40076D59C /* tabbar_background@2x.png in Resources */,
62816277
7E8E597F1B6F91C40083CA02 /* bubble_left_play_0@2x.png in Resources */,
62826278
4E96E7E11A1B537E0037C098 /* icon_file_ppt@2x.png in Resources */,
62836279
4E2F6A6E1C43CA4B00A25502 /* member_type_75@2x.png in Resources */,

‎Coding_iOS/Controllers/RootControllers/RootTabViewController.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ - (void)setupViewControllers {
101101
}
102102

103103
- (void)customizeTabBarForController {
104-
UIImage *backgroundImage = [UIImage imageNamed:@"tabbar_background"];
104+
UIImage *backgroundImage = [UIImage imageWithColor:kColorNavBG];
105105
NSArray *tabBarItemImages = @[@"project", @"task", @"tweet", @"privatemessage", @"me"];
106106
NSArray *tabBarItemTitles = @[@"项目", @"任务", @"冒泡", @"消息", @"我"];
107107
NSInteger index = 0;
@@ -116,6 +116,7 @@ - (void)customizeTabBarForController {
116116
[item setTitle:[tabBarItemTitles objectAtIndex:index]];
117117
index++;
118118
}
119+
[self.tabBar addLineUp:YES andDown:NO];
119120
}
120121

121122
#pragma mark RDVTabBarControllerDelegate

‎Coding_iOS/Images/tabbar_background@2x.png

-1019 Bytes
Binary file not shown.

‎Coding_iOS/Util/Common/EaseGitButton.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ - (instancetype)initWithFrame:(CGRect)frame
3838
}
3939

4040
_lineView = [[UIView alloc] initWithFrame:CGRectMake(splitX, 0, 1, frameHeight)];
41-
_lineView.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
41+
_lineView.backgroundColor = kColorTableSectionBg;
4242
[self addSubview:_lineView];
4343

4444
_leftButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, splitX, frameHeight)];

‎Coding_iOS/Util/Common/EaseGitButtonsView.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ - (instancetype)init
2121
self = [super init];
2222
if (self) {
2323
[self addLineUp:YES andDown:NO];
24-
self.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
24+
self.backgroundColor = kColorTableSectionBg;
2525
}
2626
return self;
2727
}

‎Coding_iOS/Util/Common/EaseToolBar.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ - (instancetype)initWithItems:(NSArray *)buttonItems{
3030
self = [super init];
3131
if (self) {
3232
self.frame = CGRectMake(0, 0, kScreen_Width, kEaseToolBar_Height);
33-
self.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
33+
self.backgroundColor = kColorTableSectionBg;
3434
self.buttonItems = buttonItems;
3535
}
3636
return self;

‎Coding_iOS/Util/Manager/SendRewardManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ - (instancetype)init
9494
[_bgView addSubview:_contentView];
9595

9696
//属性设置
97-
_contentView.backgroundColor = [UIColor colorWithHexString:@"0xF8F8F8"];
97+
_contentView.backgroundColor = kColorTableSectionBg;
9898
_contentView.layer.masksToBounds = YES;
9999
_contentView.layer.cornerRadius = 6;
100100
[_closeBtn setImage:[UIImage imageNamed:@"button_close"] forState:UIControlStateNormal];

‎Coding_iOS/Util/OC_Category/UIView+Common.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ + (UIViewAnimationOptions)animationOptionsForCurve:(UIViewAnimationCurve)curve
258258
}
259259

260260
+ (UIView *)lineViewWithPointYY:(CGFloat)pointY{
261-
return [self lineViewWithPointYY:pointY andColor:[UIColor colorWithHexString:@"0xc8c7cc"]];
261+
return [self lineViewWithPointYY:pointY andColor:kColorDDD];
262262
}
263263

264264
+ (UIView *)lineViewWithPointYY:(CGFloat)pointY andColor:(UIColor *)color{
@@ -292,7 +292,7 @@ - (void)outputSubviewTree{
292292
}
293293

294294
- (void)addLineUp:(BOOL)hasUp andDown:(BOOL)hasDown{
295-
[self addLineUp:hasUp andDown:hasDown andColor:[UIColor colorWithHexString:@"0xc8c7cc"]];
295+
[self addLineUp:hasUp andDown:hasDown andColor:kColorDDD];
296296
}
297297

298298
- (void)addLineUp:(BOOL)hasUp andDown:(BOOL)hasDown andColor:(UIColor *)color{

‎Coding_iOS/Vendor/AGEmojiKeyboard/AGEmojiKeyBoardView.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ - (void)setRecentEmojis:(NSMutableArray *)recentEmojis {
109109
- (instancetype)initWithFrame:(CGRect)frame dataSource:(id<AGEmojiKeyboardViewDataSource>)dataSource showBigEmotion:(BOOL)showBigEmotion{
110110
self = [super initWithFrame:frame];
111111
if (self) {
112-
self.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
112+
self.backgroundColor = kColorTableSectionBg;
113113
// initialize category
114114
_dataSource = dataSource;
115115
self.category = [self categoryNameAtIndex:self.defaultSelectedCategory];

‎Coding_iOS/Vendor/XTSegmentControl/XTSegmentControl.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ - (void)addRedLine
362362
[_contentView addSubview:_lineView];
363363

364364
UIView *bottomLineView = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetHeight(rect)-0.5, CGRectGetWidth(self.bounds), 0.5)];
365-
bottomLineView.backgroundColor = [UIColor colorWithHexString:@"0xc8c7cc"];
365+
bottomLineView.backgroundColor = kColorDDD;
366366
[self addSubview:bottomLineView];
367367
}
368368
}

‎Coding_iOS/Views/Cell/TweetSendTextCell.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ - (UIView *)keyboardToolBar{
108108
_footerToolBar = [[UIView alloc] initWithFrame:CGRectMake(0, kScreen_Height, kScreen_Width, 80)];
109109

110110
UIView *keyboardToolBar = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetHeight(_footerToolBar.frame) - 40, kScreen_Width, 40)];
111-
[keyboardToolBar addLineUp:YES andDown:NO andColor:[UIColor colorWithHexString:@"0xc8c7cc"]];
112-
keyboardToolBar.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
111+
[keyboardToolBar addLineUp:YES andDown:NO andColor:kColorDDD];
112+
keyboardToolBar.backgroundColor = kColorTableSectionBg;
113113
if (!_locationButton) {
114114
_locationButton = [self locationButtonWithStr:nil];
115115
}

‎Coding_iOS/Views/UIMessageInputView/UIMessageInputView.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ - (id)initWithFrame:(CGRect)frame
152152
self = [super initWithFrame:frame];
153153
if (self) {
154154
// Initialization code
155-
self.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
155+
self.backgroundColor = kColorTableSectionBg;
156156
[self addLineUp:YES andDown:NO andColor:[UIColor lightGrayColor]];
157157
_viewHeightOld = CGRectGetHeight(frame);
158158
_inputState = UIMessageInputViewStateSystem;

‎Coding_iOS/Views/UIMessageInputView/UIMessageInputView_Add.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ - (id)initWithFrame:(CGRect)frame
1414
self = [super initWithFrame:frame];
1515
if (self) {
1616
// Initialization code
17-
self.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
17+
self.backgroundColor = kColorTableSectionBg;
1818
UIButton *photoItem = [self buttonWithImageName:@"keyboard_add_photo" title:@"照片" index:0];
1919
UIButton *cameraItem = [self buttonWithImageName:@"keyboard_add_camera" title:@"拍摄" index:1];
2020
[self addSubview:photoItem];

‎Coding_iOS/Views/UIMessageInputView/UIMessageInputView_Voice.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ @implementation UIMessageInputView_Voice
3434
- (id)initWithFrame:(CGRect)frame {
3535
self = [super initWithFrame:frame];
3636
if (self) {
37-
self.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
37+
self.backgroundColor = kColorTableSectionBg;
3838

3939
_recordTipsLabel = [[UILabel alloc] init];
4040
_recordTipsLabel.font = [UIFont systemFontOfSize:18];

0 commit comments

Comments
 (0)