Skip to content
Snippets Groups Projects
Verified Commit daafb904 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixes bug where messages with background had incorrect padding

parent 0e751435
No related branches found
No related tags found
No related merge requests found
...@@ -218,6 +218,13 @@ class QuasselMessageRenderer @Inject constructor( ...@@ -218,6 +218,13 @@ class QuasselMessageRenderer @Inject constructor(
marginEnd = margin marginEnd = margin
} }
} }
viewHolder.messageContainer?.apply {
val horizontal = context.resources.getDimensionPixelSize(R.dimen.message_horizontal)
val vertical = context.resources.getDimensionPixelSize(R.dimen.message_vertical)
setPadding(horizontal, vertical, horizontal, vertical)
}
} }
override fun bind(holder: MessageAdapter.QuasselMessageViewHolder, message: FormattedMessage, override fun bind(holder: MessageAdapter.QuasselMessageViewHolder, message: FormattedMessage,
...@@ -235,8 +242,8 @@ class QuasselMessageRenderer @Inject constructor( ...@@ -235,8 +242,8 @@ class QuasselMessageRenderer @Inject constructor(
).roundToInt() ).roundToInt()
val self = message.content.flag.hasFlag(Message_Flag.Self) val self = message.content.flag.hasFlag(Message_Flag.Self)
val highlight__ = message.content.flag.hasFlag(Message_Flag.Highlight) val highlight = message.content.flag.hasFlag(Message_Flag.Highlight)
val monochromeForeground = highlight__ && monochromeHighlights val monochromeForeground = highlight && monochromeHighlights
return when (message.content.type.enabledValues().firstOrNull()) { return when (message.content.type.enabledValues().firstOrNull()) {
Message_Type.Plain -> { Message_Type.Plain -> {
val realName = ircFormatDeserializer.formatString(message.content.realName, val realName = ircFormatDeserializer.formatString(message.content.realName,
......
...@@ -33,10 +33,8 @@ ...@@ -33,10 +33,8 @@
android:background="?attr/backgroundMenuItem" android:background="?attr/backgroundMenuItem"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingBottom="@dimen/message_vertical" android:paddingBottom="@dimen/message_vertical"
android:paddingEnd="@dimen/message_horizontal"
android:paddingLeft="@dimen/message_horizontal" android:paddingLeft="@dimen/message_horizontal"
android:paddingRight="@dimen/message_horizontal" android:paddingRight="@dimen/message_horizontal"
android:paddingStart="@dimen/message_horizontal"
android:paddingTop="@dimen/message_vertical" android:paddingTop="@dimen/message_vertical"
android:textAppearance="?android:attr/textAppearanceListItemSmall"> android:textAppearance="?android:attr/textAppearanceListItemSmall">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment