felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 17:12:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: default pill icon for an unknown user

Browse Source
This commit is contained in:
Nicolas Mauri
2023-03-20 10:42:21 +01:00
parent 18a2360296
commit 406fcac64e
9 changed files with 82 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Pills/PillAttachmentView.swift
+8 -8
View File
@@ -112,25 +112,25 @@ class PillAttachmentView: UIView {
computedWidth += sizes.avatarSideLength
case .asset(let name):
case .asset(let name, let parameters):
let assetView = UIView(frame: CGRect(x: 0, y: 0, width: sizes.avatarSideLength, height: sizes.avatarSideLength))
assetView.backgroundColor = theme.colors.links
assetView.backgroundColor = parameters.backgroundColor?.uiColor
assetView.layer.cornerRadius = sizes.avatarSideLength / 2
assetView.isUserInteractionEnabled = false
assetView.translatesAutoresizingMaskIntoConstraints = false
let imageView = UIImageView(frame: .zero)
imageView.image = ImageAsset(name: name).image.withRenderingMode(.alwaysTemplate)
imageView.tintColor = theme.baseIconPrimaryColor
imageView.image = ImageAsset(name: name).image.withRenderingMode(UIImage.RenderingMode(rawValue: parameters.rawRenderingMode) ?? .automatic)
imageView.tintColor = parameters.tintColor?.uiColor ?? theme.baseIconPrimaryColor
imageView.contentMode = .scaleAspectFit
imageView.translatesAutoresizingMaskIntoConstraints = false
assetView.addSubview(imageView)
NSLayoutConstraint.activate([
imageView.leadingAnchor.constraint(equalTo: assetView.leadingAnchor, constant: 2),
imageView.trailingAnchor.constraint(equalTo: assetView.trailingAnchor, constant: -2),
imageView.topAnchor.constraint(equalTo: assetView.topAnchor, constant: 2),
imageView.bottomAnchor.constraint(equalTo: assetView.bottomAnchor, constant: -2)
imageView.leadingAnchor.constraint(equalTo: assetView.leadingAnchor, constant: parameters.padding),
imageView.trailingAnchor.constraint(equalTo: assetView.trailingAnchor, constant: -parameters.padding),
imageView.topAnchor.constraint(equalTo: assetView.topAnchor, constant: parameters.padding),
imageView.bottomAnchor.constraint(equalTo: assetView.bottomAnchor, constant: -parameters.padding)
])
stack.addArrangedSubview(assetView)
Riot/Modules/Pills/PillProvider.swift
+22 -6
View File
@@ -119,16 +119,27 @@ struct PillProvider {
// fallback on getting the user from the session's store
user = session.user(withUserId: userId)
}
let avatarUrl = roomMember?.avatarUrl ?? user?.avatarUrl
let displayName = roomMember?.displayname ?? user?.displayName ?? userId
let isHighlighted = userId == session.myUserId
let avatar: PillTextAttachmentItem
if avatarUrl == nil {
avatar = .asset(named: "pill_user",
parameters: .init(tintColor: PillAssetColor(uiColor: ThemeService.shared().theme.colors.secondaryContent),
rawRenderingMode: UIImage.RenderingMode.alwaysOriginal.rawValue,
padding: 0.0))
} else {
avatar = .avatar(url: avatarUrl,
string: displayName,
matrixId: userId)
}
let data = PillTextAttachmentData(pillType: .user(userId: userId),
items: [
.avatar(url: avatarUrl,
string: displayName,
matrixId: userId),
avatar,
.text(displayName)
],
isHighlighted: isHighlighted,
@@ -156,7 +167,7 @@ struct PillProvider {
let avatar: PillTextAttachmentItem
if let room {
if let _ = session.spaceService.getSpace(withId: roomId) {
if session.spaceService.getSpace(withId: roomId) != nil {
avatar = .spaceAvatar(url: room.avatarData.mxContentUri,
string: displayName,
matrixId: roomId)
@@ -166,7 +177,9 @@ struct PillProvider {
matrixId: roomId)
}
} else {
avatar = .asset(named: "link_icon")
avatar = .asset(named: "link_icon",
parameters: .init(backgroundColor: PillAssetColor(uiColor: ThemeService.shared().theme.colors.links),
rawRenderingMode: UIImage.RenderingMode.alwaysTemplate.rawValue))
}
let data = PillTextAttachmentData(pillType: .room(roomId: roomId),
@@ -207,7 +220,10 @@ struct PillProvider {
string: room.displayName,
matrixId: roomId)
} else {
avatar = .asset(named: "link_icon")
avatar = .asset(named: "link_icon",
parameters: .init(backgroundColor: PillAssetColor(uiColor: ThemeService.shared().theme.colors.links),
rawRenderingMode: UIImage.RenderingMode.alwaysTemplate.rawValue))
}
func computeDisplayText(withRoomDisplayName displayName: String?) -> String {
Riot/Modules/Pills/PillTextAttachmentData.swift
+22 -1
View File
@@ -17,12 +17,33 @@
import Foundation
import UIKit
@available (iOS 15.0, *)
struct PillAssetColor: Codable {
var red: CGFloat = 0.0, green: CGFloat = 0.0, blue: CGFloat = 0.0, alpha: CGFloat = 0.0
var uiColor: UIColor {
return UIColor(red: red, green: green, blue: blue, alpha: alpha)
}
init(uiColor: UIColor) {
uiColor.getRed(&red, green: &green, blue: &blue, alpha: &alpha)
}
}
@available (iOS 15.0, *)
struct PillAssetParameter: Codable {
var tintColor: PillAssetColor?
var backgroundColor: PillAssetColor?
var rawRenderingMode: Int = UIImage.RenderingMode.automatic.rawValue
var padding: CGFloat = 2.0
}
@available (iOS 15.0, *)
enum PillTextAttachmentItem: Codable {
case text(String)
case avatar(url: String?, string: String?, matrixId: String)
case spaceAvatar(url: String?, string: String?, matrixId: String)
case asset(named: String)
case asset(named: String, parameters: PillAssetParameter)
}
@available (iOS 15.0, *)