Merge pull request #21 from nicoster/main

add avatars for topics other than "ALL"

Author: isaced

.gitignore

@@ -0,0 +1,3 @@
+V2exOS.xcodeproj/project.xcworkspace/xcuserdata/
+V2exOS.xcodeproj/xcuserdata/*.xcuserdatad/
+.python-version

V2exOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -8,6 +8,9 @@
 import Foundation
 import V2exAPI
 
+
+
+
 struct PreviewData {
   static let member = V2Member(id: 79764,
                         username: "ljsh093",

V2exOS/Utils/PreviewData.swift

@@ -10,6 +10,7 @@ import Foundation
 extension String {
   func htmlToString() -> String? {
     do {
+
       let text = try NSAttributedString(data: self.data(using: .unicode)!,
                                         options: [.documentType: NSAttributedString.DocumentType.html],
                                         documentAttributes: nil).string

V2exOS/Utils/StringExt.swift

@@ -14,14 +14,17 @@ struct SidebarView: View {
   @EnvironmentObject private var currentUser: CurrentUserStore
 
   @State var nodeList : [V2Node]?
-    @State var isLoading = true
+  @State var isLoading = true
 
   var body: some View {
     List() {
 
       Section(header: Text("Home")) {
+        NavigationLink(destination: TopicListView(nodeName: "HOT")) {
+          Label("最热", systemImage: "flame")
+        }
         NavigationLink(destination: TopicListView(nodeName: "ALL")) {
-          Label("全部", systemImage: "chart.bar")
+          Label("最新", systemImage: "chart.bar")
         }
       }
 

V2exOS/Views/SidebarView.swift

@@ -17,11 +17,11 @@ struct TopicDetailView: View {
 
   @State var commentList: [V2Comment]?
   @State var page = 0
-  @State var commenEnd = false
+  @State var commentEnd = false
   @State var isCommentLoading = false
 
-  func hasCommen() -> Bool {
-    return currentUser.user != nil && (commenEnd || commentList?.count ?? 0 < topic.replies ?? 0)
+  func hasMoreComments() -> Bool {
+    return currentUser.user != nil && (commentEnd || commentList?.count ?? 0 < topic.replies ?? 0)
   }
 
   var body: some View {
@@ -64,12 +64,16 @@ struct TopicDetailView: View {
 
       CommentListView(commentCount: topic.replies, commentList: commentList)
 
-      if hasCommen() {
+      if hasMoreComments() {
         Spacer()
-        ProgressView()
-          .onAppear {
-            loadComments(page: page + 1)
-          }
+        HStack {
+          Spacer()
+          ProgressView()
+            .onAppear {
+              loadComments(page: page + 1)
+            }
+          Spacer()
+        }
       }
     }
     .foregroundColor(Color(NSColor.labelColor))
@@ -92,20 +96,20 @@ struct TopicDetailView: View {
           commentList = res?.result
         }else{
           if let list = res?.result {
-            if !hasCommen() {
+            if !hasMoreComments() {
               isCommentLoading = false
               return
             }
 
             commentList?.append(contentsOf: list)
             // 到底了
             if list.count == 0 {
-              commenEnd = true
+              commentEnd = true
             }
           }
         }
       } catch {
-        commenEnd = true
+        commentEnd = true
         print(error)
       }
 

V2exOS/Views/TopicDetail/TopicDetailView.swift

@@ -10,38 +10,49 @@ import V2exAPI
 import Kingfisher
 
 struct TopicListCellView: View {
+  @State var isMemberLoading = false
 
   @Environment(\.colorScheme) var colorScheme
 
   let topic : V2Topic
+  @State var member : V2Member?
+  
+  init(topic: V2Topic) {
+    self.topic = topic
+    self.isMemberLoading = topic.member == nil
+  }
 
   var body: some View {
     NavigationLink {
       TopicDetailView(topic: topic)
     } label: {
 
       HStack {
-        if let avatarUrl = topic.member?.avatarLarge {
-          KFImage.url(URL(string: avatarUrl))
-            .resizable()
-            .fade(duration: 0.25)
-            .scaledToFit()
-            .frame(width: 48, height: 48)
-            .mask(RoundedRectangle(cornerRadius: 8))
+        
+        if !isMemberLoading {
+          let user = topic.member ?? member
+          if let avatarUrl = user?.avatarLarge {
+            KFImage.url(URL(string: avatarUrl))
+              .resizable()
+              .fade(duration: 0.25)
+              .scaledToFit()
+              .frame(width: 48, height: 48)
+              .mask(RoundedRectangle(cornerRadius: 8))
+          }
         }
+        
         VStack(alignment: .leading, spacing: 6) {
 
           Text(topic.title ?? "")
             .lineLimit(2)
 
           HStack() {
-            if let username = topic.member?.username {
+            
+            if let username = topic.member?.username ?? topic.lastReplyBy {
               UserName(username)
-              
               Text("•")
             }
 
-            
             if let lastModified = topic.lastModified {
               Text(Date.init(timeIntervalSince1970: TimeInterval(lastModified)).fromNow())
             }
@@ -60,6 +71,12 @@ struct TopicListCellView: View {
 
       }
       .foregroundColor(Color(NSColor.labelColor))
+      .task {
+        if let name = topic.lastReplyBy {
+          member = try? await v2ex.memberShow(username: name)
+          isMemberLoading = member == nil
+        }
+      }
     }
   }
 }

V2exOS/Views/TopicList/TopicListCellView.swift

@@ -12,7 +12,6 @@ import Kingfisher
 struct TopicListView: View {
 
   var nodeName: String
-  var node: V2Node?
 
   @State var isLoading = true
   @State var topics: [V2Topic]?
@@ -32,13 +31,17 @@ struct TopicListView: View {
               TopicListCellView(topic: topic)
             }
 
-            if topics.count > 0 && nodeName != "ALL" {
-              ProgressView()
-                .onAppear {
-                  Task {
-                    await self.loadData(page: self.page + 1)
+            if topics.count > 0 && nodeName != "ALL" && nodeName != "HOT" {
+              HStack {
+                Spacer()
+                ProgressView()
+                  .onAppear {
+                    Task {
+                      await self.loadData(page: self.page + 1)
+                    }
                   }
-                }
+                Spacer()
+              }
             }
           }
 
@@ -76,14 +79,17 @@ struct TopicListView: View {
 
       if nodeName == "ALL" {
         topics = try await v2ex.latestTopics()
-      }else{
+      } else if nodeName == "HOT" {
+        topics = try await v2ex.hotTopics()
+        
+      } else {
         topics = try await v2ex.topics(nodeName: nodeName, page: page)?.result
         _node =  try await v2ex.nodesShow(name: nodeName)
       }
 
       if page == 1 {
         self.topics = topics
-      }else{
+      } else {
         self.page = page
         if let topics = topics {
           self.topics?.append(contentsOf: topics)