diff options
author | lookshe <github@lookshe.org> | 2015-06-19 23:05:08 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2015-06-19 23:05:08 +0200 |
commit | 92864c6696cf776de356f5e9bbe403a691c8746d (patch) | |
tree | dd6fa0fe95f88977b2c92f8bb75b3417f1edfdd2 /src/main/java/eu/siacs/conversations/entities/Bookmark.java | |
parent | 5586c90e1a063066f07a7f06275bb67bd819b18c (diff) | |
parent | a7121b51b8239a695dc685adaaf207d61170fee4 (diff) |
Merge branch 'trz/rename' (early part) into trz/master
Conflicts:
src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Bookmark.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Bookmark.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java index f81f1a87..cc3d3424 100644 --- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java +++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java @@ -1,5 +1,7 @@ package eu.siacs.conversations.entities; +import android.graphics.Color; + import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -74,6 +76,11 @@ public class Bookmark extends Element implements ListItem { return tags; } + @Override + public int getStatusColor() { + return Color.parseColor("#259B23"); + } + public String getNick() { Element nick = this.findChild("nick"); if (nick != null) { |