Merge pull request #89 from writeas/show-collection-in-all-posts

Show collection name in "All Posts" list

Author: AngeloStavrow

Shared/PostList/PostCellView.swift

@@ -2,38 +2,60 @@ import SwiftUI
 
 struct PostCellView: View {
     @ObservedObject var post: WFAPost
+    var collectionName: String?
+
+    static let createdDateFormat: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.locale = Locale.current
+        formatter.dateStyle = .long
+        formatter.timeStyle = .short
+        return formatter
+    }()
 
     var body: some View {
         HStack {
             VStack(alignment: .leading) {
+                if let collectionName = collectionName {
+                    Text(collectionName)
+                        .font(.caption)
+                        .foregroundColor(.secondary)
+                        .padding(EdgeInsets(top: 3, leading: 4, bottom: 3, trailing: 4))
+                        .overlay(RoundedRectangle(cornerRadius: 2).stroke(Color.secondary, lineWidth: 1))
+                }
                 Text(post.title)
                     .font(.headline)
-                    .lineLimit(1)
-                Text(buildDateString(from: post.createdDate ?? Date()))
+                Text(post.createdDate ?? Date(), formatter: Self.createdDateFormat)
                     .font(.caption)
-                    .lineLimit(1)
+                    .foregroundColor(.secondary)
+                    .padding(.top, -3)
             }
             Spacer()
             PostStatusBadgeView(post: post)
         }
         .padding(5)
     }
+}
 
-    func buildDateString(from date: Date) -> String {
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateStyle = .long
-        dateFormatter.timeStyle = .short
+struct PostCell_AllPostsPreviews: PreviewProvider {
+    static var previews: some View {
+        let context = LocalStorageManager.persistentContainer.viewContext
+        let testPost = WFAPost(context: context)
+        testPost.title = "Test Post Title"
+        testPost.body = "Here's some cool sample body text."
+        testPost.createdDate = Date()
 
-        return dateFormatter.string(from: date)
+        return PostCellView(post: testPost, collectionName: "My Cool Blog")
+            .environment(\.managedObjectContext, context)
     }
 }
 
-struct PostCell_Previews: PreviewProvider {
+struct PostCell_NormalPreviews: PreviewProvider {
     static var previews: some View {
         let context = LocalStorageManager.persistentContainer.viewContext
         let testPost = WFAPost(context: context)
         testPost.title = "Test Post Title"
         testPost.body = "Here's some cool sample body text."
+        testPost.collectionAlias = "My Cool Blog"
         testPost.createdDate = Date()
 
         return PostCellView(post: testPost)

Shared/PostList/PostListFilteredView.swift

@@ -3,9 +3,12 @@ import SwiftUI
 struct PostListFilteredView: View {
     @EnvironmentObject var model: WriteFreelyModel
 
+    @FetchRequest(entity: WFACollection.entity(), sortDescriptors: []) var collections: FetchedResults<WFACollection>
     var fetchRequest: FetchRequest<WFAPost>
+    var showAllPosts: Bool
 
     init(filter: String?, showAllPosts: Bool) {
+        self.showAllPosts = showAllPosts
         if showAllPosts {
             fetchRequest = FetchRequest<WFAPost>(
                 entity: WFAPost.entity(),
@@ -37,7 +40,16 @@ struct PostListFilteredView: View {
                     tag: post,
                     selection: $model.selectedPost
                 ) {
-                    PostCellView(post: post)
+                    if showAllPosts {
+                        if let collection = collections.filter { $0.alias == post.collectionAlias }.first {
+                            PostCellView(post: post, collectionName: collection.title)
+                        } else {
+                            let collectionName = model.account.server == "https://write.as" ? "Anonymous" : "Drafts"
+                            PostCellView(post: post, collectionName: collectionName)
+                        }
+                    } else {
+                        PostCellView(post: post)
+                    }
                 }
                 .deleteDisabled(post.status != PostStatus.local.rawValue)
             }