换颜色。。换图

wanghengheng · wanghengheng · commit 5956d076cac4 · 2016-09-22T17:35:26.000+08:00
diff --git a/Coding_iOS.xcodeproj/project.pbxproj b/Coding_iOS.xcodeproj/project.pbxproj
@@ -943,7 +943,6 @@
 		8EA6D18019E240C40076D59C /* sex_man_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CF9819E240C40076D59C /* sex_man_icon@2x.png */; };
 		8EA6D18119E240C40076D59C /* sex_woman_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CF9919E240C40076D59C /* sex_woman_icon@2x.png */; };
 		8EA6D18219E240C40076D59C /* splitlineImg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CF9A19E240C40076D59C /* splitlineImg@2x.png */; };
-		8EA6D18D19E240C40076D59C /* tabbar_background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CFA619E240C40076D59C /* tabbar_background@2x.png */; };
 		8EA6D18F19E240C40076D59C /* tasks_all@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CFA819E240C40076D59C /* tasks_all@2x.png */; };
 		8EA6D19119E240C40076D59C /* timeline_icon_read@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CFAB19E240C40076D59C /* timeline_icon_read@2x.png */; };
 		8EA6D19219E240C40076D59C /* timeline_icon_unread@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EA6CFAC19E240C40076D59C /* timeline_icon_unread@2x.png */; };
@@ -2551,7 +2550,6 @@
 		8EA6CF9819E240C40076D59C /* sex_man_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sex_man_icon@2x.png"; sourceTree = "<group>"; };
 		8EA6CF9919E240C40076D59C /* sex_woman_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sex_woman_icon@2x.png"; sourceTree = "<group>"; };
 		8EA6CF9A19E240C40076D59C /* splitlineImg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "splitlineImg@2x.png"; sourceTree = "<group>"; };
-		8EA6CFA619E240C40076D59C /* tabbar_background@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tabbar_background@2x.png"; sourceTree = "<group>"; };
 		8EA6CFA819E240C40076D59C /* tasks_all@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tasks_all@2x.png"; sourceTree = "<group>"; };
 		8EA6CFAB19E240C40076D59C /* timeline_icon_read@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "timeline_icon_read@2x.png"; sourceTree = "<group>"; };
 		8EA6CFAC19E240C40076D59C /* timeline_icon_unread@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "timeline_icon_unread@2x.png"; sourceTree = "<group>"; };
@@ -4900,7 +4898,6 @@
 				8EA6CF9819E240C40076D59C /* sex_man_icon@2x.png */,
 				8EA6CF9919E240C40076D59C /* sex_woman_icon@2x.png */,
 				8EA6CF9A19E240C40076D59C /* splitlineImg@2x.png */,
-				8EA6CFA619E240C40076D59C /* tabbar_background@2x.png */,
 				8EA6CFA819E240C40076D59C /* tasks_all@2x.png */,
 				8EA6CFBE19E240C40076D59C /* tweet_comment_btn@2x.png */,
 				8E872CFF19EFEFF7002C8F34 /* tweet_more_comment_icon@2x.png */,
@@ -6277,7 +6274,6 @@
 				4E09DCAA1C15662E001C9392 /* share_Nav@3x.png in Resources */,
 				4E2BF3D01B96CDF800A5A0A8 /* share_btn_copylink@2x.png in Resources */,
 				4EF17ED41B3C3112003CDD2D /* intro_icon_2@3x.png in Resources */,
-				8EA6D18D19E240C40076D59C /* tabbar_background@2x.png in Resources */,
 				7E8E597F1B6F91C40083CA02 /* bubble_left_play_0@2x.png in Resources */,
 				4E96E7E11A1B537E0037C098 /* icon_file_ppt@2x.png in Resources */,
 				4E2F6A6E1C43CA4B00A25502 /* member_type_75@2x.png in Resources */,
