filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix user override color when coloring by mxid 

Change-Id: I1f583a2f26fb5d3481b43abb33fee83e0ef573ee
This commit is contained in:
SpiritCroc 2022-04-27 10:33:13 +02:00
parent 07537bbc63
commit d82c4bedee
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt
View File

@ -35,8 +35,10 @@ class MatrixItemColorProvider @Inject constructor(
private val vectorPreferences: VectorPreferences, private val vectorPreferences: VectorPreferences,
private val colorProvider: ColorProvider private val colorProvider: ColorProvider
) { ) {
// Note: compared to Element, we do not cache the actual color, but the color-attr, to remain theme-safe // Note: compared to Element, we do not cache the actual color, but the color-attr, to remain theme-safe.
private val cache = mutableMapOf<String, Int>() // For user overrides, however, we still need to store the actual color, so store that separately.
private val attrCache = mutableMapOf<String, Int>()
private val overrideCache = mutableMapOf<String, Int>()
@ColorInt @ColorInt
@Suppress("UNUSED_PARAMETER") @Suppress("UNUSED_PARAMETER")
@ -57,8 +59,8 @@ class MatrixItemColorProvider @Inject constructor(
) )
} }
USER_COLORING_FROM_ID -> { USER_COLORING_FROM_ID -> {
return colorProvider.getColorFromAttribute( return overrideCache[matrixItem.id] ?: colorProvider.getColorFromAttribute(
cache.getOrPut(matrixItem.id) { attrCache.getOrPut(matrixItem.id) {
when (matrixItem) { when (matrixItem) {
is MatrixItem.UserItem -> getColorAttrFromUserId(matrixItem.id) is MatrixItem.UserItem -> getColorAttrFromUserId(matrixItem.id)
else -> getColorAttrFromRoomId(matrixItem.id) else -> getColorAttrFromRoomId(matrixItem.id)
@ -100,7 +102,7 @@ class MatrixItemColorProvider @Inject constructor(
} }
fun setOverrideColors(overrideColors: Map<String, String>?) { fun setOverrideColors(overrideColors: Map<String, String>?) {
cache.clear() overrideCache.clear()
overrideColors?.forEach { overrideColors?.forEach {
setOverrideColor(it.key, it.value) setOverrideColor(it.key, it.value)
} }
@ -109,10 +111,10 @@ class MatrixItemColorProvider @Inject constructor(
fun setOverrideColor(id: String, colorSpec: String?): Boolean { fun setOverrideColor(id: String, colorSpec: String?): Boolean {
val color = parseUserColorSpec(colorSpec) val color = parseUserColorSpec(colorSpec)
return if (color == null) { return if (color == null) {
cache.remove(id) overrideCache.remove(id)
false false
} else { } else {
cache[id] = color overrideCache[id] = color
true true
} }
} }