Skip to content

Commit 03bbe06

Browse files
wanghenghengwanghengheng
committed
UI 优化
1 parent 243c6db commit 03bbe06

71 files changed

Lines changed: 147 additions & 70 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 56 additions & 8 deletions
Large diffs are not rendered by default.

‎Coding_iOS/Controllers/EditLabelViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
223223
- (NSArray *)rightButtons
224224
{
225225
NSMutableArray *rightUtilityButtons = [NSMutableArray new];
226-
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
227-
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
226+
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xF2F4F6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
227+
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xF66262"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
228228
return rightUtilityButtons;
229229
}
230230

‎Coding_iOS/Controllers/FileActivitiesViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ - (void)sendRequest{
113113
self.activityList = data;
114114
[self.myTableView reloadData];
115115
}
116-
[self.view configBlankPage:EaseBlankPageTypeView hasData:self.activityList.count > 0 hasError:error != nil reloadButtonBlock:^(id sender) {
116+
[self.view configBlankPage:EaseBlankPageTypeView hasData:YES hasError:error != nil reloadButtonBlock:^(id sender) {
117117
[self refresh];
118118
}];
119119
}];

‎Coding_iOS/Controllers/FileListViewController.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -573,15 +573,15 @@ - (NSArray *)rightButtonsWithObj:(id)obj{
573573
ProjectFolder *folder = (ProjectFolder *)obj;
574574
if (![folder isDefaultFolder] && ![folder isShareFolder]) {
575575
if (folder.sub_folders.count <= 0) {
576-
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorDDD icon:[UIImage imageNamed:@"icon_file_cell_move"]];
576+
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorD8DDE4 icon:[UIImage imageNamed:@"icon_file_cell_move"]];
577577
}
578-
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
579-
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
578+
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xF2F4F6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
579+
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xF66262"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
580580
}
581581
}else{
582-
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorDDD icon:[UIImage imageNamed:@"icon_file_cell_move"]];
583-
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
584-
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
582+
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorD8DDE4 icon:[UIImage imageNamed:@"icon_file_cell_move"]];
583+
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xF2F4F6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
584+
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xF66262"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
585585
}
586586
return rightUtilityButtons;
587587
}

‎Coding_iOS/Controllers/FileVersionsViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
132132
#pragma mark Edit Table
133133
- (NSArray *)rightButtonsWithObj:(NSIndexPath *)indexPath{
134134
NSMutableArray *rightUtilityButtons = [NSMutableArray new];
135-
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xe6e6e6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
135+
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xF2F4F6"] icon:[UIImage imageNamed:@"icon_file_cell_rename"]];
136136
if (indexPath.row != 0) {//当前版本不能删除
137-
[rightUtilityButtons sw_addUtilityButtonWithColor:kColorBrandRed icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
137+
[rightUtilityButtons sw_addUtilityButtonWithColor:[UIColor colorWithHexString:@"0xF66262"] icon:[UIImage imageNamed:@"icon_file_cell_delete"]];
138138
}
139139
return rightUtilityButtons;
140140
}

‎Coding_iOS/Controllers/FileViewController.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ - (void)rightNavBtnClicked{
241241
if ([KxMenu isShowingInView:self.view]) {
242242
[KxMenu dismissMenu:YES];
243243
}else{
244-
[KxMenu setTitleFont:[UIFont systemFontOfSize:14]];
244+
[KxMenu setTitleFont:[UIFont systemFontOfSize:15]];
245245
[KxMenu setTintColor:[UIColor whiteColor]];
246246
[KxMenu setLineColor:kColorDDD];
247247

@@ -260,7 +260,7 @@ - (void)rightNavBtnClicked{
260260
if (self.fileUrl) {
261261
[menuItems addObject:[KxMenuItem menuItem:@"其它应用打开" image:[UIImage imageNamed:@"file_menu_icon_open"] target:self action:@selector(openByOtherApp)]];
262262
}
263-
[menuItems setValue:kColor222 forKey:@"foreColor"];
263+
[menuItems setValue:kColorDark4 forKey:@"foreColor"];
264264
CGRect senderFrame = CGRectMake(kScreen_Width - (kDevice_Is_iPhone6Plus? 30: 26), 0, 0, 0);
265265
[KxMenu showMenuInView:self.view
266266
fromRect:senderFrame
@@ -304,7 +304,7 @@ - (void)goToShareFileLink{
304304
__weak typeof(self) weakSelf = self;
305305
UIActionSheet *actionSheet;
306306
if (_curFile.share) {
307-
actionSheet = [UIActionSheet bk_actionSheetCustomWithTitle:@"该链接适用于所有人，无需登录" buttonTitles:@[@"拷贝链接", @"关闭共享"] destructiveTitle:nil cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
307+
actionSheet = [UIActionSheet bk_actionSheetCustomWithTitle:@"该链接适用于所有人，无需登录" buttonTitles:@[@"拷贝链接"] destructiveTitle:@"关闭共享" cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
308308
if (index == 0) {
309309
[weakSelf doCopyShareUrl];
310310
}else if (index == 1) {

‎Coding_iOS/Controllers/TipsViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,14 @@ - (void)rightNavBtnClicked{
175175
if ([KxMenu isShowingInView:self.view]) {
176176
[KxMenu dismissMenu:YES];
177177
}else{
178-
[KxMenu setTitleFont:[UIFont systemFontOfSize:14]];
178+
[KxMenu setTitleFont:[UIFont systemFontOfSize:15]];
179179
[KxMenu setTintColor:[UIColor whiteColor]];
180180
[KxMenu setLineColor:kColorDDD];
181181
NSArray *menuItems = @[
182182
[KxMenuItem menuItem:_myCodingTips.onlyUnread? @"查看全部": @"查看未读" image:[UIImage imageNamed:@"tips_menu_icon_status"] target:self action:@selector(p_changeTipStatus)],
183183
[KxMenuItem menuItem:@"全部标注已读" image:[UIImage imageNamed:@"tips_menu_icon_mkread"] target:self action:@selector(p_markReadAll)],
184184
];
185-
[menuItems setValue:kColor222 forKey:@"foreColor"];
185+
[menuItems setValue:kColorDark4 forKey:@"foreColor"];
186186
CGRect senderFrame = CGRectMake(kScreen_Width - (kDevice_Is_iPhone6Plus? 30: 26), 0, 0, 0);
187187
[KxMenu showMenuInView:self.view
188188
fromRect:senderFrame

‎Coding_iOS/Images/button_file_manage/[email protected]‎

-1.22 KB

‎Coding_iOS/Images/button_file_manage/[email protected]‎

-800 Bytes

‎Coding_iOS/Images/button_file_manage/[email protected]‎

-846 Bytes

0 commit comments

Comments
 (0)