From 213672da66bcb91014d1096a022e601240780cc9 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sun, 10 Dec 2017 21:18:12 +0100 Subject: ConversationsAdapter: Do not show image preview. Show pictogram instead --- .../messenger/ui/adapter/ConversationAdapter.java | 125 +++++++++------------ src/main/res/layout/conversation_list_row.xml | 11 -- 2 files changed, 55 insertions(+), 81 deletions(-) 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 b4b1d34df..162455732 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java @@ -115,88 +115,75 @@ public class ConversationAdapter extends ArrayAdapter { } final boolean fileAvailable = message.getTransferable() == null || message.getTransferable().getStatus() != Transferable.STATUS_DELETED; - if (message.getFileParams().width > 0 && fileAvailable) { - viewHolder.sender.setVisibility(View.GONE); - viewHolder.lastMessage.setVisibility(View.GONE); - viewHolder.lastMessageIcon.setVisibility(View.GONE); - viewHolder.lastImage.setVisibility(View.VISIBLE); - activity.loadBitmap(message, viewHolder.lastImage); - } else { - final boolean showPreviewText; - final String mimeType = message.getMimeType(); - if (message.getType() == Message.TYPE_FILE && fileAvailable) { - if (message.getFileParams().runtime > 0) { - showPreviewText = false; - viewHolder.lastMessageIcon.setImageResource(activity.getThemeResource(R.attr.ic_attach_record, R.drawable.ic_attach_record)); - } else if (mimeType != null) { - if (mimeType.contains("pdf")) { - showPreviewText = false; - viewHolder.lastMessageIcon.setImageResource(activity.getThemeResource(R.attr.ic_file_pdf, R.drawable.ic_file_pdf_grey600_48dp)); - } else if (mimeType.contains("vcard")) { + final boolean showPreviewText; + if (fileAvailable && (message.isFileOrImage() || message.treatAsDownloadable() || message.isGeoUri())) { + final int imageResource; + if (message.isGeoUri()) { + imageResource = activity.getThemeResource(R.attr.ic_attach_location, R.drawable.ic_attach_location); + showPreviewText = false; + } else { + final String mime = message.getMimeType(); + switch (mime == null ? "" : mime.split("/")[0]) { + case "image": + imageResource = activity.getThemeResource(R.attr.ic_attach_photo, R.drawable.ic_attach_photo); showPreviewText = false; - viewHolder.lastMessageIcon.setImageResource(activity.getThemeResource(R.attr.ic_file_vcard, R.drawable.ic_account_card_details_grey600_48dp)); - } else if (mimeType.contains("calendar")) { + break; + case "video": + imageResource = activity.getThemeResource(R.attr.ic_attach_video, R.drawable.ic_attach_video); showPreviewText = false; - viewHolder.lastMessageIcon.setImageResource(activity.getThemeResource(R.attr.ic_file_calendar, R.drawable.ic_calendar_grey600_48dp)); - } else if (mimeType.equals("application/vnd.android.package-archive")) { + break; + case "audio": + imageResource = activity.getThemeResource(R.attr.ic_attach_record, R.drawable.ic_attach_record); showPreviewText = false; - viewHolder.lastMessageIcon.setImageResource(activity.getThemeResource(R.attr.ic_file_apk, R.drawable.ic_file_grey600_48dp)); - } else { + break; + default: + imageResource = activity.getThemeResource(R.attr.ic_attach_document, R.drawable.ic_attach_document); showPreviewText = true; - viewHolder.lastMessageIcon.setImageResource(activity.getThemeResource(R.attr.ic_attach_document, R.drawable.ic_attach_document)); - } - } else { - showPreviewText = true; - viewHolder.lastMessageIcon.setImageResource(activity.getThemeResource(R.attr.ic_attach_document, R.drawable.ic_attach_document)); + break; } - viewHolder.lastMessageIcon.setVisibility(View.VISIBLE); - } else if (message.isGeoUri()) { - showPreviewText = false; - viewHolder.lastMessageIcon.setImageResource(activity.getThemeResource(R.attr.ic_attach_location, R.drawable.ic_attach_location)); - viewHolder.lastMessageIcon.setVisibility(View.VISIBLE); - } else { - showPreviewText = true; - viewHolder.lastMessageIcon.setVisibility(View.GONE); } - - final Pair preview = UIHelper.getMessagePreview(activity, message); - if (showPreviewText) { - viewHolder.lastMessage.setText(EmojiWrapper.transform(preview.first)); + viewHolder.lastMessageIcon.setImageResource(imageResource); + viewHolder.lastMessageIcon.setVisibility(View.VISIBLE); + } else { + viewHolder.lastMessageIcon.setVisibility(View.GONE); + showPreviewText = true; + } + final Pair preview = UIHelper.getMessagePreview(activity, message); + if (showPreviewText) { + viewHolder.lastMessage.setText(EmojiWrapper.transform(preview.first)); + } else { + viewHolder.lastMessageIcon.setContentDescription(preview.first); + } + viewHolder.lastMessage.setVisibility(showPreviewText ? View.VISIBLE : View.GONE); + if (preview.second) { + if (conversation.isRead()) { + viewHolder.lastMessage.setTypeface(null, Typeface.ITALIC); + viewHolder.sender.setTypeface(null, Typeface.NORMAL); } else { - viewHolder.lastMessageIcon.setContentDescription(preview.first); + viewHolder.lastMessage.setTypeface(null, Typeface.BOLD_ITALIC); + viewHolder.sender.setTypeface(null, Typeface.BOLD); } - viewHolder.lastMessage.setVisibility(showPreviewText ? View.VISIBLE : View.GONE); - viewHolder.lastImage.setVisibility(View.GONE); - if (preview.second) { - if (conversation.isRead()) { - viewHolder.lastMessage.setTypeface(null, Typeface.ITALIC); - viewHolder.sender.setTypeface(null, Typeface.NORMAL); - } else { - viewHolder.lastMessage.setTypeface(null, Typeface.BOLD_ITALIC); - viewHolder.sender.setTypeface(null, Typeface.BOLD); - } + } else { + if (conversation.isRead()) { + viewHolder.lastMessage.setTypeface(null, Typeface.NORMAL); + viewHolder.sender.setTypeface(null, Typeface.NORMAL); } else { - if (conversation.isRead()) { - viewHolder.lastMessage.setTypeface(null, Typeface.NORMAL); - viewHolder.sender.setTypeface(null, Typeface.NORMAL); - } else { - viewHolder.lastMessage.setTypeface(null, Typeface.BOLD); - viewHolder.sender.setTypeface(null, Typeface.BOLD); - } + viewHolder.lastMessage.setTypeface(null, Typeface.BOLD); + viewHolder.sender.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]+':'); - } else { - viewHolder.sender.setVisibility(View.GONE); - } - } else if (message.getType() != Message.TYPE_STATUS) { + } + if (message.getStatus() == Message.STATUS_RECEIVED) { + if (conversation.getMode() == Conversation.MODE_MULTI) { viewHolder.sender.setVisibility(View.VISIBLE); - viewHolder.sender.setText(activity.getString(R.string.me)+':'); + viewHolder.sender.setText(UIHelper.getMessageDisplayName(message).split("\\s+")[0] + ':'); } else { viewHolder.sender.setVisibility(View.GONE); } + } else if (message.getType() != Message.TYPE_STATUS) { + viewHolder.sender.setVisibility(View.VISIBLE); + viewHolder.sender.setText(activity.getString(R.string.me) + ':'); + } else { + viewHolder.sender.setVisibility(View.GONE); } long muted_till = conversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL, 0); @@ -315,7 +302,6 @@ public class ConversationAdapter extends ArrayAdapter { private ImageView lastMessageIcon; private TextView timestamp; private TextView sender; - private ImageView lastImage; private ImageView notificationIcon; private TextView unreadCount; private TextView failedCount; @@ -337,7 +323,6 @@ public class ConversationAdapter extends ArrayAdapter { viewHolder.timestamp = layout.findViewById(R.id.conversation_lastupdate); viewHolder.avatar = layout.findViewById(R.id.conversation_image); viewHolder.sender = layout.findViewById(R.id.sender_name); - viewHolder.lastImage = layout.findViewById(R.id.conversation_lastimage); viewHolder.notificationIcon = layout.findViewById(R.id.notification_status); viewHolder.unreadCount = layout.findViewById(R.id.conversation_unread); viewHolder.failedCount = layout.findViewById(R.id.conversation_failed); diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index e30e940a4..74afeae16 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -100,17 +100,6 @@ android:ellipsize="end" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" /> - -