Skip to content

Commit fdc95e3

Browse files
wanghenghengwanghengheng
committed
你猜我的心情是好还是坏。。
1 parent 789de83 commit fdc95e3

29 files changed

+73
-55
lines changed

‎Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,6 +1270,10 @@
12701270
B1C871B41EB2D9F0003DACF0 /* file_activity_icon_move_file@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C871AF1EB2D9F0003DACF0 /* file_activity_icon_move_file@3x.png */; };
12711271
B1C871B51EB2D9F0003DACF0 /* file_activity_icon_update_file@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C871B01EB2D9F0003DACF0 /* file_activity_icon_update_file@3x.png */; };
12721272
B1C871B61EB2D9F0003DACF0 /* file_activity_icon_upload_file@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C871B11EB2D9F0003DACF0 /* file_activity_icon_upload_file@3x.png */; };
1273+
B1C871BA1EB338FD003DACF0 /* comment_bg@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C871B71EB338FD003DACF0 /* comment_bg@3x.png */; };
1274+
B1C871BB1EB338FD003DACF0 /* project_tag_btn@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C871B81EB338FD003DACF0 /* project_tag_btn@3x.png */; };
1275+
B1C871BC1EB338FD003DACF0 /* project_tag_icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C871B91EB338FD003DACF0 /* project_tag_icon@3x.png */; };
1276+
B1C871BE1EB33B37003DACF0 /* task_icon_arrow@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C871BD1EB33B37003DACF0 /* task_icon_arrow@3x.png */; };
12731277
B93D904B1ACBA3110057A6EE /* ProjectDeleteAlertControllerVisualStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = B93D904A1ACBA3110057A6EE /* ProjectDeleteAlertControllerVisualStyle.m */; };
12741278
B94C1B691AC945D30000C271 /* NewProjectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B94C1B681AC945D30000C271 /* NewProjectViewController.m */; };
12751279
B94C1B6B1AC945FB0000C271 /* NewProject.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B94C1B6A1AC945FB0000C271 /* NewProject.storyboard */; };
@@ -3211,6 +3215,10 @@
32113215
B1C871AF1EB2D9F0003DACF0 /* file_activity_icon_move_file@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "file_activity_icon_move_file@3x.png"; sourceTree = "<group>"; };
32123216
B1C871B01EB2D9F0003DACF0 /* file_activity_icon_update_file@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "file_activity_icon_update_file@3x.png"; sourceTree = "<group>"; };
32133217
B1C871B11EB2D9F0003DACF0 /* file_activity_icon_upload_file@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "file_activity_icon_upload_file@3x.png"; sourceTree = "<group>"; };
3218+
B1C871B71EB338FD003DACF0 /* comment_bg@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "comment_bg@3x.png"; sourceTree = "<group>"; };
3219+
B1C871B81EB338FD003DACF0 /* project_tag_btn@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "project_tag_btn@3x.png"; sourceTree = "<group>"; };
3220+
B1C871B91EB338FD003DACF0 /* project_tag_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "project_tag_icon@3x.png"; sourceTree = "<group>"; };
3221+
B1C871BD1EB33B37003DACF0 /* task_icon_arrow@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "task_icon_arrow@3x.png"; sourceTree = "<group>"; };
32143222
B93D90491ACBA3110057A6EE /* ProjectDeleteAlertControllerVisualStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectDeleteAlertControllerVisualStyle.h; sourceTree = "<group>"; };
32153223
B93D904A1ACBA3110057A6EE /* ProjectDeleteAlertControllerVisualStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectDeleteAlertControllerVisualStyle.m; sourceTree = "<group>"; };
32163224
B94C1B671AC945D30000C271 /* NewProjectViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewProjectViewController.h; sourceTree = "<group>"; };
@@ -3834,6 +3842,7 @@
38343842
4E6383A11B3262D300D98648 /* taskPriority3@2x.png */,
38353843
4E6383A21B3262D300D98648 /* taskPriority3_small@2x.png */,
38363844
4E63840E1B34124000D98648 /* task_icon_arrow@2x.png */,
3845+
B1C871BD1EB33B37003DACF0 /* task_icon_arrow@3x.png */,
38373846
4EED9DCA1B539366000E5827 /* taskOwner@2x.png */,
38383847
4EED9DCB1B539366000E5827 /* taskProject@2x.png */,
38393848
4ED618221C3CB1AF0017946C /* taskWatchers@2x.png */,
@@ -5597,6 +5606,9 @@
55975606
4EAAD05A1E544006008AA957 /* icon_triangle@3x.png */,
55985607
B1C8714E1EADF48B003DACF0 /* cell_arrow_left@2x.png */,
55995608
B1C8714F1EADF48B003DACF0 /* cell_arrow_left@3x.png */,
5609+
B1C871B71EB338FD003DACF0 /* comment_bg@3x.png */,
5610+
B1C871B81EB338FD003DACF0 /* project_tag_btn@3x.png */,
5611+
B1C871B91EB338FD003DACF0 /* project_tag_icon@3x.png */,
56005612
);
56015613
path = Images;
56025614
sourceTree = "<group>";
@@ -6634,6 +6646,7 @@
66346646
13FB5D3B1CA17A6400EE127C /* PR_push@3x.png in Resources */,
66356647
927AFF4F1BFF6DAD00AAE593 /* shop_coding_coin_icon@3x.png in Resources */,
66366648
4EF17EDA1B3C3112003CDD2D /* intro_icon_5@3x.png in Resources */,
6649+
B1C871BC1EB338FD003DACF0 /* project_tag_icon@3x.png in Resources */,
66376650
4ED4B48D1D82646100EED8C6 /* user_info_project@2x.png in Resources */,
66386651
D09E6ABC1BF829F2009D37F8 /* icon_project_cell_setNormal@2x.png in Resources */,
66396652
D0C4480E1C02DCAC00DC1C4B /* search_Nav@3x.png in Resources */,
@@ -6651,6 +6664,7 @@
66516664
4E80E9511E02911E00DE1BC6 /* search_icon_topic@3x.png in Resources */,
66526665
D0C447D11C02DB6700DC1C4B /* pop_User@3x.png in Resources */,
66536666
B1C871691EB182C7003DACF0 /* taskPriority2_small@3x.png in Resources */,
6667+
B1C871BB1EB338FD003DACF0 /* project_tag_btn@3x.png in Resources */,
66546668
4EB52F621C7C5C4F00B5EBEA /* task_resource_reference_Task@2x.png in Resources */,
66556669
4E4972E81BB5446900F3AC15 /* tips_menu_icon_mkread@2x.png in Resources */,
66566670
8E97CEA61A0C7E26006F9AD7 /* coding_emoji_15@2x.png in Resources */,
@@ -6993,6 +7007,7 @@
69937007
4E9423F21E69401B0095F1CD /* blankpage_image_Tweet@2x.png in Resources */,
69947008
4E62410B1B74D65400E1533C /* search_tweet_like@2x.png in Resources */,
69957009
4E94C4ED1B4A867A00EB668A /* scan_bg@2x.png in Resources */,
7010+
B1C871BE1EB33B37003DACF0 /* task_icon_arrow@3x.png in Resources */,
69967011
4E996C031ABBF56A00C704F1 /* n_btn_followed_not@2x.png in Resources */,
69977012
8EA6D17F19E240C40076D59C /* section_btn_open@2x.png in Resources */,
69987013
4E095A151D9534CB00E63D9E /* intro_page_selected@2x.png in Resources */,
@@ -7037,6 +7052,7 @@
70377052
8E97CEA71A0C7E26006F9AD7 /* coding_emoji_16@2x.png in Resources */,
70387053
4EAAD05C1E544006008AA957 /* icon_triangle@3x.png in Resources */,
70397054
4EAAD09E1E5D8558008AA957 /* mrpr_icon_arrow@3x.png in Resources */,
7055+
B1C871BA1EB338FD003DACF0 /* comment_bg@3x.png in Resources */,
70407056
4E0022A81B7362EF005308DE /* intro_page0_ip6+@3x.png in Resources */,
70417057
8E8F7B2C19EF6306006BA8BD /* btn_followed_both@2x.png in Resources */,
70427058
13FB5D421CA17A6400EE127C /* PR_refuse@3x.png in Resources */,

