Skip to content

Commit 65bfa67

Browse files
committed
换图片,改 UI
1 parent fbc3d2a commit 65bfa67

File tree

158 files changed

+348
-169
lines changed

Some content is hidden

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

158 files changed

+348
-169
lines changed

Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 134 additions & 4 deletions
Large diffs are not rendered by default.

Coding_iOS/Coding_iOS-Prefix.pch.example

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,10 @@
129129
#define kColor666 [UIColor colorWithHexString:@"0x666666"]
130130
#define kColor999 [UIColor colorWithHexString:@"0x999999"]
131131
#define kColorDDD [UIColor colorWithHexString:@"0xDDDDDD"]
132+
#define kColorD8DDE4 [UIColor colorWithHexString:@"0xD8DDE4"]
132133
#define kColorCCC [UIColor colorWithHexString:@"0xCCCCCC"]
133-
#define kColorBrandGreen [UIColor colorWithHexString:@"0x3BBD79"]
134-
#define kColorBrandRed [UIColor colorWithHexString:@"0xFF5846"]
134+
#define kColorBrandGreen [UIColor colorWithHexString:@"0x2EBE76"]
135+
#define kColorBrandRed [UIColor colorWithHexString:@"0xF56061"]
135136

136137
#pragma mark New Color
137138
#define kColorDark3 [UIColor colorWithHexString:@"0x323A45"]
@@ -143,7 +144,7 @@
143144
#define kColorWhite [UIColor colorWithHexString:@"0xFFFFFF"]
144145
#define kColorActionGreen [UIColor colorWithHexString:@"0x2EBE76"]
145146
#define kColorActionRed [UIColor colorWithHexString:@"0xF56061"]
146-
#define kColorActionYellow [UIColor colorWithHexString:@"0xF3C232"]
147+
#define kColorActionYellow [UIColor colorWithHexString:@"0xF3C033"]
147148

148149
#define kPlaceholderMonkeyRoundWidth(_width_) [UIImage imageNamed:[NSString stringWithFormat:@"placeholder_monkey_round_%.0f", _width_]]
149150
#define kPlaceholderMonkeyRoundView(_view_) [UIImage imageNamed:[NSString stringWithFormat:@"placeholder_monkey_round_%.0f", CGRectGetWidth(_view_.frame)]]

Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ - (void)refresh{
100100
[[Coding_NetAPIManager sharedManager] request_ProjectDetail_WithObj:_myProject andBlock:^(id data, NSError *error) {
101101
if (data) {
102102
weakSelf.myProject = data;
103-
weakSelf.navigationItem.rightBarButtonItem = weakSelf.myProject.is_public.boolValue? nil: [UIBarButtonItem itemWithBtnTitle:@"公告" target:self action:@selector(tweetsBtnClicked)];
103+
weakSelf.navigationItem.rightBarButtonItem = weakSelf.myProject.is_public.boolValue? nil: [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"addBtn_Artboard"] style:UIBarButtonItemStylePlain target:self action:@selector(tweetsBtnClicked)];
104104
[self refreshGitButtonsView];
105105
[weakSelf.myTableView reloadData];
106106
}
@@ -228,7 +228,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
228228
if (tipStr && [ftm needToTip:tipStr]) {
229229
[cell addTipIcon];
230230
}
231-
[tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:50];
231+
[tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:52];
232232
return cell;
233233
}
234234
}

Coding_iOS/Controllers/NewProject/NewProject.storyboard

Lines changed: 38 additions & 85 deletions
Large diffs are not rendered by default.

Coding_iOS/Controllers/NewProject/NewProjectViewController.m

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -201,30 +201,30 @@ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *
201201

