cogentleman/xmpp_client
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use tertiary background color for landscape conversation overview

Browse Source
This commit is contained in:
Daniel Gultsch 2018-06-24 16:59:27 +02:00
parent e8a1f069c2
commit 27a1bdb4b9
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
View File

@ -26,6 +26,7 @@ import eu.siacs.conversations.entities.Conversation;
import eu.siacs.conversations.entities.Message; import eu.siacs.conversations.entities.Message;
import eu.siacs.conversations.entities.Transferable; import eu.siacs.conversations.entities.Transferable;
import eu.siacs.conversations.ui.ConversationFragment; import eu.siacs.conversations.ui.ConversationFragment;
import eu.siacs.conversations.ui.ConversationsOverviewFragment;
import eu.siacs.conversations.ui.XmppActivity; import eu.siacs.conversations.ui.XmppActivity;
import eu.siacs.conversations.ui.util.Color; import eu.siacs.conversations.ui.util.Color;
import eu.siacs.conversations.ui.widget.UnreadCountCustomView; import eu.siacs.conversations.ui.widget.UnreadCountCustomView;
@ -91,7 +92,11 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationAdapte
viewHolder.name.setText(EmojiWrapper.transform(name)); viewHolder.name.setText(EmojiWrapper.transform(name));
} }
viewHolder.frame.setBackgroundColor(Color.get(activity, conversation == ConversationFragment.getConversation(activity) ? R.attr.color_background_secondary : R.attr.color_background_primary)); if (conversation == ConversationFragment.getConversation(activity)) {
viewHolder.frame.setBackgroundColor(Color.get(activity,R.attr.color_background_tertiary));
} else {
viewHolder.frame.setBackground(null);
}
Message message = conversation.getLatestMessage(); Message message = conversation.getLatestMessage();
final int unreadCount = conversation.unreadCount(); final int unreadCount = conversation.unreadCount();

1
src/main/res/values/attrs.xml
View File

@ -12,6 +12,7 @@
<attr name="IconSize" format="dimension"/> <attr name="IconSize" format="dimension"/>
<attr name="color_background_tertiary" format="reference|color"/>
<attr name="color_background_secondary" format="reference|color"/> <attr name="color_background_secondary" format="reference|color"/>
<attr name="color_background_primary" format="reference|color"/> <attr name="color_background_primary" format="reference|color"/>
<attr name="color_warning" format="reference|color"/> <attr name="color_warning" format="reference|color"/>

2
src/main/res/values/themes.xml
View File

@ -9,6 +9,7 @@
<item name="color_background_primary">@color/grey50</item> <item name="color_background_primary">@color/grey50</item>
<item name="color_background_secondary">@color/grey200</item> <item name="color_background_secondary">@color/grey200</item>
<item name="color_background_tertiary">@color/grey300</item>
<item name="color_warning">@color/red_a700</item> <item name="color_warning">@color/red_a700</item>
<item name="TextColorOnline">@color/green600</item> <item name="TextColorOnline">@color/green600</item>
<item name="TextColorError">@color/red800</item> <item name="TextColorError">@color/red800</item>
@ -106,6 +107,7 @@
<item name="color_background_primary">@color/grey800</item> <item name="color_background_primary">@color/grey800</item>
<item name="color_background_secondary">@color/grey900</item> <item name="color_background_secondary">@color/grey900</item>
<item name="color_background_tertiary">@color/grey700</item>
<item name="activity_background_search">@drawable/search_background_dark</item> <item name="activity_background_search">@drawable/search_background_dark</item>
<item name="activity_background_no_results">@drawable/no_results_background_dark</item> <item name="activity_background_no_results">@drawable/no_results_background_dark</item>
<item name="list_item_background">@drawable/list_item_background_dark</item> <item name="list_item_background">@drawable/list_item_background_dark</item>