From daafb9041d00b5a2efdafcbb4b2f60abf5359af2 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 13 Jun 2018 15:24:52 +0200
Subject: [PATCH] Fixes bug where messages with background had incorrect
padding
---
.../ui/chat/messages/QuasselMessageRenderer.kt | 11 +++++++++--
app/src/main/res/layout/widget_chatmessage_plain.xml | 2 --
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
index 15d7c1785..72688b529 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
@@ -218,6 +218,13 @@ class QuasselMessageRenderer @Inject constructor(
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,
@@ -235,8 +242,8 @@ class QuasselMessageRenderer @Inject constructor(
).roundToInt()
val self = message.content.flag.hasFlag(Message_Flag.Self)
- val highlight__ = message.content.flag.hasFlag(Message_Flag.Highlight)
- val monochromeForeground = highlight__ && monochromeHighlights
+ val highlight = message.content.flag.hasFlag(Message_Flag.Highlight)
+ val monochromeForeground = highlight && monochromeHighlights
return when (message.content.type.enabledValues().firstOrNull()) {
Message_Type.Plain -> {
val realName = ircFormatDeserializer.formatString(message.content.realName,
diff --git a/app/src/main/res/layout/widget_chatmessage_plain.xml b/app/src/main/res/layout/widget_chatmessage_plain.xml
index 798547197..081f6ad2e 100644
--- a/app/src/main/res/layout/widget_chatmessage_plain.xml
+++ b/app/src/main/res/layout/widget_chatmessage_plain.xml
@@ -33,10 +33,8 @@
android:background="?attr/backgroundMenuItem"
android:orientation="horizontal"
android:paddingBottom="@dimen/message_vertical"
- android:paddingEnd="@dimen/message_horizontal"
android:paddingLeft="@dimen/message_horizontal"
android:paddingRight="@dimen/message_horizontal"
- android:paddingStart="@dimen/message_horizontal"
android:paddingTop="@dimen/message_vertical"
android:textAppearance="?android:attr/textAppearanceListItemSmall">
--
GitLab