mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-10-23 06:22:43 +00:00
Tint the framed-header caption and feature icon on SIMPLEX
On the SIMPLEX theme these two elements still drew in the flat secondary colour over the sunrise gradient, while every sibling — the quoted author above the caption, the feature label beside the icon — already switched to the warm tint made to stay legible on that gradient. Route both through simplexSecondaryTint(), which returns the unchanged secondary colour for every other theme.
This commit is contained in:
1 parent
61aa89a924
commit
bb9bba9492
2 files changed
+3
-2
No files matched your search
+1
-1
@@ -27,7 +27,7 @@ fun CIFeaturePreferenceView(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(4.dp)
|
||||
) {
|
||||
Icon(feature.icon, feature.text, Modifier.size(18.dp), tint = MaterialTheme.colors.secondary)
|
||||
Icon(feature.icon, feature.text, Modifier.size(18.dp), tint = simplexSecondaryTint())
|
||||
if (contact != null && allowed != FeatureAllowed.NO && contact.allowsFeature(feature) && !contact.userAllowsFeature(feature)) {
|
||||
val acceptStyle = SpanStyle(color = MaterialTheme.colors.primary, fontSize = 12.sp)
|
||||
val setParam = feature == ChatFeature.TimedMessages && contact.mergedPreferences.timedMessages.userPreference.pref.ttl == null
|
||||
|
||||
+2
-1
@@ -119,9 +119,10 @@ fun FramedItemView(
|
||||
tint = iconColor ?: if (isInDarkTheme()) FileDark else FileLight
|
||||
)
|
||||
}
|
||||
val captionColor = simplexSecondaryTint()
|
||||
Text(
|
||||
buildAnnotatedString {
|
||||
withStyle(SpanStyle(fontSize = 12.sp, fontStyle = if (italic) FontStyle.Italic else FontStyle.Normal, color = MaterialTheme.colors.secondary)) {
|
||||
withStyle(SpanStyle(fontSize = 12.sp, fontStyle = if (italic) FontStyle.Italic else FontStyle.Normal, color = captionColor)) {
|
||||
append(caption)
|
||||
}
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user