还是颜色

wanghengheng · wanghengheng · commit ca2905bcb767 · 2016-09-23T13:00:16.000+08:00
diff --git a/Coding_iOS/AppDelegate.m b/Coding_iOS/AppDelegate.m
@@ -250,15 +250,15 @@ - (void)customizeInterface {
     
     UINavigationBar *navigationBarAppearance = [UINavigationBar appearance];
     [navigationBarAppearance setBackgroundImage:[UIImage imageWithColor:[NSObject baseURLStrIsProduction]? kColorNavBG: kColorBrandGreen] forBarMetrics:UIBarMetricsDefault];
-    [navigationBarAppearance setTintColor:[UIColor colorWithHexString:@"0x3bbc79"]];//返回按钮的箭头颜色
+    [navigationBarAppearance setTintColor:kColorBrandGreen];//返回按钮的箭头颜色
     NSDictionary *textAttributes = @{
                                      NSFontAttributeName: [UIFont systemFontOfSize:kNavTitleFontSize],
                                      NSForegroundColorAttributeName: kColorNavTitle,
                                      };
     [navigationBarAppearance setTitleTextAttributes:textAttributes];
     
-    [[UITextField appearance] setTintColor:[UIColor colorWithHexString:@"0x3bbc79"]];//设置UITextField的光标颜色
-    [[UITextView appearance] setTintColor:[UIColor colorWithHexString:@"0x3bbc79"]];//设置UITextView的光标颜色
+    [[UITextField appearance] setTintColor:kColorBrandGreen];//设置UITextField的光标颜色
+    [[UITextView appearance] setTintColor:kColorBrandGreen];//设置UITextView的光标颜色
     [[UISearchBar appearance] setBackgroundImage:[UIImage imageWithColor:kColorTableSectionBg] forBarPosition:0 barMetrics:UIBarMetricsDefault];
 }
 
diff --git a/Coding_iOS/Coding_iOS-Prefix.pch.example b/Coding_iOS/Coding_iOS-Prefix.pch.example
@@ -119,15 +119,16 @@
 
 #define kDefaultLastId [NSNumber numberWithInteger:99999999]
 
+#define kColorNavBG [UIColor colorWithHexString:@"0xFAFAFA"]
+#define kColorNavTitle [UIColor colorWithHexString:@"0x323A45"]
+#define kColorTableBG [UIColor colorWithHexString:@"0xFFFFFF"]
+#define kColorTableSectionBg [UIColor colorWithHexString:@"0xF2F4F6"]
 #define kColor222 [UIColor colorWithHexString:@"0x222222"]
 #define kColor666 [UIColor colorWithHexString:@"0x666666"]
 #define kColor999 [UIColor colorWithHexString:@"0x999999"]
 #define kColorDDD [UIColor colorWithHexString:@"0xDDDDDD"]
-#define kColorTableBG [UIColor colorWithHexString:@"0xFFFFFF"]
-#define kColorTableSectionBg [UIColor colorWithHexString:@"0xF2F4F6"]
 #define kColorBrandGreen [UIColor colorWithHexString:@"0x3BBD79"]
-#define kColorNavBG [UIColor colorWithHexString:@"0xFAFAFA"]
-#define kColorNavTitle [UIColor colorWithHexString:@"0x323A45"]
+#define kColorBrandRed [UIColor colorWithHexString:@"0xFF5846"]
 
 #define kPlaceholderMonkeyRoundWidth(_width_) [UIImage imageNamed:[NSString stringWithFormat:@"placeholder_monkey_round_%.0f", _width_]]
 #define kPlaceholderMonkeyRoundView(_view_) [UIImage imageNamed:[NSString stringWithFormat:@"placeholder_monkey_round_%.0f", CGRectGetWidth(_view_.frame)]]
