From e1931e6aa9b78b201468146c60b5144de5a0a249 Mon Sep 17 00:00:00 2001
From: Aditya Sharat <aditya.sharat@flipkart.com>
Date: Tue, 13 Dec 2016 13:42:40 +0530
Subject: [PATCH 1/3] Resolves issue #63

---
 build.gradle                                  |   2 +-
 data/layout.json                              |   5 +
 data/layouts.json                             |  35 ++++++
 data/user.json                                |   7 +-
 demo/src/main/res/drawable/border.xml         |   6 +-
 demo/src/main/res/layout/activity_main.xml    |  12 +-
 demo/src/main/res/layout/activity_native.xml  |  24 ++--
 .../res/layout/relative_layout_example.xml    |  26 ++---
 demo/src/main/res/menu/main.xml               |   6 +-
 demo/src/main/res/raw/data_init.json          |  10 +-
 demo/src/main/res/raw/data_update.json        |   6 +-
 demo/src/main/res/values-v21/styles.xml       |   1 +
 demo/src/main/res/values/styles.xml           |   3 +
 demo/src/performance/AndroidManifest.xml      |   7 +-
 library/build.gradle                          |   2 +-
 .../flipkart/android/proteus/DataContext.java |  10 +-
 .../builder/DataParsingLayoutBuilder.java     | 103 ------------------
 .../proteus/builder/SimpleLayoutBuilder.java  |  15 +--
 .../android/proteus/parser/Attributes.java    |   1 +
 .../parser/custom/ViewGroupParser.java        |  69 ++++++++----
 .../proteus/toolbox/ProteusConstants.java     |   6 +-
 21 files changed, 168 insertions(+), 188 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7896d046..d69cc69e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:2.2.2'
     }
 }
 
diff --git a/data/layout.json b/data/layout.json
index 0b560a79..94c06efb 100644
--- a/data/layout.json
+++ b/data/layout.json
@@ -135,6 +135,11 @@
           "padding": "16dp",
           "paddingBottom": "0dp"
         },
+        {
+          "type": "DataDrivenExample",
+          "padding": "16dp",
+          "paddingBottom": "0dp"
+        },
         {
           "type": "CircleView",
           "layout_width": "150dp",
diff --git a/data/layouts.json b/data/layouts.json
index 4ce0a781..97576103 100644
--- a/data/layouts.json
+++ b/data/layouts.json
@@ -165,5 +165,40 @@
         ]
       }
     ]
+  },
+  "DataDrivenExample": {
+    "type": "FrameLayout",
+    "layout_width": "match_parent",
+    "layout_height": "wrap_content",
+    "children": [
+      {
+        "type": "LinearLayout",
+        "orientation": "horizontal",
+        "layout_width": "match_parent",
+        "background": "#ffffff",
+        "padding": "16dp",
+        "children": {
+          "data": "$user.tags",
+          "layout":{
+            "type": "TextView",
+            "dataContext": {
+              "tag": "user.tags[$index]"
+            },
+            "layout_marginRight": "8dp",
+            "layout_height": "32dp",
+            "textSize": "12sp",
+            "textColor": "#2cdb81",
+            "text": "$tag",
+            "padding": "8dp",
+            "gravity": "center",
+            "border": {
+              "width": "2dp",
+              "color": "#cccccc",
+              "bgColor": "#efefef"
+            }
+          }
+        }
+      }
+    ]
   }
 }
\ No newline at end of file
diff --git a/data/user.json b/data/user.json
index 7b5723ef..82c6ef81 100644
--- a/data/user.json
+++ b/data/user.json
@@ -15,6 +15,11 @@
     "experience": {
       "current": 4561,
       "max": 9999
-    }
+    },
+    "tags": [
+      "alpha",
+      "beta",
+      "gamma"
+    ]
   }
 }
