Skip to content

Commit f92ae36

Browse files
committed
Task - 颜色调整
1 parent c5fbe13 commit f92ae36

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

Coding_iOS/.DS_Store

0 Bytes
Binary file not shown.

Coding_iOS/Coding_iOS-Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</dict>
3737
</array>
3838
<key>CFBundleVersion</key>
39-
<string>4.4.201704251630</string>
39+
<string>4.4.201704261730</string>
4040
<key>ITSAppUsesNonExemptEncryption</key>
4141
<false/>
4242
<key>LSApplicationQueriesSchemes</key>

Coding_iOS/Views/Cell/ProjectTaskListViewCell.m

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
6565
}
6666
if (!_contentLabel) {
6767
_contentLabel = [UILabel new];
68-
_contentLabel.textColor = kColor222;
68+
_contentLabel.textColor = kColorDark3;
6969
_contentLabel.font = kProjectTaskListViewCell_ContentFont;
7070
[self.contentView addSubview:_contentLabel];
7171
}
@@ -76,13 +76,13 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
7676
if (!_numLabel) {
7777
_numLabel = [UILabel new];
7878
_numLabel.font = [UIFont systemFontOfSize:10];
79-
_numLabel.textColor = kColor222;
79+
_numLabel.textColor = kColorDark7;
8080
[self.contentView addSubview:_numLabel];
8181
}
8282
if (!_userNameLabel) {
8383
_userNameLabel = [UILabel new];
8484
_userNameLabel.font = [UIFont systemFontOfSize:10];
85-
_userNameLabel.textColor = kColor666;
85+
_userNameLabel.textColor = kColorDark7;
8686
[self.contentView addSubview:_userNameLabel];
8787
}
8888
if (!_timeClockIconView) {
@@ -93,7 +93,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
9393
if (!_timeLabel) {
9494
_timeLabel = [UILabel new];
9595
_timeLabel.font = [UIFont systemFontOfSize:10];
96-
_timeLabel.textColor = kColor999;
96+
_timeLabel.textColor = kColorDark7;
9797
[self.contentView addSubview:_timeLabel];
9898
}
9999
if (!_commentIconView) {
@@ -104,7 +104,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
104104
if (!_commentCountLabel) {
105105
_commentCountLabel = [UILabel new];
106106
_commentCountLabel.font = [UIFont systemFontOfSize:10];
107-
_commentCountLabel.textColor = kColor999;
107+
_commentCountLabel.textColor = kColorDark7;
108108
[self.contentView addSubview:_commentCountLabel];
109109
}
110110
if (!_mdIconView) {
@@ -115,7 +115,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
115115
if (!_mdLabel) {
116116
_mdLabel = [UILabel new];
117117
_mdLabel.font = [UIFont systemFontOfSize:10];
118-
_mdLabel.textColor = kColor999;
118+
_mdLabel.textColor = kColorDark7;
119119
_mdLabel.text = @"描述";
120120
[self.contentView addSubview:_mdLabel];
121121
}
@@ -203,7 +203,8 @@ - (void)layoutSubviews{
203203
[_checkView setImage:[UIImage imageNamed:_task.status.integerValue == 1? @"checkbox_unchecked" : @"checkbox_checked"]];
204204
[_userIconView sd_setImageWithURL:[_task.owner.avatar urlImageWithCodePathResize:2*kProjectTaskListViewCell_UserIconWidth] placeholderImage:kPlaceholderMonkeyRoundWidth(kProjectTaskListViewCell_UserIconWidth)];
205205
[_taskPriorityView setImage:[UIImage imageNamed:[NSString stringWithFormat:@"taskPriority%@_small", _task.priority.stringValue]]];
206-
_contentLabel.textColor = [UIColor colorWithHexString:_task.status.integerValue == 1? @"0x222222" : @"0x999999"];
206+
_contentLabel.textColor = _task.status.integerValue == 1? kColorDark3: kColorDarkA;
207+
// [UIColor colorWithHexString:_task.status.integerValue == 1? @"0x222222" : @"0x999999"];
207208
_contentLabel.text = [_task.content stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
208209
//Tags
209210
if (_task.deadline_date || _task.labels.count > 0) {
@@ -301,7 +302,7 @@ - (ProjectTagLabel *)p_getLabelWithIndex:(NSInteger)index{
301302

302303
- (void)p_makeMoreStyleWithTagLabel:(ProjectTagLabel *)tagLabel{
303304
tagLabel.layer.backgroundColor = [UIColor clearColor].CGColor;
304-
tagLabel.textColor = kColor999;
305+
tagLabel.textColor = kColorDarkA;
305306
tagLabel.text = @"···";
306307
[tagLabel setWidth:15];
307308
}

0 commit comments

Comments
 (0)