Skip to content

Commit 84068eb

Browse files
committed
Translate SourcePostAttribution to Swift
1 parent 1e83ec6 commit 84068eb

File tree

8 files changed

+30
-53
lines changed

8 files changed

+30
-53
lines changed

Sources/WordPressData/Objective-C/ReaderPost.m

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#import "ReaderPost.h"
2-
#import "SourcePostAttribution.h"
32
#import "WPAccount.h"
43
#import "WordPressData-Swift.h"
54

@@ -223,13 +222,13 @@ + (SourcePostAttribution *)createOrReplaceFromRemoteDiscoverAttribution:(RemoteS
223222
+ (NSString *)attributionTypeFromTaxonomies:(NSArray *)taxonomies
224223
{
225224
if ([taxonomies containsObject:SourceAttributionSiteTaxonomy]) {
226-
return SourcePostAttributionTypeSite;
225+
return SourcePostAttribution.site;
227226
}
228227

229228
if ([taxonomies containsObject:SourceAttributionImageTaxonomy] ||
230229
[taxonomies containsObject:SourceAttributionQuoteTaxonomy] ||
231230
[taxonomies containsObject:SourceAttributionStandardTaxonomy] ) {
232-
return SourcePostAttributionTypePost;
231+
return SourcePostAttribution.post;
233232
}
234233

235234
return nil;
@@ -358,9 +357,9 @@ - (NSString *)likeCountForDisplay
358357

359358
- (SourceAttributionStyle)sourceAttributionStyle
360359
{
361-
if ([self.sourceAttribution.attributionType isEqualToString:SourcePostAttributionTypePost]) {
360+
if ([self.sourceAttribution.attributionType isEqualToString:SourcePostAttribution.post]) {
362361
return SourceAttributionStylePost;
363-
} else if ([self.sourceAttribution.attributionType isEqualToString:SourcePostAttributionTypeSite]) {
362+
} else if ([self.sourceAttribution.attributionType isEqualToString:SourcePostAttribution.site]) {
364363
return SourceAttributionStyleSite;
365364
} else {
366365
return SourceAttributionStyleNone;

Sources/WordPressData/Objective-C/SourcePostAttribution.m

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

Sources/WordPressData/Objective-C/include/SourcePostAttribution.h

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import Foundation
2+
import CoreData
3+
4+
@objc(SourcePostAttribution)
5+
public class SourcePostAttribution: NSManagedObject {
6+
@objc public static let post = "post"
7+
@objc public static let site = "site"
8+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import Foundation
2+
import CoreData
3+
4+
public extension SourcePostAttribution {
5+
@NSManaged var permalink: String?
6+
@NSManaged var authorName: String?
7+
@NSManaged var authorURL: String?
8+
@NSManaged var blogName: String?
9+
@NSManaged var blogURL: String?
10+
@NSManaged var blogID: NSNumber?
11+
@NSManaged var postID: NSNumber?
12+
@NSManaged var commentCount: NSNumber?
13+
@NSManaged var likeCount: NSNumber?
14+
@NSManaged var avatarURL: String?
15+
@NSManaged var attributionType: String?
16+
@NSManaged var post: ReaderPost
17+
}

Sources/WordPressData/WordPressData.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ FOUNDATION_EXPORT const unsigned char WordPressDataVersionString[];
2222
#import <WordPressData/PostServiceOptions.h>
2323
#import <WordPressData/ReaderGapMarker.h>
2424
#import <WordPressData/ReaderPost.h>
25-
#import <WordPressData/SourcePostAttribution.h>
2625
#import <WordPressData/Theme.h>
2726
#import <WordPressData/WPAccount.h>
2827

WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailCoordinator.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ class ReaderDetailCoordinator {
272272
}
273273

274274
var path: String?
275-
if post.sourceAttribution.attributionType == SourcePostAttributionTypePost {
275+
if post.sourceAttribution.attributionType == SourcePostAttribution.post {
276276
path = post.sourceAttribution.permalink
277277
} else {
278278
path = post.sourceAttribution.blogURL

WordPress/WordPress.xcodeproj/project.pbxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,6 @@
11881188
"Objective-C/include/PostServiceOptions.h",
11891189
"Objective-C/include/ReaderGapMarker.h",
11901190
"Objective-C/include/ReaderPost.h",
1191-
"Objective-C/include/SourcePostAttribution.h",
11921191
"Objective-C/include/Theme.h",
11931192
"Objective-C/include/WPAccount.h",
11941193
WordPressData.h,

0 commit comments

Comments
 (0)