Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Compound. #2514

Merged
merged 3 commits into from
Mar 1, 2024
Merged

Update Compound. #2514

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
871e1a9
Update Compound.
pixlwave Feb 29, 2024
9812785
Changelog.
pixlwave Feb 29, 2024
a878e82
Update package to merged commit.
pixlwave Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ElementX.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7120,7 +7120,7 @@
repositoryURL = "https://github.com/element-hq/compound-ios";
requirement = {
kind = revision;
revision = 98bd0ed412c29bd5b3762b673ca5720b6fb9d713;
revision = d38528736c3abe9dc739d96391d1ffd372cd802d;
};
};
F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = {
Expand Down
6 changes: 3 additions & 3 deletions ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/element-hq/compound-design-tokens.git",
"state" : {
"revision" : "d7c3bba963d6b7ffab862c3293eb242a8932a0c1",
"version" : "1.0.0"
"revision" : "c3fff1f2b042295cd5f4bcf8d4fe68ec47ca4061",
"version" : "1.2.0"
}
},
{
"identity" : "compound-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/element-hq/compound-ios",
"state" : {
"revision" : "98bd0ed412c29bd5b3762b673ca5720b6fb9d713"
"revision" : "d38528736c3abe9dc739d96391d1ffd372cd802d"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion ElementX/Sources/Other/Extensions/UNNotificationContent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ extension UNMutableNotificationContent {
private func getPlaceholderAvatarImageData(name: String, id: String) async -> Data? {
// The version value is used in case the design of the placeholder is updated to force a replacement
let shouldFlipAvatar = shouldFlipAvatar()
let prefix = "notification_placeholder\(shouldFlipAvatar ? "V7" : "V6")"
let prefix = "notification_placeholder\(shouldFlipAvatar ? "V8F" : "V8")"
pixlwave marked this conversation as resolved.
Show resolved Hide resolved
let fileName = "\(prefix)_\(name)_\(id).png"
if let data = try? Data(contentsOf: URL.temporaryDirectory.appendingPathComponent(fileName)) {
MXLog.info("Found existing notification icon placeholder")
Expand Down
2 changes: 1 addition & 1 deletion project.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ packages:
# path: ../matrix-rust-sdk
Compound:
url: https://github.com/element-hq/compound-ios
revision: 98bd0ed412c29bd5b3762b673ca5720b6fb9d713
revision: d38528736c3abe9dc739d96391d1ffd372cd802d
pixlwave marked this conversation as resolved.
Show resolved Hide resolved
# path: ../compound-ios
AnalyticsEvents:
url: https://github.com/matrix-org/matrix-analytics-events
Expand Down
Loading