improve ux. (#65)

Livinglist · Jul 20, 2023 · d30fe00 · d30fe00
1 parent c43199e
commit d30fe00
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/Packages/HackerNewsKit/Sources/HackerNewsKit/Models/Comment.swift b/Packages/HackerNewsKit/Sources/HackerNewsKit/Models/Comment.swift
@@ -13,7 +13,7 @@ public struct Comment: Item {
     public let level: Int?
     public var metadata: String? {
         if let count = kids?.count, count != 0 {
-            return "\(count) cmts | \(timeAgo) by \(by.orEmpty)"
+            return "\(count) cmt\(count > 1 ? "s":"") | \(timeAgo) by \(by.orEmpty)"
         } else {
             return "\(timeAgo) by \(by.orEmpty)"
         }

diff --git a/Packages/HackerNewsKit/Sources/HackerNewsKit/Models/Story.swift b/Packages/HackerNewsKit/Sources/HackerNewsKit/Models/Story.swift
@@ -24,7 +24,7 @@ public struct Story: Item {
         if isJob {
             return "\(timeAgo) by \(by.orEmpty)"
         } else {
-            return "\(score.orZero) pts | \(descendants.orZero) cmts | \(timeAgo) by \(by.orEmpty)"
+            return "\(score.orZero) pt\(score.orZero > 1 ? "s":"") | \(descendants.orZero) cmt\(descendants.orZero > 1 ? "s":"") | \(timeAgo) by \(by.orEmpty)"
         }
     }
 

diff --git a/Shared/Models/Status.swift b/Shared/Models/Status.swift
@@ -4,6 +4,7 @@ public enum Status {
     case loading
     // Loading with no loading indicator.
     case backgroundLoading
+    case refreshing
     case loaded
     case error
 

diff --git a/Shared/Models/Stores/StoryStore.swift b/Shared/Models/Stores/StoryStore.swift
@@ -14,8 +14,8 @@ extension HomeView {
         private var currentPage: Int = 0
         private var storyIds: [Int] = .init()
 
-        func fetchStories() async {
-            self.status = .loading
+        func fetchStories(status: Status = .loading) async {
+            self.status = status
             self.currentPage = 0
             self.storyIds = await StoriesRepository.shared.fetchStoryIds(from: self.storyType)
 
@@ -32,7 +32,7 @@ extension HomeView {
         }
 
         func refresh() async -> Void {
-            await fetchStories()
+            await fetchStories(status: .refreshing)
         }
 
         func loadMore() async {

diff --git a/Shared/Views/ItemView.swift b/Shared/Views/ItemView.swift
@@ -227,7 +227,7 @@ struct ItemView: View {
                     .foregroundColor(getColor())
             }
             if let descendants = item.descendants {
-                Text("\(descendants) comment\(descendants <= 1 ? "" : "s")")
+                Text("\(descendants) cmt\(descendants <= 1 ? "" : "s")")
                     .borderedFootnote()
                     .foregroundColor(getColor())
             }

diff --git a/Shared/Views/Widgets/CommentTile.swift b/Shared/Views/Widgets/CommentTile.swift
@@ -110,7 +110,7 @@ extension ItemView {
 
                             onLoadMore()
                         } label: {
-                            Text("Load \(comment.kids.countOrZero) \(comment.kids.isMoreThanOne ? "replies" : "reply")")
+                            Text("\(comment.kids.countOrZero) \(comment.kids.isMoreThanOne ? "replies" : "reply")")
                                 .font(.footnote.weight(.bold))
                                 .foregroundColor(getColor(level: level))
                                 .frame(width: 140)
@@ -180,7 +180,7 @@ extension ItemView {
                         .foregroundColor(getColor(level: level))
                 }
                 if let descendants = comment.descendants {
-                    Text("\(descendants) comment\(descendants <= 1 ? "" : "s")")
+                    Text("\(descendants) cmt\(descendants <= 1 ? "" : "s")")
                         .borderedFootnote()
                         .foregroundColor(getColor(level: level))
                 }