Mastodon/IceCubes
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2025-01-11 06:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

EmojiText 4.0.0 (#1941)

Browse Source
This commit is contained in:
David Walter 2024-02-05 08:49:29 +01:00 committed by GitHub
parent e7702e1ad0
commit 827765f251
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -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",

2
Packages/DesignSystem/Package.swift
View File

@ -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(

8
Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift
View File

@ -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])