diff --git a/IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 21eaa53c..f429f113 100644 --- a/IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/divadretlaw/EmojiText", "state" : { - "revision" : "d0664390e3236ff6241ea0586d80f4e92702973b", - "version" : "3.2.1" + "revision" : "174a7bc7bd75650ad1acb5679dbb754296093de0", + "version" : "4.0.0" } }, { @@ -99,6 +99,24 @@ "version" : "0.14.1" } }, + { + "identity" : "swift-cmark", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-cmark.git", + "state" : { + "revision" : "f218e5d7691f78b55bfa39b367763f4612486c35", + "version" : "0.3.0" + } + }, + { + "identity" : "swift-markdown", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-markdown", + "state" : { + "revision" : "e4f95e2dc23097a1a9a1dfdfe3fe3ee44de77378", + "version" : "0.3.0" + } + }, { "identity" : "swiftsoup", "kind" : "remoteSourceControl", diff --git a/Packages/DesignSystem/Package.swift b/Packages/DesignSystem/Package.swift index 9e55c979..8cc5cdd0 100644 --- a/Packages/DesignSystem/Package.swift +++ b/Packages/DesignSystem/Package.swift @@ -20,7 +20,7 @@ let package = Package( .package(name: "Models", path: "../Models"), .package(name: "Env", path: "../Env"), .package(url: "https://github.com/kean/Nuke", from: "12.0.0"), - .package(url: "https://github.com/divadretlaw/EmojiText", from: "3.2.1"), + .package(url: "https://github.com/divadretlaw/EmojiText", from: "4.0.0"), ], targets: [ .target( diff --git a/Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift b/Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift index 4b9782f6..8da78d35 100644 --- a/Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift +++ b/Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift @@ -38,8 +38,8 @@ struct AccountPopoverView: View { EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis) .font(.headline) .foregroundColor(theme.labelColor) - .emojiSize(Font.scaledHeadlineFont.emojiSize) - .emojiBaselineOffset(Font.scaledHeadlineFont.emojiBaselineOffset) + .emojiText.size(Font.scaledHeadlineFont.emojiSize) + .emojiText.baselineOffset(Font.scaledHeadlineFont.emojiBaselineOffset) .accessibilityAddTraits(.isHeader) .help(account.safeDisplayName) @@ -62,8 +62,8 @@ struct AccountPopoverView: View { EmojiTextApp(account.note, emojis: account.emojis, lineLimit: 5) .font(.body) - .emojiSize(Font.scaledFootnoteFont.emojiSize) - .emojiBaselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) + .emojiText.size(Font.scaledFootnoteFont.emojiSize) + .emojiText.baselineOffset(Font.scaledFootnoteFont.emojiBaselineOffset) .padding(.top, 3) } .padding([.leading, .trailing, .bottom])