From fcaf48ce53d79844db15a1b0083989673d34077f Mon Sep 17 00:00:00 2001 From: Thomas Ricouard Date: Mon, 4 Dec 2023 15:49:44 +0100 Subject: [PATCH] foregroundColor -> foregroundStyle --- IceCubesApp/App/Tabs/Settings/AboutView.swift | 2 +- IceCubesApp/App/Tabs/Settings/AddAccountsView.swift | 8 ++++---- IceCubesApp/App/Tabs/Settings/SupportAppView.swift | 6 +++--- .../App/Tabs/Timeline/AddRemoteTimelineView.swift | 4 ++-- .../Sources/Account/AccountDetailHeaderView.swift | 10 +++++----- .../Account/Sources/Account/AccountDetailView.swift | 2 +- .../Account/AccountsList/AccountsListRow.swift | 2 +- .../Sources/Account/Filters/FiltersListView.swift | 6 +++--- .../Sources/AppAccount/AppAccountView.swift | 6 +++--- .../Detail/ConversationMessageView.swift | 2 +- .../Conversations/List/ConversationsListRow.swift | 2 +- .../DesignSystem/Views/AccountPopoverView.swift | 6 +++--- .../Sources/DesignSystem/Views/EmptyView.swift | 2 +- .../Sources/DesignSystem/Views/ErrorView.swift | 2 +- .../Sources/DesignSystem/Views/TagRowView.swift | 2 +- Packages/Lists/Sources/Lists/Edit/ListEditView.swift | 4 ++-- .../Sources/Notifications/NotificationRowView.swift | 10 +++++----- .../Components/StatusEditorAutoCompleteView.swift | 2 +- .../Sources/Status/Editor/StatusEditorView.swift | 2 +- .../Sources/Status/Embed/StatusEmbeddedView.swift | 2 +- .../Status/History/StatusEditHistoryView.swift | 2 +- .../Status/Sources/Status/Poll/StatusPollView.swift | 2 +- .../Status/Row/Subviews/StatusRowCardView.swift | 2 +- .../Status/Row/Subviews/StatusRowDetailView.swift | 4 ++-- .../Status/Row/Subviews/StatusRowHeaderView.swift | 12 ++++++------ .../Status/Row/Subviews/StatusRowReblogView.swift | 2 +- .../Status/Row/Subviews/StatusRowReplyView.swift | 2 +- .../Status/Row/Subviews/StatusRowTagView.swift | 2 +- .../Status/Row/Subviews/StatusRowTranslateView.swift | 2 +- .../Timeline/Sources/Timeline/TimelineView.swift | 4 ++-- 30 files changed, 58 insertions(+), 58 deletions(-) diff --git a/IceCubesApp/App/Tabs/Settings/AboutView.swift b/IceCubesApp/App/Tabs/Settings/AboutView.swift index 0f632f54..6d6e9730 100644 --- a/IceCubesApp/App/Tabs/Settings/AboutView.swift +++ b/IceCubesApp/App/Tabs/Settings/AboutView.swift @@ -81,7 +81,7 @@ struct AboutView: View { """) .multilineTextAlignment(.leading) .font(.scaledSubheadline) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } header: { Text("settings.about.built-with") .textCase(nil) diff --git a/IceCubesApp/App/Tabs/Settings/AddAccountsView.swift b/IceCubesApp/App/Tabs/Settings/AddAccountsView.swift index c66dbd49..4fda8508 100644 --- a/IceCubesApp/App/Tabs/Settings/AddAccountsView.swift +++ b/IceCubesApp/App/Tabs/Settings/AddAccountsView.swift @@ -197,12 +197,12 @@ struct AddAccountView: View { .foregroundColor(.primary) Text(instance.info?.shortDescription ?? "") .font(.scaledBody) - .foregroundColor(.gray) + .foregroundStyle(Color.secondary) (Text("instance.list.users-\(instance.users)") + Text(" ⸱ ") + Text("instance.list.posts-\(instance.statuses)")) .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(Color.secondary) } } .listRowBackground(theme.primaryBackgroundColor) @@ -218,10 +218,10 @@ struct AddAccountView: View { .foregroundColor(.primary) Text("placeholder.loading.long") .font(.scaledBody) - .foregroundColor(.gray) + .foregroundStyle(.secondary) Text("placeholder.loading.short") .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } .redacted(reason: .placeholder) .allowsHitTesting(false) diff --git a/IceCubesApp/App/Tabs/Settings/SupportAppView.swift b/IceCubesApp/App/Tabs/Settings/SupportAppView.swift index dff53dbe..6b42c46c 100644 --- a/IceCubesApp/App/Tabs/Settings/SupportAppView.swift +++ b/IceCubesApp/App/Tabs/Settings/SupportAppView.swift @@ -175,7 +175,7 @@ struct SupportAppView: View { .font(.scaledSubheadline) Text(Tip.supporter.subtitle) .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } Spacer() makePurchaseButton(product: subscription) @@ -204,7 +204,7 @@ struct SupportAppView: View { .font(.scaledSubheadline) Text(tip.subtitle) .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } Spacer() makePurchaseButton(product: product) @@ -262,7 +262,7 @@ struct SupportAppView: View { .font(.scaledSubheadline) Text("settings.support.placeholder.loading-subtitle") .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } .padding(.vertical, 8) } diff --git a/IceCubesApp/App/Tabs/Timeline/AddRemoteTimelineView.swift b/IceCubesApp/App/Tabs/Timeline/AddRemoteTimelineView.swift index b3efb02c..9f640516 100644 --- a/IceCubesApp/App/Tabs/Timeline/AddRemoteTimelineView.swift +++ b/IceCubesApp/App/Tabs/Timeline/AddRemoteTimelineView.swift @@ -95,13 +95,13 @@ struct AddRemoteTimelineView: View { .foregroundColor(.primary) Text(instance.info?.shortDescription ?? "") .font(.scaledBody) - .foregroundColor(.gray) + .foregroundStyle(Color.secondary) (Text("instance.list.users-\(instance.users)") + Text(" ⸱ ") + Text("instance.list.posts-\(instance.statuses)")) .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(Color.secondary) } } .listRowBackground(theme.primaryBackgroundColor) diff --git a/Packages/Account/Sources/Account/AccountDetailHeaderView.swift b/Packages/Account/Sources/Account/AccountDetailHeaderView.swift index 0c448ab2..79dcb03b 100644 --- a/Packages/Account/Sources/Account/AccountDetailHeaderView.swift +++ b/Packages/Account/Sources/Account/AccountDetailHeaderView.swift @@ -206,7 +206,7 @@ struct AccountDetailHeaderView: View { } Text("@\(account.acct)") .font(.scaledCallout) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .textSelection(.enabled) .accessibilityRespondsToUserInteraction(false) joinedAtView @@ -252,7 +252,7 @@ struct AccountDetailHeaderView: View { .font(.scaledBody) Text(getLocalizedStringLabel(langCode: translation.detectedSourceLanguage, provider: translation.provider)) .font(.footnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } } .fixedSize(horizontal: false, vertical: true) @@ -288,7 +288,7 @@ struct AccountDetailHeaderView: View { } Text(title) .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } .accessibilityElement(children: .ignore) .accessibilityLabel(title) @@ -304,7 +304,7 @@ struct AccountDetailHeaderView: View { Text("account.joined") Text(joinedAt, style: .date) } - .foregroundColor(.gray) + .foregroundStyle(.secondary) .font(.footnote) .padding(.top, 6) .accessibilityElement(children: .combine) @@ -315,7 +315,7 @@ struct AccountDetailHeaderView: View { private func makeNoteView(_ note: String) -> some View { VStack(alignment: .leading, spacing: 4) { Text("account.relation.note.label") - .foregroundColor(.gray) + .foregroundStyle(.secondary) Text(note) .frame(maxWidth: .infinity, alignment: .leading) .padding(8) diff --git a/Packages/Account/Sources/Account/AccountDetailView.swift b/Packages/Account/Sources/Account/AccountDetailView.swift index 2cc516ea..9aea29ca 100644 --- a/Packages/Account/Sources/Account/AccountDetailView.swift +++ b/Packages/Account/Sources/Account/AccountDetailView.swift @@ -277,7 +277,7 @@ public struct AccountDetailView: View { Label("account.post.pinned", systemImage: "pin.fill") .accessibilityAddTraits(.isHeader) .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .fontWeight(.semibold) .listRowInsets(.init(top: 0, leading: 12, diff --git a/Packages/Account/Sources/Account/AccountsList/AccountsListRow.swift b/Packages/Account/Sources/Account/AccountsList/AccountsListRow.swift index 3b66f823..a63b9caa 100644 --- a/Packages/Account/Sources/Account/AccountsList/AccountsListRow.swift +++ b/Packages/Account/Sources/Account/AccountsList/AccountsListRow.swift @@ -53,7 +53,7 @@ public struct AccountsListRow: View { .fontWeight(.semibold) Text("@\(viewModel.account.acct)") .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(Color.secondary) // First parameter is the number for the plural // Second parameter is the formatted string to show diff --git a/Packages/Account/Sources/Account/Filters/FiltersListView.swift b/Packages/Account/Sources/Account/Filters/FiltersListView.swift index 1fe5d6d6..5d7dd1a0 100644 --- a/Packages/Account/Sources/Account/Filters/FiltersListView.swift +++ b/Packages/Account/Sources/Account/Filters/FiltersListView.swift @@ -34,16 +34,16 @@ public struct FiltersListView: View { .font(.scaledSubheadline) Text("\(filter.context.map(\.name).joined(separator: ", "))") .font(.scaledBody) - .foregroundColor(.gray) + .foregroundStyle(.secondary) if filter.hasExpiry() { if filter.isExpired() { Text("filter.expired") .font(.footnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } else { Text("filter.expiry-\(filter.expiresAt!.relativeFormatted)") .font(.footnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } } } diff --git a/Packages/AppAccount/Sources/AppAccount/AppAccountView.swift b/Packages/AppAccount/Sources/AppAccount/AppAccountView.swift index d05b00cb..587edcff 100644 --- a/Packages/AppAccount/Sources/AppAccount/AppAccountView.swift +++ b/Packages/AppAccount/Sources/AppAccount/AppAccountView.swift @@ -86,7 +86,7 @@ public struct AppAccountView: View { ProgressView() Text(viewModel.appAccount.accountName ?? viewModel.acct) .font(.scaledSubheadline) - .foregroundColor(.gray) + .foregroundStyle(Color.secondary) .padding(.leading, 6) } VStack(alignment: .leading) { @@ -97,13 +97,13 @@ public struct AppAccountView: View { .font(.scaledSubheadline) .emojiSize(Font.scaledSubheadlineFont.emojiSize) .emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) - .foregroundColor(.gray) + .foregroundStyle(Color.secondary) } } if viewModel.isInNavigation { Spacer() Image(systemName: "chevron.right") - .foregroundColor(.gray) + .foregroundStyle(.secondary) } } } diff --git a/Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift b/Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift index ac1bbe24..f0e4f92c 100644 --- a/Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift +++ b/Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift @@ -78,7 +78,7 @@ struct ConversationMessageView: View { Text(message.createdAt.asDate, style: .time) } .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) if !isOwnMessage { Spacer() } diff --git a/Packages/Conversations/Sources/Conversations/List/ConversationsListRow.swift b/Packages/Conversations/Sources/Conversations/List/ConversationsListRow.swift index 3bf572ed..ac54dd8a 100644 --- a/Packages/Conversations/Sources/Conversations/List/ConversationsListRow.swift +++ b/Packages/Conversations/Sources/Conversations/List/ConversationsListRow.swift @@ -104,7 +104,7 @@ struct ConversationsListRow: View { } } .padding(.leading, 48) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } @ViewBuilder diff --git a/Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift b/Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift index 1d47f881..40d291a7 100644 --- a/Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift +++ b/Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift @@ -45,7 +45,7 @@ struct AccountPopoverView: View { Text("@\(account.acct)") .font(.callout) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .textSelection(.enabled) .accessibilityRespondsToUserInteraction(false) .help("@\(account.acct)") @@ -56,7 +56,7 @@ struct AccountPopoverView: View { Text("account.joined") Text(account.createdAt.asDate, style: .date) } - .foregroundColor(.gray) + .foregroundStyle(.secondary) .font(.footnote) .accessibilityElement(children: .combine) @@ -110,7 +110,7 @@ struct AccountPopoverView: View { } Text(title) .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .alignmentGuide(.bottomAvatar, computeValue: { dimension in dimension[.firstTextBaseline] }) diff --git a/Packages/DesignSystem/Sources/DesignSystem/Views/EmptyView.swift b/Packages/DesignSystem/Sources/DesignSystem/Views/EmptyView.swift index a7873ab0..7a5a7e25 100644 --- a/Packages/DesignSystem/Sources/DesignSystem/Views/EmptyView.swift +++ b/Packages/DesignSystem/Sources/DesignSystem/Views/EmptyView.swift @@ -23,7 +23,7 @@ public struct EmptyView: View { Text(message) .font(.scaledSubheadline) .multilineTextAlignment(.center) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } .padding(.top, 100) .padding(.layoutPadding) diff --git a/Packages/DesignSystem/Sources/DesignSystem/Views/ErrorView.swift b/Packages/DesignSystem/Sources/DesignSystem/Views/ErrorView.swift index 2394a75d..ef423d3a 100644 --- a/Packages/DesignSystem/Sources/DesignSystem/Views/ErrorView.swift +++ b/Packages/DesignSystem/Sources/DesignSystem/Views/ErrorView.swift @@ -27,7 +27,7 @@ public struct ErrorView: View { Text(message) .font(.scaledSubheadline) .multilineTextAlignment(.center) - .foregroundColor(.gray) + .foregroundStyle(.secondary) Button { onButtonPress() } label: { diff --git a/Packages/DesignSystem/Sources/DesignSystem/Views/TagRowView.swift b/Packages/DesignSystem/Sources/DesignSystem/Views/TagRowView.swift index 6eed3c5b..c3e0d9b0 100644 --- a/Packages/DesignSystem/Sources/DesignSystem/Views/TagRowView.swift +++ b/Packages/DesignSystem/Sources/DesignSystem/Views/TagRowView.swift @@ -18,7 +18,7 @@ public struct TagRowView: View { .font(.scaledHeadline) Text("design.tag.n-posts-from-n-participants \(tag.totalUses) \(tag.totalAccounts)") .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } Spacer() } diff --git a/Packages/Lists/Sources/Lists/Edit/ListEditView.swift b/Packages/Lists/Sources/Lists/Edit/ListEditView.swift index f91f7393..af82cc78 100644 --- a/Packages/Lists/Sources/Lists/Edit/ListEditView.swift +++ b/Packages/Lists/Sources/Lists/Edit/ListEditView.swift @@ -115,7 +115,7 @@ public struct ListEditView: View { .emojiSize(Font.scaledBodyFont.emojiSize) .emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) Text("@\(account.acct)") - .foregroundColor(.gray) + .foregroundStyle(.secondary) .font(.scaledFootnote) .lineLimit(1) } @@ -161,7 +161,7 @@ public struct ListEditView: View { .emojiSize(Font.scaledBodyFont.emojiSize) .emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) Text("@\(account.acct)") - .foregroundColor(.gray) + .foregroundStyle(.secondary) .font(.scaledFootnote) .lineLimit(1) } diff --git a/Packages/Notifications/Sources/Notifications/NotificationRowView.swift b/Packages/Notifications/Sources/Notifications/NotificationRowView.swift index 30c6b198..8e72b9db 100644 --- a/Packages/Notifications/Sources/Notifications/NotificationRowView.swift +++ b/Packages/Notifications/Sources/Notifications/NotificationRowView.swift @@ -109,11 +109,11 @@ struct NotificationRowView: View { Text(" ⸱ ") .font(.scaledFootnote) .fontWeight(.regular) - .foregroundColor(.gray) + + .foregroundStyle(.secondary) + Text(notification.createdAt.relativeFormatted) .font(.scaledFootnote) .fontWeight(.regular) - .foregroundColor(.gray) + .foregroundStyle(.secondary) }) .font(.scaledSubheadline) .emojiSize(Font.scaledSubheadlineFont.emojiSize) @@ -129,7 +129,7 @@ struct NotificationRowView: View { .accessibilityHidden(true) .font(.scaledFootnote) .fontWeight(.regular) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } Spacer() } @@ -169,7 +169,7 @@ struct NotificationRowView: View { Group { Text("@\(notification.accounts[0].acct)") .font(.scaledCallout) - .foregroundColor(.gray) + .foregroundStyle(.secondary) if type == .follow { EmojiTextApp(notification.accounts[0].note, @@ -179,7 +179,7 @@ struct NotificationRowView: View { .font(.scaledCallout) .emojiSize(Font.scaledCalloutFont.emojiSize) .emojiBaselineOffset(Font.scaledCalloutFont.emojiBaselineOffset) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .environment(\.openURL, OpenURLAction { url in routerPath.handle(url: url) }) diff --git a/Packages/Status/Sources/Status/Editor/Components/StatusEditorAutoCompleteView.swift b/Packages/Status/Sources/Status/Editor/Components/StatusEditorAutoCompleteView.swift index 620eb89f..98b8d937 100644 --- a/Packages/Status/Sources/Status/Editor/Components/StatusEditorAutoCompleteView.swift +++ b/Packages/Status/Sources/Status/Editor/Components/StatusEditorAutoCompleteView.swift @@ -59,7 +59,7 @@ struct StatusEditorAutoCompleteView: View { .foregroundColor(theme.tintColor) Text("tag.suggested.mentions-\(tag.totalUses)") .font(.scaledCaption) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } } } diff --git a/Packages/Status/Sources/Status/Editor/StatusEditorView.swift b/Packages/Status/Sources/Status/Editor/StatusEditorView.swift index cca44169..96004756 100644 --- a/Packages/Status/Sources/Status/Editor/StatusEditorView.swift +++ b/Packages/Status/Sources/Status/Editor/StatusEditorView.swift @@ -256,7 +256,7 @@ public struct StatusEditorView: View { privacyMenu Text("@\(account.acct)@\(appAccounts.currentClient.server)") .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } Spacer() } diff --git a/Packages/Status/Sources/Status/Embed/StatusEmbeddedView.swift b/Packages/Status/Sources/Status/Embed/StatusEmbeddedView.swift index d322ccbd..9331bfb4 100644 --- a/Packages/Status/Sources/Status/Embed/StatusEmbeddedView.swift +++ b/Packages/Status/Sources/Status/Embed/StatusEmbeddedView.swift @@ -59,7 +59,7 @@ public struct StatusEmbeddedView: View { Text(status.reblog?.createdAt.relativeFormatted ?? status.createdAt.relativeFormatted) } .font(.scaledCaption) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } } } diff --git a/Packages/Status/Sources/Status/History/StatusEditHistoryView.swift b/Packages/Status/Sources/Status/History/StatusEditHistoryView.swift index aae4dd1c..8c13d68b 100644 --- a/Packages/Status/Sources/Status/History/StatusEditHistoryView.swift +++ b/Packages/Status/Sources/Status/History/StatusEditHistoryView.swift @@ -34,7 +34,7 @@ public struct StatusEditHistoryView: View { Text(edit.createdAt.asDate, style: .time) } .font(.footnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } } } else { diff --git a/Packages/Status/Sources/Status/Poll/StatusPollView.swift b/Packages/Status/Sources/Status/Poll/StatusPollView.swift index 609c012a..e030e5a2 100644 --- a/Packages/Status/Sources/Status/Poll/StatusPollView.swift +++ b/Packages/Status/Sources/Status/Poll/StatusPollView.swift @@ -145,7 +145,7 @@ public struct StatusPollView: View { } } .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .accessibilityElement(children: .combine) .accessibilityAddTraits(.updatesFrequently) } diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowCardView.swift b/Packages/Status/Sources/Status/Row/Subviews/StatusRowCardView.swift index 5e865033..273ec117 100644 --- a/Packages/Status/Sources/Status/Row/Subviews/StatusRowCardView.swift +++ b/Packages/Status/Sources/Status/Row/Subviews/StatusRowCardView.swift @@ -74,7 +74,7 @@ public struct StatusRowCardView: View { if let description = card.description, !description.isEmpty { Text(description) .font(.scaledBody) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .lineLimit(3) } Text(url.host() ?? url.absoluteString) diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowDetailView.swift b/Packages/Status/Sources/Status/Row/Subviews/StatusRowDetailView.swift index 0e3debd3..8dbb5a78 100644 --- a/Packages/Status/Sources/Status/Row/Subviews/StatusRowDetailView.swift +++ b/Packages/Status/Sources/Status/Row/Subviews/StatusRowDetailView.swift @@ -39,7 +39,7 @@ struct StatusRowDetailView: View { } } .font(.scaledCaption) - .foregroundColor(.gray) + .foregroundStyle(.secondary) if let editedAt = viewModel.status.editedAt { Divider() @@ -55,7 +55,7 @@ struct StatusRowDetailView: View { } .underline() .font(.scaledCaption) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } if viewModel.actionsAccountsFetched, statusDataController.favoritesCount > 0 { diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowHeaderView.swift b/Packages/Status/Sources/Status/Row/Subviews/StatusRowHeaderView.swift index 498b9e04..d5fd244a 100644 --- a/Packages/Status/Sources/Status/Row/Subviews/StatusRowHeaderView.swift +++ b/Packages/Status/Sources/Status/Row/Subviews/StatusRowHeaderView.swift @@ -65,12 +65,12 @@ struct StatusRowHeaderView: View { if theme.avatarPosition == .leading { dateView .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .lineLimit(1) } else { Text("@\(theme.displayFullUsername ? viewModel.finalStatus.account.acct : viewModel.finalStatus.account.username)") .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .lineLimit(1) .accountPopover(viewModel.finalStatus.account) } @@ -78,12 +78,12 @@ struct StatusRowHeaderView: View { if theme.avatarPosition == .top { dateView .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .lineLimit(1) } else if theme.displayFullUsername, theme.avatarPosition == .leading { Text("@\(viewModel.finalStatus.account.acct)") .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .lineLimit(1) .offset(y: 1) .accountPopover(viewModel.finalStatus.account) @@ -114,7 +114,7 @@ struct StatusRowHeaderView: View { .resizable() .aspectRatio(contentMode: .fit) .frame(width: 15) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } } @@ -131,7 +131,7 @@ struct StatusRowHeaderView: View { .frame(width: 40, height: 40) } .menuStyle(.borderlessButton) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .contentShape(Rectangle()) .accessibilityHidden(true) } diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowReblogView.swift b/Packages/Status/Sources/Status/Row/Subviews/StatusRowReblogView.swift index d62032f7..08e8325a 100644 --- a/Packages/Status/Sources/Status/Row/Subviews/StatusRowReblogView.swift +++ b/Packages/Status/Sources/Status/Row/Subviews/StatusRowReblogView.swift @@ -21,7 +21,7 @@ struct StatusRowReblogView: View { .font(.scaledFootnote) .emojiSize(Font.scaledFootnoteFont.emojiSize) .emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .fontWeight(.semibold) .onTapGesture { viewModel.navigateToAccountDetail(account: viewModel.status.account) diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowReplyView.swift b/Packages/Status/Sources/Status/Row/Subviews/StatusRowReplyView.swift index 823354df..eab94f9b 100644 --- a/Packages/Status/Sources/Status/Row/Subviews/StatusRowReplyView.swift +++ b/Packages/Status/Sources/Status/Row/Subviews/StatusRowReplyView.swift @@ -32,7 +32,7 @@ struct StatusRowReplyView: View { } } .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .fontWeight(.semibold) } } diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowTagView.swift b/Packages/Status/Sources/Status/Row/Subviews/StatusRowTagView.swift index 79511812..92e91bab 100644 --- a/Packages/Status/Sources/Status/Row/Subviews/StatusRowTagView.swift +++ b/Packages/Status/Sources/Status/Row/Subviews/StatusRowTagView.swift @@ -12,7 +12,7 @@ struct StatusRowTagView: View { }) { Text("#\(tag.title)") .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) .fontWeight(.semibold) } } diff --git a/Packages/Status/Sources/Status/Row/Subviews/StatusRowTranslateView.swift b/Packages/Status/Sources/Status/Row/Subviews/StatusRowTranslateView.swift index f2e071e3..a1a2fed4 100644 --- a/Packages/Status/Sources/Status/Row/Subviews/StatusRowTranslateView.swift +++ b/Packages/Status/Sources/Status/Row/Subviews/StatusRowTranslateView.swift @@ -62,7 +62,7 @@ struct StatusRowTranslateView: View { .font(.scaledBody) Text(getLocalizedString(langCode: translation.detectedSourceLanguage, provider: translation.provider)) .font(.footnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } } .fixedSize(horizontal: false, vertical: true) diff --git a/Packages/Timeline/Sources/Timeline/TimelineView.swift b/Packages/Timeline/Sources/Timeline/TimelineView.swift index 79a964d8..70097d8c 100644 --- a/Packages/Timeline/Sources/Timeline/TimelineView.swift +++ b/Packages/Timeline/Sources/Timeline/TimelineView.swift @@ -159,7 +159,7 @@ public struct TimelineView: View { .font(.scaledHeadline) Text("timeline.n-recent-from-n-participants \(tag.totalUses) \(tag.totalAccounts)") .font(.scaledFootnote) - .foregroundColor(.gray) + .foregroundStyle(.secondary) } .accessibilityElement(children: .combine) Spacer() @@ -236,7 +236,7 @@ public struct TimelineView: View { .font(.headline) Text(timeline.localizedTitle()) .font(.caption) - .foregroundColor(.gray) + .foregroundStyle(.secondary) default: Text(timeline.localizedTitle()) .font(.headline)