\ No newline at end of file
diff --git a/demo/src/main/res/drawable/border.xml b/demo/src/main/res/drawable/border.xml
index ac5ab17e..d476438b 100644
--- a/demo/src/main/res/drawable/border.xml
+++ b/demo/src/main/res/drawable/border.xml
@@ -16,10 +16,10 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
+       android:shape="rectangle">
     <stroke
         android:width="2dp"
-        android:color="#cccccc" />
+        android:color="#cccccc"/>
 
-    <solid android:color="#efefef" />
+    <solid android:color="#efefef"/>
 </shape>
\ No newline at end of file
diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml
index d245943c..66241e6f 100644
--- a/demo/src/main/res/layout/activity_main.xml
+++ b/demo/src/main/res/layout/activity_main.xml
@@ -15,10 +15,10 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <Button
         android:id="@+id/inflate_native"
@@ -27,7 +27,7 @@
         android:text="Native"
         android:padding="8dp"
         android:layout_margin="8dp"
-        tools:ignore="HardcodedText" />
+        tools:ignore="HardcodedText"/>
 
     <Button
         android:id="@+id/inflate_proteus"
@@ -36,7 +36,7 @@
         android:text="Proteus"
         android:padding="8dp"
         android:layout_margin="8dp"
-        tools:ignore="HardcodedText" />
+        tools:ignore="HardcodedText"/>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/demo/src/main/res/layout/activity_native.xml b/demo/src/main/res/layout/activity_native.xml
index d669bebc..46d00bbe 100644
--- a/demo/src/main/res/layout/activity_native.xml
+++ b/demo/src/main/res/layout/activity_native.xml
@@ -16,10 +16,10 @@
   -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbars="none">
+            xmlns:tools="http://schemas.android.com/tools"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scrollbars="none">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -48,7 +48,7 @@
                     android:text="TextView"
                     android:textColor="#000000"
                     android:textSize="12sp"
-                    tools:ignore="HardcodedText" />
+                    tools:ignore="HardcodedText"/>
 
                 <TextView
                     android:id="@+id/html_text_view"
@@ -56,14 +56,14 @@
                     android:layout_height="wrap_content"
                     android:gravity="right"
                     android:textSize="14sp"
-                    tools:ignore="RtlHardcoded" />
+                    tools:ignore="RtlHardcoded"/>
 
                 <ImageView
                     android:layout_width="60dp"
                     android:layout_height="60dp"
                     android:layout_marginRight="8dp"
                     android:src="@drawable/github_icon"
-                    tools:ignore="RtlHardcoded" />
+                    tools:ignore="RtlHardcoded"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -81,7 +81,7 @@
                         android:text="1"
                         android:textColor="#2cdb81"
                         android:textSize="12sp"
-                        tools:ignore="HardcodedText,RtlHardcoded" />
+                        tools:ignore="HardcodedText,RtlHardcoded"/>
 
                     <TextView
                         android:layout_width="0dp"
@@ -93,7 +93,7 @@
                         android:text="2"
                         android:textColor="#2cdb81"
                         android:textSize="12sp"
-                        tools:ignore="HardcodedText,RtlHardcoded" />
+                        tools:ignore="HardcodedText,RtlHardcoded"/>
 
                     <TextView
                         android:layout_width="0dp"
@@ -105,7 +105,7 @@
                         android:text="3"
                         android:textColor="#2cdb81"
                         android:textSize="12sp"
-                        tools:ignore="HardcodedText,RtlHardcoded" />
+                        tools:ignore="HardcodedText,RtlHardcoded"/>
 
                 </LinearLayout>
 
@@ -113,9 +113,9 @@
 
         </FrameLayout>
 
-        <include layout="@layout/relative_layout_example" />
+        <include layout="@layout/relative_layout_example"/>
 
-        <include layout="@layout/simple_data_binding_example" />
+        <include layout="@layout/simple_data_binding_example"/>
 
     </LinearLayout>
 </ScrollView>
