shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 71 Pull Requests Releases Wiki Activity

Avoid unnecessarily recreating avatar views in notifications cells

This commit is contained in:
Shadowfacts 2023-09-25 21:44:43 -04:00
parent bf1ed57180
commit a2fe0dfb78
2 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Tusker/Screens/Notifications/ActionNotificationGroupCollectionViewCell.swift
View File

@ -139,19 +139,25 @@ class ActionNotificationGroupCollectionViewCell: UICollectionViewListCell {
mastodonController.persistentContainer.account(for: $0.account.id) mastodonController.persistentContainer.account(for: $0.account.id)
} }
avatarStack.arrangedSubviews.forEach { $0.removeFromSuperview() } let visibleAvatars = Array(people.lazy.compactMap(\.avatar).prefix(10))
for avatarURL in people.lazy.compactMap(\.avatar).prefix(10) { for (index, avatarURL) in visibleAvatars.enumerated() {
let imageView = CachedImageView(cache: .avatars) let imageView: CachedImageView
imageView.contentMode = .scaleAspectFill if index < avatarStack.arrangedSubviews.count {
imageView.layer.masksToBounds = true imageView = avatarStack.arrangedSubviews[index] as! CachedImageView
imageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * 30 } else {
imageView.layer.cornerCurve = .continuous imageView = CachedImageView(cache: .avatars)
avatarStack.addArrangedSubview(imageView) imageView.contentMode = .scaleAspectFill
imageView.layer.masksToBounds = true
imageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * 30
imageView.layer.cornerCurve = .continuous
avatarStack.addArrangedSubview(imageView)
imageView.widthAnchor.constraint(equalTo: imageView.heightAnchor).isActive = true
}
imageView.update(for: avatarURL) imageView.update(for: avatarURL)
} }
NSLayoutConstraint.activate(avatarStack.arrangedSubviews.map { for imageView in avatarStack.arrangedSubviews.dropFirst(visibleAvatars.count) {
$0.widthAnchor.constraint(equalTo: $0.heightAnchor) avatarStack.removeArrangedSubview(imageView)
}) }
actionLabel.setEmojis(pairs: people.map { ($0.displayOrUserName, $0.emojis) }, identifier: group.id) actionLabel.setEmojis(pairs: people.map { ($0.displayOrUserName, $0.emojis) }, identifier: group.id)

28
Tusker/Screens/Notifications/FollowNotificationGroupCollectionViewCell.swift
View File

@ -116,19 +116,25 @@ class FollowNotificationGroupCollectionViewCell: UICollectionViewListCell {
}, identifier: group.id) }, identifier: group.id)
updateTimestamp() updateTimestamp()
avatarStack.arrangedSubviews.forEach { $0.removeFromSuperview() } let visibleAvatars = Array(people.lazy.compactMap(\.avatar).prefix(10))
for avatarURL in people.lazy.compactMap(\.avatar).prefix(10) { for (index, avatarURL) in visibleAvatars.enumerated() {
let imageView = CachedImageView(cache: .avatars) let imageView: CachedImageView
imageView.contentMode = .scaleAspectFill if index < avatarStack.arrangedSubviews.count {
imageView.layer.masksToBounds = true imageView = avatarStack.arrangedSubviews[index] as! CachedImageView
imageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * 30 } else {
imageView.layer.cornerCurve = .continuous imageView = CachedImageView(cache: .avatars)
imageView.contentMode = .scaleAspectFill
imageView.layer.masksToBounds = true
imageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * 30
imageView.layer.cornerCurve = .continuous
avatarStack.addArrangedSubview(imageView)
imageView.widthAnchor.constraint(equalTo: imageView.heightAnchor).isActive = true
}
imageView.update(for: avatarURL) imageView.update(for: avatarURL)
avatarStack.addArrangedSubview(imageView)
} }
NSLayoutConstraint.activate(avatarStack.arrangedSubviews.map { for imageView in avatarStack.arrangedSubviews.dropFirst(visibleAvatars.count) {
$0.widthAnchor.constraint(equalTo: $0.heightAnchor) avatarStack.removeArrangedSubview(imageView)
}) }
} }
private func updateActionLabel(names: [NSAttributedString]) -> NSAttributedString { private func updateActionLabel(names: [NSAttributedString]) -> NSAttributedString {