202202
-(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
203203
{
204-
//
205-
if (indexPath.section == 0 && indexPath.row == 0) {
206-
return;
207-
}
208-
if (indexPath.section == 1 && indexPath.row == 0) {
209-
cell.separatorInset = UIEdgeInsetsMake(0.f, cell.bounds.size.width, 0.f, 0.f);
210-
return;
211-
}
212-
213-
// Remove seperator inset
214-
if ([cell respondsToSelector:@selector(setSeparatorInset:)]) {
215-
[cell setSeparatorInset:UIEdgeInsetsZero];
216-
}
217-
218-
// Prevent the cell from inheriting the Table View's margin settings
219-
if ([cell respondsToSelector:@selector(setPreservesSuperviewLayoutMargins:)]) {
220-
[cell setPreservesSuperviewLayoutMargins:NO];
221-
}
222-
223-
// Explictly set your cell's layout margins
224-
if ([cell respondsToSelector:@selector(setLayoutMargins:)]) {
225-
[cell setLayoutMargins:UIEdgeInsetsZero];
226-
}
227-
204+
// //
205+
// if (indexPath.section == 0 && indexPath.row == 0) {
206+
// return;
207+
// }
208+
// if (indexPath.section == 1 && indexPath.row == 0) {
209+
// cell.separatorInset = UIEdgeInsetsMake(0.f, cell.bounds.size.width, 0.f, 0.f);
210+
// return;
211+
// }
212+
//
213+
// // Remove seperator inset
214+
// if ([cell respondsToSelector:@selector(setSeparatorInset:)]) {
215+
// [cell setSeparatorInset:UIEdgeInsetsZero];
216+
// }
217+
//
218+
// // Prevent the cell from inheriting the Table View's margin settings
219+
// if ([cell respondsToSelector:@selector(setPreservesSuperviewLayoutMargins:)]) {
220+
// [cell setPreservesSuperviewLayoutMargins:NO];
221+
// }
222+
//
223+
// // Explictly set your cell's layout margins
224+
// if ([cell respondsToSelector:@selector(setLayoutMargins:)]) {
225+
// [cell setLayoutMargins:UIEdgeInsetsZero];
226+
// }
227+
[tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];
228228
}
229229

230230
#pragma mark NewProjectTypeViewController Delegate

Coding_iOS/Controllers/RootControllers/MyTask_RootViewController.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ - (void)viewDidLoad
8181
icarousel;
8282
});
8383

84-
UIBarButtonItem *addBar = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"addBtn_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(addItemClicked:)];
85-
UIBarButtonItem *screenBar = [self HDCustomNavButtonWithTitle:nil imageName:@"task_filter_nav_unchecked" target:self action:@selector(screenItemClicked:)];
84+
// UIBarButtonItem *addBar = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"addBtn_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(addItemClicked:)];
85+
UIBarButtonItem *addBar = [self HDCustomNavButtonWithTitle:nil imageName:@"addBtn_Nav" target:self action:@selector(addItemClicked:)];
86+
UIBarButtonItem *screenBar = [self HDCustomNavButtonWithTitle:nil imageName:@"task_filter_nav_unchecked" target:self action:@selector(screenItemClicked:)];
8687
self.navigationItem.rightBarButtonItems = @[addBar, screenBar];
8788

88-
8989
//初始化过滤目录
9090
_myFliterMenu = [[TaskSelectionView alloc] initWithFrame:CGRectMake(0, 64, kScreen_Width, kScreen_Height - 64) items:@[@"我的任务(0)", @"我关注的(0)", @"我创建的(0)"]];
9191
__weak typeof(self) weakSelf = self;

Coding_iOS/Images.xcassets/task_filter/task_filter_nav_checked.imageset/Contents.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
},
77
{
88
"idiom" : "universal",
9-
"filename" : "已筛@2x.png",
9+
"filename" : "ic-nav-screening@2x.png",
1010
"scale" : "2x"
1111
},
1212
{
1313
"idiom" : "universal",
14-
"filename" : "已筛@3x.png",
14+
"filename" : "icon-Bar-screening@3x.png",
1515
"scale" : "3x"
1616
}
1717
],
1.97 KB
3.14 KB
Binary file not shown.

0 commit comments

Comments
 (0)