Skip to content

Commit 706475b

Browse files
wanghenghengwanghengheng
committed
TaskCommentActivity
1 parent 9a5d7b7 commit 706475b

5 files changed

Lines changed: 2 additions & 42 deletions

File tree

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,6 @@
355355
4EE548291AE9166B00A92306 /* icon_project_cell_pin@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EE548271AE9166B00A92306 /* icon_project_cell_pin@2x.png */; };
356356
4EF818161B049C89005F974B /* addPictureBgImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EF818151B049C89005F974B /* addPictureBgImage@2x.png */; };
357357
4EF818191B05C984005F974B /* ProjectTopicActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EF818181B05C984005F974B /* ProjectTopicActivity.m */; };
358-
4EF8181C1B05C9AE005F974B /* TaskCommentActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EF8181B1B05C9AE005F974B /* TaskCommentActivity.m */; };
359358
4EF8181F1B05C9D8005F974B /* ProjectLineNoteActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EF8181E1B05C9D8005F974B /* ProjectLineNoteActivity.m */; };
360359
4EF818221B09D43D005F974B /* UIImage+WebP.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EF818211B09D43D005F974B /* UIImage+WebP.m */; };
361360
4EF818241B09D8D8005F974B /* WebP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EF818231B09D8D8005F974B /* WebP.framework */; };
@@ -1245,8 +1244,6 @@
12451244
4EF818151B049C89005F974B /* addPictureBgImage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "addPictureBgImage@2x.png"; sourceTree = "<group>"; };
12461245
4EF818171B05C984005F974B /* ProjectTopicActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectTopicActivity.h; sourceTree = "<group>"; };
12471246
4EF818181B05C984005F974B /* ProjectTopicActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectTopicActivity.m; sourceTree = "<group>"; };
1248-
4EF8181A1B05C9AE005F974B /* TaskCommentActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskCommentActivity.h; sourceTree = "<group>"; };
1249-
4EF8181B1B05C9AE005F974B /* TaskCommentActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TaskCommentActivity.m; sourceTree = "<group>"; };
12501247
4EF8181D1B05C9D8005F974B /* ProjectLineNoteActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectLineNoteActivity.h; sourceTree = "<group>"; };
12511248
4EF8181E1B05C9D8005F974B /* ProjectLineNoteActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectLineNoteActivity.m; sourceTree = "<group>"; };
12521249
4EF818201B09D43D005F974B /* UIImage+WebP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+WebP.h"; sourceTree = "<group>"; };
@@ -3042,8 +3039,6 @@
30423039
4E787DE41B03342000F06E83 /* ProjectActivity.m */,
30433040
4EF818171B05C984005F974B /* ProjectTopicActivity.h */,
30443041
4EF818181B05C984005F974B /* ProjectTopicActivity.m */,
3045-
4EF8181A1B05C9AE005F974B /* TaskCommentActivity.h */,
3046-
4EF8181B1B05C9AE005F974B /* TaskCommentActivity.m */,
30473042
4EF8181D1B05C9D8005F974B /* ProjectLineNoteActivity.h */,
30483043
4EF8181E1B05C9D8005F974B /* ProjectLineNoteActivity.m */,
30493044
4E787DE01B0329B300F06E83 /* ProjectLineNote.h */,
@@ -4016,7 +4011,6 @@
40164011
4E5C06EB1AC4009100F427C5 /* CannotLoginViewController.m in Sources */,
40174012
8EA6D12819E240C40076D59C /* AppDelegate.m in Sources */,
40184013
4ECE8AFF1A3946C10021E29C /* Coding_NetAPIManager.m in Sources */,
4019-
4EF8181C1B05C9AE005F974B /* TaskCommentActivity.m in Sources */,
40204014
8E59F0FA1A00F3F3009A905F /* FileListFileCell.m in Sources */,
40214015
8EA6D14219E240C40076D59C /* TipsViewController.m in Sources */,
40224016
8EA6D1CA19E240C40076D59C /* UIPlaceHolderTextView.m in Sources */,

‎Coding_iOS/Models/Commit.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ @implementation Commit
1212
- (NSString *)contentStr{
1313
NSString *contentStr;
1414
if (_sha && _sha.length > 0) {
15-
contentStr = [NSString stringWithFormat:@"%@:[%@]%@", _committer.name, [_sha substringToIndex:7], _short_message];
15+
contentStr = [NSString stringWithFormat:@"%@ : [%@] %@", _committer.name, [_sha substringToIndex:7], _short_message];
1616
}
1717
return contentStr;
1818
}

‎Coding_iOS/Models/ProjectActivity.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#import <Foundation/Foundation.h>
1010
#import "ProjectTopicActivity.h"
11-
#import "TaskCommentActivity.h"
1211
#import "ProjectLineNoteActivity.h"
1312

1413
#import "Projects.h"
@@ -22,7 +21,7 @@
2221
@property (readwrite, nonatomic, strong) User *user, *target_user;
2322
@property (readwrite, nonatomic, strong) NSDate *created_at;
2423
@property (readwrite, nonatomic, strong) Task *origin_task, *task;
25-
@property (readwrite, nonatomic, strong) TaskCommentActivity *taskComment, *origin_taskComment;
24+
@property (readwrite, nonatomic, strong) TaskComment *taskComment, *origin_taskComment;
2625
@property (readwrite, nonatomic, strong) Project *project;
2726
@property (readwrite, nonatomic, strong) ProjectTopicActivity *project_topic;
2827
@property (readwrite, nonatomic, strong) File *file;

‎Coding_iOS/Models/TaskCommentActivity.h‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎Coding_iOS/Models/TaskCommentActivity.m‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)