cleaning up my mess

proteus-core/src/main/java/com/flipkart/android/proteus/parser/IncludeParser.java

@@ -33,6 +33,9 @@
 
 /**
  * IncludeParser
+ * <p>
+ * TODO: merge the attributes into the included layout
+ * </p>
  *
  * @author aditya.sharat
  */

proteus-core/src/main/java/com/flipkart/android/proteus/parser/ParseHelper.java

@@ -83,7 +83,6 @@ public class ParseHelper {
     private static final String TEXT_ALIGNMENT_VIEW_END = "viewEnd";
 
 
-    private static final String ATTR_START_LITERAL = "?";
     private static final String TWEEN_LOCAL_RESOURCE_STR = "@anim/";
 
     private static final String DRAWABLE_STR = "drawable";
@@ -269,7 +268,7 @@ public static int parseVisibility(@Nullable Value value) {
         return returnValue == null ? View.VISIBLE : returnValue;
     }
 
-    public static Primitive getVisibilty(int visibility) {
+    public static Primitive getVisibility(int visibility) {
         Primitive value = sVisibilityMap.get(visibility);
         return null != value ? value : sVisibilityMap.get(View.GONE);
     }
@@ -329,10 +328,6 @@ public static int parseTextStyle(String attributeValue) {
         return typeface;
     }
 
-    public static boolean isLocalAttribute(String value) {
-        return value.startsWith(ATTR_START_LITERAL);
-    }
-
     public static boolean isTweenAnimationResource(String attributeValue) {
         return attributeValue.startsWith(TWEEN_LOCAL_RESOURCE_STR);
     }

proteus-core/src/main/java/com/flipkart/android/proteus/parser/ViewParser.java

@@ -86,7 +86,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusAndroidView(context);
     }
 
@@ -363,7 +364,7 @@ public void handleStyleResource(V view, StyleResource style) {
             @Override
             public Value compile(@Nullable Value value, Context context) {
                 int visibility = ParseHelper.parseVisibility(value);
-                return ParseHelper.getVisibilty(visibility);
+                return ParseHelper.getVisibility(visibility);
             }
         });
         addAttributeProcessor(Attributes.View.Id, new StringAttributeProcessor<V>() {

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/ButtonParser.java

@@ -51,7 +51,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusButton(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/CheckBoxParser.java

@@ -54,7 +54,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusCheckBox(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/EditTextParser.java

@@ -51,7 +51,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusEditText(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/FrameLayoutParser.java

@@ -54,7 +54,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusAspectRatioFrameLayout(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/HorizontalProgressBarParser.java

@@ -52,7 +52,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusHorizontalProgressBar(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/HorizontalScrollViewParser.java

@@ -55,7 +55,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusHorizontalScrollView(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/ImageButtonParser.java

@@ -50,7 +50,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusImageButton(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/ImageViewParser.java

@@ -56,7 +56,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusImageView(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/LinearLayoutParser.java

@@ -59,7 +59,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusLinearLayout(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/ProgressBarParser.java

@@ -70,7 +70,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusProgressBar(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/RatingBarParser.java

@@ -57,7 +57,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusFixedRatingBar(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/RelativeLayoutParser.java

@@ -53,7 +53,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusRelativeLayout(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/ScrollViewParser.java

@@ -53,7 +53,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusScrollView(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/TextViewParser.java

@@ -65,7 +65,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusTextView(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/ViewGroupParser.java

@@ -68,7 +68,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusAspectRatioFrameLayout(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/parser/custom/WebViewParser.java

@@ -52,7 +52,8 @@ public String getParentType() {
 
     @NonNull
     @Override
-    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data, @Nullable ViewGroup parent, int dataIndex) {
+    public ProteusView createView(@NonNull ProteusContext context, @NonNull Layout layout, @NonNull ObjectValue data,
+                                  @Nullable ViewGroup parent, int dataIndex) {
         return new ProteusWebView(context);
     }
 

proteus-core/src/main/java/com/flipkart/android/proteus/processor/BooleanAttributeProcessor.java

@@ -40,15 +40,9 @@
 
 public abstract class BooleanAttributeProcessor<V extends View> extends AttributeProcessor<V> {
 
-    public static final String BOOLEAN_RESOURCE_PREFIX = "@bool/";
-
     public static final Primitive TRUE = new Primitive(true);
     public static final Primitive FALSE = new Primitive(false);
 
-    public static boolean isLocalBooleanResource(String value) {
-        return value.startsWith(BOOLEAN_RESOURCE_PREFIX);
-    }
-
     @Override
     public void handleValue(V view, Value value) {
         if (value.isPrimitive() && value.getAsPrimitive().isBoolean()) {

proteus-core/src/main/java/com/flipkart/android/proteus/processor/StringAttributeProcessor.java

@@ -24,8 +24,6 @@
 import android.support.annotation.Nullable;
 import android.view.View;
 
-import com.flipkart.android.proteus.ProteusContext;
-import com.flipkart.android.proteus.parser.ParseHelper;
 import com.flipkart.android.proteus.value.AttributeResource;
 import com.flipkart.android.proteus.value.Primitive;
 import com.flipkart.android.proteus.value.Resource;
@@ -40,24 +38,14 @@ public abstract class StringAttributeProcessor<V extends View> extends Attribute
 
     public static final String EMPTY_STRING = "";
     public static final Primitive EMPTY = new Primitive(EMPTY_STRING);
-    private static final String STRING_RESOURCE_PREFIX = "@string/";
-
-    public static boolean isLocalStringResource(String value) {
-        return value.startsWith(STRING_RESOURCE_PREFIX);
-    }
 
     /**
      * @param view  View
      * @param value
      */
     @Override
     public void handleValue(V view, Value value) {
-        String string = value.getAsString();
-        if (ParseHelper.isLocalAttribute(string) || isLocalStringResource(string)) {
-            process(view, precompile(value, view.getContext(), ((ProteusContext) view.getContext()).getFormatterManager()));
-        } else {
-            setString(view, string);
-        }
+        setString(view, value.getAsString());
     }
 
     @Override

proteus-core/src/main/java/com/flipkart/android/proteus/processor/TweenAnimationResourceProcessor.java

@@ -31,7 +31,12 @@
 import com.flipkart.android.proteus.value.Value;
 
 /**
- * Use this as the base processor for references like @anim
+ * TweenAnimationResourceProcessor
+ * <p>
+ * TODO: implement precompiling animation blocks
+ * </p>
+ *
+ * @author yasirmhd
  */
 public abstract class TweenAnimationResourceProcessor<V extends View> extends AttributeProcessor<V> {
 

proteus-core/src/main/java/com/flipkart/android/proteus/value/Color.java

@@ -34,7 +34,6 @@
 
 /**
  * ColorValue
- * TODO: fix the color state list to consume color resources and style attributes.
  *
  * @author aditya.sharat
  */
@@ -183,10 +182,6 @@ public static boolean isColor(String color) {
         return color.startsWith(COLOR_PREFIX_LITERAL);
     }
 
-    public static boolean isLocalColorResource(String attributeValue) {
-        return attributeValue.startsWith(COLOR_RESOURCE_PREFIX);
-    }
-
     private static HashMap<String, Integer> getAttributesMap() {
         if (null == sAttributesMap) {
             synchronized (Color.class) {

proteus-core/src/main/java/com/flipkart/android/proteus/value/Dimension.java

@@ -48,8 +48,6 @@ public class Dimension extends Value {
     public static final String FILL_PARENT = "fill_parent";
     public static final String WRAP_CONTENT = "wrap_content";
 
-    public static final String PREFIX_DIMENSION = "@dimen/";
-
     public static final String SUFFIX_PX = "px";
     public static final String SUFFIX_DP = "dp";
     public static final String SUFFIX_SP = "sp";
@@ -128,10 +126,6 @@ public static float apply(String dimension, Context context) {
         return Dimension.valueOf(dimension, context).apply(context);
     }
 
-    public static boolean isLocalDimensionResource(String value) {
-        return value.startsWith(PREFIX_DIMENSION);
-    }
-
     public float apply(Context context) {
         double result;
 

proteus-core/src/main/java/com/flipkart/android/proteus/value/DrawableValue.java

@@ -56,8 +56,6 @@
  */
 public abstract class DrawableValue extends Value {
 
-    private static final String PREFIX_DRAWABLE = "@drawable/";
-
     private static final String TYPE = "type";
     private static final String CHILDREN = "children";
 
@@ -74,10 +72,6 @@ public abstract class DrawableValue extends Value {
     private static final String TYPE_SOLID = "solid";
     private static final String TYPE_STROKE = "stroke";
 
-    public static boolean isLocalDrawableResource(String value) {
-        return value.startsWith(PREFIX_DRAWABLE);
-    }
-
     @Nullable
     public static DrawableValue valueOf(String value, Context context) {
         if (Color.isColor(value)) {

proteus-core/src/main/java/com/flipkart/android/proteus/value/ObjectValue.java

@@ -275,8 +275,12 @@ public Array getAsArray(String memberName) {
      * @param memberName name of the member being requested.
      * @return the ObjectValue corresponding to the specified member.
      */
+    @Nullable
     public ObjectValue getAsObject(String memberName) {
-        return (ObjectValue) members.get(memberName);
+        if (isObject(memberName)) {
+            return (ObjectValue) members.get(memberName);
+        }
+        return null;
     }
 
     @Nullable

proteus-core/src/main/java/com/flipkart/android/proteus/value/StyleResource.java

@@ -25,7 +25,6 @@
 import android.util.LruCache;
 
 import com.flipkart.android.proteus.ProteusConstants;
-import com.flipkart.android.proteus.parser.ParseHelper;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -53,9 +52,6 @@ private StyleResource() {
     }
 
     private StyleResource(String value, Context context) throws IllegalArgumentException, NoSuchFieldException, IllegalAccessException, ClassNotFoundException {
-        if (!ParseHelper.isLocalAttribute(value)) {
-            throw new IllegalArgumentException(value + " is not a valid style attribute");
-        }
         String[] tokens = value.substring(1, value.length()).split(":");
         String style = tokens[0];
         String attr = tokens[1];