Fix warnings + better recently used tags

2024-12-26 17:10:40 +00:00 · 2024-01-06 11:21:07 +01:00 · 2024-01-06 11:21:07 +01:00 · 8c8c551686
commit 8c8c551686
parent bb55154b75
11 changed files with 41 additions and 25 deletions
--- a/IceCubesApp/App/Tabs/Settings/RecenTagsSettingView.swift
+++ b/IceCubesApp/App/Tabs/Settings/RecenTagsSettingView.swift
@ -15,7 +15,14 @@ struct RecenTagsSettingView: View {
  var body: some View {
    Form {
      ForEach(tags) { tag in
-        Text("#\(tag.title)")
+        VStack(alignment: .leading) {
+          Text("#\(tag.title)")
+            .font(.scaledBody)
+            .foregroundColor(.primary)
+          Text(tag.formattedDate)
+            .font(.scaledFootnote)
+            .foregroundStyle(.secondary)
+        }
      }.onDelete { indexes in
        if let index = indexes.first {
          context.delete(tags[index])
--- a/Packages/Account/Sources/Account/AccountsList/AccountsListViewModel.swift
+++ b/Packages/Account/Sources/Account/AccountsList/AccountsListViewModel.swift
@ -61,12 +61,12 @@ public enum AccountsListMode {
      let link: LinkHandler?
      switch mode {
      case let .followers(accountId):
-        var account: Account = try await client.get(endpoint: Accounts.accounts(id: accountId))
+        let account: Account = try await client.get(endpoint: Accounts.accounts(id: accountId))
        totalCount = account.followersCount
        (accounts, link) = try await client.getWithLink(endpoint: Accounts.followers(id: accountId,
                                                                                     maxId: nil))
      case let .following(accountId):
-        var account: Account = try await client.get(endpoint: Accounts.accounts(id: accountId))
+        let account: Account = try await client.get(endpoint: Accounts.accounts(id: accountId))
        totalCount = account.followingCount
        (accounts, link) = try await client.getWithLink(endpoint: Accounts.following(id: accountId,
                                                                                     maxId: nil))
--- a/Packages/Account/Sources/Account/Edit/EditAccountViewModel.swift
+++ b/Packages/Account/Sources/Account/Edit/EditAccountViewModel.swift
@ -52,9 +52,9 @@ import Status
        Task {
          if let data = await getItemImageData(item: item) {
            if isChangingAvatar {
-              await uploadAvatar(data: data)
+              _ = await uploadAvatar(data: data)
            } else if isChangingHeader {
-              await uploadHeader(data: data)
+              _ = await uploadHeader(data: data)
            }
            await fetchAccount()
            isChangingAvatar = false
--- a/Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift
+++ b/Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift
@ -122,7 +122,7 @@ struct AccountPopoverView: View {
  }

  private var adaptiveConfig: AvatarView.FrameConfig {
-    var cornerRadius: CGFloat = if config == .badge || theme.avatarShape == .circle {
+    let cornerRadius: CGFloat = if config == .badge || theme.avatarShape == .circle {
      config.width / 2
    } else {
      config.cornerRadius
--- a/Packages/DesignSystem/Sources/DesignSystem/Views/AvatarView.swift
+++ b/Packages/DesignSystem/Sources/DesignSystem/Views/AvatarView.swift
@ -21,7 +21,7 @@ public struct AvatarView: View {
  }

  private var adaptiveConfig: FrameConfig {
-    var cornerRadius: CGFloat = if config == .badge || theme.avatarShape == .circle {
+    let cornerRadius: CGFloat = if config == .badge || theme.avatarShape == .circle {
      config.width / 2
    } else {
      config.cornerRadius
--- a/Packages/MediaUI/Sources/MediaUI/MediaUITransferableImage.swift
+++ b/Packages/MediaUI/Sources/MediaUI/MediaUITransferableImage.swift
@ -5,8 +5,8 @@ import UIKit
 struct MediaUIImageTransferable: Codable, Transferable {
  let url: URL

-  func fetchAsImage() async -> Image {
-    let data = try? await URLSession.shared.data(from: url).0
+  func fetchAsImage() -> Image {
+    let data = try? Data(contentsOf: url)
    guard let data, let uiimage = UIImage(data: data) else {
      return Image(systemName: "photo")
    }
@ -15,7 +15,7 @@ struct MediaUIImageTransferable: Codable, Transferable {

  static var transferRepresentation: some TransferRepresentation {
    ProxyRepresentation { media in
-      await media.fetchAsImage()
+      media.fetchAsImage()
    }
  }
 }
--- a/Packages/Models/Sources/Models/SwiftData/RecentTag.swift
+++ b/Packages/Models/Sources/Models/SwiftData/RecentTag.swift
@ -11,3 +11,9 @@ import SwiftUI
    self.lastUse = Date()
  }
 }
+
+extension RecentTag {
+  public var formattedDate: String {
+    DateFormatterCache.shared.createdAtRelativeFormatter.localizedString(for: lastUse, relativeTo: Date())
+  }
+}
--- a/Packages/Status/Sources/Status/Editor/Components/AutoComplete/ExpandedView.swift
+++ b/Packages/Status/Sources/Status/Editor/Components/AutoComplete/ExpandedView.swift
@ -32,10 +32,15 @@ extension StatusEditorAutoCompleteView {
                  viewModel.selectHashtagSuggestion(tag: tag.title)
                }
              } label: {
-                Text("#\(tag.title)")
-                  .font(.scaledFootnote)
-                  .fontWeight(.bold)
-                  .foregroundColor(theme.labelColor)
+                VStack(alignment: .leading) {
+                  Text("#\(tag.title)")
+                    .font(.scaledFootnote)
+                    .fontWeight(.bold)
+                    .foregroundColor(theme.labelColor)
+                  Text(tag.formattedDate)
+                    .font(.scaledFootnote)
+                    .foregroundStyle(theme.tintColor)
+                }
              }
              Spacer()
            }
--- a/Packages/Status/Sources/Status/Editor/Components/AutoComplete/RecentTagsView.swift
+++ b/Packages/Status/Sources/Status/Editor/Components/AutoComplete/RecentTagsView.swift
@ -29,6 +29,9 @@ extension StatusEditorAutoCompleteView {
              .font(.scaledFootnote)
              .fontWeight(.bold)
              .foregroundColor(theme.labelColor)
+            Text(tag.formattedDate)
+              .font(.scaledFootnote)
+              .foregroundStyle(theme.tintColor)
          }
        }
      }
--- a/Packages/Status/Sources/Status/Editor/Components/AutoComplete/StatusEditorAutoCompleteView.swift
+++ b/Packages/Status/Sources/Status/Editor/Components/AutoComplete/StatusEditorAutoCompleteView.swift
@ -28,7 +28,11 @@ struct StatusEditorAutoCompleteView: View {
              if !viewModel.mentionsSuggestions.isEmpty {
                Self.MentionsView(viewModel: viewModel)
              } else {
-                suggestionsTagView
+                if viewModel.showRecentsTagsInline {
+                  Self.RecentTagsView(viewModel: viewModel, isTagSuggestionExpanded: $isTagSuggestionExpanded)
+                } else {
+                  Self.RemoteTagsView(viewModel: viewModel, isTagSuggestionExpanded: $isTagSuggestionExpanded)
+                }
              }
            }
            .padding(.horizontal, .layoutPadding)
@ -54,13 +58,4 @@ struct StatusEditorAutoCompleteView: View {
      .background(.thinMaterial)
    }
  }
-
-  @ViewBuilder
-  private var suggestionsTagView: some View {
-    if viewModel.showRecentsTagsInline {
-      Self.RecentTagsView(viewModel: viewModel, isTagSuggestionExpanded: $isTagSuggestionExpanded)
-    } else {
-      Self.RemoteTagsView(viewModel: viewModel, isTagSuggestionExpanded: $isTagSuggestionExpanded)
-    }
-  }
 }
--- a/Packages/Timeline/Sources/Timeline/actors/TimelineCache.swift
+++ b/Packages/Timeline/Sources/Timeline/actors/TimelineCache.swift
@ -71,7 +71,7 @@ public actor TimelineCache {
  }

  func setLatestSeenStatuses(_ statuses: [Status], for client: Client, filter: String) {
-    var statuses = statuses.sorted(by: { $0.createdAt.asDate > $1.createdAt.asDate })
+    let statuses = statuses.sorted(by: { $0.createdAt.asDate > $1.createdAt.asDate })
    if filter == "Home" {
      UserDefaults.standard.set(statuses.map{ $0.id }, forKey: "timeline-last-seen-\(client.id)")
    } else {