diff --git a/Coding_iOS/Controllers/EditLabelViewController.m b/Coding_iOS/Controllers/EditLabelViewController.m
@@ -221,7 +221,7 @@ - (NSArray *)rightButtons
 {
     NSMutableArray *rightUtilityButtons = [NSMutableArray new];
     [rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
-    [rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
+    [rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
     return rightUtilityButtons;
 }
 
diff --git a/Coding_iOS/Controllers/FileListViewController.m b/Coding_iOS/Controllers/FileListViewController.m
@@ -567,12 +567,12 @@ - (NSArray *)rightButtonsWithObj:(id)obj{
         ProjectFolder *folder = (ProjectFolder *)obj;
         if (![folder isDefaultFolder]) {
             [rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
-            [rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
+            [rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
         }
     }else{
         [rightUtilityButtons sw_addUtilityButtonWithColor:kColorDDD icon:[UIImage imageNamed:@"icon_file_cell_move"]];
         [rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
-        [rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
+        [rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
     }
     return rightUtilityButtons;
 }
diff --git a/Coding_iOS/Controllers/FileVersionsViewController.m b/Coding_iOS/Controllers/FileVersionsViewController.m
@@ -131,7 +131,7 @@ - (NSArray *)rightButtonsWithObj:(NSIndexPath *)indexPath{
     NSMutableArray *rightUtilityButtons = [NSMutableArray new];
     [rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
     if (indexPath.row != 0) {//当前版本不能删除
-        [rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
+        [rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
     }
     return rightUtilityButtons;
 }
diff --git a/Coding_iOS/Controllers/ProjectMemberListViewController.m b/Coding_iOS/Controllers/ProjectMemberListViewController.m
@@ -330,7 +330,7 @@ - (NSArray *)rightButtonsWithObj:(ProjectMember *)mem{
     }
     if (canDelete) {
         [rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xF0F0F0"] icon:[UIImage imageNamed:@"member_cell_edit_type"]];
-        [rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"member_cell_edit_remove"]];
+        [rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"member_cell_edit_remove"]];
     }
     return rightUtilityButtons;
 }
diff --git a/Coding_iOS/Controllers/Shop/ExchangeGoodsViewController.m b/Coding_iOS/Controllers/Shop/ExchangeGoodsViewController.m
@@ -101,7 +101,7 @@ - (void)viewDidLoad {
     UIView *footView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(_myTableView.frame), 136/2)];
     _shopOrderBtn = ({
         UIButton *orderBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [orderBtn setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithHexString:@"0xFF3BBD79"]] forState:UIControlStateNormal];
+        [orderBtn setBackgroundImage:[UIImage imageWithColor:kColorBrandGreen] forState:UIControlStateNormal];
         [orderBtn addTarget:self action:@selector(orderCommitAction:) forControlEvents:UIControlEventTouchUpInside];
         [orderBtn setTitle:@"提交订单" forState:UIControlStateNormal];
         [orderBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
diff --git a/Coding_iOS/Controllers/Shop/LocationViewController.m b/Coding_iOS/Controllers/Shop/LocationViewController.m
@@ -32,7 +32,7 @@ - (void)viewDidLoad{
         tableView.dataSource = self;
         [tableView registerClass:[LocationCell class] forCellReuseIdentifier:kCellIdentifier_LocationCell];
         tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine;
-        tableView.separatorColor = [UIColor colorWithHexString:@"0xFFDDDDDD"];
+        tableView.separatorColor = [UIColor colorWithHexString:@"0xDDDDDD"];
         tableView.separatorInset = UIEdgeInsetsMake(0, 12, 0, 12);
         [self.view addSubview:tableView];
         [tableView mas_makeConstraints:^(MASConstraintMaker *make) {
diff --git a/Coding_iOS/Util/OC_Category/UIButton+Bootstrap.m b/Coding_iOS/Util/OC_Category/UIButton+Bootstrap.m
@@ -37,7 +37,7 @@ -(void)primaryStyle{
 -(void)successStyle{
     [self bootstrapStyle];
     self.layer.borderColor = [[UIColor clearColor] CGColor];
-    [self setBackgroundImage:[self buttonImageFromColor:[UIColor colorWithHexString:@"0x3bbc79"]] forState:UIControlStateNormal];
+    [self setBackgroundImage:[self buttonImageFromColor:kColorBrandGreen] forState:UIControlStateNormal];
     [self setBackgroundImage:[self buttonImageFromColor:[UIColor colorWithHexString:@"0x3bbc79" andAlpha:0.5]] forState:UIControlStateDisabled];
     [self setBackgroundImage:[self buttonImageFromColor:[UIColor colorWithHexString:@"0x32a067"]] forState:UIControlStateHighlighted];
     [self setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
diff --git a/Coding_iOS/Util/OC_Category/UIViewController+Swizzle.m b/Coding_iOS/Util/OC_Category/UIViewController+Swizzle.m
@@ -47,7 +47,7 @@ - (UIBarButtonItem *)backButton{
     if ([temporaryBarButtonItem respondsToSelector:@selector(setTitleTextAttributes:forState:)]){
         textAttributes = @{
                            NSFontAttributeName: [UIFont systemFontOfSize:kBackButtonFontSize],
-                           NSForegroundColorAttributeName: [UIColor colorWithHexString:@"0x3bbc79"],
+                           NSForegroundColorAttributeName: kColorBrandGreen,
                            };
         
         [[UIBarButtonItem appearance] setTitleTextAttributes:textAttributes forState:UIControlStateNormal];
@@ -71,4 +71,4 @@ void swizzleAllViewController()
     Swizzle([UIViewController class], @selector(viewDidAppear:), @selector(customViewDidAppear:));
     Swizzle([UIViewController class], @selector(viewWillDisappear:), @selector(customViewWillDisappear:));
     Swizzle([UIViewController class], @selector(viewWillAppear:), @selector(customviewWillAppear:));
-}
+}
diff --git a/Coding_iOS/Vendor/AGEmojiKeyboard/AGEmojiKeyBoardView.m b/Coding_iOS/Vendor/AGEmojiKeyboard/AGEmojiKeyBoardView.m
@@ -453,7 +453,7 @@ - (void)setSelectedIndex:(NSInteger)selectedIndex{
             UIButton *tabButton = self.tabButtons[i];
             if (i==selectedIndex) {
                 [tabButton setImage:self.selectedImages[i] forState:UIControlStateNormal];
-                [tabButton setBackgroundColor:[UIColor colorWithHexString:@"0xe5e5e5"]];
+                [tabButton setBackgroundColor:kColorTableSectionBg];
             }else{
                 [tabButton setImage:self.unSelectedImages[i] forState:UIControlStateNormal];
                 [tabButton setBackgroundColor:[UIColor clearColor]];
diff --git a/Coding_iOS/Vendor/KxMenu/KxMenu.m b/Coding_iOS/Vendor/KxMenu/KxMenu.m
@@ -537,13 +537,8 @@ - (UIView *) mkContentView
         }
         
         if (itemNum < _menuItems.count - 1) {
-//            UIView *lineView=[UIView new];
-//            lineView.backgroundColor=[UIColor colorWithHexString:@"0xffffff" andAlpha:0.2];
-//            lineView.frame=CGRectMake(0, maxItemHeight + 0.3, 160, 0.5);
-//            [itemView addSubview:lineView];
             itemY += 2;
         }
-        
         itemY += maxItemHeight;
         ++itemNum;
     }    
diff --git a/Coding_iOS/Views/Cell/LocalFileCell.m b/Coding_iOS/Views/Cell/LocalFileCell.m
@@ -51,7 +51,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         }];
         
         NSMutableArray *rightUtilityButtons = [NSMutableArray new];
-        [rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
+        [rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
         [self setRightUtilityButtons:rightUtilityButtons WithButtonWidth:[LocalFileCell cellHeight]];
     }
     return self;
diff --git a/Coding_iOS/Views/Cell/LocalFolderCell.m b/Coding_iOS/Views/Cell/LocalFolderCell.m
@@ -44,7 +44,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
             make.height.mas_equalTo(30);
         }];
         NSMutableArray *rightUtilityButtons = [NSMutableArray new];
-        [rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
+        [rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
         [self setRightUtilityButtons:rightUtilityButtons WithButtonWidth:[LocalFolderCell cellHeight]];
     }
     return self;
diff --git a/Coding_iOS/Views/CodingShareView.m b/Coding_iOS/Views/CodingShareView.m
@@ -57,7 +57,7 @@ - (instancetype)init
         }
         if (!_contentView) {
             _contentView = [UIView new];
-            _contentView.backgroundColor = [UIColor colorWithHexString:@"0xF0F0F0"];
+            _contentView.backgroundColor = kColorTableSectionBg;
             if (!_titleL) {
                 _titleL = ({
                     UILabel *label = [UILabel new];
diff --git a/Coding_iOS/Views/TableListView/ProjectFolderListView.m b/Coding_iOS/Views/TableListView/ProjectFolderListView.m
@@ -115,7 +115,7 @@ - (NSArray *)rightButtonsWithObj:(id)obj{
         ProjectFolder *folder = (ProjectFolder *)obj;
         if (![folder isDefaultFolder]) {
             [rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
-            [rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xff5846"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
+            [rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
         }
     }
     return rightUtilityButtons;

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ - (NSArray *)rightButtons`
`221`	`221`	`{`
`222`	`222`	`NSMutableArray *rightUtilityButtons = [NSMutableArray new];`
`223`	`223`	`[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"]];`
`225`	`225`	`return rightUtilityButtons;`
`226`	`226`	`}`
`227`	`227`
Original file line number	Diff line number	Diff line change
`@@ -567,12 +567,12 @@ - (NSArray *)rightButtonsWithObj:(id)obj{`
`567`	`567`	`ProjectFolder folder = (ProjectFolder )obj;`
`568`	`568`	`if (![folder isDefaultFolder]) {`
`569`	`569`	`[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"]];`
`571`	`571`	`}`
`572`	`572`	`}else{`
`573`	`573`	`[rightUtilityButtons sw_addUtilityButtonWithColor:kColorDDD icon:[UIImage imageNamed:@"icon_file_cell_move"]];`
`574`	`574`	`[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"]];`
`576`	`576`	`}`
`577`	`577`	`return rightUtilityButtons;`
`578`	`578`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ - (NSArray )rightButtonsWithObj:(NSIndexPath )indexPath{`
`131`	`131`	`NSMutableArray *rightUtilityButtons = [NSMutableArray new];`
`132`	`132`	`[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];`
`133`	`133`	`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"]];`
`135`	`135`	`}`
`136`	`136`	`return rightUtilityButtons;`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ - (NSArray )rightButtonsWithObj:(ProjectMember )mem{`
`330`	`330`	`}`
`331`	`331`	`if (canDelete) {`
`332`	`332`	`[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"]];`
`334`	`334`	`}`
`335`	`335`	`return rightUtilityButtons;`
`336`	`336`	`}`