Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@longerian
longerian committed Dec 3, 2017
2 parents 788809d + c7674c1 commit 051bee8
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 36 deletions.
32 changes: 15 additions & 17 deletions vlayout/src/main/java/com/alibaba/android/vlayout/layout/OnePlusNLayoutHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
package com.alibaba.android.vlayout.layout;

import android.graphics.Rect;
import android.support.v7.widget.OrientationHelper;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.View;
Expand All @@ -34,7 +33,6 @@

import com.alibaba.android.vlayout.LayoutManagerHelper;
import com.alibaba.android.vlayout.OrientationHelperEx;
import com.alibaba.android.vlayout.Range;
import com.alibaba.android.vlayout.VirtualLayoutManager;
import com.alibaba.android.vlayout.VirtualLayoutManager.LayoutStateWrapper;

Expand Down Expand Up @@ -346,7 +344,7 @@ private int handleOne(LayoutStateWrapper layoutState, LayoutChunkResult result,

View view = mContentViews[0];
final ViewGroup.MarginLayoutParams lp = new ViewGroup.MarginLayoutParams(
view.getLayoutParams());
(ViewGroup.MarginLayoutParams) view.getLayoutParams());

if (!Float.isNaN(mAspectRatio)) {
if (layoutInVertical) {
Expand Down Expand Up @@ -394,10 +392,10 @@ private int handleTwo(LayoutStateWrapper layoutState, LayoutChunkResult result,

final View child1 = mContentViews[0];
final ViewGroup.MarginLayoutParams lp1 = new ViewGroup.MarginLayoutParams(
child1.getLayoutParams());
(ViewGroup.MarginLayoutParams)child1.getLayoutParams());
final View child2 = mContentViews[1];
final ViewGroup.MarginLayoutParams lp2 = new ViewGroup.MarginLayoutParams(
child2.getLayoutParams());
(ViewGroup.MarginLayoutParams)child2.getLayoutParams());
final float weight1 = getViewMainWeight(lp1, 0);
final float weight2 = getViewMainWeight(lp1, 1);

Expand Down Expand Up @@ -506,14 +504,14 @@ private int handleThree(LayoutStateWrapper layoutState, LayoutChunkResult result

final View child1 = mContentViews[0];
final ViewGroup.MarginLayoutParams lp1 = new ViewGroup.MarginLayoutParams(
child1.getLayoutParams());
(ViewGroup.MarginLayoutParams)child1.getLayoutParams());
final View child2 = helper.getReverseLayout() ? mContentViews[2] : mContentViews[1];
final View child3 = helper.getReverseLayout() ? mContentViews[1] : mContentViews[2];

final ViewGroup.MarginLayoutParams lp2 = new ViewGroup.MarginLayoutParams(
child2.getLayoutParams());
(ViewGroup.MarginLayoutParams)child2.getLayoutParams());
final ViewGroup.MarginLayoutParams lp3 = new ViewGroup.MarginLayoutParams(
child3.getLayoutParams());
(ViewGroup.MarginLayoutParams)child3.getLayoutParams());

