From 5b7bfba4447b78c3eb8f0d844cea649228451178 Mon Sep 17 00:00:00 2001 From: Thomas Ricouard Date: Thu, 9 Feb 2023 12:24:18 +0100 Subject: [PATCH] More optimizations to StatusRowView --- .../Status/Sources/Status/List/StatusesListView.swift | 2 -- .../Status/Sources/Status/Row/StatusRowView.swift | 11 +++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Packages/Status/Sources/Status/List/StatusesListView.swift b/Packages/Status/Sources/Status/List/StatusesListView.swift index 5e390c15..8d6a3a82 100644 --- a/Packages/Status/Sources/Status/List/StatusesListView.swift +++ b/Packages/Status/Sources/Status/List/StatusesListView.swift @@ -6,7 +6,6 @@ import SwiftUI public struct StatusesListView: View where Fetcher: StatusesFetcher { @EnvironmentObject private var theme: Theme - @EnvironmentObject private var routerPath: RouterPath @ObservedObject private var fetcher: Fetcher private let isRemote: Bool @@ -25,7 +24,6 @@ public struct StatusesListView: View where Fetcher: StatusesFetcher { StatusRowView(viewModel: .init(status: status, isCompact: false)) .padding(.horizontal, isEmbdedInList ? 0 : .layoutPadding) .redacted(reason: .placeholder) - .id(UUID()) .listRowBackground(theme.primaryBackgroundColor) .listRowInsets(.init(top: 12, leading: .layoutPadding, diff --git a/Packages/Status/Sources/Status/Row/StatusRowView.swift b/Packages/Status/Sources/Status/Row/StatusRowView.swift index 1462f92a..1bcda4f3 100644 --- a/Packages/Status/Sources/Status/Row/StatusRowView.swift +++ b/Packages/Status/Sources/Status/Row/StatusRowView.swift @@ -9,7 +9,6 @@ import SwiftUI public struct StatusRowView: View { @Environment(\.redactionReasons) private var reasons @EnvironmentObject private var preferences: UserPreferences - @EnvironmentObject private var account: CurrentAccount @EnvironmentObject private var theme: Theme @EnvironmentObject private var client: Client @EnvironmentObject private var routerPath: RouterPath @@ -169,18 +168,14 @@ public struct StatusRowView: View { HStack(spacing: 2) { Image(systemName: "arrow.left.arrow.right.circle.fill") AvatarView(url: viewModel.status.account.avatar, size: .boost) - if viewModel.status.account.url != account.account?.url { - EmojiTextApp(.init(stringValue: viewModel.status.account.safeDisplayName), emojis: viewModel.status.account.emojis) - Text("status.row.was-boosted") - } else { - Text("status.row.you-boosted") - } + EmojiTextApp(.init(stringValue: viewModel.status.account.safeDisplayName), emojis: viewModel.status.account.emojis) + Text("status.row.was-boosted") } .accessibilityElement() .accessibilityLabel( Text("\(viewModel.status.account.safeDisplayName)") + Text(" ") - + Text(viewModel.status.account.url != account.account?.url ? "status.row.was-boosted" : "status.row.you-boosted") + + Text("status.row.was-boosted") ) .font(.scaledFootnote) .foregroundColor(.gray)