Merge branch 'master' of https://github.com/luiing/StackViewLayout

Author: luiing

README.md

@@ -9,19 +9,19 @@
 ![效果图](/pic/demo20.gif)
 
 ### Use
-    implementation 'com.uis:stacklayout:0.0.2'
+    implementation 'com.uis:stacklayout:0.1.1'
 
 *Name*| *Descript*|*Value*
   -----|--------|---
-stackSpace|间距|10dp
-stackEdge|边界距离|10dp
-stackZoomX|x方向缩放| 0.0-2.0
-stackZoomY|y方向缩放|0.0-0.2
+stackSpace|间距|默认值：10dp
+stackEdge|边界距离|默认值：10dp
+stackZoomX|x方向缩放| 0<x<=1,1表示等间距，默认值：1
+stackPadX|x方向偏移|表示偏移间距,默认值：0
+stackPadX|PadX*(Size-1) < Space|PadX优先级高于ZoomX
+stackZoomY|y方向缩放| 0<y<=1,1表示和顶层等高度，默认值：0.9
 stackLooper|自动轮播|false/true
 stackSize|层叠数量|3
 stackEdgeModel|层叠位置|left/right
-
-
 
 ```Xml
     <?xml version="1.0" encoding="utf-8"?>
@@ -88,7 +88,9 @@ stackEdgeModel|层叠位置|left/right
 *Version*| *Descript*|*Fixed*
 ----|----|----
 0.0.1|自动轮播，滑动从顶部移除，整体上浮|初始版本
-0.0.2|滑动从顶层加入，整体下沉|内部view点击事件
+0.0.2|滑动从顶层加入，整体下沉|fixed 内部view点击事件
+0.1.0|zoomX,zoomY呈等比数列|更改属性
+0.1.1|只有一条数据时|fixed
 
 ### Thanks
 

demo/src/main/res/layout/stack_left.xml

@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     stack:stackSpace="10dp"
     stack:stackEdge="10dp"
-    stack:stackZoomX="0.1"
-    stack:stackZoomY="0.1"
+    stack:stackZoomX="1"
+    stack:stackZoomY="0.9"
     stack:stackLooper = "true"
     stack:stackSize = "5"
     stack:stackEdgeModel = "left">

demo/src/main/res/layout/stack_right.xml

@@ -3,11 +3,12 @@
     xmlns:stack="http://schemas.android.com/apk/res-auto"
     android:id="@+id/stacklayout"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    stack:stackSpace="10dp"
+    android:layout_height="150dp"
+    stack:stackSpace="15dp"
     stack:stackEdge="10dp"
-    stack:stackZoomX="0.2"
-    stack:stackZoomY="0.1"
+    stack:stackZoomX="1"
+    stack:stackPadX="5dp"
+    stack:stackZoomY="0.9"
     stack:stackLooper = "false"
     stack:stackSize = "3"
     stack:stackEdgeModel = "right">

stacklayout/src/main/java/com/uis/stackview/StackHelper.java

@@ -70,8 +70,12 @@ void measureChild(int width,int height){
                 float stackSpaces = 0;
                 everyHeight = height - layout.getPaddingTop() - layout.getPaddingBottom();
                 originX.add(layout.stackEdge);
+                int padX = layout.stackPadX;
+                if(padX*(size-1) > layout.stackSpace){
+                    padX = 0;
+                }
                 for (int i = 1; i < size; i++) {
-                    int stackSpace = (int)(layout.stackSpace /(1+layout.stackZoomX*(size-1-i)));
+                    int stackSpace = (int)((layout.stackSpace-padX*(size-1-i))*Math.pow(layout.stackZoomX,(size-1-i)));
                     stackSpaces += stackSpace;
                     originX.add(originX.get(i - 1) + stackSpace);
                 }
@@ -97,7 +101,8 @@ void layoutChild(){
         if(needRelayout && layout != null) {
             needRelayout = false;
             int childSize = layout.getChildCount();
-            int stackSize = layout.stackSize;
+            int stackSize = layout.getRealStackSize();
+            int realSize = layout.getRealStackSize();
             for (int i = 0; i < childSize; i++) {
                 int top, bottom, left, right, pivot;
                 View view = layout.getChildAt(i);
@@ -117,7 +122,7 @@ void layoutChild(){
                     view.setPivotX(pivot);
                     view.setPivotY(everyHeight / 2);
                     view.layout(left, top, right, bottom);
-                    view.setScaleY(getChildScale(i, layout.stackZoomY));
+                    view.setScaleY((float) Math.pow(layout.stackZoomY,realSize-1-i));
                     if(view.getTranslationX() != 0f){
                         if(i+1 < stackSize){
                             view.setTranslationX(0);
@@ -193,11 +198,6 @@ private void removeStackView(View view){
         }
     }
 
-    private float getChildScale(int index,float zoom) {
-        int rate = layout.getRealStackSize() -1 - index;
-        return (float) Math.pow(1.0f - zoom,rate);
-    }
-
     /**
      * 在StackLayout是否能水平滑动
      * @return true:拦截滑动，false：放行
@@ -301,9 +301,10 @@ void setAutoPlay(boolean looper){
     /** 加入底层 */
     private void addBottomView(){
         int cnt = layout.getAdapter().getItemCount();
+        int stackSize = layout.getRealStackSize();
         displayPosition += 1;
         displayPosition %= cnt;
-        int index = (layout.stackSize - 1 + displayPosition) % cnt;
+        int index = (stackSize - 1 + displayPosition) % cnt;
         View view = getStackView();
         layout.getAdapter().onBindView(view, index);
         needRelayout = true;

stacklayout/src/main/java/com/uis/stackview/StackLayout.java

@@ -24,10 +24,11 @@ public class StackLayout extends ViewGroup{
     int stackSpace = 10;
     /** 层叠视图边距 */
     int stackEdge = 0;
-    /** 层叠递减倍数 0.0-2.0*/
-    float stackZoomX = 0.1f;
-    /** 层叠缩放比例 0.0-0.2*/
-    float stackZoomY = 0.1f;
+    /** 层叠递减倍数 >0*/
+    float stackZoomX = 1f;
+    int stackPadX = 0;
+    /** 层叠缩放比例 >0*/
+    float stackZoomY = 0.9f;
     /** 层叠显示数量 */
     int stackSize = 3;
     /** 自动轮播 */
@@ -58,6 +59,7 @@ public StackLayout(Context context, AttributeSet attrs, int defStyleAttr) {
         stackSpace =  (int)type.getDimension(R.styleable.StackLayout_stackSpace, stackSpace);
         stackEdge = (int)type.getDimension(R.styleable.StackLayout_stackEdge,stackEdge);
         stackZoomX = type.getFloat(R.styleable.StackLayout_stackZoomX, stackZoomX);
+        stackPadX = (int)type.getDimension(R.styleable.StackLayout_stackPadX,stackPadX);
         stackZoomY = type.getFloat(R.styleable.StackLayout_stackZoomY, stackZoomY);
         stackSize = type.getInteger(R.styleable.StackLayout_stackSize,stackSize);
         stackLooper = type.getBoolean(R.styleable.StackLayout_stackLooper,stackLooper);
@@ -73,6 +75,9 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         int width = getDefaultSize(getSuggestedMinimumWidth(), widthMeasureSpec);
         int height = MeasureSpec.EXACTLY != MeasureSpec.getMode(heightMeasureSpec) ? width/2
                 : getDefaultSize(getSuggestedMinimumHeight(),heightMeasureSpec);
+        if(!isInEditMode() && (adapter == null || adapter.getItemCount() == 0)){
+            height = 0;
+        }
         setMeasuredDimension(width,height);
         if(adapter != null) {
             stackHelper.measureChild(width,height);

stacklayout/src/main/res/values/attrs.xml

@@ -2,6 +2,7 @@
 <resources>
     <declare-styleable name="StackLayout">
         <attr name="stackSpace" format="dimension" />
+        <attr name="stackPadX" format="dimension" />
         <attr name="stackZoomX" format="float" />
         <attr name="stackZoomY" format="float" />
         <attr name="stackLooper" format="boolean"/>