添加仓库的关注

SwiftPamphletApp/Core/FundationFunction.swift

@@ -35,7 +35,7 @@ func wrapperHtmlContent(content: String, codeStyle: String = "lioshi.min") -> St
 func howLongAgo(date: Date) -> String {
  let simplifiedChinese = Locale(identifier: "zh_Hans")
  return date.formatted(.relative(presentation: .named,
- unitsStyle: .spellOut).locale(simplifiedChinese))
+ unitsStyle: .wide).locale(simplifiedChinese))
 }
 func howLongFromNow(timeStr: String) -> String {
  let cn = Region(zone: Zones.asiaShanghai, locale: Locales.chineseChina)

SwiftPamphletApp/GitHubAPI/DetailView/RepoView.swift

@@ -152,7 +152,6 @@ struct IssuesView: View {
  } else {
  IssueLabelView(issue: issue)
  }
- Divider()
  } // end ForEach
  } // end List
  } // end body
@@ -172,7 +171,6 @@ struct IssueEventsView: View {
  } else {
  IssueEventLabelView(issueEvent: issueEvent)
  }
- Divider()
  } // end ForEach
  } // end List
  } // end body
@@ -201,8 +199,6 @@ struct RepoCommitsView: View {
  } else {
  RepoCommitLabelView(repo: repo, commit: commit, isUnRead: unReadCount > 0 && i < unReadCount)
  }
-
- Divider()
  } // end ForEach
  } // end List
  .frame(minWidth: SPC.detailMinWidth)

SwiftPamphletApp/GitHubAPI/Developer/DeveloperListView.swift

@@ -20,7 +20,18 @@ struct DeveloperListView: View {
  AsyncImageWithPlaceholder(size: .smallSize, url: dev.avatar)
  VStack {
  HStack {
- Text(dev.name)
+ if dev.repoName.isEmpty {
+ Text(dev.name)
+
+ } else {
+ VStack(alignment:.leading) {
+ Text(dev.repoOwner)
+ .font(.footnote)
+ .foregroundColor(light: .secondary, dark: .secondary)
+ Text(dev.repoName)
+ }
+ }
+
  Spacer()
  Text(howLongAgo(date: dev.updateDate))
  .font(.footnote)
@@ -62,7 +73,7 @@ struct DeveloperListView: View {
  }
 
  func addDev() {
- let dev = DeveloperModel(name: "", des: "", avatar: "", createDate: Date.now, updateDate: Date.now)
+ let dev = DeveloperModel(name: "", des: "", avatar: "", repoOwner: "", repoName: "", createDate: Date.now, updateDate: Date.now)
  modelContext.insert(dev)
  selectDev = dev
  }

SwiftPamphletApp/GitHubAPI/Developer/DeveloperModel.swift

@@ -14,13 +14,18 @@ final class DeveloperModel {
  var des: String = ""
  var avatar: String = ""
 
+ var repoOwner: String = ""
+ var repoName: String = ""
+
  var createDate: Date = Date.now
  var updateDate: Date = Date.now
 
- init(name: String, des: String, avatar: String, createDate: Date, updateDate: Date) {
+ init(name: String, des: String, avatar: String, repoOwner: String, repoName: String, createDate: Date, updateDate: Date) {
  self.name = name
  self.des = des
  self.avatar = avatar
+ self.repoOwner = repoOwner
+ self.repoName = repoName
  self.createDate = createDate
  self.updateDate = updateDate
  }

SwiftPamphletApp/GitHubAPI/Developer/EditDeveloper.swift

@@ -13,27 +13,142 @@ struct EditDeveloper: View {
  @State var vm: UserVM
  @State private var tabSelct = 1
 
+ @State var vmRepo: RepoVM
+ @State private var tabSelctRepo = 1
+
+
  var body: some View {
  Form {
  HStack {
- TextField("用户名:", text: $dev.name, prompt: Text("输入 Github 用户名"))
- .onSubmit {
- vm = UserVM(userName: dev.name)
- vm.doing(.updateAll)
+ TextField("用户名:", text: $dev.name, prompt: Text("输入 Github 用户名 dev 或仓库名 dev/repo"))
+ .onChange(of: dev.name) { oldValue, newValue in
+ let dn = dev.name.components(separatedBy: "/") 
+ if dn.count > 1 {
+ vmRepo = RepoVM(repoName: dev.name)
+ vmRepo.doing(.inInit)
+ dev.repoName = dn.last ?? ""
+ dev.repoOwner = dn.first ?? ""
+ } else {
+ vm = UserVM(userName: dev.name)
+ vm.doing(.updateAll)
+ dev.repoName = ""
+ dev.repoOwner = ""
+ }
  }
  TextField("描述:", text: $dev.des)
  }
  }
  .padding(EdgeInsets(top: 10, leading: 10, bottom: 0, trailing: 10))
 
+ if dev.name.components(separatedBy: "/").count > 1 {
+ repoEventView()
+ } else {
+ devEventView()
+ }
+ }
+
+ @ViewBuilder
+ func repoEventView() -> some View {
+ HStack {
+ VStack(alignment: .leading, spacing: 10) {
+ HStack {
+ Text(vmRepo.repo.name).font(.system(.largeTitle))
+ Text("(\(vmRepo.repo.fullName))")
+ }
+ HStack {
+ Image(systemName: "star.fill").foregroundColor(.red)
+ Text("\(vmRepo.repo.stargazersCount)")
+ Image(systemName: "tuningfork").foregroundColor(.cyan)
+ Text("\(vmRepo.repo.forks)")
+ Text("议题 \(vmRepo.repo.openIssues)")
+ Text("语言 \(vmRepo.repo.language ?? "")")
+ ButtonGoGitHubWeb(url: vmRepo.repo.htmlUrl ?? "https:", text: "在 GitHub 上访问")
+
+ }
+ if vmRepo.repo.description != nil {
+ Text("简介：\(vmRepo.repo.description ?? "")")
+ }
+
+ HStack {
+ Text("作者：")
+ AsyncImageWithPlaceholder(size: .smallSize, url: vmRepo.repo.owner.avatarUrl)
+ ButtonGoGitHubWeb(url: vmRepo.repo.owner.login, text: vmRepo.repo.owner.login, ignoreHost: true)
+ }
+ } // end VStack
+ Spacer()
+ }
+ .frame(minWidth: SPC.detailMinWidth)
+ .onChange(of: vmRepo.repo, { oldValue, newValue in
+ if !newValue.owner.avatarUrl.isEmpty {
+ dev.avatar = newValue.owner.avatarUrl
+ }
+ })
+ .onChange(of: vmRepo.commits, { oldValue, newValue in
+ if ((newValue.first?.commit.author.date.isEmpty) != nil) {
+ let iso8601String = newValue.first?.commit.author.date ?? ""
+ let formatter = ISO8601DateFormatter()
+ dev.updateDate = formatter.date(from: iso8601String) ?? Date.now
+ }
+ })
+ .padding(EdgeInsets(top: 20, leading: 10, bottom: 0, trailing: 10))
+ .onAppear {
+ vmRepo.doing(.inInit)
+ }
+ // end HStack
+
+ TabView(selection: $tabSelct) {
+ RepoCommitsView(commits: vmRepo.commits, repo: vmRepo.repo)
+ .tabItem {
+ Text("新提交")
+ }
+ .onAppear {
+ vmRepo.doing(.inCommit)
+ }
+ .tag(1)
+
+ IssuesView(issues: vmRepo.issues, repo: vmRepo.repo)
+ .tabItem {
+ Text("议题列表")
+ }
+ .onAppear {
+ vmRepo.doing(.inIssues)
+ }
+ .tag(2)
+
+ IssueEventsView(issueEvents: vmRepo.issueEvents, repo: vmRepo.repo)
+ .tabItem {
+ Text("议题事件")
+ }
+ .onAppear {
+ vmRepo.doing(.inIssueEvents)
+ }
+ .tag(3)
+
+ ReadmeView(content: vmRepo.readme.content.replacingOccurrences(of: "\n", with: ""))
+ .tabItem {
+ Text("README")
+ }
+ .onAppear {
+ vmRepo.doing(.inReadme)
+ }
+ .tag(4)
+
+ } // end TabView
+ Spacer()
+ }
+
+ @ViewBuilder
+ func devEventView() -> some View {
  HStack {
  VStack(alignment: .leading, spacing: 10) {
  HStack {
  AsyncImageWithPlaceholder(size: .normalSize, url: vm.user.avatarUrl)
  VStack(alignment: .leading, spacing: 5) {
  HStack {
  Text(vm.user.name ?? vm.user.login).font(.system(.title))
- Text("(\(vm.user.login))")
+ if !vm.user.login.isEmpty {
+ Text("(\(vm.user.login))")
+ }
  Text("订阅者 \(vm.user.followers) 人，仓库 \(vm.user.publicRepos) 个")
  }
  HStack {
@@ -97,6 +212,7 @@ struct EditDeveloper: View {
  vm.doing(.inEvent)
  }
  .tag(1)
+
  DeveloperEventView(events: vm.receivedEvents)
  .tabItem {
  Image(systemName: "keyboard.badge.ellipsis")

SwiftPamphletApp/GitHubAPI/VM/RepoVM.swift

@@ -48,6 +48,9 @@ final class RepoVM: APIVMable {
  switch somethinglike {
  case .inInit:
  apRepoSj.send(())
+ apCommitsSj.send(())
+ apIssueEventsSj.send(())
+ apIssuesSj.send(())
  case .inCommit:
  apCommitsSj.send(())
  case .inInitJustRepo:

SwiftPamphletApp/HomeUI/DataLink.swift

@@ -38,14 +38,14 @@ struct DataLink: Identifiable {
  EmptyView()
  }
  }
- case "开发者":
+ case "开发/仓库":
  switch type {
  case .content:
  DeveloperListView(selectDev:selectDev)
  case .detail:
  if let dev = selectDevBindable {
  if SPC.gitHubAccessToken.isEmpty == false || SPC.githubAccessToken().isEmpty == false {
- EditDeveloper(dev: dev, vm: UserVM(userName: dev.name))
+ EditDeveloper(dev: dev, vm: UserVM(userName: dev.name), vmRepo: RepoVM(repoName: dev.name))
  } else {
  Text("请在设置里写上 Github 的 access token")
  }
@@ -78,7 +78,7 @@ extension DataLink {
  DataLink(title: "资料整理", imageName: "p11")
  ]),
  DataLink(title: "Github", imageName: "", children: [
- DataLink(title: "开发者", imageName: "p5"),
+ DataLink(title: "开发/仓库", imageName: "p5"),
  ]),
  DataLink(title: "Swift指南", imageName: "", children: [
  DataLink(title: "语法速查", imageName: "p23"),

SwiftPamphletApp/InfoOrganizer/Info/EditInfoView.swift

@@ -117,8 +117,8 @@ struct EditInfoView: View {
  WebUIView(html: wrapperHtmlContent(content: MarkdownParser().html(from: info.des)), baseURLStr: "")
  .tabItem { Label("预览", systemImage: "circle") }
  .tag(2)
- if !info.url.isEmpty {
- WebUIView(urlStr: info.url)
+ if let url = URL(string: info.url) {
+ WebUIView(urlStr: url.absoluteString)
  .tabItem { Label("网页", systemImage: "circle") }
  .tag(3)
  }