Skip to content

Commit 6131f9e

Browse files
committed
Fetch collection name for post list cell if showing all posts
1 parent c55636d commit 6131f9e

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

Shared/PostList/PostListFilteredView.swift

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ import SwiftUI
33
struct PostListFilteredView: View {
44
@EnvironmentObject var model: WriteFreelyModel
55

6+
@FetchRequest(entity: WFACollection.entity(), sortDescriptors: []) var collections: FetchedResults<WFACollection>
67
var fetchRequest: FetchRequest<WFAPost>
8+
var showAllPosts: Bool
79

810
init(filter: String?, showAllPosts: Bool) {
11+
self.showAllPosts = showAllPosts
912
if showAllPosts {
1013
fetchRequest = FetchRequest<WFAPost>(
1114
entity: WFAPost.entity(),
@@ -37,7 +40,16 @@ struct PostListFilteredView: View {
3740
tag: post,
3841
selection: $model.selectedPost
3942
) {
40-
PostCellView(post: post)
43+
if showAllPosts {
44+
if let collection = collections.filter { $0.alias == post.collectionAlias }.first {
45+
PostCellView(post: post, collectionName: collection.title)
46+
} else {
47+
let collectionName = model.account.server == "https://write.as" ? "Anonymous" : "Drafts"
48+
PostCellView(post: post, collectionName: collectionName)
49+
}
50+
} else {
51+
PostCellView(post: post)
52+
}
4153
}
4254
.deleteDisabled(post.status != PostStatus.local.rawValue)
4355
}

WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<key>WriteFreely-MultiPlatform (iOS).xcscheme_^#shared#^_</key>
88
<dict>
99
<key>orderHint</key>
10-
<integer>0</integer>
10+
<integer>1</integer>
1111
</dict>
1212
<key>WriteFreely-MultiPlatform (macOS).xcscheme_^#shared#^_</key>
1313
<dict>
1414
<key>orderHint</key>
15-
<integer>1</integer>
15+
<integer>0</integer>
1616
</dict>
1717
</dict>
1818
</dict>

0 commit comments

Comments
 (0)