‎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.201704271430</string>
39+
<string>4.4.201704281800</string>
4040
<key>ITSAppUsesNonExemptEncryption</key>
4141
<false/>
4242
<key>LSApplicationQueriesSchemes</key>

‎Coding_iOS/Controllers/RootControllers/BaseNavigationController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ - (void)viewWillAppear:(BOOL)animated{
2525
//添新
2626
if (!_navLineV) {
2727
_navLineV = [[UIView alloc]initWithFrame:CGRectMake(0, 44, kScreen_Width, 1.0/ [UIScreen mainScreen].scale)];
28-
_navLineV.backgroundColor = kColorCCC;
28+
_navLineV.backgroundColor = kColorD8DDE4;
2929
[self.navigationBar addSubview:_navLineV];
3030
}
3131
}

‎Coding_iOS/Images/comment_bg@2x.png

165 Bytes
Loading

‎Coding_iOS/Images/comment_bg@3x.png

1.41 KB
Loading

‎Coding_iOS/Images/nav_button/addUserBtn_Nav@2x.png

-131 Bytes
Loading

‎Coding_iOS/Images/nav_button/addUserBtn_Nav@3x.png

-136 Bytes
Loading

‎Coding_iOS/Images/nav_button/hot_topic_Nav@2x.png

441 Bytes
Loading

