From 03515ea592584e14bf8cb7161fb017cba847ae1b Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Mon, 13 Jan 2020 15:12:57 +0100 Subject: [PATCH] Fix #699 Signed-off-by: Mario Danic --- .../MagicIncomingTextMessageViewHolder.kt | 5 ---- .../MagicOutcomingTextMessageViewHolder.kt | 5 ---- .../talk/controllers/ChatController.kt | 5 ---- .../main/res/layout/item_message_quote.xml | 23 +++++-------------- 4 files changed, 6 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt index 80b436a55..1c9c74151 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt @@ -71,10 +71,6 @@ class MagicIncomingTextMessageViewHolder(incomingView: View) : MessageHolders @BindView(R.id.quotedChatMessageView) var quotedChatMessageView: RelativeLayout? = null - @JvmField - @BindView(R.id.quotedUserAvatar) - var quotedUserAvatar: ImageView? = null - @JvmField @BindView(R.id.quotedMessageAuthor) var quotedUserName: EmojiTextView? = null @@ -219,7 +215,6 @@ class MagicIncomingTextMessageViewHolder(incomingView: View) : MessageHolders message.parentMessage?.let { parentChatMessage -> parentChatMessage.activeUser = message.activeUser - imageLoader.loadImage(quotedUserAvatar, parentChatMessage.user.avatar, null) parentChatMessage.imageUrl?.let { quotedMessagePreview?.visibility = View.VISIBLE imageLoader.loadImage(quotedMessagePreview, it, null) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt index ee1dd9337..2afdd9c1a 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt @@ -58,10 +58,6 @@ class MagicOutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessage @BindView(R.id.quotedChatMessageView) var quotedChatMessageView: RelativeLayout? = null - @JvmField - @BindView(R.id.quotedUserAvatar) - var quotedUserAvatar: ImageView? = null - @JvmField @BindView(R.id.quotedMessageAuthor) var quotedUserName: EmojiTextView? = null @@ -144,7 +140,6 @@ class MagicOutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessage message.parentMessage?.let { parentChatMessage -> parentChatMessage.activeUser = message.activeUser - imageLoader.loadImage(quotedUserAvatar, parentChatMessage.user.avatar, null) parentChatMessage.imageUrl?.let { quotedMessagePreview?.visibility = View.VISIBLE imageLoader.loadImage(quotedMessagePreview, it, null) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index 22cf22c69..a9ca2d106 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -1413,11 +1413,6 @@ class ChatController(args: Bundle) : BaseController(), MessagesListAdapter ?: context.getText(R.string.nc_nick_guest) conversationUser?.let { currentUser -> - messageInputView?.findViewById(R.id.quotedUserAvatar)?.load(it.user.avatar) { - addHeader("Authorization", currentUser.getCredentials()) - transformations(CircleCropTransformation()) - } - chatMessage.imageUrl?.let { previewImageUrl -> messageInputView?.findViewById(R.id.quotedMessageImage)?.visibility = View.VISIBLE diff --git a/app/src/main/res/layout/item_message_quote.xml b/app/src/main/res/layout/item_message_quote.xml index 586a824f5..815590d64 100644 --- a/app/src/main/res/layout/item_message_quote.xml +++ b/app/src/main/res/layout/item_message_quote.xml @@ -14,24 +14,15 @@ android:layout_alignBottom="@id/flexboxQuoted" android:layout_alignParentStart="true" android:layout_marginEnd="4dp" - android:background="@color/colorPrimary"> - - + android:background="@color/colorPrimary"/> @@ -40,8 +31,8 @@ android:id="@+id/flexboxQuoted" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@id/quotedUserAvatar" - android:layout_alignStart="@id/quotedUserAvatar" + android:layout_below="@id/quotedMessageAuthor" + android:layout_alignStart="@id/quotedMessageAuthor" android:layout_toStartOf="@id/cancelReplyButton" android:layout_marginTop="4dp" android:orientation="vertical" @@ -66,7 +57,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/quotedMessageImage" - android:layout_alignStart="@id/quotedUserAvatar" + android:layout_alignStart="@id/quotedMessageAuthor" android:lineSpacingMultiplier="1.2" android:textSize="14sp" app:layout_alignSelf="flex_start" @@ -83,8 +74,6 @@ app:layout_alignSelf="center" android:textColor="@color/warm_grey_four" tools:text="16:08" /> - /> -