diff --git a/FlycoTabLayout_Lib/build.gradle b/FlycoTabLayout_Lib/build.gradle index 6c94aee4..ce2097ce 100644 --- a/FlycoTabLayout_Lib/build.gradle +++ b/FlycoTabLayout_Lib/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.library' //apply plugin: 'com.jfrog.bintray' // 这个version是区分library版本的,因此当我们需要更新library时记得修改这个version -version = "1.4.0" +version = "1.4.2" android { compileSdkVersion 23 buildToolsVersion "22.0.1" @@ -11,7 +11,7 @@ android { defaultConfig { minSdkVersion 8 targetSdkVersion 23 - versionCode 140 + versionCode 142 versionName version } buildTypes { diff --git a/README.md b/README.md index 27dd2392..2fd12cdb 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ #FlycoTabLayout [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-FlycoTabLayout-green.svg?style=true)](https://android-arsenal.com/details/1/2756) ####[中文版](https://github.com/H07000223/FlycoTabLayout/blob/master/README_CN.md) -An Android TabLayout Lib has two kinds of TabLayout at present. +An Android TabLayout Lib has 3 kinds of TabLayout at present. * SlidingTabLayout: deeply modified from [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip). * new added attribute @@ -29,11 +29,15 @@ can be used freely with other widgets together. public void setTabData(ArrayList tabEntitys, FragmentManager fm, int containerViewId, ArrayList fragments) ``` +* SegmentTabLayout + ##Demo ![](https://github.com/H07000223/FlycoTabLayout/blob/master/preview_1.gif) ![](https://github.com/H07000223/FlycoTabLayout/blob/master/preview_2.gif) +![](https://github.com/H07000223/FlycoTabLayout/blob/master/preview_3.gif) + ##Gradle ```groovy @@ -41,7 +45,7 @@ dependencies{ compile 'com.android.support:support-v4:23.1.1' compile 'com.nineoldandroids:library:2.4.0' compile 'com.flyco.roundview:FlycoRoundView_Lib:1.1.2@aar' - compile 'com.flyco.tablayout:FlycoTabLayout_Lib:1.4.0@aar' + compile 'com.flyco.tablayout:FlycoTabLayout_Lib:1.4.2@aar' } ``` diff --git a/README_CN.md b/README_CN.md index d17fa93f..fffbac64 100644 --- a/README_CN.md +++ b/README_CN.md @@ -1,7 +1,7 @@ #FlycoTabLayout [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-FlycoTabLayout-green.svg?style=true)](https://android-arsenal.com/details/1/2756) -一个Android TabLayout库,目前有两个TabLayout +一个Android TabLayout库,目前有3个TabLayout * SlidingTabLayout:参照[PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip)进行大量修改. * 新增部分属性 @@ -28,12 +28,15 @@ public void setTabData(ArrayList tabEntitys, FragmentManager fm, int containerViewId, ArrayList fragments) ``` +* SegmentTabLayout ##Demo ![](https://github.com/H07000223/FlycoTabLayout/blob/master/preview_1.gif) ![](https://github.com/H07000223/FlycoTabLayout/blob/master/preview_2.gif) +![](https://github.com/H07000223/FlycoTabLayout/blob/master/preview_3.gif) + ##Gradle ```groovy @@ -41,7 +44,7 @@ dependencies{ compile 'com.android.support:support-v4:23.1.1' compile 'com.nineoldandroids:library:2.4.0' compile 'com.flyco.roundview:FlycoRoundView_Lib:1.1.2@aar' - compile 'com.flyco.tablayout:FlycoTabLayout_Lib:1.4.0@aar' + compile 'com.flyco.tablayout:FlycoTabLayout_Lib:1.4.2@aar' } ``` diff --git a/app/build.gradle b/app/build.gradle index 65f7b8e8..cd0dfec3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,9 +22,9 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:23.1.1' - compile project(':FlycoTabLayout_Lib') +// compile project(':FlycoTabLayout_Lib') -/* compile 'com.flyco.tablayout:FlycoTabLayout_Lib:1.4.0@aar' + compile 'com.flyco.tablayout:FlycoTabLayout_Lib:1.4.2@aar' compile 'com.flyco.roundview:FlycoRoundView_Lib:1.1.2@aar' - compile 'com.nineoldandroids:library:2.4.0'*/ + compile 'com.nineoldandroids:library:2.4.0' } diff --git a/preview_3.gif b/preview_3.gif new file mode 100644 index 00000000..0875c1c1 Binary files /dev/null and b/preview_3.gif differ