‎Coding_iOS/Images/nav_button/hot_topic_Nav@3x.png

736 Bytes
Loading

‎Coding_iOS/Images/nav_button/tweetBtn_Nav@2x.png

3 Bytes
Loading

‎Coding_iOS/Images/nav_button/tweetBtn_Nav@3x.png

47 Bytes
Loading

‎Coding_iOS/Images/project_tag_btn@2x.png

94 Bytes
Loading

‎Coding_iOS/Images/project_tag_btn@3x.png

1.36 KB
Loading

‎Coding_iOS/Images/project_tag_icon@2x.png

113 Bytes
Loading

‎Coding_iOS/Images/project_tag_icon@3x.png

1.36 KB
Loading

‎Coding_iOS/Images/shop/shop_nar_history_icon@2x.png

-558 Bytes
Loading

‎Coding_iOS/Images/shop/shop_nar_history_icon@3x.png

-771 Bytes
Loading

‎Coding_iOS/Images/task/task_icon_arrow@2x.png

12 Bytes
Loading

‎Coding_iOS/Images/task/task_icon_arrow@3x.png

805 Bytes
Loading

‎Coding_iOS/Vendor/XTSegmentControl/XTSegmentControl.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ - (void)initItemsWithTitleArray:(NSArray *)titleArray withIcon:(BOOL)isIcon
363363
(CGRectGetHeight(rect) - 14) * 0.5,
364364
1,
365365
14)];
366-
lineView.backgroundColor = kColorDDD;
366+
lineView.backgroundColor = kColorD8DDE4;
367367
[self addSubview:lineView];
368368
}
369369
}
@@ -385,7 +385,7 @@ - (void)addRedLine
385385
[_contentView addSubview:_lineView];
386386

387387
UIView *bottomLineView = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetHeight(rect)-0.5, CGRectGetWidth(self.bounds), 0.5)];
388-
bottomLineView.backgroundColor = kColorDDD;
388+
bottomLineView.backgroundColor = kColorD8DDE4;
389389
[self addSubview:bottomLineView];
390390
}
391391
}

‎Coding_iOS/Views/Cell/FileActivityCell.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ + (NSAttributedString *)attrContentWithObj:(ProjectActivity *)curActivity{
2828

2929
attrContent = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@ %@", userName, contentStr]];
3030
[attrContent addAttributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:13],
31-
NSForegroundColorAttributeName : kColor222}
31+
NSForegroundColorAttributeName : kColorDark3}
3232
range:NSMakeRange(0, userName.length)];
3333
[attrContent addAttributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13],
34-
NSForegroundColorAttributeName : kColor999}
34+
NSForegroundColorAttributeName : kColorDark7}
3535
range:NSMakeRange(userName.length + 1, contentStr.length)];
3636