diff --git a/demo/src/main/res/layout/relative_layout_example.xml b/demo/src/main/res/layout/relative_layout_example.xml
index 52cb4582..58786697 100644
--- a/demo/src/main/res/layout/relative_layout_example.xml
+++ b/demo/src/main/res/layout/relative_layout_example.xml
@@ -16,13 +16,13 @@
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="0dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:paddingTop="16dp">
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:paddingBottom="0dp"
+             android:paddingLeft="16dp"
+             android:paddingRight="16dp"
+             android:paddingTop="16dp">
 
 
     <RelativeLayout
@@ -39,7 +39,7 @@
             android:text="Center"
             android:textColor="#323232"
             android:textSize="14sp"
-            tools:ignore="HardcodedText" />
+            tools:ignore="HardcodedText"/>
 
         <ImageView
             android:layout_width="wrap_content"
@@ -47,7 +47,7 @@
             android:layout_above="@id/center"
             android:layout_centerHorizontal="true"
             android:layout_marginBottom="8dp"
-            android:src="@drawable/star_filled" />
+            android:src="@drawable/star_filled"/>
 
         <ImageView
             android:layout_width="wrap_content"
@@ -55,7 +55,7 @@
             android:layout_below="@id/center"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="8dp"
-            android:src="@drawable/star_filled" />
+            android:src="@drawable/star_filled"/>
 
         <ImageView
             android:layout_width="wrap_content"
@@ -64,7 +64,7 @@
             android:layout_marginLeft="8dp"
             android:layout_toRightOf="@id/center"
             android:src="@drawable/star_filled"
-            tools:ignore="RtlHardcoded" />
+            tools:ignore="RtlHardcoded"/>
 
         <ImageView
             android:layout_width="wrap_content"
@@ -73,7 +73,7 @@
             android:layout_marginRight="8dp"
             android:layout_toLeftOf="@id/center"
             android:src="@drawable/star_filled"
-            tools:ignore="RtlHardcoded" />
+            tools:ignore="RtlHardcoded"/>
 
         <ImageView
             android:layout_width="100dp"
@@ -84,7 +84,7 @@
             android:background="#027cd5"
             android:padding="8dp"
             android:scaleType="fitCenter"
-            tools:ignore="RtlHardcoded" />
+            tools:ignore="RtlHardcoded"/>
 
     </RelativeLayout>
 
diff --git a/demo/src/main/res/menu/main.xml b/demo/src/main/res/menu/main.xml
index de14da23..f05c1fa2 100644
--- a/demo/src/main/res/menu/main.xml
+++ b/demo/src/main/res/menu/main.xml
@@ -15,14 +15,14 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools">
 
     <item
         android:id="@+id/settings"
         android:orderInCategory="100"
         android:title="Settings"
         app:showAsAction="always"
-        tools:ignore="HardcodedText" />
+        tools:ignore="HardcodedText"/>
 
 </menu>
diff --git a/demo/src/main/res/raw/data_init.json b/demo/src/main/res/raw/data_init.json
index 627a7fae..4c467db0 100644
--- a/demo/src/main/res/raw/data_init.json
+++ b/demo/src/main/res/raw/data_init.json
@@ -13,6 +13,14 @@
   },
   "data": {
     "totalAchievements": 114,
-    "tags": ["Alpha", "Bravo", "Charlie", "Delta", "Echo", "Foxtrot", "Mike"]
+    "tags": [
+      "Alpha",
+      "Bravo",
+      "Charlie",
+      "Delta",
+      "Echo",
+      "Foxtrot",
+      "Mike"
+    ]
   }
 }
\ No newline at end of file
diff --git a/demo/src/main/res/raw/data_update.json b/demo/src/main/res/raw/data_update.json
index 01abd94a..005bba01 100644
--- a/demo/src/main/res/raw/data_update.json
+++ b/demo/src/main/res/raw/data_update.json
@@ -13,6 +13,10 @@
   },
   "data": {
     "totalAchievements": 114,
-    "tags": ["Alpha", "Bravo", "Charlie"]
+    "tags": [
+      "Alpha",
+      "Bravo",
+      "Charlie"
+    ]
   }
 }
