更改属性

Author: uis

README.md

@@ -9,19 +9,19 @@
 ![效果图](/pic/demo20.gif)
 
 ### Use
-    implementation 'com.uis:stacklayout:0.0.2'
+    implementation 'com.uis:stacklayout:0.1.0'
 
 *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"?>
@@ -89,6 +89,7 @@ stackEdgeModel|层叠位置|left/right
 ----|----|----
 0.0.1|自动轮播，滑动从顶部移除，整体上浮|初始版本
 0.0.2|滑动从顶层加入，整体下沉|内部view点击事件
+0.1.0|zoomX,zoomY呈等比数列|更改属性
 
 ### Thanks
 

stacklayout/build.gradle

@@ -23,4 +23,4 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
-//apply from: '../../../bintray.gradle'
+apply from: '../../../bintray.gradle'

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);
                 }
@@ -98,6 +102,7 @@ void layoutChild(){
             needRelayout = false;
             int childSize = layout.getChildCount();
             int stackSize = layout.stackSize;
+            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：放行

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);

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"/>