mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-26 02:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

foregroundColor -> foregroundStyle

Browse source
This commit is contained in:
Thomas Ricouard 2023-12-04 15:49:44 +01:00
parent 3840b8fb28
commit fcaf48ce53
30 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
IceCubesApp/App/Tabs/Settings/AboutView.swift
View file

@ -81,7 +81,7 @@ struct AboutView: View {
""") """)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.font(.scaledSubheadline) .font(.scaledSubheadline)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} header: { } header: {
Text("settings.about.built-with") Text("settings.about.built-with")
.textCase(nil) .textCase(nil)

8
IceCubesApp/App/Tabs/Settings/AddAccountsView.swift
View file

@ -197,12 +197,12 @@ struct AddAccountView: View {
.foregroundColor(.primary) .foregroundColor(.primary)
Text(instance.info?.shortDescription ?? "") Text(instance.info?.shortDescription ?? "")
.font(.scaledBody) .font(.scaledBody)
.foregroundColor(.gray) .foregroundStyle(Color.secondary)
(Text("instance.list.users-\(instance.users)") (Text("instance.list.users-\(instance.users)")
+ Text(" ⸱ ") + Text(" ⸱ ")
+ Text("instance.list.posts-\(instance.statuses)")) + Text("instance.list.posts-\(instance.statuses)"))
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(Color.secondary)
} }
} }
.listRowBackground(theme.primaryBackgroundColor) .listRowBackground(theme.primaryBackgroundColor)
@ -218,10 +218,10 @@ struct AddAccountView: View {
.foregroundColor(.primary) .foregroundColor(.primary)
Text("placeholder.loading.long") Text("placeholder.loading.long")
.font(.scaledBody) .font(.scaledBody)
.foregroundColor(.gray) .foregroundStyle(.secondary)
Text("placeholder.loading.short") Text("placeholder.loading.short")
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
.redacted(reason: .placeholder) .redacted(reason: .placeholder)
.allowsHitTesting(false) .allowsHitTesting(false)

6
IceCubesApp/App/Tabs/Settings/SupportAppView.swift
View file

@ -175,7 +175,7 @@ struct SupportAppView: View {
.font(.scaledSubheadline) .font(.scaledSubheadline)
Text(Tip.supporter.subtitle) Text(Tip.supporter.subtitle)
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
Spacer() Spacer()
makePurchaseButton(product: subscription) makePurchaseButton(product: subscription)
@ -204,7 +204,7 @@ struct SupportAppView: View {
.font(.scaledSubheadline) .font(.scaledSubheadline)
Text(tip.subtitle) Text(tip.subtitle)
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
Spacer() Spacer()
makePurchaseButton(product: product) makePurchaseButton(product: product)
@ -262,7 +262,7 @@ struct SupportAppView: View {
.font(.scaledSubheadline) .font(.scaledSubheadline)
Text("settings.support.placeholder.loading-subtitle") Text("settings.support.placeholder.loading-subtitle")
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
.padding(.vertical, 8) .padding(.vertical, 8)
} }

4
IceCubesApp/App/Tabs/Timeline/AddRemoteTimelineView.swift
View file

@ -95,13 +95,13 @@ struct AddRemoteTimelineView: View {
.foregroundColor(.primary) .foregroundColor(.primary)
Text(instance.info?.shortDescription ?? "") Text(instance.info?.shortDescription ?? "")
.font(.scaledBody) .font(.scaledBody)
.foregroundColor(.gray) .foregroundStyle(Color.secondary)
(Text("instance.list.users-\(instance.users)") (Text("instance.list.users-\(instance.users)")
+ Text(" ⸱ ") + Text(" ⸱ ")
+ Text("instance.list.posts-\(instance.statuses)")) + Text("instance.list.posts-\(instance.statuses)"))
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(Color.secondary)
} }
} }
.listRowBackground(theme.primaryBackgroundColor) .listRowBackground(theme.primaryBackgroundColor)