diff --git a/Coding_iOS/Controllers/RootControllers/RootTabViewController.m b/Coding_iOS/Controllers/RootControllers/RootTabViewController.m
@@ -101,7 +101,7 @@ - (void)setupViewControllers {
 }
 
 - (void)customizeTabBarForController {
-    UIImage *backgroundImage = [UIImage imageNamed:@"tabbar_background"];
+    UIImage *backgroundImage = [UIImage imageWithColor:kColorNavBG];
     NSArray *tabBarItemImages = @[@"project", @"task", @"tweet", @"privatemessage", @"me"];
     NSArray *tabBarItemTitles = @[@"项目", @"任务", @"冒泡", @"消息", @"我"];
     NSInteger index = 0;
@@ -116,6 +116,7 @@ - (void)customizeTabBarForController {
         [item setTitle:[tabBarItemTitles objectAtIndex:index]];
         index++;
     }
+    [self.tabBar addLineUp:YES andDown:NO];
 }
 
 #pragma mark RDVTabBarControllerDelegate
diff --git a/Coding_iOS/Images/tabbar_background@2x.png b/Coding_iOS/Images/tabbar_background@2x.png
diff --git a/Coding_iOS/Util/Common/EaseGitButton.m b/Coding_iOS/Util/Common/EaseGitButton.m
@@ -38,7 +38,7 @@ - (instancetype)initWithFrame:(CGRect)frame
         }
         
         _lineView = [[UIView alloc] initWithFrame:CGRectMake(splitX, 0, 1, frameHeight)];
-        _lineView.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
+        _lineView.backgroundColor = kColorTableSectionBg;
         [self addSubview:_lineView];
         
         _leftButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, splitX, frameHeight)];
diff --git a/Coding_iOS/Util/Common/EaseGitButtonsView.m b/Coding_iOS/Util/Common/EaseGitButtonsView.m
@@ -21,7 +21,7 @@ - (instancetype)init
     self = [super init];
     if (self) {
         [self addLineUp:YES andDown:NO];
-        self.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
+        self.backgroundColor = kColorTableSectionBg;
     }
     return self;
 }
