From 8f31e34e1d4a08a2da1b67ce4369d9247cd5a8fd Mon Sep 17 00:00:00 2001 From: Thomas Ricouard Date: Fri, 15 Dec 2023 20:13:50 +0100 Subject: [PATCH] Fix colors --- Packages/Status/Sources/Status/Editor/StatusEditorView.swift | 2 +- .../Sources/Status/Row/Subviews/StatusRowContextMenu.swift | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Packages/Status/Sources/Status/Editor/StatusEditorView.swift b/Packages/Status/Sources/Status/Editor/StatusEditorView.swift index 8e87d5c2..fa447f99 100644 --- a/Packages/Status/Sources/Status/Editor/StatusEditorView.swift +++ b/Packages/Status/Sources/Status/Editor/StatusEditorView.swift @@ -74,7 +74,7 @@ public struct StatusEditorView: View { .scrollPosition(id: $scrollID, anchor: .top) .animation(.bouncy(duration: 0.3), value: editorFocusState) .animation(.bouncy(duration: 0.3), value: followUpSEVMs) - .background(Color.primaryBackground) + .background(theme.primaryBackgroundColor) .safeAreaInset(edge: .bottom) { StatusEditorAutoCompleteView(viewModel: focusedSEVM) } diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowContextMenu.swift b/Packages/Status/Sources/Status/Row/Subviews/StatusRowContextMenu.swift index 44592cd9..21aa6084 100644 --- a/Packages/Status/Sources/Status/Row/Subviews/StatusRowContextMenu.swift +++ b/Packages/Status/Sources/Status/Row/Subviews/StatusRowContextMenu.swift @@ -16,6 +16,7 @@ struct StatusRowContextMenu: View { @Environment(CurrentInstance.self) private var currentInstance @Environment(StatusDataController.self) private var statusDataController @Environment(QuickLook.self) private var quickLook + @Environment(Theme.self) private var theme var viewModel: StatusRowViewModel @Binding var showTextForSelection: Bool @@ -296,7 +297,7 @@ struct SelectTextView: View { } } } - .background(Color.primaryBackground) + .background(Theme.shared.primaryBackgroundColor) .navigationTitle("status.action.select-text") .navigationBarTitleDisplayMode(.inline) } @@ -318,7 +319,7 @@ struct SelectableText: UIViewRepresentable { textView.isEditable = false textView.attributedText = attributedText textView.textColor = UIColor(Color.label) - textView.backgroundColor = UIColor(Color.primaryBackground) + textView.backgroundColor = UIColor(Theme.shared.primaryBackgroundColor) return textView }