From 9fa86472deb7df5b03c72a5bd2a7a3f87bf03c36 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sun, 27 Jan 2019 12:24:01 +0100 Subject: migrate conversation list row to binder --- .../messenger/ui/adapter/ConversationAdapter.java | 208 ++++++------- src/main/res/layout/conversation_list_row.xml | 326 +++++++++++---------- 2 files changed, 255 insertions(+), 279 deletions(-) (limited to 'src') diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java index e97a8d407..5656ce625 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java @@ -1,8 +1,8 @@ package de.pixart.messenger.ui.adapter; -import android.content.Context; import android.content.SharedPreferences; import android.content.res.Resources; +import android.databinding.DataBindingUtil; import android.graphics.Bitmap; import android.graphics.Typeface; import android.graphics.drawable.BitmapDrawable; @@ -16,24 +16,20 @@ import android.util.Pair; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.FrameLayout; import android.widget.ImageView; -import android.widget.TextView; import java.lang.ref.WeakReference; import java.util.List; import java.util.concurrent.RejectedExecutionException; import de.pixart.messenger.R; +import de.pixart.messenger.databinding.ConversationListRowBinding; import de.pixart.messenger.entities.Conversation; import de.pixart.messenger.entities.Message; import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.entities.Transferable; import de.pixart.messenger.ui.ConversationFragment; import de.pixart.messenger.ui.XmppActivity; import de.pixart.messenger.ui.util.StyledAttributes; -import de.pixart.messenger.ui.widget.FailedCountCustomView; -import de.pixart.messenger.ui.widget.UnreadCountCustomView; import de.pixart.messenger.utils.EmojiWrapper; import de.pixart.messenger.utils.IrregularUnicodeDetector; import de.pixart.messenger.utils.UIHelper; @@ -44,7 +40,7 @@ public class ConversationAdapter extends RecyclerView.Adapter conversations; - private OnConversationClickListener listener; + private OnConversationClickListener listener; public ConversationAdapter(XmppActivity activity, List conversations) { this.activity = activity; @@ -79,9 +75,7 @@ public class ConversationAdapter extends RecyclerView.Adapter 0) { - viewHolder.unreadCount.setVisibility(View.VISIBLE); - viewHolder.unreadCount.setUnreadCount(unreadCount); + viewHolder.binding.unreadCount.setVisibility(View.VISIBLE); + viewHolder.binding.unreadCount.setUnreadCount(unreadCount); } else { - viewHolder.unreadCount.setVisibility(View.GONE); + viewHolder.binding.unreadCount.setVisibility(View.GONE); } if (failedCount > 0) { - viewHolder.failedCount.setVisibility(View.VISIBLE); - viewHolder.failedCount.setFailedCount(failedCount); + viewHolder.binding.failedCount.setVisibility(View.VISIBLE); + viewHolder.binding.failedCount.setFailedCount(failedCount); } else { - viewHolder.failedCount.setVisibility(View.GONE); + viewHolder.binding.failedCount.setVisibility(View.GONE); } if (draft != null) { - viewHolder.lastMessageIcon.setVisibility(View.GONE); - viewHolder.lastMessage.setText(EmojiWrapper.transform(draft.getMessage())); - viewHolder.sender.setText(R.string.draft); - viewHolder.sender.setVisibility(View.VISIBLE); - viewHolder.lastMessage.setTypeface(null, Typeface.NORMAL); - viewHolder.sender.setTypeface(null, Typeface.ITALIC); + viewHolder.binding.conversationLastmsgImg.setVisibility(View.GONE); + viewHolder.binding.conversationLastmsg.setText(EmojiWrapper.transform(draft.getMessage())); + viewHolder.binding.senderName.setText(R.string.draft); + viewHolder.binding.senderName.setVisibility(View.VISIBLE); + viewHolder.binding.conversationLastmsg.setTypeface(null, Typeface.NORMAL); + viewHolder.binding.senderName.setTypeface(null, Typeface.ITALIC); } else { final boolean fileAvailable = !message.isFileDeleted(); final boolean showPreviewText; @@ -167,65 +163,66 @@ public class ConversationAdapter extends RecyclerView.Adapter preview = UIHelper.getMessagePreview(activity, message, viewHolder.lastMessage.getCurrentTextColor()); + final Pair preview = UIHelper.getMessagePreview(activity, message, viewHolder.binding.conversationLastmsg.getCurrentTextColor()); if (showPreviewText) { - viewHolder.lastMessage.setText(EmojiWrapper.transform(UIHelper.shorten(preview.first))); + viewHolder.binding.conversationLastmsg.setText(EmojiWrapper.transform(UIHelper.shorten(preview.first))); } else { - viewHolder.lastMessageIcon.setContentDescription(preview.first); + viewHolder.binding.conversationLastmsgImg.setContentDescription(preview.first); } - viewHolder.lastMessage.setVisibility(showPreviewText ? View.VISIBLE : View.GONE); + viewHolder.binding.conversationLastmsg.setVisibility(showPreviewText ? View.VISIBLE : View.GONE); if (preview.second) { if (isRead) { - viewHolder.lastMessage.setTypeface(null, Typeface.ITALIC); - viewHolder.sender.setTypeface(null, Typeface.NORMAL); + viewHolder.binding.conversationLastmsg.setTypeface(null, Typeface.ITALIC); + viewHolder.binding.senderName.setTypeface(null, Typeface.NORMAL); } else { - viewHolder.lastMessage.setTypeface(null, Typeface.BOLD_ITALIC); - viewHolder.sender.setTypeface(null, Typeface.BOLD); + viewHolder.binding.conversationLastmsg.setTypeface(null, Typeface.BOLD_ITALIC); + viewHolder.binding.senderName.setTypeface(null, Typeface.BOLD); } } else { if (isRead) { - viewHolder.lastMessage.setTypeface(null, Typeface.NORMAL); - viewHolder.sender.setTypeface(null, Typeface.NORMAL); + viewHolder.binding.conversationLastmsg.setTypeface(null, Typeface.NORMAL); + viewHolder.binding.senderName.setTypeface(null, Typeface.NORMAL); } else { - viewHolder.lastMessage.setTypeface(null, Typeface.BOLD); - viewHolder.sender.setTypeface(null, Typeface.BOLD); + viewHolder.binding.conversationLastmsg.setTypeface(null, Typeface.BOLD); + viewHolder.binding.senderName.setTypeface(null, Typeface.BOLD); } } if (message.getStatus() == Message.STATUS_RECEIVED) { if (conversation.getMode() == Conversation.MODE_MULTI) { - viewHolder.sender.setVisibility(View.VISIBLE); - viewHolder.sender.setText(UIHelper.getMessageDisplayName(message).split("\\s+")[0] + ':'); + viewHolder.binding.senderName.setVisibility(View.VISIBLE); + viewHolder.binding.senderName.setText(UIHelper.getMessageDisplayName(message).split("\\s+")[0] + ':'); } else { - viewHolder.sender.setVisibility(View.GONE); + viewHolder.binding.senderName.setVisibility(View.GONE); } } else if (message.getType() != Message.TYPE_STATUS) { - viewHolder.sender.setVisibility(View.VISIBLE); - viewHolder.sender.setText(activity.getString(R.string.me) + ':'); + viewHolder.binding.senderName.setVisibility(View.VISIBLE); + viewHolder.binding.senderName.setText(activity.getString(R.string.me) + ':'); } else { - viewHolder.sender.setVisibility(View.GONE); + viewHolder.binding.senderName.setVisibility(View.GONE); } } long muted_till = conversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL, 0); if (muted_till == Long.MAX_VALUE) { + viewHolder.binding.notificationStatus.setVisibility(View.VISIBLE); int ic_notifications_off = activity.getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black_24dp); - viewHolder.notificationIcon.setImageResource(ic_notifications_off); + viewHolder.binding.notificationStatus.setImageResource(ic_notifications_off); } else if (muted_till >= System.currentTimeMillis()) { - viewHolder.notificationIcon.setVisibility(View.VISIBLE); + viewHolder.binding.notificationStatus.setVisibility(View.VISIBLE); int ic_notifications_paused = activity.getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black_24dp); - viewHolder.notificationIcon.setImageResource(ic_notifications_paused); + viewHolder.binding.notificationStatus.setImageResource(ic_notifications_paused); } else if (conversation.alwaysNotify()) { - viewHolder.notificationIcon.setVisibility(View.GONE); + viewHolder.binding.notificationStatus.setVisibility(View.GONE); } else { - viewHolder.notificationIcon.setVisibility(View.VISIBLE); + viewHolder.binding.notificationStatus.setVisibility(View.VISIBLE); int ic_notifications_none = activity.getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black_24dp); - viewHolder.notificationIcon.setImageResource(ic_notifications_none); + viewHolder.binding.notificationStatus.setImageResource(ic_notifications_none); } long timestamp; @@ -234,46 +231,50 @@ public class ConversationAdapter extends RecyclerView.Adapter listener.onConversationClick(v, conversation)); if (conversation.getMode() == Conversation.MODE_SINGLE && ShowPresenceColoredNames()) { switch (conversation.getContact().getPresences().getShownStatus()) { case CHAT: case ONLINE: - viewHolder.name.setTextColor(ContextCompat.getColor(activity, R.color.online)); + viewHolder.binding.conversationName.setTextColor(ContextCompat.getColor(activity, R.color.online)); break; case AWAY: - viewHolder.name.setTextColor(ContextCompat.getColor(activity, R.color.away)); + viewHolder.binding.conversationName.setTextColor(ContextCompat.getColor(activity, R.color.away)); break; case XA: case DND: - viewHolder.name.setTextColor(ContextCompat.getColor(activity, R.color.notavailable)); + viewHolder.binding.conversationName.setTextColor(ContextCompat.getColor(activity, R.color.notavailable)); break; default: - viewHolder.name.setTextColor(StyledAttributes.getColor(activity, R.attr.text_Color_Main)); + viewHolder.binding.conversationName.setTextColor(StyledAttributes.getColor(activity, R.attr.text_Color_Main)); break; } } else { - viewHolder.name.setTextColor(StyledAttributes.getColor(activity, R.attr.text_Color_Main)); + viewHolder.binding.conversationName.setTextColor(StyledAttributes.getColor(activity, R.attr.text_Color_Main)); } if (activity.xmppConnectionService.indicateReceived()) { switch (message.getMergedStatus()) { case Message.STATUS_SEND_RECEIVED: - viewHolder.receivedStatus.setVisibility(View.VISIBLE); + viewHolder.binding.indicatorReceived.setVisibility(View.VISIBLE); break; case Message.STATUS_SEND_DISPLAYED: - viewHolder.receivedStatus.setVisibility(View.VISIBLE); - viewHolder.readStatus.setVisibility(View.VISIBLE); + viewHolder.binding.indicatorReceived.setVisibility(View.VISIBLE); + viewHolder.binding.indicatorRead.setVisibility(View.VISIBLE); break; + default: + viewHolder.binding.indicatorReceived.setVisibility(View.GONE); + viewHolder.binding.indicatorRead.setVisibility(View.GONE); } } if (conversation.getMode() == Conversation.MODE_SINGLE) { if (conversation.getIncomingChatState().equals(ChatState.COMPOSING)) { - viewHolder.lastMessage.setText(R.string.is_typing); - viewHolder.lastMessage.setTypeface(null, Typeface.BOLD_ITALIC); - viewHolder.sender.setVisibility(View.GONE); + viewHolder.binding.conversationLastmsg.setText(R.string.is_typing); + viewHolder.binding.conversationLastmsg.setTypeface(null, Typeface.BOLD_ITALIC); + viewHolder.binding.senderName.setVisibility(View.GONE); } } else { ChatState state = ChatState.COMPOSING; @@ -286,9 +287,9 @@ public class ConversationAdapter extends RecyclerView.Adapter 0) { if (userWithChatStates.size() == 1) { MucOptions.User user = userWithChatStates.get(0); - viewHolder.lastMessage.setText(activity.getString(R.string.contact_is_typing, UIHelper.getDisplayName(user))); - viewHolder.lastMessage.setTypeface(null, Typeface.BOLD_ITALIC); - viewHolder.sender.setVisibility(View.GONE); + viewHolder.binding.conversationLastmsg.setText(activity.getString(R.string.contact_is_typing, UIHelper.getDisplayName(user))); + viewHolder.binding.conversationLastmsg.setTypeface(null, Typeface.BOLD_ITALIC); + viewHolder.binding.senderName.setVisibility(View.GONE); } else { StringBuilder builder = new StringBuilder(); for (MucOptions.User user : userWithChatStates) { @@ -297,16 +298,16 @@ public class ConversationAdapter extends RecyclerView.Adapter listener.onConversationClick(v, conversation)); } + @Override public int getItemCount() { return conversations.size(); @@ -330,7 +331,7 @@ public class ConversationAdapter extends RecyclerView.Adapter + + android:descendantFocusability="blocksDescendants"> - - - + android:background="?attr/color_background_secondary"> - - + android:background="?android:selectableItemBackground" + android:orientation="horizontal" + android:padding="8dp"> + + + android:layout_centerVertical="true" + android:layout_toEndOf="@+id/conversation_image" + android:layout_toRightOf="@+id/conversation_image" + android:paddingStart="@dimen/avatar_item_distance" + android:paddingLeft="@dimen/avatar_item_distance"> - - + + - - + android:layout_below="@id/conversation_name" + android:layout_marginTop="4dp"> - + android:text="@string/me" + android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary" + android:visibility="visible" /> - + + + + + + + + + + + + + + + + + + + + + - - - - - - - + android:gravity="end" + android:paddingStart="4dp" + android:paddingLeft="4dp" + android:paddingEnd="4dp" + android:paddingRight="4dp" + android:textAppearance="@style/TextAppearance.Conversations.Caption" /> - - - - - - - + - \ No newline at end of file + \ No newline at end of file -- cgit v1.2.3