diff --git a/Coding_iOS/Util/Common/EaseToolBar.m b/Coding_iOS/Util/Common/EaseToolBar.m
@@ -30,7 +30,7 @@ - (instancetype)initWithItems:(NSArray *)buttonItems{
     self = [super init];
     if (self) {
         self.frame = CGRectMake(0, 0, kScreen_Width, kEaseToolBar_Height);
-        self.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
+        self.backgroundColor = kColorTableSectionBg;
         self.buttonItems = buttonItems;
     }
     return self;
diff --git a/Coding_iOS/Util/Manager/SendRewardManager.m b/Coding_iOS/Util/Manager/SendRewardManager.m
@@ -94,7 +94,7 @@ - (instancetype)init
         [_bgView addSubview:_contentView];
         
         //属性设置
-        _contentView.backgroundColor = [UIColor colorWithHexString:@"0xF8F8F8"];
+        _contentView.backgroundColor = kColorTableSectionBg;
         _contentView.layer.masksToBounds = YES;
         _contentView.layer.cornerRadius = 6;
         [_closeBtn setImage:[UIImage imageNamed:@"button_close"] forState:UIControlStateNormal];
diff --git a/Coding_iOS/Util/OC_Category/UIView+Common.m b/Coding_iOS/Util/OC_Category/UIView+Common.m
@@ -258,7 +258,7 @@ + (UIViewAnimationOptions)animationOptionsForCurve:(UIViewAnimationCurve)curve
 }
 
 + (UIView *)lineViewWithPointYY:(CGFloat)pointY{
-    return [self lineViewWithPointYY:pointY andColor:[UIColor colorWithHexString:@"0xc8c7cc"]];
+    return [self lineViewWithPointYY:pointY andColor:kColorDDD];
 }
 
 + (UIView *)lineViewWithPointYY:(CGFloat)pointY andColor:(UIColor *)color{
@@ -292,7 +292,7 @@ - (void)outputSubviewTree{
 }
 
 - (void)addLineUp:(BOOL)hasUp andDown:(BOOL)hasDown{
-    [self addLineUp:hasUp andDown:hasDown andColor:[UIColor colorWithHexString:@"0xc8c7cc"]];
+    [self addLineUp:hasUp andDown:hasDown andColor:kColorDDD];
 }
 
 - (void)addLineUp:(BOOL)hasUp andDown:(BOOL)hasDown andColor:(UIColor *)color{
diff --git a/Coding_iOS/Vendor/AGEmojiKeyboard/AGEmojiKeyBoardView.m b/Coding_iOS/Vendor/AGEmojiKeyboard/AGEmojiKeyBoardView.m
@@ -109,7 +109,7 @@ - (void)setRecentEmojis:(NSMutableArray *)recentEmojis {
 - (instancetype)initWithFrame:(CGRect)frame dataSource:(id<AGEmojiKeyboardViewDataSource>)dataSource  showBigEmotion:(BOOL)showBigEmotion{
     self = [super initWithFrame:frame];
     if (self) {
-        self.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
+        self.backgroundColor = kColorTableSectionBg;
         // initialize category
         _dataSource = dataSource;
         self.category = [self categoryNameAtIndex:self.defaultSelectedCategory];
diff --git a/Coding_iOS/Vendor/XTSegmentControl/XTSegmentControl.m b/Coding_iOS/Vendor/XTSegmentControl/XTSegmentControl.m
@@ -362,7 +362,7 @@ - (void)addRedLine
         [_contentView addSubview:_lineView];
        
         UIView *bottomLineView = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetHeight(rect)-0.5, CGRectGetWidth(self.bounds), 0.5)];
-        bottomLineView.backgroundColor = [UIColor colorWithHexString:@"0xc8c7cc"];
+        bottomLineView.backgroundColor = kColorDDD;
         [self addSubview:bottomLineView];
     }
 }
diff --git a/Coding_iOS/Views/Cell/TweetSendTextCell.m b/Coding_iOS/Views/Cell/TweetSendTextCell.m
@@ -108,8 +108,8 @@ - (UIView *)keyboardToolBar{
         _footerToolBar = [[UIView alloc] initWithFrame:CGRectMake(0, kScreen_Height, kScreen_Width, 80)];
         
         UIView  *keyboardToolBar = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetHeight(_footerToolBar.frame) - 40, kScreen_Width, 40)];
-        [keyboardToolBar addLineUp:YES andDown:NO andColor:[UIColor colorWithHexString:@"0xc8c7cc"]];
-        keyboardToolBar.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
+        [keyboardToolBar addLineUp:YES andDown:NO andColor:kColorDDD];
+        keyboardToolBar.backgroundColor = kColorTableSectionBg;
         if (!_locationButton) {
             _locationButton = [self locationButtonWithStr:nil];
         }
