Skip to content

Commit ed31d6e

Browse files
wanghenghengwanghengheng
committed
换图 + 调整
1 parent d2e2354 commit ed31d6e

15 files changed

+54
-28
lines changed

‎Coding_iOS.xcodeproj/project.pbxproj

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,6 @@
663663
4EB52F281C76ED4A00B5EBEA /* TagColorEditCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EB52F271C76ED4A00B5EBEA /* TagColorEditCell.m */; };
664664
4EB52F2B1C76ED7000B5EBEA /* TagColorDisplayCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EB52F2A1C76ED7000B5EBEA /* TagColorDisplayCell.m */; };
665665
4EB52F2E1C77138A00B5EBEA /* button_scan@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EB52F2C1C77138A00B5EBEA /* button_scan@2x.png */; };
666-
4EB52F2F1C77138A00B5EBEA /* button_scan@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EB52F2D1C77138A00B5EBEA /* button_scan@3x.png */; };
667666
4EB52F381C7C38F600B5EBEA /* ResourceReference.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EB52F371C7C38F600B5EBEA /* ResourceReference.m */; };
668667
4EB52F3B1C7C45E700B5EBEA /* taskResourceReference@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EB52F391C7C45E700B5EBEA /* taskResourceReference@2x.png */; };
669668
4EB52F3C1C7C45E700B5EBEA /* taskResourceReference@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EB52F3A1C7C45E700B5EBEA /* taskResourceReference@3x.png */; };
@@ -1247,6 +1246,12 @@
12471246
B1C871841EB18599003DACF0 /* calendar_0xF56061@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C8717A1EB18599003DACF0 /* calendar_0xF56061@3x.png */; };
12481247
B1C871851EB18599003DACF0 /* calendar_0xF68435@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C8717B1EB18599003DACF0 /* calendar_0xF68435@2x.png */; };
12491248
B1C871861EB18599003DACF0 /* calendar_0xF68435@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C8717C1EB18599003DACF0 /* calendar_0xF68435@3x.png */; };
1249+
B1C8718D1EB1E608003DACF0 /* btn_setFrequent@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C871871EB1E608003DACF0 /* btn_setFrequent@3x.png */; };
1250+
B1C8718E1EB1E608003DACF0 /* cell_checkmark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C871881EB1E608003DACF0 /* cell_checkmark@3x.png */; };
1251+
B1C8718F1EB1E608003DACF0 /* icon_add_comment@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C871891EB1E608003DACF0 /* icon_add_comment@3x.png */; };
1252+
B1C871901EB1E608003DACF0 /* nav_page_selected@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C8718A1EB1E608003DACF0 /* nav_page_selected@3x.png */; };
1253+
B1C871911EB1E608003DACF0 /* nav_page_unselected@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C8718B1EB1E608003DACF0 /* nav_page_unselected@3x.png */; };
1254+
B1C871921EB1E608003DACF0 /* tasks_all@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = B1C8718C1EB1E608003DACF0 /* tasks_all@3x.png */; };
12501255
B93D904B1ACBA3110057A6EE /* ProjectDeleteAlertControllerVisualStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = B93D904A1ACBA3110057A6EE /* ProjectDeleteAlertControllerVisualStyle.m */; };
12511256
B94C1B691AC945D30000C271 /* NewProjectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B94C1B681AC945D30000C271 /* NewProjectViewController.m */; };
12521257
B94C1B6B1AC945FB0000C271 /* NewProject.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B94C1B6A1AC945FB0000C271 /* NewProject.storyboard */; };
@@ -2300,7 +2305,6 @@
23002305
4EB52F291C76ED7000B5EBEA /* TagColorDisplayCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TagColorDisplayCell.h; sourceTree = "<group>"; };
23012306
4EB52F2A1C76ED7000B5EBEA /* TagColorDisplayCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TagColorDisplayCell.m; sourceTree = "<group>"; };
23022307
4EB52F2C1C77138A00B5EBEA /* button_scan@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_scan@2x.png"; sourceTree = "<group>"; };
2303-
4EB52F2D1C77138A00B5EBEA /* button_scan@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_scan@3x.png"; sourceTree = "<group>"; };
23042308
4EB52F361C7C38F600B5EBEA /* ResourceReference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceReference.h; sourceTree = "<group>"; };
23052309
4EB52F371C7C38F600B5EBEA /* ResourceReference.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResourceReference.m; sourceTree = "<group>"; };
23062310
4EB52F391C7C45E700B5EBEA /* taskResourceReference@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "taskResourceReference@2x.png"; sourceTree = "<group>"; };
@@ -3165,6 +3169,12 @@
31653169
B1C8717A1EB18599003DACF0 /* calendar_0xF56061@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "calendar_0xF56061@3x.png"; sourceTree = "<group>"; };
31663170
B1C8717B1EB18599003DACF0 /* calendar_0xF68435@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "calendar_0xF68435@2x.png"; sourceTree = "<group>"; };
31673171
B1C8717C1EB18599003DACF0 /* calendar_0xF68435@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "calendar_0xF68435@3x.png"; sourceTree = "<group>"; };
3172+
B1C871871EB1E608003DACF0 /* btn_setFrequent@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "btn_setFrequent@3x.png"; sourceTree = "<group>"; };
3173+
B1C871881EB1E608003DACF0 /* cell_checkmark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cell_checkmark@3x.png"; sourceTree = "<group>"; };
3174+
B1C871891EB1E608003DACF0 /* icon_add_comment@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_add_comment@3x.png"; sourceTree = "<group>"; };
3175+
B1C8718A1EB1E608003DACF0 /* nav_page_selected@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav_page_selected@3x.png"; sourceTree = "<group>"; };
3176+
B1C8718B1EB1E608003DACF0 /* nav_page_unselected@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav_page_unselected@3x.png"; sourceTree = "<group>"; };
3177+
B1C8718C1EB1E608003DACF0 /* tasks_all@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tasks_all@3x.png"; sourceTree = "<group>"; };
31683178
B93D90491ACBA3110057A6EE /* ProjectDeleteAlertControllerVisualStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectDeleteAlertControllerVisualStyle.h; sourceTree = "<group>"; };
31693179
B93D904A1ACBA3110057A6EE /* ProjectDeleteAlertControllerVisualStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectDeleteAlertControllerVisualStyle.m; sourceTree = "<group>"; };
31703180
B94C1B671AC945D30000C271 /* NewProjectViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewProjectViewController.h; sourceTree = "<group>"; };
@@ -5430,6 +5440,12 @@
54305440
4E1A228C1AB19D1F00CFC14F /* git_btn_icons */,
54315441
7E8E59781B6F91C40083CA02 /* bubble */,
54325442
8EA6CF5F19E240C40076D59C /* btn_delete_tweetimage@2x.png */,
5443+
B1C871871EB1E608003DACF0 /* btn_setFrequent@3x.png */,
5444+
B1C871881EB1E608003DACF0 /* cell_checkmark@3x.png */,
5445+
B1C871891EB1E608003DACF0 /* icon_add_comment@3x.png */,
5446+
B1C8718A1EB1E608003DACF0 /* nav_page_selected@3x.png */,
5447+
B1C8718B1EB1E608003DACF0 /* nav_page_unselected@3x.png */,
5448+
B1C8718C1EB1E608003DACF0 /* tasks_all@3x.png */,
54335449
8B3516541B6CF69E0049BC45 /* icon_search_clock@2x.png */,
54345450
D0C448121C02F76600DC1C4B /* icon_search_searchbar@2x.png */,
54355451
D0C448131C02F76600DC1C4B /* icon_search_searchbar@3x.png */,
@@ -5516,7 +5532,6 @@
55165532
4EC480101C2A909D005F1772 /* register_step_un@3x.png */,
55175533
4ED6181E1C3A732F0017946C /* button_arrow_left@2x.png */,
55185534
4EB52F2C1C77138A00B5EBEA /* button_scan@2x.png */,
5519-
4EB52F2D1C77138A00B5EBEA /* button_scan@3x.png */,
55205535
4ECEFA001D1D0B4B002A27D3 /* tip_bg@2x.png */,
55215536
4ECEFA011D1D0B4B002A27D3 /* tip_bg@3x.png */,
55225537
4E59D3301D409C8C008C914B /* topic_add_watcher_btn@2x.png */,
@@ -6610,6 +6625,7 @@
66106625
4EC5AD941A258DF8006FA97C /* icon_file_cell_rename@2x.png in Resources */,
66116626
13FB5D561CA17A6400EE127C /* PR_grant@3x.png in Resources */,
66126627
8E97CE9A1A0C7E26006F9AD7 /* coding_emoji_03@2x.png in Resources */,
6628+
B1C8718E1EB1E608003DACF0 /* cell_checkmark@3x.png in Resources */,
66136629
4ED618241C3CB1AF0017946C /* taskWatchers@2x.png in Resources */,
66146630
4E96E7E21A1B537E0037C098 /* icon_file_psd@2x.png in Resources */,
66156631
8EA6D18019E240C40076D59C /* sex_man_icon@2x.png in Resources */,
@@ -6696,6 +6712,7 @@
66966712
4E80E9301DFFF06E00DE1BC6 /* shortcut_task@3x.png in Resources */,
66976713
4EF17ECD1B3C3112003CDD2D /* intro_dot_unselected@2x.png in Resources */,
66986714
B1C871671EB182C7003DACF0 /* taskPriority1_small@3x.png in Resources */,
6715+
B1C871921EB1E608003DACF0 /* tasks_all@3x.png in Resources */,
66996716
8E97CEA01A0C7E26006F9AD7 /* coding_emoji_09@2x.png in Resources */,
67006717
0A06C2531AB9E57900AB3B03 /* map_annotation@2x.png in Resources */,
67016718
4EB52F601C7C5C4F00B5EBEA /* task_resource_reference_ProjectTopic@2x.png in Resources */,
@@ -6959,6 +6976,7 @@
69596976
4ED4B48F1D82646100EED8C6 /* user_info_setup@2x.png in Resources */,
69606977
B1C871841EB18599003DACF0 /* calendar_0xF56061@3x.png in Resources */,
69616978
4E9423DE1E69401B0095F1CD /* blankpage_image_File@2x.png in Resources */,
6979+
B1C8718F1EB1E608003DACF0 /* icon_add_comment@3x.png in Resources */,
69626980
4EACB4431A2C45300097ABB3 /* button_file_download_enable@2x.png in Resources */,
69636981
D0FE4DB81C103FA0006E5A76 /* git_icon_fork_old@2x.png in Resources */,
69646982
8E97CE691A0A3424006F9AD7 /* keyboard_page_selected@2x.png in Resources */,
@@ -7018,14 +7036,17 @@
70187036
4E9423DD1E69401B0095F1CD /* blankpage_image_Default@3x.png in Resources */,
70197037
4EAECBC21C44CB860096CA74 /* member_cell_edit_alias@2x.png in Resources */,
70207038
4E6383BA1B32640900D98648 /* messageRight_bg_img@2x.png in Resources */,
7039+
B1C871901EB1E608003DACF0 /* nav_page_selected@3x.png in Resources */,
70217040
4E9113AC1A1CB19900AC9431 /* icon_file_state_pause@2x.png in Resources */,
7041+
B1C8718D1EB1E608003DACF0 /* btn_setFrequent@3x.png in Resources */,
70227042
D0C447E41C02DB8900DC1C4B /* tweet_normal@3x.png in Resources */,
70237043
8B3516551B6CF69E0049BC45 /* icon_search_clock@2x.png in Resources */,
70247044
4E6383AA1B3262D300D98648 /* taskPriority2@2x.png in Resources */,
70257045
4EAE06C31B7B51AF00179F4B /* file_activity_icon_upload_file@2x.png in Resources */,
70267046
4ECEF9FC1D1D0B3D002A27D3 /* tip_normal_Nav@2x.png in Resources */,
70277047
4E80E9561E02911E00DE1BC6 /* search_icon_user@2x.png in Resources */,
70287048
4E66EE281A28226000DA1B3E /* button_file_denete_unable@2x.png in Resources */,
7049+
B1C871911EB1E608003DACF0 /* nav_page_unselected@3x.png in Resources */,
70297050
8E97CE4A1A0A2E11006F9AD7 /* EmojisList.plist in Resources */,
70307051
8BDF9AB51B7474990093BF2C /* keyboard_topic@2x.png in Resources */,
70317052
4EBFBD181AA85B8500E4B10E /* add_user_icon@2x.png in Resources */,
@@ -7080,7 +7101,6 @@
70807101
8EA6D19219E240C40076D59C /* timeline_icon_unread@2x.png in Resources */,
70817102
4E54C24B1D8FE19100A61023 /* user_info_edit@2x.png in Resources */,
70827103
4E095A6D1B69F920008DC439 /* banner__page_selected@2x.png in Resources */,
7083-
4EB52F2F1C77138A00B5EBEA /* button_scan@3x.png in Resources */,
70847104
4EB52F5D1C7C5C4F00B5EBEA /* task_resource_reference_MergeRequestBean@3x.png in Resources */,
70857105
4E86FEE51BB556D6005E53F3 /* tipIcon_ProjectFileComment@2x.png in Resources */,
70867106
4E217F141A70EDC700F6DF88 /* SVWebViewControllerActivitySafari-iPad@2x.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.201704261730</string>
39+
<string>4.4.201704271430</string>
4040
<key>ITSAppUsesNonExemptEncryption</key>
4141
<false/>
4242
<key>LSApplicationQueriesSchemes</key>

‎Coding_iOS/Images/button_scan@2x.png

145 Bytes
Loading

‎Coding_iOS/Images/button_scan@3x.png

-289 Bytes
Binary file not shown.

‎Coding_iOS/Images/cell_checkmark@2x.png

100755100644
-1022 Bytes
Loading

‎Coding_iOS/Images/cell_checkmark@3x.png

753 Bytes
Loading

‎Coding_iOS/Images/icon_project_private@2x.png

-236 Bytes
Loading

‎Coding_iOS/Images/splitlineImg@2x.png

-848 Bytes
Loading

‎Coding_iOS/Images/tweet_more_comment_icon@2x.png

100755100644
-794 Bytes
Loading

‎Coding_iOS/Vendor/XTSegmentControl/XTSegmentControl.m

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,13 @@ - (void)addRedLine
375375
CGRect rect = [_itemFrames[0] CGRectValue];
376376

377377
CGRect lineRect = CGRectMake(CGRectGetMinX(rect) + XTSegmentControlHspace,
378-
CGRectGetHeight(rect) - XTSegmentControlLineHeight,
378+
CGRectGetHeight(rect) - XTSegmentControlLineHeight - .5,
379379
CGRectGetWidth(rect) - 2 * XTSegmentControlHspace,
380380
XTSegmentControlLineHeight);
381381
_lineView = [[UIView alloc] initWithFrame:lineRect];
382382
_lineView.backgroundColor = kColorBrandGreen;
383+
_lineView.layer.cornerRadius = 1.5;
384+
_lineView.layer.masksToBounds = YES;
383385
[_contentView addSubview:_lineView];
384386

385387
UIView *bottomLineView = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetHeight(rect)-0.5, CGRectGetWidth(self.bounds), 0.5)];
@@ -390,19 +392,21 @@ - (void)addRedLine
390392

391393
- (CGFloat)p_Hspace{
392394
CGFloat value = 0;
393-
XTSegmentControlItem *item = _items.firstObject;
394-
if (item.type == XTSegmentControlItemTypeIconUrl) {
395-
value = 15;
396-
}
395+
CGRect rect = [_itemFrames.firstObject CGRectValue];
396+
value = MAX(0, (rect.size.width - 20) / 2);
397+
// XTSegmentControlItem *item = _items.firstObject;
398+
// if (item.type == XTSegmentControlItemTypeIconUrl) {
399+
// value = 15;
400+
// }
397401
return value;
398402
}
399403

400404
- (CGFloat)p_LineHeight{
401-
CGFloat value = 2;
402-
XTSegmentControlItem *item = _items.firstObject;
403-
if (item.type == XTSegmentControlItemTypeIconUrl) {
404-
value = 2;
405-
}
405+
CGFloat value = 3;
406+
// XTSegmentControlItem *item = _items.firstObject;
407+
// if (item.type == XTSegmentControlItemTypeIconUrl) {
408+
// value = 2;
409+
// }
406410
return value;
407411
}
408412

@@ -427,7 +431,7 @@ - (void)selectIndex:(NSInteger)index
427431
if (index != _currentIndex) {
428432
XTSegmentControlItem *curItem = [_items objectAtIndex:index];
429433
CGRect rect = [_itemFrames[index] CGRectValue];
430-
CGRect lineRect = CGRectMake(CGRectGetMinX(rect) + XTSegmentControlHspace, CGRectGetHeight(rect) - XTSegmentControlLineHeight, CGRectGetWidth(rect) - 2 * XTSegmentControlHspace, XTSegmentControlLineHeight);
434+
CGRect lineRect = CGRectMake(CGRectGetMinX(rect) + XTSegmentControlHspace, CGRectGetHeight(rect) - XTSegmentControlLineHeight - .5, CGRectGetWidth(rect) - 2 * XTSegmentControlHspace, XTSegmentControlLineHeight);
431435
if (_currentIndex < 0) {
432436
_lineView.frame = lineRect;
433437
[curItem setSelected:YES];
@@ -456,7 +460,7 @@ - (void)moveIndexWithProgress:(float)progress
456460

457461
CGRect origionRect = [_itemFrames[_currentIndex] CGRectValue];;
458462

459-
CGRect origionLineRect = CGRectMake(CGRectGetMinX(origionRect) + XTSegmentControlHspace, CGRectGetHeight(origionRect) - XTSegmentControlLineHeight, CGRectGetWidth(origionRect) - 2 * XTSegmentControlHspace, XTSegmentControlLineHeight);
463+
CGRect origionLineRect = CGRectMake(CGRectGetMinX(origionRect) + XTSegmentControlHspace, CGRectGetHeight(origionRect) - XTSegmentControlLineHeight - .5, CGRectGetWidth(origionRect) - 2 * XTSegmentControlHspace, XTSegmentControlLineHeight);
460464

461465
CGRect rect;
462466

@@ -466,7 +470,7 @@ - (void)moveIndexWithProgress:(float)progress
466470
self.currentIndex += floorf(delta);
467471
delta -= floorf(delta);
468472
origionRect = [_itemFrames[_currentIndex] CGRectValue];;
469-
origionLineRect = CGRectMake(CGRectGetMinX(origionRect) + XTSegmentControlHspace, CGRectGetHeight(origionRect) - XTSegmentControlLineHeight, CGRectGetWidth(origionRect) - 2 * XTSegmentControlHspace, XTSegmentControlLineHeight);
473+
origionLineRect = CGRectMake(CGRectGetMinX(origionRect) + XTSegmentControlHspace, CGRectGetHeight(origionRect) - XTSegmentControlLineHeight - .5, CGRectGetWidth(origionRect) - 2 * XTSegmentControlHspace, XTSegmentControlLineHeight);
470474
}
471475

472476

@@ -477,7 +481,7 @@ - (void)moveIndexWithProgress:(float)progress
477481

478482
rect = [_itemFrames[_currentIndex + 1] CGRectValue];
479483

480-
CGRect lineRect = CGRectMake(CGRectGetMinX(rect) + XTSegmentControlHspace, CGRectGetHeight(rect) - XTSegmentControlLineHeight, CGRectGetWidth(rect) - 2 * XTSegmentControlHspace, XTSegmentControlLineHeight);
484+
CGRect lineRect = CGRectMake(CGRectGetMinX(rect) + XTSegmentControlHspace, CGRectGetHeight(rect) - XTSegmentControlLineHeight - .5, CGRectGetWidth(rect) - 2 * XTSegmentControlHspace, XTSegmentControlLineHeight);
481485

482486
CGRect moveRect = CGRectZero;
483487

@@ -490,7 +494,7 @@ - (void)moveIndexWithProgress:(float)progress
490494
return;
491495
}
492496
rect = [_itemFrames[_currentIndex - 1] CGRectValue];
493-
CGRect lineRect = CGRectMake(CGRectGetMinX(rect) + XTSegmentControlHspace, CGRectGetHeight(rect) - XTSegmentControlLineHeight, CGRectGetWidth(rect) - 2 * XTSegmentControlHspace, XTSegmentControlLineHeight);
497+
CGRect lineRect = CGRectMake(CGRectGetMinX(rect) + XTSegmentControlHspace, CGRectGetHeight(rect) - XTSegmentControlLineHeight - .5, CGRectGetWidth(rect) - 2 * XTSegmentControlHspace, XTSegmentControlLineHeight);
494498
CGRect moveRect = CGRectZero;
495499
moveRect.size = CGSizeMake(CGRectGetWidth(origionLineRect) - delta * (CGRectGetWidth(lineRect) - CGRectGetWidth(origionLineRect)), CGRectGetHeight(lineRect));
496500
moveRect.origin = CGPointMake(CGRectGetMidX(origionLineRect) - delta * (CGRectGetMidX(lineRect) - CGRectGetMidX(origionLineRect)) - CGRectGetMidX(moveRect), CGRectGetMidY(origionLineRect) - CGRectGetMidY(moveRect));

‎Coding_iOS/Views/CCell/TweetLikeUserCCell.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ - (void)configWithUser:(User *)user rewarded:(BOOL)rewarded{
3232
}
3333
}else{
3434
[self.imgView sd_setImageWithURL:nil];
35-
[self.imgView setImage:[UIImage imageWithColor:[UIColor colorWithHexString:@"0xdadada"]]];
35+
[self.imgView setImage:[UIImage imageWithColor:[UIColor colorWithHexString:@"0xD8DDE4"]]];
3636
if (!_likesLabel) {
3737
_likesLabel = [[UILabel alloc] initWithFrame:_imgView.bounds];
3838
_likesLabel.backgroundColor = [UIColor clearColor];

‎Coding_iOS/Views/Cell/ProjectTaskListViewCell.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
127127
kProjectTaskListViewCell_CheckBoxWidth));
128128
}];
129129
[_userIconView mas_makeConstraints:^(MASConstraintMaker *make) {
130-
make.left.equalTo(self.checkView.mas_right).offset(10);
130+
make.left.equalTo(self.checkView.mas_right).offset(15);
131131
make.centerY.equalTo(self.contentView);
132132
make.size.mas_equalTo(CGSizeMake(kProjectTaskListViewCell_UserIconWidth,
133133
kProjectTaskListViewCell_UserIconWidth));
134134
}];
135135
[_taskPriorityView mas_makeConstraints:^(MASConstraintMaker *make) {
136-
make.top.equalTo(self.contentView).offset(10);
136+
make.top.equalTo(self.contentView).offset(15);
137137
make.left.equalTo(self.userIconView.mas_right).offset(10);
138138
make.size.mas_equalTo(CGSizeMake(17, 17));
139139
}];
@@ -150,12 +150,12 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
150150
make.right.equalTo(self.contentView).offset(-kPaddingLeftWidth);
151151
}];
152152
[_numLabel mas_makeConstraints:^(MASConstraintMaker *make) {
153-
make.bottom.equalTo(self.contentView).offset(-10);
153+
make.bottom.equalTo(self.contentView).offset(-15);
154154
make.left.equalTo(self.userIconView.mas_right).offset(10);
155155
make.height.mas_equalTo(15);
156156
}];
157157
[_userNameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
158-
make.left.equalTo(self.numLabel.mas_right).offset(5);
158+
make.left.equalTo(self.numLabel.mas_right).offset(10);
159159
make.centerY.equalTo(self.numLabel);
160160
make.height.mas_equalTo(15);
161161
}];
@@ -229,9 +229,9 @@ + (CGFloat)cellHeightWithObj:(id)obj{
229229
if ([obj isKindOfClass:[Task class]]) {
230230
Task *task = (Task *)obj;
231231
if (task.deadline_date || task.labels.count > 0) {
232-
cellHeight = 95;
232+
cellHeight = 105;
233233
}else{
234-
cellHeight = 60;
234+
cellHeight = 70;
235235
}
236236
}
237237
return cellHeight;

0 commit comments

Comments
 (0)