Pin DesignKit version and use contantAndAvatars array.

This commit is contained in:
Doug
2022-07-01 14:36:04 +01:00
committed by Doug
parent 7d29bca319
commit 2d4e553cbd
12 changed files with 19 additions and 40 deletions

View File

@@ -36,24 +36,11 @@ public protocol ThemeSwiftUIType {
/// may contain more design components in future, like icons, audio files etc.
}
// MARK: - Legacy Colors
public extension ElementColors {
// MARK: - Legacy
var legacyTile: Color {
let dynamicColor = UIColor { $0.userInterfaceStyle == .light ? .elementLight.tile : .elementDark.tile }
return Color(dynamicColor)
}
// TODO: Generate in DesignTokens repo.
var namesAndAvatars: [Color] {
[
globalAzure,
globalGrape,
globalVerde,
globalPolly,
globalMelon,
globalAqua,
globalPrune,
globalKiwi
]
}
}

View File

@@ -23,7 +23,7 @@ extension ThemeSwiftUI {
/// - Parameter userId: The user id used to hash.
/// - Returns: The SwiftUI color for the associated userId.
func userColor(for userId: String) -> Color {
let senderNameColorIndex = Int(userId.vc_hashCode % Int32(colors.namesAndAvatars.count))
return colors.namesAndAvatars[senderNameColorIndex]
let senderNameColorIndex = Int(userId.vc_hashCode % Int32(colors.contentAndAvatars.count))
return colors.contentAndAvatars[senderNameColorIndex]
}
}