Commit cb08dca1 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Fix message bubbles

Makes the incoming message bubble follow accent color and also makes the text in it follow the background app so that it is consistent with other elements like floating action button
parent dff11419
Pipeline #186516 passed with stage
in 8 minutes and 55 seconds
......@@ -82,7 +82,7 @@ class Colors @Inject constructor(
val pref = prefs.theme(recipient?.id ?: 0)
val color = when {
recipient == null || !prefs.autoColor.get() || pref.isSet -> pref.get()
else -> generateColor(recipient)
else -> context.getColor(R.color.tools_theme)
}
return Theme(color, this)
}
......
......@@ -243,7 +243,7 @@ class MessagesAdapter @Inject constructor(
holder.avatar.setRecipient(contactCache[message.address])
holder.avatar.setVisible(!canGroup(message, next), View.INVISIBLE)
holder.body.setTextColor(theme.textPrimary)
holder.body.setTextColor(context.resources.getColor(R.color.backgroundDark))
holder.body.setBackgroundTint(theme.theme)
}
......
......@@ -68,7 +68,7 @@ class ConversationsAdapter @Inject constructor(
view.snippet.maxLines = 5
view.unread.isVisible = true
view.unread.setTint(context.getColor(R.color.tools_theme))
view.unread.setTint(context.getColor(R.color.unread_dot))
view.date.setTypeface(view.date.typeface, Typeface.BOLD)
view.date.setTextColor(textColorPrimary)
......@@ -122,7 +122,6 @@ class ConversationsAdapter @Inject constructor(
else -> conversation.snippet
}
holder.pinned.isVisible = conversation.pinned
holder.unread.setTint(theme)
}
override fun getItemId(position: Int): Long {
......
......@@ -335,4 +335,5 @@
<item>#263238</item>
</array>
<color name="unread_dot">#44B04C</color>
</resources>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment