diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-06-29 22:11:05 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-06-29 22:11:05 +0200 |
| commit | 1e360cbba5e9c98c92a0ed434210d6dba4f911ca (patch) | |
| tree | 25206c298e177bf24ce66cf60a6ae6dda203f054 /src/main/java/de/pixart/messenger/ui | |
| parent | 195de26689b0e8bf76a04822474426c52978e9d3 (diff) | |
| parent | 6c80b2ba5ab1729152e38db0a71aa8dbd4adfc96 (diff) | |
Merge branch 'master' of https://github.com/kriztan/Pix-Art-Messenger
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java index b625c2391..64d432041 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java @@ -112,7 +112,7 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> { viewHolder.tags.setAlpha(INACTIVE_ALPHA); } else { if (ShowPresenceColoredNames()) { - viewHolder.name.setTextColor(color); + viewHolder.name.setTextColor(color != 0 ? color : Color.get(activity, R.attr.text_Color_Main)); } else { viewHolder.name.setTextColor(Color.get(activity, R.attr.text_Color_Main)); } |