Add interface to setHGap between two pages

alibaba · May 19, 2017 · c241c62 · c241c62
1 parent ffe2e37
commit c241c62
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/README-ch.md b/README-ch.md
@@ -28,11 +28,11 @@ UltraViewPager继承自RelativeLayout，将ViewPager和indicator置于其中，
 竖向滑动是通过在ViewPager的onInterceptTouchEvent和onTouchEvent中交换横竖向的event location，同时设置特殊PageTransformer实现，详见源码.
 
 #### 使用方法
-版本请参考mvn repository上的最新版本（目前最新版本是1.0.3），最新的 aar 都会发布到 jcenter 和 MavenCentral 上，确保配置了这两个仓库源，然后引入aar依赖：
+版本请参考mvn repository上的最新版本（目前最新版本是1.0.4），最新的 aar 都会发布到 jcenter 和 MavenCentral 上，确保配置了这两个仓库源，然后引入aar依赖：
 
 ```
 //gradle
-compile ('com.alibaba.android:ultraviewpager:1.0.3@aar') {
+compile ('com.alibaba.android:ultraviewpager:1.0.4@aar') {
 	transitive = true
 }
 
@@ -45,7 +45,7 @@ compile ('com.alibaba.android:ultraviewpager:1.0.3@aar') {
 <dependency>
   <groupId>com.alibaba.android</groupId>
   <artifactId>ultraviewpager</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4</version>
   <type>aar</type>
 </dependency>
 

diff --git a/README.md b/README.md
@@ -31,13 +31,13 @@ In order to achieve vertical scroll, through exchanging MotionEvent in onInterce
 
 #### Usage
 
-Please find the latest version(1.0.3 so far) in maven repository. The newest version has been upload to jcenter and MavenCantral, make sure you have added at least one of these repositories.
+Please find the latest version(1.0.4 so far) in maven repository. The newest version has been upload to jcenter and MavenCantral, make sure you have added at least one of these repositories.
 
 Using Gradle:
 
 ```
 //gradle
-compile ('com.alibaba.android:ultraviewpager:1.0.3@aar') {
+compile ('com.alibaba.android:ultraviewpager:1.0.4@aar') {
 	transitive = true
 }
 ```
@@ -48,7 +48,7 @@ or grab via Maven:
 <dependency>
   <groupId>com.alibaba.android</groupId>
   <artifactId>ultraviewpager</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4</version>
   <type>aar</type>
 </dependency>
 

diff --git a/gradle.properties b/gradle.properties
@@ -46,7 +46,7 @@
 GROUP=com.alibaba.android
 ARTIFACT=ultraviewpager
 VERSION=1
-VERSION_NAME=1.0.3
+VERSION_NAME=1.0.4
 PACKAGING_TYPE=aar
 systemProp.compileSdkVersion=23
 systemProp.targetSdkVersion=23

diff --git a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/IUltraViewPagerFeature.java b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/IUltraViewPagerFeature.java
@@ -158,6 +158,13 @@ interface IUltraViewPagerFeature {
      */
     void setItemRatio(double ratio);
 
+    /**
+     * Set the gap between two pages in pixel
+     *
+     * @param pixel
+     */
+    void setHGap(int pixel);
+
     /**
      * Set item margin
      *

diff --git a/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPager.java b/ultraviewpager/src/main/java/com/tmall/ultraviewpager/UltraViewPager.java
@@ -332,6 +332,13 @@ public void setRatio(float ratio) {
         viewPager.setRatio(ratio);
     }
 
+    @Override
+    public void setHGap(int pixel) {
+        int screenWidth = getContext().getResources().getDisplayMetrics().widthPixels;
+        viewPager.setMultiScreen((screenWidth - pixel) / (float) screenWidth);
+        viewPager.setPageMargin(pixel);
+    }
+
     @Override
     public void setMaxHeight(int height) {
         maxHeight = height;