From 82179e5f6f65d8cbebe63f8786d8ce5b265fbdb6 Mon Sep 17 00:00:00 2001 From: Thomas Ricouard Date: Fri, 3 Mar 2023 09:20:17 +0100 Subject: [PATCH] Fix notification text color --- .../Sources/Notifications/NotificationRowView.swift | 4 ++-- Packages/Status/Sources/Status/Row/StatusRowViewModel.swift | 5 ++++- .../Sources/Status/Row/Subviews/StatusRowTextView.swift | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Packages/Notifications/Sources/Notifications/NotificationRowView.swift b/Packages/Notifications/Sources/Notifications/NotificationRowView.swift index 441573b1..edb3a33e 100644 --- a/Packages/Notifications/Sources/Notifications/NotificationRowView.swift +++ b/Packages/Notifications/Sources/Notifications/NotificationRowView.swift @@ -144,9 +144,9 @@ struct NotificationRowView: View { StatusRowView(viewModel: { .init(status: status, client: client, routerPath: routerPath, - showActions: false) }) + showActions: false, + textDisabled: true) }) .lineLimit(4) - .foregroundColor(.gray) } Spacer() } diff --git a/Packages/Status/Sources/Status/Row/StatusRowViewModel.swift b/Packages/Status/Sources/Status/Row/StatusRowViewModel.swift index c3af64f1..329d5be9 100644 --- a/Packages/Status/Sources/Status/Row/StatusRowViewModel.swift +++ b/Packages/Status/Sources/Status/Row/StatusRowViewModel.swift @@ -12,6 +12,7 @@ public class StatusRowViewModel: ObservableObject { let isFocused: Bool let isRemote: Bool let showActions: Bool + let textDisabled: Bool let finalStatus: AnyStatus @Published var isPinned: Bool @@ -89,7 +90,8 @@ public class StatusRowViewModel: ObservableObject { routerPath: RouterPath, isFocused: Bool = false, isRemote: Bool = false, - showActions: Bool = true) + showActions: Bool = true, + textDisabled: Bool = false) { self.status = status self.finalStatus = status.reblog ?? status @@ -98,6 +100,7 @@ public class StatusRowViewModel: ObservableObject { self.isFocused = isFocused self.isRemote = isRemote self.showActions = showActions + self.textDisabled = textDisabled if let reblog = status.reblog { isPinned = reblog.pinned == true } else { diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowTextView.swift b/Packages/Status/Sources/Status/Row/Subviews/StatusRowTextView.swift index 3d64f7fe..aa465877 100644 --- a/Packages/Status/Sources/Status/Row/Subviews/StatusRowTextView.swift +++ b/Packages/Status/Sources/Status/Row/Subviews/StatusRowTextView.swift @@ -5,7 +5,6 @@ import SwiftUI struct StatusRowTextView: View { @EnvironmentObject private var theme: Theme - @EnvironmentObject private var preferences: UserPreferences @ObservedObject var viewModel: StatusRowViewModel @@ -17,7 +16,7 @@ struct StatusRowTextView: View { language: viewModel.finalStatus.language, lineLimit: viewModel.lineLimit) .font(.scaledBody) - .foregroundColor(theme.labelColor) + .foregroundColor(viewModel.textDisabled ? .gray : theme.labelColor) .emojiSize(Font.scaledBodyPointSize) .environment(\.openURL, OpenURLAction { url in viewModel.routerPath.handleStatus(status: viewModel.finalStatus, url: url)