mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 12:07:55 +00:00
Indent blank lines and address avatar crop review feedback
Indent the new method's blank lines to satisfy SwiftFormat's indent-blank-lines rule, which failed the Tests CI jobs. Also address review findings on the crop itself: - Request a 256pt thumbnail box at both donation sites so cropping a scaled (aspect-fit) thumbnail to its minor axis keeps enough resolution for the share sheet's circle. - Round the draw offsets to whole pixels so odd-sized crops blit instead of resampling. - Log when fetched avatar data can't be decoded rather than silently swapping in the placeholder, and document the non-obvious format.scale pinning.
This commit is contained in:
@@ -44,23 +44,28 @@ enum Avatars {
|
||||
/// images to fill its circle, so centre-crop to a square before donating them.
|
||||
nonisolated static func squareAvatarImageData(from data: Data) -> Data? {
|
||||
guard let image = UIImage(data: data) else { return nil }
|
||||
|
||||
|
||||
let side = min(image.size.width, image.size.height)
|
||||
guard side > 0 else { return nil }
|
||||
|
||||
|
||||
if image.size.width == image.size.height {
|
||||
return data
|
||||
}
|
||||
|
||||
|
||||
let format = UIGraphicsImageRendererFormat()
|
||||
// UIImage(data:) decodes at scale 1; pin the renderer to that so the
|
||||
// output isn't silently multiplied by the device's screen scale.
|
||||
format.scale = image.scale
|
||||
|
||||
|
||||
return UIGraphicsImageRenderer(size: CGSize(width: side, height: side), format: format)
|
||||
.pngData { _ in
|
||||
image.draw(at: CGPoint(x: (side - image.size.width) / 2, y: (side - image.size.height) / 2))
|
||||
// Round the offsets to pixel boundaries so the crop is a straight
|
||||
// copy rather than resampling (and softening) the whole image.
|
||||
image.draw(at: CGPoint(x: ((side - image.size.width) / 2).rounded(),
|
||||
y: ((side - image.size.height) / 2).rounded()))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@MainActor
|
||||
static func generatePlaceholderAvatarImageData(name: String, id: String, size: CGSize) -> Data? {
|
||||
let image = PlaceholderAvatarImage(name: name, contentID: id)
|
||||
|
||||
@@ -650,9 +650,14 @@ class TimelineController: TimelineControllerProtocol {
|
||||
}
|
||||
|
||||
if let avatarURL, let mediaSource = try? MediaSourceProxy(url: avatarURL, mimeType: nil) {
|
||||
if case let .success(avatarData) = await mediaProvider.loadThumbnailForSource(source: mediaSource, size: .init(width: 100, height: 100)),
|
||||
let squareAvatarData = Avatars.squareAvatarImageData(from: avatarData) {
|
||||
sendMessageIntent.setImage(INImage(imageData: squareAvatarData), forParameterNamed: \.speakableGroupName)
|
||||
// Request a generous size so the square crop of a non-square avatar keeps enough resolution.
|
||||
if case let .success(avatarData) = await mediaProvider.loadThumbnailForSource(source: mediaSource, size: .init(width: 256, height: 256)) {
|
||||
if let squareAvatarData = Avatars.squareAvatarImageData(from: avatarData) {
|
||||
sendMessageIntent.setImage(INImage(imageData: squareAvatarData), forParameterNamed: \.speakableGroupName)
|
||||
} else {
|
||||
MXLog.error("Failed processing the room avatar for the send message intent, using a placeholder.")
|
||||
addPlacehoder()
|
||||
}
|
||||
} else {
|
||||
addPlacehoder()
|
||||
}
|
||||
|
||||
@@ -257,10 +257,13 @@ nonisolated struct NotificationContentBuilder {
|
||||
let image: INImage
|
||||
if !forcePlaceholder,
|
||||
let mediaSource = icon.mediaSource {
|
||||
switch await mediaProvider.loadThumbnailForSource(source: mediaSource, size: .init(width: 100, height: 100)) {
|
||||
// Request a generous size so the square crop of a non-square avatar keeps enough resolution.
|
||||
switch await mediaProvider.loadThumbnailForSource(source: mediaSource, size: .init(width: 256, height: 256)) {
|
||||
case .success(let data):
|
||||
if let squareData = Avatars.squareAvatarImageData(from: data) {
|
||||
fetchedImage = INImage(imageData: squareData)
|
||||
} else {
|
||||
MXLog.error("Couldn't decode the fetched sender icon, using a placeholder.")
|
||||
}
|
||||
case .failure(let error):
|
||||
MXLog.error("Couldn't add sender icon: \(error)")
|
||||
|
||||
Reference in New Issue
Block a user