Mastodon/IceCubes
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2025-02-09 16:08:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate EmojiText API

Browse Source
This commit is contained in:
Thomas Ricouard 2024-02-05 08:55:24 +01:00
parent 827765f251
commit b4dbda8722
16 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Packages/Account/Sources/Account/AccountDetailHeaderView.swift
View File

@ -172,8 +172,8 @@ struct AccountDetailHeaderView: View {
EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis) EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis)
.font(.scaledHeadline) .font(.scaledHeadline)
.foregroundColor(theme.labelColor) .foregroundColor(theme.labelColor)
.emojiSize(Font.scaledHeadlineFont.emojiSize) .emojiText.size(Font.scaledHeadlineFont.emojiSize)
.emojiBaselineOffset(Font.scaledHeadlineFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledHeadlineFont.emojiBaselineOffset)
.accessibilityAddTraits(.isHeader) .accessibilityAddTraits(.isHeader)
// The views here are wrapped in ZStacks as a Text(Image) does not provide an `accessibilityLabel`. // 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) EmojiTextApp(account.note, emojis: account.emojis)
.font(.scaledBody) .font(.scaledBody)
.foregroundColor(theme.labelColor) .foregroundColor(theme.labelColor)
.emojiSize(Font.scaledBodyFont.emojiSize) .emojiText.size(Font.scaledBodyFont.emojiSize)
.emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset)
.padding(.top, 8) .padding(.top, 8)
.textSelection(.enabled) .textSelection(.enabled)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
@ -338,8 +338,8 @@ struct AccountDetailHeaderView: View {
HStack { HStack {
VStack(alignment: .leading, spacing: 2) { VStack(alignment: .leading, spacing: 2) {
EmojiTextApp(.init(stringValue: field.name), emojis: viewModel.account?.emojis ?? []) EmojiTextApp(.init(stringValue: field.name), emojis: viewModel.account?.emojis ?? [])
.emojiSize(Font.scaledHeadlineFont.emojiSize) .emojiText.size(Font.scaledHeadlineFont.emojiSize)
.emojiBaselineOffset(Font.scaledHeadlineFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledHeadlineFont.emojiBaselineOffset)
.font(.scaledHeadline) .font(.scaledHeadline)
HStack { HStack {
if field.verifiedAt != nil { if field.verifiedAt != nil {
@ -348,8 +348,8 @@ struct AccountDetailHeaderView: View {
.accessibilityHidden(true) .accessibilityHidden(true)
} }
EmojiTextApp(field.value, emojis: viewModel.account?.emojis ?? []) EmojiTextApp(field.value, emojis: viewModel.account?.emojis ?? [])
.emojiSize(Font.scaledBodyFont.emojiSize) .emojiText.size(Font.scaledBodyFont.emojiSize)
.emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset)
.foregroundColor(theme.tintColor) .foregroundColor(theme.tintColor)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
routerPath.handle(url: url) routerPath.handle(url: url)

12
Packages/Account/Sources/Account/AccountsList/AccountsListRow.swift
View File

@ -48,8 +48,8 @@ public struct AccountsListRow: View {
VStack(alignment: .leading, spacing: 2) { VStack(alignment: .leading, spacing: 2) {
EmojiTextApp(.init(stringValue: viewModel.account.safeDisplayName), emojis: viewModel.account.emojis) EmojiTextApp(.init(stringValue: viewModel.account.safeDisplayName), emojis: viewModel.account.emojis)
.font(.scaledSubheadline) .font(.scaledSubheadline)
.emojiSize(Font.scaledSubheadlineFont.emojiSize) .emojiText.size(Font.scaledSubheadlineFont.emojiSize)
.emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset)
.fontWeight(.semibold) .fontWeight(.semibold)
Text("@\(viewModel.account.acct)") Text("@\(viewModel.account.acct)")
.font(.scaledFootnote) .font(.scaledFootnote)
@ -68,8 +68,8 @@ public struct AccountsListRow: View {
EmojiTextApp(field.value, emojis: viewModel.account.emojis) EmojiTextApp(field.value, emojis: viewModel.account.emojis)
.font(.scaledFootnote) .font(.scaledFootnote)
.emojiSize(Font.scaledFootnoteFont.emojiSize) .emojiText.size(Font.scaledFootnoteFont.emojiSize)
.emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
routerPath.handle(url: url) routerPath.handle(url: url)
}) })
@ -78,8 +78,8 @@ public struct AccountsListRow: View {
EmojiTextApp(viewModel.account.note, emojis: viewModel.account.emojis, lineLimit: 2) EmojiTextApp(viewModel.account.note, emojis: viewModel.account.emojis, lineLimit: 2)
.font(.scaledCaption) .font(.scaledCaption)
.emojiSize(Font.scaledFootnoteFont.emojiSize) .emojiText.size(Font.scaledFootnoteFont.emojiSize)
.emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
routerPath.handle(url: url) routerPath.handle(url: url)
}) })

4
Packages/Account/Sources/Account/Edit/EditAccountView.swift
View File

@ -189,8 +189,8 @@ public struct EditAccountView: View {
TextField("account.edit.metadata-name-placeholder", text: $field.name) TextField("account.edit.metadata-name-placeholder", text: $field.name)
.font(.scaledHeadline) .font(.scaledHeadline)
TextField("account.edit.metadata-value-placeholder", text: $field.value) TextField("account.edit.metadata-value-placeholder", text: $field.value)
.emojiSize(Font.scaledBodyFont.emojiSize) .emojiText.size(Font.scaledBodyFont.emojiSize)
.emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset)
.foregroundColor(theme.tintColor) .foregroundColor(theme.tintColor)
} }
} }

