diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-03-29 22:23:31 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-03-29 22:23:31 +0200 |
commit | ee7240f2e0d02346cd0c606b082d095cae5a1fa5 (patch) | |
tree | 8f5cdb984cb4b3f8196044ee33243bd56301e949 /src/main/java/de/pixart/messenger/ui/adapter | |
parent | 48e09a935902b715aa605d368795925999f1cfa9 (diff) |
move new activity back to original name
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/adapter')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java | 10 |
1 files changed, 6 insertions, 4 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 35d4ad7f4..74a2b0e91 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java @@ -31,6 +31,7 @@ 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.Color; import de.pixart.messenger.utils.EmojiWrapper; import de.pixart.messenger.utils.UIHelper; import de.pixart.messenger.xmpp.chatstate.ChatState; @@ -77,13 +78,12 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { LayoutInflater inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = inflater.inflate(R.layout.conversation_list_row, parent, false); } + ViewHolder viewHolder = ViewHolder.get(view); Conversation conversation = getItem(position); if (this.activity instanceof XmppActivity) { - View swipeableItem = view.findViewById(R.id.swipeable_item); - int c = conversation == selectedConversation ? this.activity.getSecondaryBackgroundColor() : this.activity.getPrimaryBackgroundColor(); - swipeableItem.setBackgroundColor(c); + int c = Color.get(activity, conversation == selectedConversation ? R.attr.color_background_secondary: R.attr.color_background_primary); + viewHolder.swipeableItem.setBackgroundColor(c); } - ViewHolder viewHolder = ViewHolder.get(view); if (conversation.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) { viewHolder.name.setText(EmojiWrapper.transform(conversation.getName())); } else { @@ -309,6 +309,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { } public static class ViewHolder { + private View swipeableItem; private TextView name; private TextView lastMessage; private ImageView lastMessageIcon; @@ -329,6 +330,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { ViewHolder viewHolder = (ViewHolder) layout.getTag(); if (viewHolder == null) { viewHolder = new ViewHolder(); + viewHolder.swipeableItem = layout.findViewById(R.id.swipeable_item); viewHolder.name = layout.findViewById(R.id.conversation_name); viewHolder.lastMessage = layout.findViewById(R.id.conversation_lastmsg); viewHolder.lastMessageIcon = layout.findViewById(R.id.conversation_lastmsg_img); |