10
Packages/Account/Sources/Account/AccountDetailHeaderView.swift
View file

@ -206,7 +206,7 @@ struct AccountDetailHeaderView: View {
} }
Text("@\(account.acct)") Text("@\(account.acct)")
.font(.scaledCallout) .font(.scaledCallout)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.textSelection(.enabled) .textSelection(.enabled)
.accessibilityRespondsToUserInteraction(false) .accessibilityRespondsToUserInteraction(false)
joinedAtView joinedAtView
@ -252,7 +252,7 @@ struct AccountDetailHeaderView: View {
.font(.scaledBody) .font(.scaledBody)
Text(getLocalizedStringLabel(langCode: translation.detectedSourceLanguage, provider: translation.provider)) Text(getLocalizedStringLabel(langCode: translation.detectedSourceLanguage, provider: translation.provider))
.font(.footnote) .font(.footnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
} }
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
@ -288,7 +288,7 @@ struct AccountDetailHeaderView: View {
} }
Text(title) Text(title)
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
.accessibilityElement(children: .ignore) .accessibilityElement(children: .ignore)
.accessibilityLabel(title) .accessibilityLabel(title)
@ -304,7 +304,7 @@ struct AccountDetailHeaderView: View {
Text("account.joined") Text("account.joined")
Text(joinedAt, style: .date) Text(joinedAt, style: .date)
} }
.foregroundColor(.gray) .foregroundStyle(.secondary)
.font(.footnote) .font(.footnote)
.padding(.top, 6) .padding(.top, 6)
.accessibilityElement(children: .combine) .accessibilityElement(children: .combine)
@ -315,7 +315,7 @@ struct AccountDetailHeaderView: View {
private func makeNoteView(_ note: String) -> some View { private func makeNoteView(_ note: String) -> some View {
VStack(alignment: .leading, spacing: 4) { VStack(alignment: .leading, spacing: 4) {
Text("account.relation.note.label") Text("account.relation.note.label")
.foregroundColor(.gray) .foregroundStyle(.secondary)
Text(note) Text(note)
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)
.padding(8) .padding(8)

2
Packages/Account/Sources/Account/AccountDetailView.swift
View file

@ -277,7 +277,7 @@ public struct AccountDetailView: View {
Label("account.post.pinned", systemImage: "pin.fill") Label("account.post.pinned", systemImage: "pin.fill")
.accessibilityAddTraits(.isHeader) .accessibilityAddTraits(.isHeader)
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.fontWeight(.semibold) .fontWeight(.semibold)
.listRowInsets(.init(top: 0, .listRowInsets(.init(top: 0,
leading: 12, leading: 12,

2
Packages/Account/Sources/Account/AccountsList/AccountsListRow.swift
View file

@ -53,7 +53,7 @@ public struct AccountsListRow: View {
.fontWeight(.semibold) .fontWeight(.semibold)
Text("@\(viewModel.account.acct)") Text("@\(viewModel.account.acct)")
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(Color.secondary)
// First parameter is the number for the plural // First parameter is the number for the plural
// Second parameter is the formatted string to show // Second parameter is the formatted string to show

6
Packages/Account/Sources/Account/Filters/FiltersListView.swift
View file

@ -34,16 +34,16 @@ public struct FiltersListView: View {
.font(.scaledSubheadline) .font(.scaledSubheadline)
Text("\(filter.context.map(\.name).joined(separator: ", "))") Text("\(filter.context.map(\.name).joined(separator: ", "))")
.font(.scaledBody) .font(.scaledBody)
.foregroundColor(.gray) .foregroundStyle(.secondary)
if filter.hasExpiry() { if filter.hasExpiry() {
if filter.isExpired() { if filter.isExpired() {
Text("filter.expired") Text("filter.expired")
.font(.footnote) .font(.footnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} else { } else {
Text("filter.expiry-\(filter.expiresAt!.relativeFormatted)") Text("filter.expiry-\(filter.expiresAt!.relativeFormatted)")
.font(.footnote) .font(.footnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
} }
} }

6
Packages/AppAccount/Sources/AppAccount/AppAccountView.swift
View file

@ -86,7 +86,7 @@ public struct AppAccountView: View {
ProgressView() ProgressView()
Text(viewModel.appAccount.accountName ?? viewModel.acct) Text(viewModel.appAccount.accountName ?? viewModel.acct)
.font(.scaledSubheadline) .font(.scaledSubheadline)
.foregroundColor(.gray) .foregroundStyle(Color.secondary)
.padding(.leading, 6) .padding(.leading, 6)
} }
VStack(alignment: .leading) { VStack(alignment: .leading) {
@ -97,13 +97,13 @@ public struct AppAccountView: View {
.font(.scaledSubheadline) .font(.scaledSubheadline)
.emojiSize(Font.scaledSubheadlineFont.emojiSize) .emojiSize(Font.scaledSubheadlineFont.emojiSize)
.emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) .emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset)
.foregroundColor(.gray) .foregroundStyle(Color.secondary)
} }
} }
if viewModel.isInNavigation { if viewModel.isInNavigation {
Spacer() Spacer()
Image(systemName: "chevron.right") Image(systemName: "chevron.right")
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
} }
} }

2
Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift
View file

@ -78,7 +78,7 @@ struct ConversationMessageView: View {
Text(message.createdAt.asDate, style: .time) Text(message.createdAt.asDate, style: .time)
} }
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
if !isOwnMessage { if !isOwnMessage {
Spacer() Spacer()
} }

2
Packages/Conversations/Sources/Conversations/List/ConversationsListRow.swift
View file

@ -104,7 +104,7 @@ struct ConversationsListRow: View {
} }
} }
.padding(.leading, 48) .padding(.leading, 48)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
@ViewBuilder @ViewBuilder

6
Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift
View file

@ -45,7 +45,7 @@ struct AccountPopoverView: View {
Text("@\(account.acct)") Text("@\(account.acct)")
.font(.callout) .font(.callout)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.textSelection(.enabled) .textSelection(.enabled)
.accessibilityRespondsToUserInteraction(false) .accessibilityRespondsToUserInteraction(false)
.help("@\(account.acct)") .help("@\(account.acct)")
@ -56,7 +56,7 @@ struct AccountPopoverView: View {
Text("account.joined") Text("account.joined")
Text(account.createdAt.asDate, style: .date) Text(account.createdAt.asDate, style: .date)
} }
.foregroundColor(.gray) .foregroundStyle(.secondary)
.font(.footnote) .font(.footnote)
.accessibilityElement(children: .combine) .accessibilityElement(children: .combine)
@ -110,7 +110,7 @@ struct AccountPopoverView: View {
} }
Text(title) Text(title)
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.alignmentGuide(.bottomAvatar, computeValue: { dimension in .alignmentGuide(.bottomAvatar, computeValue: { dimension in
dimension[.firstTextBaseline] dimension[.firstTextBaseline]
}) })

2
Packages/DesignSystem/Sources/DesignSystem/Views/EmptyView.swift
View file

@ -23,7 +23,7 @@ public struct EmptyView: View {
Text(message) Text(message)
.font(.scaledSubheadline) .font(.scaledSubheadline)
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
.padding(.top, 100) .padding(.top, 100)
.padding(.layoutPadding) .padding(.layoutPadding)

2
Packages/DesignSystem/Sources/DesignSystem/Views/ErrorView.swift
View file

@ -27,7 +27,7 @@ public struct ErrorView: View {
Text(message) Text(message)
.font(.scaledSubheadline) .font(.scaledSubheadline)
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
.foregroundColor(.gray) .foregroundStyle(.secondary)
Button { Button {
onButtonPress() onButtonPress()
} label: { } label: {

2
Packages/DesignSystem/Sources/DesignSystem/Views/TagRowView.swift
View file

@ -18,7 +18,7 @@ public struct TagRowView: View {
.font(.scaledHeadline) .font(.scaledHeadline)
Text("design.tag.n-posts-from-n-participants \(tag.totalUses) \(tag.totalAccounts)") Text("design.tag.n-posts-from-n-participants \(tag.totalUses) \(tag.totalAccounts)")
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
Spacer() Spacer()
} }

4
Packages/Lists/Sources/Lists/Edit/ListEditView.swift
View file

@ -115,7 +115,7 @@ public struct ListEditView: View {
.emojiSize(Font.scaledBodyFont.emojiSize) .emojiSize(Font.scaledBodyFont.emojiSize)
.emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset)
Text("@\(account.acct)") Text("@\(account.acct)")
.foregroundColor(.gray) .foregroundStyle(.secondary)
.font(.scaledFootnote) .font(.scaledFootnote)
.lineLimit(1) .lineLimit(1)
} }
@ -161,7 +161,7 @@ public struct ListEditView: View {
.emojiSize(Font.scaledBodyFont.emojiSize) .emojiSize(Font.scaledBodyFont.emojiSize)
.emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset)
Text("@\(account.acct)") Text("@\(account.acct)")
.foregroundColor(.gray) .foregroundStyle(.secondary)
.font(.scaledFootnote) .font(.scaledFootnote)
.lineLimit(1) .lineLimit(1)
} }

10
Packages/Notifications/Sources/Notifications/NotificationRowView.swift
View file

@ -109,11 +109,11 @@ struct NotificationRowView: View {
Text(" ⸱ ") Text(" ⸱ ")
.font(.scaledFootnote) .font(.scaledFootnote)
.fontWeight(.regular) .fontWeight(.regular)
.foregroundColor(.gray) + .foregroundStyle(.secondary) +
Text(notification.createdAt.relativeFormatted) Text(notification.createdAt.relativeFormatted)
.font(.scaledFootnote) .font(.scaledFootnote)
.fontWeight(.regular) .fontWeight(.regular)
.foregroundColor(.gray) .foregroundStyle(.secondary)
}) })
.font(.scaledSubheadline) .font(.scaledSubheadline)
.emojiSize(Font.scaledSubheadlineFont.emojiSize) .emojiSize(Font.scaledSubheadlineFont.emojiSize)
@ -129,7 +129,7 @@ struct NotificationRowView: View {
.accessibilityHidden(true) .accessibilityHidden(true)
.font(.scaledFootnote) .font(.scaledFootnote)
.fontWeight(.regular) .fontWeight(.regular)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
Spacer() Spacer()
} }
@ -169,7 +169,7 @@ struct NotificationRowView: View {
Group { Group {
Text("@\(notification.accounts[0].acct)") Text("@\(notification.accounts[0].acct)")
.font(.scaledCallout) .font(.scaledCallout)
.foregroundColor(.gray) .foregroundStyle(.secondary)
if type == .follow { if type == .follow {
EmojiTextApp(notification.accounts[0].note, EmojiTextApp(notification.accounts[0].note,
@ -179,7 +179,7 @@ struct NotificationRowView: View {
.font(.scaledCallout) .font(.scaledCallout)
.emojiSize(Font.scaledCalloutFont.emojiSize) .emojiSize(Font.scaledCalloutFont.emojiSize)
.emojiBaselineOffset(Font.scaledCalloutFont.emojiBaselineOffset) .emojiBaselineOffset(Font.scaledCalloutFont.emojiBaselineOffset)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
routerPath.handle(url: url) routerPath.handle(url: url)
}) })

2
Packages/Status/Sources/Status/Editor/Components/StatusEditorAutoCompleteView.swift
View file

@ -59,7 +59,7 @@ struct StatusEditorAutoCompleteView: View {
.foregroundColor(theme.tintColor) .foregroundColor(theme.tintColor)
Text("tag.suggested.mentions-\(tag.totalUses)") Text("tag.suggested.mentions-\(tag.totalUses)")
.font(.scaledCaption) .font(.scaledCaption)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
} }
} }

2
Packages/Status/Sources/Status/Editor/StatusEditorView.swift
View file

@ -256,7 +256,7 @@ public struct StatusEditorView: View {
privacyMenu privacyMenu
Text("@\(account.acct)@\(appAccounts.currentClient.server)") Text("@\(account.acct)@\(appAccounts.currentClient.server)")
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
Spacer() Spacer()
} }

2
Packages/Status/Sources/Status/Embed/StatusEmbeddedView.swift
View file

@ -59,7 +59,7 @@ public struct StatusEmbeddedView: View {
Text(status.reblog?.createdAt.relativeFormatted ?? status.createdAt.relativeFormatted) Text(status.reblog?.createdAt.relativeFormatted ?? status.createdAt.relativeFormatted)
} }
.font(.scaledCaption) .font(.scaledCaption)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
} }
} }

2
Packages/Status/Sources/Status/History/StatusEditHistoryView.swift
View file

@ -34,7 +34,7 @@ public struct StatusEditHistoryView: View {
Text(edit.createdAt.asDate, style: .time) Text(edit.createdAt.asDate, style: .time)
} }
.font(.footnote) .font(.footnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
} }
} else { } else {

2
Packages/Status/Sources/Status/Poll/StatusPollView.swift
View file

@ -145,7 +145,7 @@ public struct StatusPollView: View {
} }
} }
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.accessibilityElement(children: .combine) .accessibilityElement(children: .combine)
.accessibilityAddTraits(.updatesFrequently) .accessibilityAddTraits(.updatesFrequently)
} }

2
Packages/Status/Sources/Status/Row/Subviews/StatusRowCardView.swift
View file

@ -74,7 +74,7 @@ public struct StatusRowCardView: View {
if let description = card.description, !description.isEmpty { if let description = card.description, !description.isEmpty {
Text(description) Text(description)
.font(.scaledBody) .font(.scaledBody)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.lineLimit(3) .lineLimit(3)
} }
Text(url.host() ?? url.absoluteString) Text(url.host() ?? url.absoluteString)

4
Packages/Status/Sources/Status/Row/Subviews/StatusRowDetailView.swift
View file

@ -39,7 +39,7 @@ struct StatusRowDetailView: View {
} }
} }
.font(.scaledCaption) .font(.scaledCaption)
.foregroundColor(.gray) .foregroundStyle(.secondary)
if let editedAt = viewModel.status.editedAt { if let editedAt = viewModel.status.editedAt {
Divider() Divider()
@ -55,7 +55,7 @@ struct StatusRowDetailView: View {
} }
.underline() .underline()
.font(.scaledCaption) .font(.scaledCaption)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
if viewModel.actionsAccountsFetched, statusDataController.favoritesCount > 0 { if viewModel.actionsAccountsFetched, statusDataController.favoritesCount > 0 {

12
Packages/Status/Sources/Status/Row/Subviews/StatusRowHeaderView.swift
View file

@ -65,12 +65,12 @@ struct StatusRowHeaderView: View {
if theme.avatarPosition == .leading { if theme.avatarPosition == .leading {
dateView dateView
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.lineLimit(1) .lineLimit(1)
} else { } else {
Text("@\(theme.displayFullUsername ? viewModel.finalStatus.account.acct : viewModel.finalStatus.account.username)") Text("@\(theme.displayFullUsername ? viewModel.finalStatus.account.acct : viewModel.finalStatus.account.username)")
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.lineLimit(1) .lineLimit(1)
.accountPopover(viewModel.finalStatus.account) .accountPopover(viewModel.finalStatus.account)
} }
@ -78,12 +78,12 @@ struct StatusRowHeaderView: View {
if theme.avatarPosition == .top { if theme.avatarPosition == .top {
dateView dateView
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.lineLimit(1) .lineLimit(1)
} else if theme.displayFullUsername, theme.avatarPosition == .leading { } else if theme.displayFullUsername, theme.avatarPosition == .leading {
Text("@\(viewModel.finalStatus.account.acct)") Text("@\(viewModel.finalStatus.account.acct)")
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.lineLimit(1) .lineLimit(1)
.offset(y: 1) .offset(y: 1)
.accountPopover(viewModel.finalStatus.account) .accountPopover(viewModel.finalStatus.account)
@ -114,7 +114,7 @@ struct StatusRowHeaderView: View {
.resizable() .resizable()
.aspectRatio(contentMode: .fit) .aspectRatio(contentMode: .fit)
.frame(width: 15) .frame(width: 15)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
} }
@ -131,7 +131,7 @@ struct StatusRowHeaderView: View {
.frame(width: 40, height: 40) .frame(width: 40, height: 40)
} }
.menuStyle(.borderlessButton) .menuStyle(.borderlessButton)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.contentShape(Rectangle()) .contentShape(Rectangle())
.accessibilityHidden(true) .accessibilityHidden(true)
} }

2
Packages/Status/Sources/Status/Row/Subviews/StatusRowReblogView.swift
View file

@ -21,7 +21,7 @@ struct StatusRowReblogView: View {
.font(.scaledFootnote) .font(.scaledFootnote)
.emojiSize(Font.scaledFootnoteFont.emojiSize) .emojiSize(Font.scaledFootnoteFont.emojiSize)
.emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) .emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.fontWeight(.semibold) .fontWeight(.semibold)
.onTapGesture { .onTapGesture {
viewModel.navigateToAccountDetail(account: viewModel.status.account) viewModel.navigateToAccountDetail(account: viewModel.status.account)

2
Packages/Status/Sources/Status/Row/Subviews/StatusRowReplyView.swift
View file

@ -32,7 +32,7 @@ struct StatusRowReplyView: View {
} }
} }
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.fontWeight(.semibold) .fontWeight(.semibold)
} }
} }

2
Packages/Status/Sources/Status/Row/Subviews/StatusRowTagView.swift
View file

@ -12,7 +12,7 @@ struct StatusRowTagView: View {
}) { }) {
Text("#\(tag.title)") Text("#\(tag.title)")
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
.fontWeight(.semibold) .fontWeight(.semibold)
} }
} }

2
Packages/Status/Sources/Status/Row/Subviews/StatusRowTranslateView.swift
View file

@ -62,7 +62,7 @@ struct StatusRowTranslateView: View {
.font(.scaledBody) .font(.scaledBody)
Text(getLocalizedString(langCode: translation.detectedSourceLanguage, provider: translation.provider)) Text(getLocalizedString(langCode: translation.detectedSourceLanguage, provider: translation.provider))
.font(.footnote) .font(.footnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
} }
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)

4
Packages/Timeline/Sources/Timeline/TimelineView.swift
View file

@ -159,7 +159,7 @@ public struct TimelineView: View {
.font(.scaledHeadline) .font(.scaledHeadline)
Text("timeline.n-recent-from-n-participants \(tag.totalUses) \(tag.totalAccounts)") Text("timeline.n-recent-from-n-participants \(tag.totalUses) \(tag.totalAccounts)")
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundStyle(.secondary)
} }
.accessibilityElement(children: .combine) .accessibilityElement(children: .combine)
Spacer() Spacer()
@ -236,7 +236,7 @@ public struct TimelineView: View {
.font(.headline) .font(.headline)
Text(timeline.localizedTitle()) Text(timeline.localizedTitle())
.font(.caption) .font(.caption)
.foregroundColor(.gray) .foregroundStyle(.secondary)
default: default:
Text(timeline.localizedTitle()) Text(timeline.localizedTitle())
.font(.headline) .font(.headline)