diff --git a/Coding_iOS/Views/UIMessageInputView/UIMessageInputView.m b/Coding_iOS/Views/UIMessageInputView/UIMessageInputView.m
@@ -152,7 +152,7 @@ - (id)initWithFrame:(CGRect)frame
     self = [super initWithFrame:frame];
     if (self) {
         // Initialization code
-        self.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
+        self.backgroundColor = kColorTableSectionBg;
         [self addLineUp:YES andDown:NO andColor:[UIColor lightGrayColor]];
         _viewHeightOld = CGRectGetHeight(frame);
         _inputState = UIMessageInputViewStateSystem;
diff --git a/Coding_iOS/Views/UIMessageInputView/UIMessageInputView_Add.m b/Coding_iOS/Views/UIMessageInputView/UIMessageInputView_Add.m
@@ -14,7 +14,7 @@ - (id)initWithFrame:(CGRect)frame
     self = [super initWithFrame:frame];
     if (self) {
         // Initialization code
-        self.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
+        self.backgroundColor = kColorTableSectionBg;
         UIButton *photoItem = [self buttonWithImageName:@"keyboard_add_photo" title:@"照片" index:0];
         UIButton *cameraItem = [self buttonWithImageName:@"keyboard_add_camera" title:@"拍摄" index:1];
         [self addSubview:photoItem];
diff --git a/Coding_iOS/Views/UIMessageInputView/UIMessageInputView_Voice.m b/Coding_iOS/Views/UIMessageInputView/UIMessageInputView_Voice.m
@@ -34,7 +34,7 @@ @implementation UIMessageInputView_Voice
 - (id)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {
-        self.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];
+        self.backgroundColor = kColorTableSectionBg;
         
         _recordTipsLabel = [[UILabel alloc] init];
         _recordTipsLabel.font = [UIFont systemFontOfSize:18];

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ - (void)setupViewControllers {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`- (void)customizeTabBarForController {`
`104`		`- UIImage *backgroundImage = [UIImage imageNamed:@"tabbar_background"];`
	`104`	`+ UIImage *backgroundImage = [UIImage imageWithColor:kColorNavBG];`
`105`	`105`	`NSArray *tabBarItemImages = @[@"project", @"task", @"tweet", @"privatemessage", @"me"];`
`106`	`106`	`NSArray *tabBarItemTitles = @[@"项目", @"任务", @"冒泡", @"消息", @"我"];`
`107`	`107`	`NSInteger index = 0;`
`@@ -116,6 +116,7 @@ - (void)customizeTabBarForController {`
`116`	`116`	`[item setTitle:[tabBarItemTitles objectAtIndex:index]];`
`117`	`117`	`index++;`
`118`	`118`	`}`
	`119`	`+ [self.tabBar addLineUp:YES andDown:NO];`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`#pragma mark RDVTabBarControllerDelegate`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ - (instancetype)initWithFrame:(CGRect)frame`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`_lineView = [[UIView alloc] initWithFrame:CGRectMake(splitX, 0, 1, frameHeight)];`
`41`		`- _lineView.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];`
	`41`	`+ _lineView.backgroundColor = kColorTableSectionBg;`
`42`	`42`	`[self addSubview:_lineView];`
`43`	`43`
`44`	`44`	`_leftButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, splitX, frameHeight)];`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ - (instancetype)init`
`21`	`21`	`self = [super init];`
`22`	`22`	`if (self) {`
`23`	`23`	`[self addLineUp:YES andDown:NO];`
`24`		`- self.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];`
	`24`	`+ self.backgroundColor = kColorTableSectionBg;`
`25`	`25`	`}`
`26`	`26`	`return self;`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ - (instancetype)initWithItems:(NSArray *)buttonItems{`
`30`	`30`	`self = [super init];`
`31`	`31`	`if (self) {`
`32`	`32`	`self.frame = CGRectMake(0, 0, kScreen_Width, kEaseToolBar_Height);`
`33`		`- self.backgroundColor = [UIColor colorWithHexString:@"0xf8f8f8"];`
	`33`	`+ self.backgroundColor = kColorTableSectionBg;`
`34`	`34`	`self.buttonItems = buttonItems;`
`35`	`35`	`}`
`36`	`36`	`return self;`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ + (UIViewAnimationOptions)animationOptionsForCurve:(UIViewAnimationCurve)curve`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`+ (UIView *)lineViewWithPointYY:(CGFloat)pointY{`
`261`		`- return [self lineViewWithPointYY:pointY andColor:[UIColor colorWithHexString:@"0xc8c7cc"]];`
	`261`	`+ return [self lineViewWithPointYY:pointY andColor:kColorDDD];`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`+ (UIView )lineViewWithPointYY:(CGFloat)pointY andColor:(UIColor )color{`
`@@ -292,7 +292,7 @@ - (void)outputSubviewTree{`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`- (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];`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`- (void)addLineUp:(BOOL)hasUp andDown:(BOOL)hasDown andColor:(UIColor *)color{`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ - (void)addRedLine`
`362`	`362`	`[_contentView addSubview:_lineView];`
`363`	`363`
`364`	`364`	`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;`
`366`	`366`	`[self addSubview:bottomLineView];`
`367`	`367`	`}`
`368`	`368`	`}`