From 005d4276eb725a6621219dc3f3cc3909bda098b4 Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Fri, 6 Apr 2018 21:36:48 +0200 Subject: [PATCH] Minor bugfixes --- .../kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt | 1 + .../quasseldroid/ui/chat/messages/MessageListFragment.kt | 1 - app/src/main/res/layout/widget_chatmessage_error.xml | 1 + app/src/main/res/layout/widget_chatmessage_info.xml | 3 ++- app/src/main/res/layout/widget_chatmessage_notice.xml | 5 +++-- app/src/main/res/layout/widget_chatmessage_server.xml | 5 +++-- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt index d7a5dcdbd..c52c8e00f 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt @@ -210,6 +210,7 @@ class MessageAdapter( .placeholder(message.fallbackDrawable) .into(avatarView) } else { + GlideApp.with(itemView).clear(avatarView) avatarView.setImageDrawable(message.fallbackDrawable) } } diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt index aa0234f3b..b8a983601 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt @@ -235,7 +235,6 @@ class MessageListFragment : ServiceBoundFragment() { messageList.adapter = adapter messageList.layoutManager = linearLayoutManager messageList.itemAnimator = null - messageList.setItemViewCacheSize(20) val senderColors = requireContext().theme.styledAttributes( R.attr.senderColor0, R.attr.senderColor1, R.attr.senderColor2, R.attr.senderColor3, diff --git a/app/src/main/res/layout/widget_chatmessage_error.xml b/app/src/main/res/layout/widget_chatmessage_error.xml index 3e6cc388d..12d904c15 100644 --- a/app/src/main/res/layout/widget_chatmessage_error.xml +++ b/app/src/main/res/layout/widget_chatmessage_error.xml @@ -17,6 +17,7 @@ android:id="@+id/time_left" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="top" android:layout_marginEnd="@dimen/message_horizontal" android:layout_marginRight="@dimen/message_horizontal" android:textColor="?attr/colorForegroundSecondary" diff --git a/app/src/main/res/layout/widget_chatmessage_info.xml b/app/src/main/res/layout/widget_chatmessage_info.xml index 8b304e287..bb275b6f8 100644 --- a/app/src/main/res/layout/widget_chatmessage_info.xml +++ b/app/src/main/res/layout/widget_chatmessage_info.xml @@ -17,10 +17,11 @@ android:id="@+id/time_left" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="top" android:layout_marginEnd="@dimen/message_horizontal" android:layout_marginRight="@dimen/message_horizontal" - android:fontFamily="monospace" android:textColor="?attr/colorForegroundSecondary" + android:typeface="monospace" tools:text="@sample/messages.json/data/time" /> <Space diff --git a/app/src/main/res/layout/widget_chatmessage_notice.xml b/app/src/main/res/layout/widget_chatmessage_notice.xml index 5b18d8d84..d3e0e2760 100644 --- a/app/src/main/res/layout/widget_chatmessage_notice.xml +++ b/app/src/main/res/layout/widget_chatmessage_notice.xml @@ -17,10 +17,11 @@ android:id="@+id/time_left" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="top" android:layout_marginEnd="@dimen/message_horizontal" android:layout_marginRight="@dimen/message_horizontal" - android:fontFamily="monospace" - android:textColor="?attr/colorForegroundNotice" + android:textColor="?attr/colorForegroundSecondary" + android:typeface="monospace" tools:text="@sample/messages.json/data/time" /> <Space diff --git a/app/src/main/res/layout/widget_chatmessage_server.xml b/app/src/main/res/layout/widget_chatmessage_server.xml index 0981257a5..9bcccdfb2 100644 --- a/app/src/main/res/layout/widget_chatmessage_server.xml +++ b/app/src/main/res/layout/widget_chatmessage_server.xml @@ -17,8 +17,9 @@ android:id="@+id/time_left" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/message_horizontal" - android:layout_marginStart="@dimen/message_horizontal" + android:layout_gravity="top" + android:layout_marginEnd="@dimen/message_horizontal" + android:layout_marginRight="@dimen/message_horizontal" android:textColor="?attr/colorForegroundSecondary" android:typeface="monospace" tools:text="@sample/messages.json/data/time" /> -- GitLab