3737
NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];

‎Coding_iOS/Views/Cell/LeftImage_LRTextCell.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
3232
if (!_leftLabel) {
3333
_leftLabel = [[UILabel alloc] initWithFrame:CGRectMake(60, ([LeftImage_LRTextCell cellHeight] - 30) / 2, 80, 30)];
3434
_leftLabel.font = [UIFont systemFontOfSize:16];
35-
_leftLabel.textColor = kColor222;
35+
_leftLabel.textColor = kColorDark3;
3636
_leftLabel.textAlignment = NSTextAlignmentLeft;
3737
[self.contentView addSubview:_leftLabel];
3838
}
3939
if (!_rightLabel) {
4040
_rightLabel = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(_leftLabel.frame), ([LeftImage_LRTextCell cellHeight] - 30) / 2, kScreen_Width - CGRectGetMaxX(_leftLabel.frame) - 35, 30)];
4141
_rightLabel.font = [UIFont systemFontOfSize:16];
42-
_rightLabel.textColor = kColor999;
42+
_rightLabel.textColor = kColorDark7;
4343
_rightLabel.textAlignment = NSTextAlignmentRight;
4444
[self.contentView addSubview:_rightLabel];
4545
}

‎Coding_iOS/Views/Cell/ProjectAboutMeListCell.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
4545
}
4646
if (!_ownerTitleLabel) {
4747
_ownerTitleLabel = [UILabel new];
48-
_ownerTitleLabel.textColor = kColorDark7;
48+
_ownerTitleLabel.textColor = kColorDarkA;
4949
_ownerTitleLabel.font = [UIFont systemFontOfSize:15];
5050
[self.contentView addSubview:_ownerTitleLabel];
5151
}

‎Coding_iOS/Views/Cell/TaskActivityCell.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ + (NSAttributedString *)attrContentWithObj:(ProjectActivity *)curActivity{
143143
contentStr = contentStr? contentStr: @"...";
144144
attrContent = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@ %@", userName, contentStr]];
145145
[attrContent addAttributes:@{NSFontAttributeName : [UIFont boldSystemFontOfSize:13],
146-
NSForegroundColorAttributeName : kColor222}
146+
NSForegroundColorAttributeName : kColorDark3}
147147
range:NSMakeRange(0, userName.length)];
148148
[attrContent addAttributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13],
149-
NSForegroundColorAttributeName : kColor999}
149+
NSForegroundColorAttributeName : kColorDark7}
150150
range:NSMakeRange(userName.length + 1, contentStr.length)];
151151

152152
NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];

‎Coding_iOS/Views/Cell/TaskCommentCell.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
6363
}
6464
if (!_contentLabel) {
6565
_contentLabel = [[UITTTAttributedLabel alloc] initWithFrame:CGRectMake(kTaskCommentCell_LeftContentPading, 7 + 15, kTaskCommentCell_ContentWidth, 30)];
66-
_contentLabel.textColor = kColor222;
66+
_contentLabel.textColor = kColorDark4;
6767
_contentLabel.font = kTaskCommentCell_FontContent;
6868
_contentLabel.linkAttributes = kLinkAttributes;
6969
_contentLabel.activeLinkAttributes = kLinkAttributesActive;
@@ -72,7 +72,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
7272
}
7373
if (!_timeLabel) {
7474
_timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(kTaskCommentCell_LeftContentPading, 0, kTaskCommentCell_ContentWidth, 20)];
75-
_timeLabel.textColor = kColor999;
75+
_timeLabel.textColor = kColorDark7;
7676
_timeLabel.font = [UIFont systemFontOfSize:12];
7777
[self.contentView addSubview:_timeLabel];
7878
}

0 commit comments

Comments
 (0)