Skip to content

Commit

Permalink
remove the dependence of NineOldAnimation
Browse files Browse the repository at this point in the history
  • Loading branch information
H07000223 committed Apr 28, 2016
1 parent 188ba5d commit b082039
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 17 deletions.
4 changes: 4 additions & 0 deletions CHNAGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,7 @@ Version 2.0.0 *(2016.3.1)*
* remove the dependence of FlycoRoundView
* new added method getIconView and getTitleView

Version 2.0.2 *(2016.4.23)*
----------------------------
* remove the dependence of NineOldAnimation(only support 3.0+)

11 changes: 6 additions & 5 deletions FlycoTabLayout_Lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ apply plugin: 'com.android.library'
//apply plugin: 'com.jfrog.bintray'

// 这个version是区分library版本的,因此当我们需要更新library时记得修改这个version
version = "2.0.0"
version = "2.0.2"
android {
compileSdkVersion 23
buildToolsVersion "23.0.2"

defaultConfig {
minSdkVersion 8
minSdkVersion 11
targetSdkVersion 23
versionCode 200
versionCode 202
versionName version
}
buildTypes {
Expand All @@ -24,8 +24,9 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-v4:23.1.1'
compile 'com.nineoldandroids:library:2.4.0'
compile 'com.android.support:support-v4:23.3.0'
// compile 'com.android.support:appcompat-v7:23.3.0'
// compile 'com.nineoldandroids:library:2.4.0'
}

//def siteUrl = 'https://github.com/H07000223' // 项目的主页
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.flyco.tablayout;

import android.animation.TypeEvaluator;
import android.animation.ValueAnimator;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Canvas;
Expand Down Expand Up @@ -29,8 +31,6 @@
import com.flyco.tablayout.utils.FragmentChangeManager;
import com.flyco.tablayout.utils.UnreadMsgUtils;
import com.flyco.tablayout.widget.MsgView;
import com.nineoldandroids.animation.TypeEvaluator;
import com.nineoldandroids.animation.ValueAnimator;

import java.util.ArrayList;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.flyco.tablayout;

import android.animation.TypeEvaluator;
import android.animation.ValueAnimator;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Canvas;
Expand All @@ -25,8 +27,6 @@
import com.flyco.tablayout.utils.FragmentChangeManager;
import com.flyco.tablayout.utils.UnreadMsgUtils;
import com.flyco.tablayout.widget.MsgView;
import com.nineoldandroids.animation.TypeEvaluator;
import com.nineoldandroids.animation.ValueAnimator;

import java.util.ArrayList;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package com.flyco.tablayout.listener;

import android.view.View;
import android.view.ViewGroup;
import android.support.annotation.DrawableRes;

public interface CustomTabEntity {
String getTabTitle();

@DrawableRes
int getTabSelectedIcon();

@DrawableRes
int getTabUnselectedIcon();
}
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ can be used freely with other widgets together.
- remove the dependence of FlycoRoundView
- new added method getIconView and getTitleView
> v2.0.2(2016-04-23)
- remove the dependence of NineOldAnimation(only support 3.0+)
##Gradle
Expand All @@ -62,6 +65,12 @@ dependencies{
compile 'com.nineoldandroids:library:2.4.0'
compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.0.0@aar'
}
After v2.0.2(support 3.0+)
dependencies{
compile 'com.android.support:support-v4:23.1.1'
compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.0.2@aar'
}
```
##Attributes
Expand Down
10 changes: 9 additions & 1 deletion README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
- 删除了对FlycoRoundView库的依赖
- 新增方法getIconView和getTitleView(为了某些情况需要动态更新icon之类的)

> v2.0.2(2016-04-23)
- 删除了对NineOldAnimation库依赖(仅支持3.0+)

##Gradle

Expand All @@ -55,12 +57,18 @@ dependencies{
compile 'com.flyco.tablayout:FlycoTabLayout_Lib:1.5.0@aar'
}

After v2.0.0
After v2.0.0(support 2.2+)
dependencies{
compile 'com.android.support:support-v4:23.1.1'
compile 'com.nineoldandroids:library:2.4.0'
compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.0.0@aar'
}

After v2.0.2(support 3.0+)
dependencies{
compile 'com.android.support:support-v4:23.1.1'
compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.0.2@aar'
}
```

##Attributes
Expand Down
7 changes: 5 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ android {

defaultConfig {
applicationId "com.flyco.tablayoutsamples"
minSdkVersion 8
minSdkVersion 11
targetSdkVersion 23
versionCode 1
versionName "1.0"
Expand All @@ -21,9 +21,12 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:appcompat-v7:23.3.0'
compile project(':FlycoTabLayout_Lib')

//--->support 3.0+
// compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.0.2@aar'
//--->support 2.2+
// compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.0.0@aar'
// compile 'com.nineoldandroids:library:2.4.0'
}
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'
classpath 'com.android.tools.build:gradle:2.0.0'
// classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
// classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
// classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

0 comments on commit b082039

Please sign in to comment.