4
Packages/AppAccount/Sources/AppAccount/AppAccountView.swift
View File

@ -104,8 +104,8 @@ public struct AppAccountView: View {
.foregroundColor(theme.labelColor) .foregroundColor(theme.labelColor)
Text("\(account.username)@\(viewModel.appAccount.server)") Text("\(account.username)@\(viewModel.appAccount.server)")
.font(.scaledSubheadline) .font(.scaledSubheadline)
.emojiSize(Font.scaledSubheadlineFont.emojiSize) .emojiText.size(Font.scaledSubheadlineFont.emojiSize)
.emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset)
.foregroundStyle(Color.secondary) .foregroundStyle(Color.secondary)
} }
} }

4
Packages/Conversations/Sources/Conversations/Detail/ConversationDetailView.swift
View File

@ -82,8 +82,8 @@ public struct ConversationDetailView: View {
EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis) EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis)
.font(.scaledHeadline) .font(.scaledHeadline)
.foregroundColor(theme.labelColor) .foregroundColor(theme.labelColor)
.emojiSize(Font.scaledHeadlineFont.emojiSize) .emojiText.size(Font.scaledHeadlineFont.emojiSize)
.emojiBaselineOffset(Font.scaledHeadlineFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledHeadlineFont.emojiBaselineOffset)
} else { } else {
Text("Direct message with \(viewModel.conversation.accounts.count) people") Text("Direct message with \(viewModel.conversation.accounts.count) people")
.font(.scaledHeadline) .font(.scaledHeadline)

4
Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift
View File

@ -36,8 +36,8 @@ struct ConversationMessageView: View {
EmojiTextApp(message.content, emojis: message.emojis) EmojiTextApp(message.content, emojis: message.emojis)
.font(.scaledBody) .font(.scaledBody)
.foregroundColor(theme.labelColor) .foregroundColor(theme.labelColor)
.emojiSize(Font.scaledBodyFont.emojiSize) .emojiText.size(Font.scaledBodyFont.emojiSize)
.emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset)
.padding(6) .padding(6)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
routerPath.handleStatus(status: message, url: url) routerPath.handleStatus(status: message, url: url)

8
Packages/Conversations/Sources/Conversations/List/ConversationsListRow.swift
View File

@ -33,8 +33,8 @@ struct ConversationsListRow: View {
emojis: conversation.accounts.flatMap(\.emojis)) emojis: conversation.accounts.flatMap(\.emojis))
.font(.scaledSubheadline) .font(.scaledSubheadline)
.foregroundColor(theme.labelColor) .foregroundColor(theme.labelColor)
.emojiSize(Font.scaledSubheadlineFont.emojiSize) .emojiText.size(Font.scaledSubheadlineFont.emojiSize)
.emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset)
.fontWeight(.semibold) .fontWeight(.semibold)
.foregroundColor(theme.labelColor) .foregroundColor(theme.labelColor)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
@ -57,8 +57,8 @@ struct ConversationsListRow: View {
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.font(.scaledBody) .font(.scaledBody)
.foregroundColor(theme.labelColor) .foregroundColor(theme.labelColor)
.emojiSize(Font.scaledBodyFont.emojiSize) .emojiText.size(Font.scaledBodyFont.emojiSize)
.emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset)
.accessibilityLabel(conversation.lastStatus?.content.asRawText ?? "") .accessibilityLabel(conversation.lastStatus?.content.asRawText ?? "")
} }
Spacer() Spacer()

