2 files changed, 23 insertions, 16 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ui/TextViewUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/ui/TextViewUtil.java
index 27a269f2..faa9a5ed 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/ui/TextViewUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/ui/TextViewUtil.java
@@ -4,6 +4,8 @@ import android.support.annotation.StringRes;
 import android.view.View;
 import android.widget.TextView;
 
+import de.thedevstack.conversationsplus.ConversationsPlusColors;
+
 /**
  *
  */
@@ -61,7 +63,7 @@ public final class TextViewUtil extends ViewUtil {
 
     public static void setColorEnabledAndTextResId(TextView tv, Integer color, Boolean enabled, @StringRes Integer resid) {
         if (null != color) {
-            tv.setTextColor(color);
+            tv.setTextColor(ConversationsPlusColors.byId(color));
         }
 
         if (enabled != null) {
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ui/ViewUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/ui/ViewUtil.java
index 77422587..170a6401 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/ui/ViewUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/ui/ViewUtil.java
@@ -10,30 +10,35 @@ import android.view.View;
 public class ViewUtil {
 
     public static <T extends View> T visible(View parentView, @IdRes int textViewId) {
-        T tv = (T) parentView.findViewById(textViewId);
-        if (null != tv) {
-            tv.setVisibility(View.VISIBLE);
-        }
-
-        return tv;
+        return ViewUtil.visible((T) parentView.findViewById(textViewId));
     }
 
     public static <T extends View> T invisible(View parentView, @IdRes int textViewId) {
-        T tv = (T) parentView.findViewById(textViewId);
-        if (null != tv) {
-            tv.setVisibility(View.INVISIBLE);
+        return ViewUtil.invisible((T) parentView.findViewById(textViewId));
     }
 
-        return tv;
+    public static <T extends View> T gone(View parentView, @IdRes int textViewId) {
+        return ViewUtil.gone((T) parentView.findViewById(textViewId));
     }
 
-    public static <T extends View> T gone(View parentView, @IdRes int textViewId) {
-        T tv = (T) parentView.findViewById(textViewId);
-        if (null != tv) {
-            tv.setVisibility(View.GONE);
+    public static <T extends View> T gone(T view) {
+        if (null != view) {
+            view.setVisibility(View.GONE);
+        }
+        return view;
     }
 
-        return tv;
+    public static <T extends View> T visible(T view) {
+        if (null != view) {
+            view.setVisibility(View.VISIBLE);
+        }
+        return view;
     }
 
+    public static <T extends View> T invisible(T view) {
+        if (null != view) {
+            view.setVisibility(View.INVISIBLE);
+        }
+        return view;
+    }
 }