\ No newline at end of file
diff --git a/demo/src/main/res/values-v21/styles.xml b/demo/src/main/res/values-v21/styles.xml
index 7bb9fe3b..7437b64c 100644
--- a/demo/src/main/res/values-v21/styles.xml
+++ b/demo/src/main/res/values-v21/styles.xml
@@ -15,6 +15,7 @@
   -->
 
 <resources>
+
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
diff --git a/demo/src/main/res/values/styles.xml b/demo/src/main/res/values/styles.xml
index 2fcbca57..da887b80 100644
--- a/demo/src/main/res/values/styles.xml
+++ b/demo/src/main/res/values/styles.xml
@@ -23,11 +23,14 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
+
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
+
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
 
 </resources>
diff --git a/demo/src/performance/AndroidManifest.xml b/demo/src/performance/AndroidManifest.xml
index 46cc7135..802bed8e 100644
--- a/demo/src/performance/AndroidManifest.xml
+++ b/demo/src/performance/AndroidManifest.xml
@@ -28,9 +28,10 @@
         android:theme="@style/AppTheme.NoActionBar">
         <activity android:name=".performance.MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
         <activity android:name=".performance.ProteusActivity"/>
diff --git a/library/build.gradle b/library/build.gradle
index 48591d13..72dc5124 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -24,7 +24,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 24
         versionCode 410000
