Fixed issues bmelnychuk#1 and bmelnychuk#11

Bogdan Melnychuk · Bogdan Melnychuk · commit 15eb9d8f50af · 2015-04-11T22:22:01.000+03:00
diff --git a/gradle.properties b/gradle.properties
@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=1.2.3
-VERSION_CODE=5
+VERSION_NAME=1.2.4
+VERSION_CODE=6
 
 
 ANDROID_BUILD_MIN_SDK_VERSION=11
diff --git a/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java b/library/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java
@@ -85,7 +85,7 @@ public View getView(int style) {
         if (containerStyle != 0 && applyForRoot) {
             containerContext = new ContextThemeWrapper(mContext, containerStyle);
         }
-        final LinearLayout viewTreeItems = new LinearLayout(containerContext);
+        final LinearLayout viewTreeItems = new LinearLayout(containerContext, null, containerStyle);
 
         viewTreeItems.setId(R.id.tree_items);
         viewTreeItems.setOrientation(LinearLayout.VERTICAL);
@@ -185,7 +185,7 @@ private void collapseNode(TreeNode node, final boolean includeSubnodes) {
         node.setExpanded(false);
         TreeNode.BaseNodeViewHolder nodeViewHolder = getViewHolderForNode(node);
 
-        if(mUseDefaultAnimation) {
+        if (mUseDefaultAnimation) {
             collapse(nodeViewHolder.getNodeItemsView());
         } else {
             nodeViewHolder.getNodeItemsView().setVisibility(View.GONE);
@@ -214,7 +214,7 @@ private void expandNode(final TreeNode node, boolean includeSubnodes) {
             }
 
         }
-        if(mUseDefaultAnimation) {
+        if (mUseDefaultAnimation) {
             expand(parentViewHolder.getNodeItemsView());
         } else {
             parentViewHolder.getNodeItemsView().setVisibility(View.VISIBLE);
@@ -372,13 +372,12 @@ private static void expand(final View v) {
 
         v.getLayoutParams().height = 0;
         v.setVisibility(View.VISIBLE);
-        Animation a = new Animation()
-        {
+        Animation a = new Animation() {
             @Override
             protected void applyTransformation(float interpolatedTime, Transformation t) {
                 v.getLayoutParams().height = interpolatedTime == 1
                         ? LinearLayout.LayoutParams.WRAP_CONTENT
-                        : (int)(targetHeight * interpolatedTime);
+                        : (int) (targetHeight * interpolatedTime);
                 v.requestLayout();
             }
 
@@ -389,21 +388,20 @@ public boolean willChangeBounds() {
         };
 
         // 1dp/ms
-        a.setDuration((int)(targetHeight / v.getContext().getResources().getDisplayMetrics().density));
+        a.setDuration((int) (targetHeight / v.getContext().getResources().getDisplayMetrics().density));
         v.startAnimation(a);
     }
 
     private static void collapse(final View v) {
         final int initialHeight = v.getMeasuredHeight();
 
-        Animation a = new Animation()
-        {
+        Animation a = new Animation() {
             @Override
             protected void applyTransformation(float interpolatedTime, Transformation t) {
-                if(interpolatedTime == 1){
+                if (interpolatedTime == 1) {
                     v.setVisibility(View.GONE);
-                }else{
-                    v.getLayoutParams().height = initialHeight - (int)(initialHeight * interpolatedTime);
+                } else {
+                    v.getLayoutParams().height = initialHeight - (int) (initialHeight * interpolatedTime);
                     v.requestLayout();
                 }
             }
@@ -415,7 +413,7 @@ public boolean willChangeBounds() {
         };
 
         // 1dp/ms
-        a.setDuration((int)(initialHeight / v.getContext().getResources().getDisplayMetrics().density));
+        a.setDuration((int) (initialHeight / v.getContext().getResources().getDisplayMetrics().density));
         v.startAnimation(a);
     }
 
diff --git a/library/src/main/java/com/unnamed/b/atv/view/TreeNodeWrapperView.java b/library/src/main/java/com/unnamed/b/atv/view/TreeNodeWrapperView.java
@@ -31,7 +31,7 @@ private void init() {
         nodeContainer.setId(R.id.node_header);
 
         ContextThemeWrapper newContext = new ContextThemeWrapper(getContext(), containerStyle);
-        nodeItemsContainer = new LinearLayout(newContext);
+        nodeItemsContainer = new LinearLayout(newContext, null, containerStyle);
         nodeItemsContainer.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
         nodeItemsContainer.setId(R.id.node_items);
         nodeItemsContainer.setOrientation(LinearLayout.VERTICAL);