8
Packages/Lists/Sources/Lists/Edit/ListEditView.swift
View File

@ -124,8 +124,8 @@ public struct ListEditView: View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
EmojiTextApp(.init(stringValue: account.safeDisplayName), EmojiTextApp(.init(stringValue: account.safeDisplayName),
emojis: account.emojis) emojis: account.emojis)
.emojiSize(Font.scaledBodyFont.emojiSize) .emojiText.size(Font.scaledBodyFont.emojiSize)
.emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset)
Text("@\(account.acct)") Text("@\(account.acct)")
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
.font(.scaledFootnote) .font(.scaledFootnote)
@ -170,8 +170,8 @@ public struct ListEditView: View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
EmojiTextApp(.init(stringValue: account.safeDisplayName), EmojiTextApp(.init(stringValue: account.safeDisplayName),
emojis: account.emojis) emojis: account.emojis)
.emojiSize(Font.scaledBodyFont.emojiSize) .emojiText.size(Font.scaledBodyFont.emojiSize)
.emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset)
Text("@\(account.acct)") Text("@\(account.acct)")
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
.font(.scaledFootnote) .font(.scaledFootnote)

8
Packages/Notifications/Sources/Notifications/NotificationRowView.swift
View File

@ -117,8 +117,8 @@ struct NotificationRowView: View {
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
}) })
.font(.scaledSubheadline) .font(.scaledSubheadline)
.emojiSize(Font.scaledSubheadlineFont.emojiSize) .emojiText.size(Font.scaledSubheadlineFont.emojiSize)
.emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset)
.fontWeight(.semibold) .fontWeight(.semibold)
.lineLimit(3) .lineLimit(3)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
@ -185,8 +185,8 @@ struct NotificationRowView: View {
.accessibilityLabel(notification.accounts[0].note.asRawText) .accessibilityLabel(notification.accounts[0].note.asRawText)
.lineLimit(3) .lineLimit(3)
.font(.scaledCallout) .font(.scaledCallout)
.emojiSize(Font.scaledCalloutFont.emojiSize) .emojiText.size(Font.scaledCalloutFont.emojiSize)
.emojiBaselineOffset(Font.scaledCalloutFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledCalloutFont.emojiBaselineOffset)
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
routerPath.handle(url: url) routerPath.handle(url: url)

4
Packages/StatusKit/Sources/StatusKit/Editor/Components/AutoComplete/MentionsView.swift
View File

@ -22,8 +22,8 @@ extension StatusEditor.AutoCompleteView {
VStack(alignment: .leading) { VStack(alignment: .leading) {
EmojiTextApp(.init(stringValue: account.safeDisplayName), EmojiTextApp(.init(stringValue: account.safeDisplayName),
emojis: account.emojis) emojis: account.emojis)
.emojiSize(Font.scaledFootnoteFont.emojiSize) .emojiText.size(Font.scaledFootnoteFont.emojiSize)
.emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset)
.font(.scaledFootnote) .font(.scaledFootnote)
.fontWeight(.bold) .fontWeight(.bold)
.foregroundColor(theme.labelColor) .foregroundColor(theme.labelColor)

4
Packages/StatusKit/Sources/StatusKit/Embed/StatusEmbeddedView.swift
View File

@ -55,8 +55,8 @@ public struct StatusEmbeddedView: View {
VStack(alignment: .leading, spacing: 0) { VStack(alignment: .leading, spacing: 0) {
EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis) EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis)
.font(.scaledFootnote) .font(.scaledFootnote)
.emojiSize(Font.scaledFootnoteFont.emojiSize) .emojiText.size(Font.scaledFootnoteFont.emojiSize)
.emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset)
.fontWeight(.semibold) .fontWeight(.semibold)
Group { Group {
Text("@\(account.acct)") + Text("@\(account.acct)") +

4
Packages/StatusKit/Sources/StatusKit/History/StatusEditHistoryView.swift
View File

@ -26,8 +26,8 @@ public struct StatusEditHistoryView: View {
VStack(alignment: .leading, spacing: 8) { VStack(alignment: .leading, spacing: 8) {
EmojiTextApp(edit.content, emojis: edit.emojis) EmojiTextApp(edit.content, emojis: edit.emojis)
.font(.scaledBody) .font(.scaledBody)
.emojiSize(Font.scaledBodyFont.emojiSize) .emojiText.size(Font.scaledBodyFont.emojiSize)
.emojiBaselineOffset(Font.scaledBodyFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledBodyFont.emojiBaselineOffset)
Group { Group {
Text(edit.createdAt.asDate, style: .date) + Text(edit.createdAt.asDate, style: .date) +
Text("status.summary.at-time") + Text("status.summary.at-time") +

4
Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowHeaderView.swift
View File

@ -49,8 +49,8 @@ struct StatusRowHeaderView: View {
emojis: viewModel.finalStatus.account.emojis) emojis: viewModel.finalStatus.account.emojis)
.font(.scaledSubheadline) .font(.scaledSubheadline)
.foregroundColor(theme.labelColor) .foregroundColor(theme.labelColor)
.emojiSize(Font.scaledSubheadlineFont.emojiSize) .emojiText.size(Font.scaledSubheadlineFont.emojiSize)
.emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset)
.fontWeight(.semibold) .fontWeight(.semibold)
.lineLimit(1) .lineLimit(1)
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)

4
Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowReblogView.swift
View File

@ -19,8 +19,8 @@ struct StatusRowReblogView: View {
+ Text("status.row.was-boosted") + Text("status.row.was-boosted")
) )
.font(.scaledFootnote) .font(.scaledFootnote)
.emojiSize(Font.scaledFootnoteFont.emojiSize) .emojiText.size(Font.scaledFootnoteFont.emojiSize)
.emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset)
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
.fontWeight(.semibold) .fontWeight(.semibold)
.onTapGesture { .onTapGesture {

4
Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowSpoilerView.swift
View File

@ -13,8 +13,8 @@ struct StatusRowSpoilerView: View {
.foregroundColor(.secondary) .foregroundColor(.secondary)
EmojiTextApp(status.spoilerText, emojis: status.emojis, language: status.language) EmojiTextApp(status.spoilerText, emojis: status.emojis, language: status.language)
.font(.system(.subheadline, weight: .bold)) .font(.system(.subheadline, weight: .bold))
.emojiSize(Font.scaledSubheadlineFont.emojiSize) .emojiText.size(Font.scaledSubheadlineFont.emojiSize)
.emojiBaselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset) .emojiText.baselineOffset(Font.scaledSubheadlineFont.emojiBaselineOffset)
.foregroundColor(.secondary) .foregroundColor(.secondary)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
Spacer() Spacer()

4
Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowTextView.swift
View File

@ -22,8 +22,8 @@ struct StatusRowTextView: View {
.font(isFocused ? .scaledBodyFocused : .scaledBody) .font(isFocused ? .scaledBodyFocused : .scaledBody)
.lineSpacing(CGFloat(theme.lineSpacing)) .lineSpacing(CGFloat(theme.lineSpacing))
.foregroundColor(viewModel.textDisabled ? .gray : theme.labelColor) .foregroundColor(viewModel.textDisabled ? .gray : theme.labelColor)
.emojiSize(isFocused ? Font.scaledBodyFocusedFont.emojiSize : Font.scaledBodyFont.emojiSize) .emojiText.size(isFocused ? Font.scaledBodyFocusedFont.emojiSize : Font.scaledBodyFont.emojiSize)
.emojiBaselineOffset(isFocused ? Font.scaledBodyFocusedFont.emojiBaselineOffset : Font.scaledBodyFont.emojiBaselineOffset) .emojiText.baselineOffset(isFocused ? Font.scaledBodyFocusedFont.emojiBaselineOffset : Font.scaledBodyFont.emojiBaselineOffset)
.environment(\.openURL, OpenURLAction { url in .environment(\.openURL, OpenURLAction { url in
viewModel.routerPath.handleStatus(status: viewModel.finalStatus, url: url) viewModel.routerPath.handleStatus(status: viewModel.finalStatus, url: url)
}) })