Skip to content

Commit ca2905b

wanghengheng wanghengheng

committed

还是颜色

1 parent ed660fe commit ca2905bCopy full SHA for ca2905b

File tree

16 files changed

+23

-27

lines changed

Coding_iOS
- AppDelegate.m
- Coding_iOS-Prefix.pch.example
- Controllers
- Util/OC_Category
  - UIButton+Bootstrap.m
  - UIViewController+Swizzle.m
- Vendor
  - AGEmojiKeyboard
    - AGEmojiKeyBoardView.m
  - KxMenu
    - KxMenu.m
- Views
  - Cell
    - LocalFileCell.m
    - LocalFolderCell.m
  - CodingShareView.m
  - TableListView
    - ProjectFolderListView.m

16 files changed

+23

-27

lines changed

`‎Coding_iOS/AppDelegate.m‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -250,15 +250,15 @@ - (void)customizeInterface {`
`250`	`250`
`251`	`251`	`UINavigationBar *navigationBarAppearance = [UINavigationBar appearance];`
`252`	`252`	`[navigationBarAppearance setBackgroundImage:[UIImage imageWithColor:[NSObject baseURLStrIsProduction]? kColorNavBG: kColorBrandGreen] forBarMetrics:UIBarMetricsDefault];`
`253`		`- [navigationBarAppearance setTintColor:[UIColor colorWithHexString:@"0x3bbc79"]];//返回按钮的箭头颜色`
	`253`	`+ [navigationBarAppearance setTintColor:kColorBrandGreen];//返回按钮的箭头颜色`
`254`	`254`	`NSDictionary *textAttributes = @{`
`255`	`255`	`NSFontAttributeName: [UIFont systemFontOfSize:kNavTitleFontSize],`
`256`	`256`	`NSForegroundColorAttributeName: kColorNavTitle,`
`257`	`257`	`};`
`258`	`258`	`[navigationBarAppearance setTitleTextAttributes:textAttributes];`
`259`	`259`
`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的光标颜色`
`262`	`262`	`[[UISearchBar appearance] setBackgroundImage:[UIImage imageWithColor:kColorTableSectionBg] forBarPosition:0 barMetrics:UIBarMetricsDefault];`
`263`	`263`	`}`
`264`	`264`

`‎Coding_iOS/Coding_iOS-Prefix.pch.example‎`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,15 +119,16 @@`
`119`	`119`
`120`	`120`	`#define kDefaultLastId [NSNumber numberWithInteger:99999999]`
`121`	`121`
	`122`	`+#define kColorNavBG [UIColor colorWithHexString:@"0xFAFAFA"]`
	`123`	`+#define kColorNavTitle [UIColor colorWithHexString:@"0x323A45"]`
	`124`	`+#define kColorTableBG [UIColor colorWithHexString:@"0xFFFFFF"]`
	`125`	`+#define kColorTableSectionBg [UIColor colorWithHexString:@"0xF2F4F6"]`
`122`	`126`	`#define kColor222 [UIColor colorWithHexString:@"0x222222"]`
`123`	`127`	`#define kColor666 [UIColor colorWithHexString:@"0x666666"]`
`124`	`128`	`#define kColor999 [UIColor colorWithHexString:@"0x999999"]`
`125`	`129`	`#define kColorDDD [UIColor colorWithHexString:@"0xDDDDDD"]`
`126`		`-#define kColorTableBG [UIColor colorWithHexString:@"0xFFFFFF"]`
`127`		`-#define kColorTableSectionBg [UIColor colorWithHexString:@"0xF2F4F6"]`
`128`	`130`	`#define kColorBrandGreen [UIColor colorWithHexString:@"0x3BBD79"]`
`129`		`-#define kColorNavBG [UIColor colorWithHexString:@"0xFAFAFA"]`
`130`		`-#define kColorNavTitle [UIColor colorWithHexString:@"0x323A45"]`
	`131`	`+#define kColorBrandRed [UIColor colorWithHexString:@"0xFF5846"]`
`131`	`132`
`132`	`133`	`#define kPlaceholderMonkeyRoundWidth(_width_) [UIImage imageNamed:[NSString stringWithFormat:@"placeholder_monkey_round_%.0f", _width_]]`
`133`	`134`	`#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 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`

`‎Coding_iOS/Controllers/FileListViewController.m‎`

