From 871e1a9ce6de178c127c76a456dc18c5c4365932 Mon Sep 17 00:00:00 2001 From: Doug Date: Thu, 29 Feb 2024 17:30:25 +0000 Subject: [PATCH 1/3] Update Compound. --- ElementX.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 6 +++--- .../Sources/Other/Extensions/UNNotificationContent.swift | 2 +- project.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 12a858f5a2..4089c55346 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -7120,7 +7120,7 @@ repositoryURL = "https://github.com/element-hq/compound-ios"; requirement = { kind = revision; - revision = 98bd0ed412c29bd5b3762b673ca5720b6fb9d713; + revision = d38528736c3abe9dc739d96391d1ffd372cd802d; }; }; F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 7698ea97d5..8ef22520a2 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "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" } }, { @@ -14,7 +14,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/compound-ios", "state" : { - "revision" : "98bd0ed412c29bd5b3762b673ca5720b6fb9d713" + "revision" : "d38528736c3abe9dc739d96391d1ffd372cd802d" } }, { diff --git a/ElementX/Sources/Other/Extensions/UNNotificationContent.swift b/ElementX/Sources/Other/Extensions/UNNotificationContent.swift index 4424eb4d3f..4440021229 100644 --- a/ElementX/Sources/Other/Extensions/UNNotificationContent.swift +++ b/ElementX/Sources/Other/Extensions/UNNotificationContent.swift @@ -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")" let fileName = "\(prefix)_\(name)_\(id).png" if let data = try? Data(contentsOf: URL.temporaryDirectory.appendingPathComponent(fileName)) { MXLog.info("Found existing notification icon placeholder") diff --git a/project.yml b/project.yml index 0688849ea8..48a456ed14 100644 --- a/project.yml +++ b/project.yml @@ -52,7 +52,7 @@ packages: # path: ../matrix-rust-sdk Compound: url: https://github.com/element-hq/compound-ios - revision: 98bd0ed412c29bd5b3762b673ca5720b6fb9d713 + revision: d38528736c3abe9dc739d96391d1ffd372cd802d # path: ../compound-ios AnalyticsEvents: url: https://github.com/matrix-org/matrix-analytics-events From 981278552b702eac56b9bdf4a000974ce52cd121 Mon Sep 17 00:00:00 2001 From: Doug Date: Thu, 29 Feb 2024 17:37:10 +0000 Subject: [PATCH 2/3] Changelog. --- changelog.d/pr-2514.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/pr-2514.bugfix diff --git a/changelog.d/pr-2514.bugfix b/changelog.d/pr-2514.bugfix new file mode 100644 index 0000000000..a4298dfde0 --- /dev/null +++ b/changelog.d/pr-2514.bugfix @@ -0,0 +1 @@ +Fix a bug where some avatar backgrounds were hard to see in notifications. \ No newline at end of file From a878e82c96af5e6f8861acba6ef4c1c527ce181e Mon Sep 17 00:00:00 2001 From: Doug Date: Fri, 1 Mar 2024 11:32:12 +0000 Subject: [PATCH 3/3] Update package to merged commit. --- ElementX.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- project.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 4089c55346..4eb5c80716 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -7120,7 +7120,7 @@ repositoryURL = "https://github.com/element-hq/compound-ios"; requirement = { kind = revision; - revision = d38528736c3abe9dc739d96391d1ffd372cd802d; + revision = 19c778b6ce0b82601ecdca23ff8d4a7aa41f990f; }; }; F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8ef22520a2..cbe6cb781b 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,7 +14,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/compound-ios", "state" : { - "revision" : "d38528736c3abe9dc739d96391d1ffd372cd802d" + "revision" : "19c778b6ce0b82601ecdca23ff8d4a7aa41f990f" } }, { diff --git a/project.yml b/project.yml index 48a456ed14..aeb47e7653 100644 --- a/project.yml +++ b/project.yml @@ -52,7 +52,7 @@ packages: # path: ../matrix-rust-sdk Compound: url: https://github.com/element-hq/compound-ios - revision: d38528736c3abe9dc739d96391d1ffd372cd802d + revision: 19c778b6ce0b82601ecdca23ff8d4a7aa41f990f # path: ../compound-ios AnalyticsEvents: url: https://github.com/matrix-org/matrix-analytics-events