final float weight1 = getViewMainWeight(lp1, 0);
final float weight2 = getViewMainWeight(lp1, 1);
Expand Down Expand Up @@ -614,16 +612,16 @@ private int handleFour(LayoutStateWrapper layoutState, LayoutChunkResult result,

final View child1 = mContentViews[0];
final VirtualLayoutManager.LayoutParams lp1 = new VirtualLayoutManager.LayoutParams(
child1.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child1.getLayoutParams());
final View child2 = helper.getReverseLayout() ? mContentViews[3] : mContentViews[1];
final VirtualLayoutManager.LayoutParams lp2 = new VirtualLayoutManager.LayoutParams(
child2.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child2.getLayoutParams());
final View child3 = mContentViews[2];
final VirtualLayoutManager.LayoutParams lp3 = new VirtualLayoutManager.LayoutParams(
child3.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child3.getLayoutParams());
final View child4 = helper.getReverseLayout() ? mContentViews[1] : mContentViews[3];
final VirtualLayoutManager.LayoutParams lp4 = new VirtualLayoutManager.LayoutParams(
child4.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child4.getLayoutParams());

final float weight1 = getViewMainWeight(lp1, 0);
final float weight2 = getViewMainWeight(lp1, 1);
Expand Down Expand Up @@ -738,19 +736,19 @@ private int handleFive(LayoutStateWrapper layoutState, LayoutChunkResult result,

final View child1 = mContentViews[0];
final VirtualLayoutManager.LayoutParams lp1 = new VirtualLayoutManager.LayoutParams(
child1.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child1.getLayoutParams());
final View child2 = helper.getReverseLayout() ? mContentViews[4] : mContentViews[1];
final VirtualLayoutManager.LayoutParams lp2 = new VirtualLayoutManager.LayoutParams(
child2.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child2.getLayoutParams());
final View child3 = helper.getReverseLayout() ? mContentViews[3] : mContentViews[2];
final VirtualLayoutManager.LayoutParams lp3 = new VirtualLayoutManager.LayoutParams(
child3.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child3.getLayoutParams());
final View child4 = helper.getReverseLayout() ? mContentViews[2] : mContentViews[3];
final VirtualLayoutManager.LayoutParams lp4 = new VirtualLayoutManager.LayoutParams(
child4.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child4.getLayoutParams());
final View child5 = helper.getReverseLayout() ? mContentViews[1] : mContentViews[4];
final VirtualLayoutManager.LayoutParams lp5 = new VirtualLayoutManager.LayoutParams(
child5.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child5.getLayoutParams());

final float weight1 = getViewMainWeight(lp1, 0);
final float weight2 = getViewMainWeight(lp1, 1);
Expand Down
37 changes: 18 additions & 19 deletions vlayout/src/main/java/com/alibaba/android/vlayout/layout/OnePlusNLayoutHelperEx.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
package com.alibaba.android.vlayout.layout;

import android.graphics.Rect;
import android.support.v7.widget.OrientationHelper;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.View;
Expand Down Expand Up @@ -230,19 +229,19 @@ private int handleFive(LayoutStateWrapper layoutState, LayoutChunkResult result,

final View child1 = mChildrenViews[0];
final VirtualLayoutManager.LayoutParams lp1 = new VirtualLayoutManager.LayoutParams(
child1.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child1.getLayoutParams());
final View child2 = helper.getReverseLayout() ? mChildrenViews[4] : mChildrenViews[1];
final VirtualLayoutManager.LayoutParams lp2 = new VirtualLayoutManager.LayoutParams(
child2.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child2.getLayoutParams());
final View child3 = helper.getReverseLayout() ? mChildrenViews[3] : mChildrenViews[2];
final VirtualLayoutManager.LayoutParams lp3 = new VirtualLayoutManager.LayoutParams(
child3.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child3.getLayoutParams());
final View child4 = helper.getReverseLayout() ? mChildrenViews[2] : mChildrenViews[3];
final VirtualLayoutManager.LayoutParams lp4 = new VirtualLayoutManager.LayoutParams(
child4.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child4.getLayoutParams());
final View child5 = helper.getReverseLayout() ? mChildrenViews[1] : mChildrenViews[4];
final VirtualLayoutManager.LayoutParams lp5 = new VirtualLayoutManager.LayoutParams(
child5.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child5.getLayoutParams());

final float weight1 = getViewMainWeight(lp1, 0);
final float weight2 = getViewMainWeight(lp1, 1);
Expand Down Expand Up @@ -363,22 +362,22 @@ private int handSix(LayoutStateWrapper layoutState, LayoutChunkResult result, La

final View child1 = mChildrenViews[0];
final VirtualLayoutManager.LayoutParams lp1 = new VirtualLayoutManager.LayoutParams(
child1.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child1.getLayoutParams());
final View child2 = helper.getReverseLayout() ? mChildrenViews[5] : mChildrenViews[1];
final VirtualLayoutManager.LayoutParams lp2 = new VirtualLayoutManager.LayoutParams(
child2.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child2.getLayoutParams());
final View child3 = helper.getReverseLayout() ? mChildrenViews[4] : mChildrenViews[2];
final VirtualLayoutManager.LayoutParams lp3 = new VirtualLayoutManager.LayoutParams(
child3.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child3.getLayoutParams());
final View child4 = helper.getReverseLayout() ? mChildrenViews[3] : mChildrenViews[3];
final VirtualLayoutManager.LayoutParams lp4 = new VirtualLayoutManager.LayoutParams(
child4.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child4.getLayoutParams());
final View child5 = helper.getReverseLayout() ? mChildrenViews[2] : mChildrenViews[4];
final VirtualLayoutManager.LayoutParams lp5 = new VirtualLayoutManager.LayoutParams(
child5.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child5.getLayoutParams());
final View child6 = helper.getReverseLayout() ? mChildrenViews[1] : mChildrenViews[5];
final VirtualLayoutManager.LayoutParams lp6 = new VirtualLayoutManager.LayoutParams(
child6.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child6.getLayoutParams());

final float weight1 = getViewMainWeight(lp1, 0);
final float weight2 = getViewMainWeight(lp1, 1);
Expand Down Expand Up @@ -524,25 +523,25 @@ private int handSeven(LayoutStateWrapper layoutState, LayoutChunkResult result,

final View child1 = mChildrenViews[0];
final VirtualLayoutManager.LayoutParams lp1 = new VirtualLayoutManager.LayoutParams(
child1.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child1.getLayoutParams());
final View child2 = helper.getReverseLayout() ? mChildrenViews[6] : mChildrenViews[1];
final VirtualLayoutManager.LayoutParams lp2 = new VirtualLayoutManager.LayoutParams(
child2.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child2.getLayoutParams());
final View child3 = helper.getReverseLayout() ? mChildrenViews[5] : mChildrenViews[2];
final VirtualLayoutManager.LayoutParams lp3 = new VirtualLayoutManager.LayoutParams(
child3.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child3.getLayoutParams());
final View child4 = helper.getReverseLayout() ? mChildrenViews[4] : mChildrenViews[3];
final VirtualLayoutManager.LayoutParams lp4 = new VirtualLayoutManager.LayoutParams(
child4.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child4.getLayoutParams());
final View child5 = helper.getReverseLayout() ? mChildrenViews[3] : mChildrenViews[4];
final VirtualLayoutManager.LayoutParams lp5 = new VirtualLayoutManager.LayoutParams(
child5.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child5.getLayoutParams());
final View child6 = helper.getReverseLayout() ? mChildrenViews[2] : mChildrenViews[5];
final VirtualLayoutManager.LayoutParams lp6 = new VirtualLayoutManager.LayoutParams(
child6.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child6.getLayoutParams());
final View child7 = helper.getReverseLayout() ? mChildrenViews[1] : mChildrenViews[6];
final VirtualLayoutManager.LayoutParams lp7 = new VirtualLayoutManager.LayoutParams(
child7.getLayoutParams());
(VirtualLayoutManager.LayoutParams)child7.getLayoutParams());

final float weight1 = getViewMainWeight(lp1, 0);
final float weight2 = getViewMainWeight(lp1, 1);
Expand Down

0 comments on commit 051bee8

Please sign in to comment.