Lines changed: 2 additions & 2 deletions

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`	`}`

`‎Coding_iOS/Controllers/FileVersionsViewController.m‎`

Lines changed: 1 addition & 1 deletion

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`	`}`

`‎Coding_iOS/Controllers/ProjectMemberListViewController.m‎`

Lines changed: 1 addition & 1 deletion

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`	`}`

`‎Coding_iOS/Controllers/Shop/ExchangeGoodsViewController.m‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ - (void)viewDidLoad {`
`101`	`101`	`UIView *footView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(_myTableView.frame), 136/2)];`
`102`	`102`	`_shopOrderBtn = ({`
`103`	`103`	`UIButton *orderBtn = [UIButton buttonWithType:UIButtonTypeCustom];`
`104`		`- [orderBtn setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithHexString:@"0xFF3BBD79"]] forState:UIControlStateNormal];`
	`104`	`+ [orderBtn setBackgroundImage:[UIImage imageWithColor:kColorBrandGreen] forState:UIControlStateNormal];`
`105`	`105`	`[orderBtn addTarget:self action:@selector(orderCommitAction:) forControlEvents:UIControlEventTouchUpInside];`
`106`	`106`	`[orderBtn setTitle:@"提交订单" forState:UIControlStateNormal];`
`107`	`107`	`[orderBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];`

`‎Coding_iOS/Controllers/Shop/LocationViewController.m‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ - (void)viewDidLoad{`
`32`	`32`	`tableView.dataSource = self;`
`33`	`33`	`[tableView registerClass:[LocationCell class] forCellReuseIdentifier:kCellIdentifier_LocationCell];`
`34`	`34`	`tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine;`
`35`		`- tableView.separatorColor = [UIColor colorWithHexString:@"0xFFDDDDDD"];`
	`35`	`+ tableView.separatorColor = [UIColor colorWithHexString:@"0xDDDDDD"];`
`36`	`36`	`tableView.separatorInset = UIEdgeInsetsMake(0, 12, 0, 12);`
`37`	`37`	`[self.view addSubview:tableView];`
`38`	`38`	`[tableView mas_makeConstraints:^(MASConstraintMaker *make) {`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ -(void)primaryStyle{`
`37`	`37`	`-(void)successStyle{`
`38`	`38`	`[self bootstrapStyle];`
`39`	`39`	`self.layer.borderColor = [[UIColor clearColor] CGColor];`
`40`		`- [self setBackgroundImage:[self buttonImageFromColor:[UIColor colorWithHexString:@"0x3bbc79"]] forState:UIControlStateNormal];`
	`40`	`+ [self setBackgroundImage:[self buttonImageFromColor:kColorBrandGreen] forState:UIControlStateNormal];`
`41`	`41`	`[self setBackgroundImage:[self buttonImageFromColor:[UIColor colorWithHexString:@"0x3bbc79" andAlpha:0.5]] forState:UIControlStateDisabled];`
`42`	`42`	`[self setBackgroundImage:[self buttonImageFromColor:[UIColor colorWithHexString:@"0x32a067"]] forState:UIControlStateHighlighted];`
`43`	`43`	`[self setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];`

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ - (UIBarButtonItem *)backButton{`
`47`	`47`	`if ([temporaryBarButtonItem respondsToSelector:@selector(setTitleTextAttributes:forState:)]){`
`48`	`48`	`textAttributes = @{`
`49`	`49`	`NSFontAttributeName: [UIFont systemFontOfSize:kBackButtonFontSize],`
`50`		`- NSForegroundColorAttributeName: [UIColor colorWithHexString:@"0x3bbc79"],`
	`50`	`+ NSForegroundColorAttributeName: kColorBrandGreen,`
`51`	`51`	`};`
`52`	`52`
`53`	`53`	`[[UIBarButtonItem appearance] setTitleTextAttributes:textAttributes forState:UIControlStateNormal];`
`@@ -71,4 +71,4 @@ void swizzleAllViewController()`
`71`	`71`	`Swizzle([UIViewController class], @selector(viewDidAppear:), @selector(customViewDidAppear:));`
`72`	`72`	`Swizzle([UIViewController class], @selector(viewWillDisappear:), @selector(customViewWillDisappear:));`
`73`	`73`	`Swizzle([UIViewController class], @selector(viewWillAppear:), @selector(customviewWillAppear:));`
`74`		`-}`
	`74`	`+}`

0 commit comments

Comments

(0)