diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-07-09 21:12:29 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-07-09 21:13:01 +0200 |
| commit | 3ac56bcbdb27be63275c00a60eef32cdd985c827 (patch) | |
| tree | 2d848c7e376bae0a31bb61fdbc408523be448404 /src | |
| parent | 056382107891892c98d9236871b4f3e95db884e4 (diff) | |
use tertiary background color for landscape conversation overview
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java | 6 | ||||
| -rw-r--r-- | src/main/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 2 |
3 files changed, 8 insertions, 1 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 11c129522..5294ba7cd 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java @@ -96,7 +96,11 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationAdapte 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.setBackgroundColor(Color.get(activity,R.attr.color_background_primary)); + } Message message = conversation.getLatestMessage(); final int failedCount = conversation.failedCount(); diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 1925f8cfe..11b461812 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -17,6 +17,7 @@ <attr name="text_Color_Main" format="reference|color" /> + <attr name="color_background_tertiary" format="reference|color" /> <attr name="color_background_secondary" format="reference|color" /> <attr name="color_background_primary" format="reference|color" /> <attr name="color_warning" format="reference|color" /> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index f6114cc23..ed34c3452 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -12,6 +12,7 @@ <item name="color_background_primary">@color/grey50</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="TextColorOnline">@color/green500</item> <item name="TextColorError">@color/red800</item> @@ -147,6 +148,7 @@ <item name="color_background_primary">@color/grey800</item> <item name="color_background_secondary">@color/grey900</item> + <item name="color_background_tertiary">@color/grey700</item> <item name="color_warning">@color/red_a700</item> <item name="TextColorOnline">@color/green500</item> <item name="TextColorError">@color/red500</item> |