-        versionName "4.1.0"
+        versionName "4.1.1"
     }
 
     lintOptions {
diff --git a/library/src/main/java/com/flipkart/android/proteus/DataContext.java b/library/src/main/java/com/flipkart/android/proteus/DataContext.java
index 74a40c31..f9f33c9d 100644
--- a/library/src/main/java/com/flipkart/android/proteus/DataContext.java
+++ b/library/src/main/java/com/flipkart/android/proteus/DataContext.java
@@ -58,10 +58,12 @@ public DataContext(DataContext dataContext) {
         this.isClone = true;
     }
 
-    public static DataContext updateDataContext(DataContext dataContext, JsonObject data, JsonObject scope) {
+    public static DataContext updateDataContext(DataContext dataContext, JsonObject data, JsonObject scope, int dataIndex) {
         JsonObject reverseScope = new JsonObject();
         JsonObject newData = new JsonObject();
 
+        dataContext.setIndex(dataIndex);
+
         if (data == null) {
             data = new JsonObject();
         }
@@ -157,11 +159,11 @@ public void setIndex(int index) {
         this.index = index;
     }
 
-    public DataContext createChildDataContext(JsonObject scope, int childIndex) {
-        return updateDataContext(new DataContext(), data, scope);
+    public DataContext createChildDataContext(JsonObject scope, int dataIndex) {
+        return updateDataContext(new DataContext(), data, scope, dataIndex);
     }
 
     public void updateDataContext(JsonObject data) {
-        updateDataContext(this, data, scope);
+        updateDataContext(this, data, scope, index);
     }
 }
diff --git a/library/src/main/java/com/flipkart/android/proteus/builder/DataParsingLayoutBuilder.java b/library/src/main/java/com/flipkart/android/proteus/builder/DataParsingLayoutBuilder.java
index f32e5102..52723971 100644
--- a/library/src/main/java/com/flipkart/android/proteus/builder/DataParsingLayoutBuilder.java
+++ b/library/src/main/java/com/flipkart/android/proteus/builder/DataParsingLayoutBuilder.java
@@ -21,12 +21,10 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 
 import com.flipkart.android.proteus.DataContext;
 import com.flipkart.android.proteus.binding.Binding;
 import com.flipkart.android.proteus.parser.LayoutHandler;
-import com.flipkart.android.proteus.parser.ParseHelper;
 import com.flipkart.android.proteus.toolbox.Formatter;
 import com.flipkart.android.proteus.toolbox.IdGenerator;
 import com.flipkart.android.proteus.toolbox.ProteusConstants;
@@ -56,81 +54,6 @@ protected DataParsingLayoutBuilder(@NonNull IdGenerator idGenerator) {
         super(idGenerator);
     }
 
-    @Override
-    protected void handleChildren(LayoutHandler handler, ProteusView view) {
-
-        ProteusViewManager viewManager = view.getViewManager();
-        JsonObject layout = viewManager.getLayout();
-
-        if (ProteusConstants.isLoggingEnabled()) {
-            Log.d(TAG, "Parsing children for view with " + Utils.getLayoutIdentifier(layout));
-        }
-
-        if (layout == null) {
-            return;
-        }
-
-        JsonElement element = isDataDriven(viewManager);
-
-        if (element != null) {
-
-            int length = 0;
-            String dataPath = element.getAsString().substring(1);
-            viewManager.setDataPathForChildren(dataPath);
-
-            Result result = Utils.readJson(dataPath, viewManager.getDataContext().getData(), viewManager.getDataContext().getIndex());
-            JsonElement elementFromData = result.isSuccess() ? result.element : null;
-
-            if (null != elementFromData) {
-                length = ParseHelper.parseInt(elementFromData.getAsString());
-            }
-
-            // get the child type
-            JsonObject childLayout = getChildLayout(layout.get(ProteusConstants.CHILD_TYPE), layout, view);
-
-            JsonElement childDataContext = childLayout.get(ProteusConstants.CHILD_DATA_CONTEXT);
-            JsonElement childDataContextFromParent = layout.get(ProteusConstants.CHILD_DATA_CONTEXT);
-
-            if (childDataContextFromParent != null && childDataContext != null) {
-                Utils.addElements(childDataContext.getAsJsonObject(), childDataContextFromParent.getAsJsonObject(), true);
-            } else if (childDataContextFromParent != null) {
-                childLayout.add(ProteusConstants.DATA_CONTEXT, childDataContextFromParent);
-            }
-
-            viewManager.setChildLayout(childLayout);
-
-            for (int index = 0; index < length; index++) {
-                ProteusView child = build((ViewGroup) view, childLayout, viewManager.getDataContext().getData(), index, viewManager.getStyles());
-                if (child != null) {
-                    handler.addView(view, child);
-                }
-            }
-        }
-
-        super.handleChildren(handler, view);
-    }
-
-    @Nullable
-    protected JsonElement isDataDriven(ProteusViewManager viewManager) {
-        if (viewManager.getLayout() == null || viewManager.getDataContext() == null || viewManager.getDataContext().getData() == null) {
-            return null;
-        }
-
-        JsonElement element = viewManager.getLayout().get(ProteusConstants.CHILDREN);
-        JsonElement child = viewManager.getLayout().get(ProteusConstants.CHILD_TYPE);
-
-        if (child == null || child.isJsonNull()) {
-            return null;
-        }
-
-        if (element != null && element.isJsonPrimitive() && !element.getAsString().isEmpty()
-                && element.getAsString().charAt(0) == ProteusConstants.DATA_PREFIX) {
-            return element;
-        }
-
-        return null;
-    }
-
     @Override
     protected ProteusViewManager createViewManager(LayoutHandler handler, View parent, JsonObject layout, JsonObject data, int index, Styles styles) {
         ProteusViewManagerImpl viewManager = new ProteusViewManagerImpl();
@@ -287,32 +210,6 @@ private String format(JsonElement toFormat, String formatterName) {
         return formatter.format(toFormat);
     }
 
-    // TODO: possible NPE, re-factor required
-    public JsonObject getChildLayout(JsonElement type, JsonObject source, ProteusView view) {
-        if (type == null) {
-            return null;
-        }
-
-        JsonObject layout;
-        if (type.isJsonObject() && !type.isJsonNull()) {
-            layout = type.getAsJsonObject();
-            layout = Utils.mergeLayouts(layout, source);
-        } else if (type.isJsonPrimitive()) {
-            layout = onLayoutRequired(type.getAsString(), view);
-            if (layout == null) {
-                layout = new JsonObject();
-                layout.add(ProteusConstants.TYPE, type);
-            } else {
-                layout = Utils.mergeLayouts(layout, source);
-            }
-        } else {
-            layout = Utils.mergeLayouts(new JsonObject(), source);
-            layout.add(ProteusConstants.TYPE, type);
-        }
-
-        return layout;
-    }
-
     @Nullable
     protected JsonObject onLayoutRequired(String type, ProteusView parent) {
         if (ProteusConstants.isLoggingEnabled()) {
diff --git a/library/src/main/java/com/flipkart/android/proteus/builder/SimpleLayoutBuilder.java b/library/src/main/java/com/flipkart/android/proteus/builder/SimpleLayoutBuilder.java
index bb663a39..97dac75b 100644
--- a/library/src/main/java/com/flipkart/android/proteus/builder/SimpleLayoutBuilder.java
+++ b/library/src/main/java/com/flipkart/android/proteus/builder/SimpleLayoutBuilder.java
@@ -111,7 +111,7 @@ public ProteusView build(ViewGroup parent, JsonObject layout, JsonObject data, i
         String attribute;
 
         for (Map.Entry<String, JsonElement> entry : layout.entrySet()) {
-            if (ProteusConstants.TYPE.equals(entry.getKey()) || ProteusConstants.CHILDREN.equals(entry.getKey()) || ProteusConstants.CHILD_TYPE.equals(entry.getKey())) {
+            if (ProteusConstants.TYPE.equals(entry.getKey())) {
                 continue;
             }
 
@@ -125,11 +125,6 @@ public ProteusView build(ViewGroup parent, JsonObject layout, JsonObject data, i
             }
         }
 
-        /**
-         * Process the children.
-         */
-        handleChildren(handler, view);
-
         return view;
     }
 
@@ -165,14 +160,6 @@ protected ProteusViewManager createViewManager(LayoutHandler handler, View paren
         return viewManager;
     }
 
-    protected void handleChildren(LayoutHandler handler, ProteusView view) {
-        if (ProteusConstants.isLoggingEnabled()) {
-            Log.d(TAG, "Parsing children for view with " + Utils.getLayoutIdentifier(view.getViewManager().getLayout()));
-        }
-
-        handler.handleChildren(view);
-    }
-
     public boolean handleAttribute(LayoutHandler handler, ProteusView view, String attribute, JsonElement value) {
         if (ProteusConstants.isLoggingEnabled()) {
             Log.d(TAG, "Handle '" + attribute + "' : " + value.toString() + " for view with " + Utils.getLayoutIdentifier(view.getViewManager().getLayout()));
diff --git a/library/src/main/java/com/flipkart/android/proteus/parser/Attributes.java b/library/src/main/java/com/flipkart/android/proteus/parser/Attributes.java
index 5200b4c1..b152f981 100644
--- a/library/src/main/java/com/flipkart/android/proteus/parser/Attributes.java
+++ b/library/src/main/java/com/flipkart/android/proteus/parser/Attributes.java
@@ -188,6 +188,7 @@ public static class ImageView {
     }
 
     public static class ViewGroup {
+        public static Attribute Children = new Attribute("children");
         public static Attribute ClipChildren = new Attribute("clipChildren");
         public static Attribute ClipToPadding = new Attribute("clipToPadding");
         public static Attribute LayoutMode = new Attribute("layoutMode");
diff --git a/library/src/main/java/com/flipkart/android/proteus/parser/custom/ViewGroupParser.java b/library/src/main/java/com/flipkart/android/proteus/parser/custom/ViewGroupParser.java
index 04eacaa2..9b4df79b 100644
--- a/library/src/main/java/com/flipkart/android/proteus/parser/custom/ViewGroupParser.java
+++ b/library/src/main/java/com/flipkart/android/proteus/parser/custom/ViewGroupParser.java
@@ -20,19 +20,20 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.flipkart.android.proteus.DataContext;
 import com.flipkart.android.proteus.builder.LayoutBuilder;
 import com.flipkart.android.proteus.parser.Attributes;
 import com.flipkart.android.proteus.parser.ParseHelper;
 import com.flipkart.android.proteus.parser.Parser;
 import com.flipkart.android.proteus.parser.WrappableParser;
+import com.flipkart.android.proteus.processor.AttributeProcessor;
 import com.flipkart.android.proteus.processor.StringAttributeProcessor;
 import com.flipkart.android.proteus.toolbox.ProteusConstants;
+import com.flipkart.android.proteus.toolbox.Result;
 import com.flipkart.android.proteus.toolbox.Styles;
+import com.flipkart.android.proteus.toolbox.Utils;
 import com.flipkart.android.proteus.view.ProteusAspectRatioFrameLayout;
 import com.flipkart.android.proteus.view.ProteusView;
 import com.flipkart.android.proteus.view.manager.ProteusViewManager;
-import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
@@ -89,35 +90,65 @@ public void handle(String attributeKey, String attributeValue, T view) {
                 view.setMotionEventSplittingEnabled(splitMotionEvents);
             }
         });
+
+        addHandler(Attributes.ViewGroup.Children, new AttributeProcessor<T>() {
+            @Override
+            public void handle(String key, JsonElement value, T view) {
+                handleChildren((ProteusView) view);
+            }
+        });
     }
 
     @Override
     public boolean handleChildren(ProteusView view) {
         ProteusViewManager viewManager = view.getViewManager();
-        LayoutBuilder layoutBuilder = viewManager.getLayoutBuilder();
-        DataContext dataContext = viewManager.getDataContext();
+        LayoutBuilder builder = viewManager.getLayoutBuilder();
         JsonObject layout = viewManager.getLayout();
-
-        if (dataContext == null || layout == null) {
-            return false;
+        JsonElement children = layout.get(ProteusConstants.CHILDREN);
+        JsonObject data = viewManager.getDataContext().getData();
+        int dataIndex = viewManager.getDataContext().getIndex();
+        Styles styles = view.getViewManager().getStyles();
+
+        if (null != children && !children.isJsonNull()) {
+            if (children.isJsonArray()) {
+                ProteusView child;
+                for (JsonElement jsonElement : children.getAsJsonArray()) {
+                    child = builder.build((ViewGroup) view, jsonElement.getAsJsonObject(), data, dataIndex, styles);
+                    addView(view, child);
+                }
+            } else if (children.isJsonObject()) {
+                handleDataDrivenChildren(builder, view, viewManager, children.getAsJsonObject(), data, dataIndex);
+            }
         }
 
-        JsonObject data = dataContext.getData();
-        JsonElement element = layout.get(ProteusConstants.CHILDREN);
-        JsonArray children;
-        ProteusView child;
+        return true;
+    }
 
-        if (!(element instanceof JsonArray) || layoutBuilder == null) {
-            return false;
-        }
+    private void handleDataDrivenChildren(LayoutBuilder builder, ProteusView parent, ProteusViewManager viewManager, JsonObject children, JsonObject data, int dataIndex) {
+
+        String dataPath = children.get(ProteusConstants.DATA).getAsString().substring(1);
+        viewManager.setDataPathForChildren(dataPath);
+
+        Result result = Utils.readJson(dataPath, data, dataIndex);
+        JsonElement element = result.isSuccess() ? result.element : null;
+
+        JsonObject childLayout = children.getAsJsonObject(ProteusConstants.LAYOUT);
+
+        viewManager.setChildLayout(childLayout);
 
-        children = element.getAsJsonArray();
-        for (int index = 0; index < children.size(); index++) {
-            child = layoutBuilder.build((ViewGroup) view, children.get(index).getAsJsonObject(), data, viewManager.getDataContext().getIndex(), view.getViewManager().getStyles());
-            addView(view, child);
+        if (null == element || element.isJsonNull()) {
+            return;
         }
 
-        return true;
+        int length = element.getAsJsonArray().size();
+
+        ProteusView child;
+        for (int index = 0; index < length; index++) {
+            child = builder.build((ViewGroup) parent, childLayout, viewManager.getDataContext().getData(), index, viewManager.getStyles());
+            if (child != null) {
+                this.addView(parent, child);
+            }
+        }
     }
 
     @Override
diff --git a/library/src/main/java/com/flipkart/android/proteus/toolbox/ProteusConstants.java b/library/src/main/java/com/flipkart/android/proteus/toolbox/ProteusConstants.java
index 8d25c378..b055d4df 100644
--- a/library/src/main/java/com/flipkart/android/proteus/toolbox/ProteusConstants.java
+++ b/library/src/main/java/com/flipkart/android/proteus/toolbox/ProteusConstants.java
@@ -27,15 +27,15 @@ public class ProteusConstants {
     public static final String ID = "id";
     public static final String TAG = "tag";
 
+    public static final String LAYOUT = "layout";
+
     public static final String CHILDREN = "children";
-    public static final String CHILD_TYPE = "childType";
 
     public static final String STYLE_DELIMITER = "\\.";
 
+    public static final String DATA = "data";
     public static final String DATA_CONTEXT = "dataContext";
-    public static final String CHILD_DATA_CONTEXT = "childDataContext";
 
-    public static final String DATA_VISIBILITY = "data";
     public static final String DATA_NULL = "null";
 
     public static final char DATA_PREFIX = '$';

From e4d87af1d670659d10707ebee43e850fc93b4146 Mon Sep 17 00:00:00 2001
From: Aditya Sharat <aditya.sharat@flipkart.com>
Date: Tue, 20 Dec 2016 13:19:14 +0530
Subject: [PATCH 2/3] some clean up

---
 .../android/proteus/parser/custom/ViewGroupParser.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/src/main/java/com/flipkart/android/proteus/parser/custom/ViewGroupParser.java b/library/src/main/java/com/flipkart/android/proteus/parser/custom/ViewGroupParser.java
index 9b4df79b..a877fc21 100644
--- a/library/src/main/java/com/flipkart/android/proteus/parser/custom/ViewGroupParser.java
+++ b/library/src/main/java/com/flipkart/android/proteus/parser/custom/ViewGroupParser.java
@@ -117,14 +117,14 @@ public boolean handleChildren(ProteusView view) {
                     addView(view, child);
                 }
             } else if (children.isJsonObject()) {
-                handleDataDrivenChildren(builder, view, viewManager, children.getAsJsonObject(), data, dataIndex);
+                handleDataDrivenChildren(builder, view, viewManager, children.getAsJsonObject(), data, styles, dataIndex);
             }
         }
 
         return true;
     }
 
-    private void handleDataDrivenChildren(LayoutBuilder builder, ProteusView parent, ProteusViewManager viewManager, JsonObject children, JsonObject data, int dataIndex) {
+    private void handleDataDrivenChildren(LayoutBuilder builder, ProteusView parent, ProteusViewManager viewManager, JsonObject children, JsonObject data, Styles styles, int dataIndex) {
 
         String dataPath = children.get(ProteusConstants.DATA).getAsString().substring(1);
         viewManager.setDataPathForChildren(dataPath);
@@ -144,7 +144,7 @@ private void handleDataDrivenChildren(LayoutBuilder builder, ProteusView parent,
 
         ProteusView child;
         for (int index = 0; index < length; index++) {
-            child = builder.build((ViewGroup) parent, childLayout, viewManager.getDataContext().getData(), index, viewManager.getStyles());
+            child = builder.build((ViewGroup) parent, childLayout, data, index, styles);
             if (child != null) {
                 this.addView(parent, child);
             }

From 6ff4b2d686cf0d5eb6090e1adf3d99ebd70181d1 Mon Sep 17 00:00:00 2001
From: Aditya Sharat <aditya.sharat@flipkart.com>
Date: Tue, 20 Dec 2016 13:29:02 +0530
Subject: [PATCH 3/3] bump gradle

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d69cc69e..214ce6d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }