diff --git a/Packages/Account/Sources/Account/AccountDetailHeaderView.swift b/Packages/Account/Sources/Account/AccountDetailHeaderView.swift index ed157b88..1cc7be8a 100644 --- a/Packages/Account/Sources/Account/AccountDetailHeaderView.swift +++ b/Packages/Account/Sources/Account/AccountDetailHeaderView.swift @@ -172,8 +172,8 @@ struct AccountDetailHeaderView: View { EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis) .font(.scaledHeadline) .foregroundColor(theme.labelColor) - .emojiSize(Font.scaledHeadlineFont.emojiSize) - .emojiBaselineOffset(Font.scaledHeadlineFont.emojiBaselineOffset) + .emojiText.size(Font.scaledHeadlineFont.emojiSize) + .emojiText.baselineOffset(Font.scaledHeadlineFont.emojiBaselineOffset) .accessibilityAddTraits(.isHeader) // The views here are wrapped in ZStacks as a Text(Image) does not provide an `accessibilityLabel`. @@ -236,8 +236,8 @@ struct AccountDetailHeaderView: View { EmojiTextApp(account.note, emojis: account.emojis) .font(.scaledBody) .foregroundColor(theme.labelColor) - .emojiSize(Font.scaledBodyFont.emojiSize) - .emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) + .emojiText.size(Font.scaledBodyFont.emojiSize) + .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .padding(.top, 8) .textSelection(.enabled) .environment(\.openURL, OpenURLAction { url in @@ -338,8 +338,8 @@ struct AccountDetailHeaderView: View { HStack { VStack(alignment: .leading, spacing: 2) { EmojiTextApp(.init(stringValue: field.name), emojis: viewModel.account?.emojis ?? []) - .emojiSize(Font.scaledHeadlineFont.emojiSize) - .emojiBaselineOffset(Font.scaledHeadlineFont.emojiBaselineOffset) + .emojiText.size(Font.scaledHeadlineFont.emojiSize) + .emojiText.baselineOffset(Font.scaledHeadlineFont.emojiBaselineOffset) .font(.scaledHeadline) HStack { if field.verifiedAt != nil { @@ -348,8 +348,8 @@ struct AccountDetailHeaderView: View { .accessibilityHidden(true) } EmojiTextApp(field.value, emojis: viewModel.account?.emojis ?? []) - .emojiSize(Font.scaledBodyFont.emojiSize) - .emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) + .emojiText.size(Font.scaledBodyFont.emojiSize) + .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .foregroundColor(theme.tintColor) .environment(\.openURL, OpenURLAction { url in routerPath.handle(url: url) diff --git a/Packages/Account/Sources/Account/AccountsList/AccountsListRow.swift b/Packages/Account/Sources/Account/AccountsList/AccountsListRow.swift index a63b9caa..e37096ed 100644 --- a/Packages/Account/Sources/Account/AccountsList/AccountsListRow.swift +++ b/Packages/Account/Sources/Account/AccountsList/AccountsListRow.swift @@ -48,8 +48,8 @@ public struct AccountsListRow: View { VStack(alignment: .leading, spacing: 2) { EmojiTextApp(.init(stringValue: viewModel.account.safeDisplayName), emojis: viewModel.account.emojis) .font(.scaledSubheadline) - .emojiSize(Font.scaledSubheadlineFont.emojiSize) - .emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) + .emojiText.size(Font.scaledSubheadlineFont.emojiSize) + .emojiText.baselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) .fontWeight(.semibold) Text("@\(viewModel.account.acct)") .font(.scaledFootnote) @@ -68,8 +68,8 @@ public struct AccountsListRow: View { EmojiTextApp(field.value, emojis: viewModel.account.emojis) .font(.scaledFootnote) - .emojiSize(Font.scaledFootnoteFont.emojiSize) - .emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) + .emojiText.size(Font.scaledFootnoteFont.emojiSize) + .emojiText.baselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) .environment(\.openURL, OpenURLAction { url in routerPath.handle(url: url) }) @@ -78,8 +78,8 @@ public struct AccountsListRow: View { EmojiTextApp(viewModel.account.note, emojis: viewModel.account.emojis, lineLimit: 2) .font(.scaledCaption) - .emojiSize(Font.scaledFootnoteFont.emojiSize) - .emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) + .emojiText.size(Font.scaledFootnoteFont.emojiSize) + .emojiText.baselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) .environment(\.openURL, OpenURLAction { url in routerPath.handle(url: url) }) diff --git a/Packages/Account/Sources/Account/Edit/EditAccountView.swift b/Packages/Account/Sources/Account/Edit/EditAccountView.swift index 8e5007a0..6e9a3675 100644 --- a/Packages/Account/Sources/Account/Edit/EditAccountView.swift +++ b/Packages/Account/Sources/Account/Edit/EditAccountView.swift @@ -189,8 +189,8 @@ public struct EditAccountView: View { TextField("account.edit.metadata-name-placeholder", text: $field.name) .font(.scaledHeadline) TextField("account.edit.metadata-value-placeholder", text: $field.value) - .emojiSize(Font.scaledBodyFont.emojiSize) - .emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) + .emojiText.size(Font.scaledBodyFont.emojiSize) + .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .foregroundColor(theme.tintColor) } } diff --git a/Packages/AppAccount/Sources/AppAccount/AppAccountView.swift b/Packages/AppAccount/Sources/AppAccount/AppAccountView.swift index 11c00e9b..f39c63ce 100644 --- a/Packages/AppAccount/Sources/AppAccount/AppAccountView.swift +++ b/Packages/AppAccount/Sources/AppAccount/AppAccountView.swift @@ -104,8 +104,8 @@ public struct AppAccountView: View { .foregroundColor(theme.labelColor) Text("\(account.username)@\(viewModel.appAccount.server)") .font(.scaledSubheadline) - .emojiSize(Font.scaledSubheadlineFont.emojiSize) - .emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) + .emojiText.size(Font.scaledSubheadlineFont.emojiSize) + .emojiText.baselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) .foregroundStyle(Color.secondary) } } diff --git a/Packages/Conversations/Sources/Conversations/Detail/ConversationDetailView.swift b/Packages/Conversations/Sources/Conversations/Detail/ConversationDetailView.swift index df092647..999b861b 100644 --- a/Packages/Conversations/Sources/Conversations/Detail/ConversationDetailView.swift +++ b/Packages/Conversations/Sources/Conversations/Detail/ConversationDetailView.swift @@ -82,8 +82,8 @@ public struct ConversationDetailView: View { EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis) .font(.scaledHeadline) .foregroundColor(theme.labelColor) - .emojiSize(Font.scaledHeadlineFont.emojiSize) - .emojiBaselineOffset(Font.scaledHeadlineFont.emojiBaselineOffset) + .emojiText.size(Font.scaledHeadlineFont.emojiSize) + .emojiText.baselineOffset(Font.scaledHeadlineFont.emojiBaselineOffset) } else { Text("Direct message with \(viewModel.conversation.accounts.count) people") .font(.scaledHeadline) diff --git a/Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift b/Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift index a31d8ac0..f53dd1ad 100644 --- a/Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift +++ b/Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift @@ -36,8 +36,8 @@ struct ConversationMessageView: View { EmojiTextApp(message.content, emojis: message.emojis) .font(.scaledBody) .foregroundColor(theme.labelColor) - .emojiSize(Font.scaledBodyFont.emojiSize) - .emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) + .emojiText.size(Font.scaledBodyFont.emojiSize) + .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .padding(6) .environment(\.openURL, OpenURLAction { url in routerPath.handleStatus(status: message, url: url) diff --git a/Packages/Conversations/Sources/Conversations/List/ConversationsListRow.swift b/Packages/Conversations/Sources/Conversations/List/ConversationsListRow.swift index 11edb522..c212f27b 100644 --- a/Packages/Conversations/Sources/Conversations/List/ConversationsListRow.swift +++ b/Packages/Conversations/Sources/Conversations/List/ConversationsListRow.swift @@ -33,8 +33,8 @@ struct ConversationsListRow: View { emojis: conversation.accounts.flatMap(\.emojis)) .font(.scaledSubheadline) .foregroundColor(theme.labelColor) - .emojiSize(Font.scaledSubheadlineFont.emojiSize) - .emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) + .emojiText.size(Font.scaledSubheadlineFont.emojiSize) + .emojiText.baselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) .fontWeight(.semibold) .foregroundColor(theme.labelColor) .multilineTextAlignment(.leading) @@ -57,8 +57,8 @@ struct ConversationsListRow: View { .multilineTextAlignment(.leading) .font(.scaledBody) .foregroundColor(theme.labelColor) - .emojiSize(Font.scaledBodyFont.emojiSize) - .emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) + .emojiText.size(Font.scaledBodyFont.emojiSize) + .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .accessibilityLabel(conversation.lastStatus?.content.asRawText ?? "") } Spacer() diff --git a/Packages/Lists/Sources/Lists/Edit/ListEditView.swift b/Packages/Lists/Sources/Lists/Edit/ListEditView.swift index 635a45d9..64eda77b 100644 --- a/Packages/Lists/Sources/Lists/Edit/ListEditView.swift +++ b/Packages/Lists/Sources/Lists/Edit/ListEditView.swift @@ -124,8 +124,8 @@ public struct ListEditView: View { VStack(alignment: .leading) { EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis) - .emojiSize(Font.scaledBodyFont.emojiSize) - .emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) + .emojiText.size(Font.scaledBodyFont.emojiSize) + .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset) Text("@\(account.acct)") .foregroundStyle(.secondary) .font(.scaledFootnote) @@ -170,8 +170,8 @@ public struct ListEditView: View { VStack(alignment: .leading) { EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis) - .emojiSize(Font.scaledBodyFont.emojiSize) - .emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) + .emojiText.size(Font.scaledBodyFont.emojiSize) + .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset) Text("@\(account.acct)") .foregroundStyle(.secondary) .font(.scaledFootnote) diff --git a/Packages/Notifications/Sources/Notifications/NotificationRowView.swift b/Packages/Notifications/Sources/Notifications/NotificationRowView.swift index c884cf1f..c3899d73 100644 --- a/Packages/Notifications/Sources/Notifications/NotificationRowView.swift +++ b/Packages/Notifications/Sources/Notifications/NotificationRowView.swift @@ -117,8 +117,8 @@ struct NotificationRowView: View { .foregroundStyle(.secondary) }) .font(.scaledSubheadline) - .emojiSize(Font.scaledSubheadlineFont.emojiSize) - .emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) + .emojiText.size(Font.scaledSubheadlineFont.emojiSize) + .emojiText.baselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) .fontWeight(.semibold) .lineLimit(3) .fixedSize(horizontal: false, vertical: true) @@ -185,8 +185,8 @@ struct NotificationRowView: View { .accessibilityLabel(notification.accounts[0].note.asRawText) .lineLimit(3) .font(.scaledCallout) - .emojiSize(Font.scaledCalloutFont.emojiSize) - .emojiBaselineOffset(Font.scaledCalloutFont.emojiBaselineOffset) + .emojiText.size(Font.scaledCalloutFont.emojiSize) + .emojiText.baselineOffset(Font.scaledCalloutFont.emojiBaselineOffset) .foregroundStyle(.secondary) .environment(\.openURL, OpenURLAction { url in routerPath.handle(url: url) diff --git a/Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/MentionsView.swift b/Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/MentionsView.swift index d0367de8..fcff3abe 100644 --- a/Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/MentionsView.swift +++ b/Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/MentionsView.swift @@ -22,8 +22,8 @@ extension StatusEditor.AutoCompleteView { VStack(alignment: .leading) { EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis) - .emojiSize(Font.scaledFootnoteFont.emojiSize) - .emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) + .emojiText.size(Font.scaledFootnoteFont.emojiSize) + .emojiText.baselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) .font(.scaledFootnote) .fontWeight(.bold) .foregroundColor(theme.labelColor) diff --git a/Packages/StatusKit/Sources/StatusKit/Embed/StatusEmbeddedView.swift b/Packages/StatusKit/Sources/StatusKit/Embed/StatusEmbeddedView.swift index e65aab30..20312b3b 100644 --- a/Packages/StatusKit/Sources/StatusKit/Embed/StatusEmbeddedView.swift +++ b/Packages/StatusKit/Sources/StatusKit/Embed/StatusEmbeddedView.swift @@ -55,8 +55,8 @@ public struct StatusEmbeddedView: View { VStack(alignment: .leading, spacing: 0) { EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis) .font(.scaledFootnote) - .emojiSize(Font.scaledFootnoteFont.emojiSize) - .emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) + .emojiText.size(Font.scaledFootnoteFont.emojiSize) + .emojiText.baselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) .fontWeight(.semibold) Group { Text("@\(account.acct)") + diff --git a/Packages/StatusKit/Sources/StatusKit/History/StatusEditHistoryView.swift b/Packages/StatusKit/Sources/StatusKit/History/StatusEditHistoryView.swift index acdc02d3..544b3012 100644 --- a/Packages/StatusKit/Sources/StatusKit/History/StatusEditHistoryView.swift +++ b/Packages/StatusKit/Sources/StatusKit/History/StatusEditHistoryView.swift @@ -26,8 +26,8 @@ public struct StatusEditHistoryView: View { VStack(alignment: .leading, spacing: 8) { EmojiTextApp(edit.content, emojis: edit.emojis) .font(.scaledBody) - .emojiSize(Font.scaledBodyFont.emojiSize) - .emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) + .emojiText.size(Font.scaledBodyFont.emojiSize) + .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset) Group { Text(edit.createdAt.asDate, style: .date) + Text("status.summary.at-time") + diff --git a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowHeaderView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowHeaderView.swift index a6e0987a..526a135a 100644 --- a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowHeaderView.swift +++ b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowHeaderView.swift @@ -49,8 +49,8 @@ struct StatusRowHeaderView: View { emojis: viewModel.finalStatus.account.emojis) .font(.scaledSubheadline) .foregroundColor(theme.labelColor) - .emojiSize(Font.scaledSubheadlineFont.emojiSize) - .emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) + .emojiText.size(Font.scaledSubheadlineFont.emojiSize) + .emojiText.baselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) .fontWeight(.semibold) .lineLimit(1) #if targetEnvironment(macCatalyst) diff --git a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowReblogView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowReblogView.swift index 08e8325a..3ff93aa2 100644 --- a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowReblogView.swift +++ b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowReblogView.swift @@ -19,8 +19,8 @@ struct StatusRowReblogView: View { + Text("status.row.was-boosted") ) .font(.scaledFootnote) - .emojiSize(Font.scaledFootnoteFont.emojiSize) - .emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) + .emojiText.size(Font.scaledFootnoteFont.emojiSize) + .emojiText.baselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) .foregroundStyle(.secondary) .fontWeight(.semibold) .onTapGesture { diff --git a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowSpoilerView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowSpoilerView.swift index 515be138..502e0458 100644 --- a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowSpoilerView.swift +++ b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowSpoilerView.swift @@ -13,8 +13,8 @@ struct StatusRowSpoilerView: View { .foregroundColor(.secondary) EmojiTextApp(status.spoilerText, emojis: status.emojis, language: status.language) .font(.system(.subheadline, weight: .bold)) - .emojiSize(Font.scaledSubheadlineFont.emojiSize) - .emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) + .emojiText.size(Font.scaledSubheadlineFont.emojiSize) + .emojiText.baselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) .foregroundColor(.secondary) .multilineTextAlignment(.leading) Spacer() diff --git a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTextView.swift b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTextView.swift index 16375f9b..e796637b 100644 --- a/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTextView.swift +++ b/Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTextView.swift @@ -22,8 +22,8 @@ struct StatusRowTextView: View { .font(isFocused ? .scaledBodyFocused : .scaledBody) .lineSpacing(CGFloat(theme.lineSpacing)) .foregroundColor(viewModel.textDisabled ? .gray : theme.labelColor) - .emojiSize(isFocused ? Font.scaledBodyFocusedFont.emojiSize : Font.scaledBodyFont.emojiSize) - .emojiBaselineOffset(isFocused ? Font.scaledBodyFocusedFont.emojiBaselineOffset : Font.scaledBodyFont.emojiBaselineOffset) + .emojiText.size(isFocused ? Font.scaledBodyFocusedFont.emojiSize : Font.scaledBodyFont.emojiSize) + .emojiText.baselineOffset(isFocused ? Font.scaledBodyFocusedFont.emojiBaselineOffset : Font.scaledBodyFont.emojiBaselineOffset) .environment(\.openURL, OpenURLAction { url in viewModel.routerPath.handleStatus(status: viewModel.finalStatus, url: url) })