Skip to content

Commit

Permalink
1、修复在scrollable模式并且没有指定tab_height时，首个TabView会错误的match VerticalTabLayo…
Browse files Browse the repository at this point in the history 
…ut导致剩余的Tab无法显示的Bug

2、修复TabView中title文字长度超过TabView的宽度后没有换行导致title显示不全的问题
  • Loading branch information
@qstumn
qstumn committed Mar 22, 2017
1 parent 8d691d9 commit c5de4ef
Show file tree
Hide file tree
Showing 9 changed files with 228 additions and 166 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.novoda:bintray-release:0.4.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
@@ -1,6 +1,6 @@
#Thu Sep 01 09:44:34 CST 2016
#Fri Mar 03 09:25:44 CST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
10 changes: 5 additions & 5 deletions verticaltablayout/build.gradle
View file
Expand Up @@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
apply plugin: 'com.novoda.bintray-release'

android {
compileSdkVersion 24
buildToolsVersion "24.0.3"
compileSdkVersion 25
buildToolsVersion '25.0.0'

defaultConfig {
minSdkVersion 14
targetSdkVersion 24
targetSdkVersion 25
versionCode 1
versionName "1.0"
}
Expand All @@ -31,6 +31,6 @@ publish {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
compile 'com.android.support:support-v4:24.2.1'
compile 'q.rorbin:badgeview:1.0.6'
compile 'com.android.support:support-v4:25.2.0'
compile 'q.rorbin:badgeview:1.1.0'
}
165 changes: 80 additions & 85 deletions verticaltablayout/src/main/java/q/rorbin/verticaltablayout/VerticalTabLayout.java
View file
Expand Up @@ -2,6 +2,7 @@

import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ValueAnimator;
import android.content.Context;
import android.content.res.TypedArray;
Expand All @@ -15,6 +16,7 @@
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.util.AttributeSet;
import android.util.Log;
import android.view.Gravity;
import android.view.View;
import android.widget.LinearLayout;
Expand All @@ -30,6 +32,8 @@
import q.rorbin.verticaltablayout.widget.TabIndicator;
import q.rorbin.verticaltablayout.widget.TabView;

import static android.R.attr.y;
import static android.content.ContentValues.TAG;
import static android.support.v4.view.ViewPager.SCROLL_STATE_IDLE;
import static android.support.v4.view.ViewPager.SCROLL_STATE_SETTLING;

Expand Down Expand Up @@ -74,7 +78,6 @@ public VerticalTabLayout(Context context, AttributeSet attrs) {
public VerticalTabLayout(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
mContext = context;
setFillViewport(true);
mTabSelectedListeners = new ArrayList<>();
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.VerticalTabLayout);
mColorIndicator = typedArray.getColor(R.styleable.VerticalTabLayout_indicator_color,
Expand All @@ -91,7 +94,8 @@ public VerticalTabLayout(Context context, AttributeSet attrs, int defStyleAttr)
}
mTabMargin = (int) typedArray.getDimension(R.styleable.VerticalTabLayout_tab_margin, 0);
mTabMode = typedArray.getInteger(R.styleable.VerticalTabLayout_tab_mode, TAB_MODE_FIXED);
mTabHeight = (int) typedArray.getDimension(R.styleable.VerticalTabLayout_tab_height, LayoutParams.WRAP_CONTENT);
int defaultTabHeight = LinearLayout.LayoutParams.WRAP_CONTENT;
mTabHeight = (int) typedArray.getDimension(R.styleable.VerticalTabLayout_tab_height, defaultTabHeight);
typedArray.recycle();
}

Expand All @@ -104,7 +108,7 @@ protected void onFinishInflate() {

private void initTabStrip() {
mTabStrip = new TabStrip(mContext);
addView(mTabStrip, new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT));
addView(mTabStrip, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
}

public void removeAllTabs() {
Expand Down Expand Up @@ -135,6 +139,12 @@ private void addTabWithMode(TabView tabView) {
params.setMargins(0, 0, 0, 0);
tabView.setLayoutParams(params);
mSelectedTab = tabView;
mTabStrip.post(new Runnable() {
@Override
public void run() {
mTabStrip.moveIndicator(0);
}
});
}
}

Expand All @@ -143,28 +153,25 @@ private void initTabWithMode(LinearLayout.LayoutParams params) {
params.height = 0;
params.weight = 1.0f;
params.setMargins(0, 0, 0, 0);
setFillViewport(true);
} else if (mTabMode == TAB_MODE_SCROLLABLE) {
params.height = mTabHeight;
params.weight = 0f;
params.setMargins(0, mTabMargin, 0, 0);
setFillViewport(false);
}
}

private void scrollToTab(int position) {
final TabView tabView = getTabAt(position);
tabView.post(new Runnable() {
@Override
public void run() {
int y = getScrollY();
int tabTop = tabView.getTop() + tabView.getHeight() / 2 - y;
int target = getHeight() / 2;
if (tabTop > target) {
smoothScrollBy(0, tabTop - target);
} else if (tabTop < target) {
smoothScrollBy(0, tabTop - target);
}
}
});
int y = getScrollY();
int tabTop = tabView.getTop() + tabView.getHeight() / 2 - y;
int target = getHeight() / 2;
if (tabTop > target) {
smoothScrollBy(0, tabTop - target);
} else if (tabTop < target) {
smoothScrollBy(0, tabTop - target);
}
}

private float mLastPositionOffset;
Expand Down Expand Up @@ -207,12 +214,12 @@ private void setTabSelected(final int position, final boolean updataIndicator, f
post(new Runnable() {
@Override
public void run() {
setTabSelectedImp(position, updataIndicator, callListener);
setTabSelectedImpl(position, updataIndicator, callListener);
}
});
}

private void setTabSelectedImp(final int position, boolean updataIndicator, boolean callListener) {
private void setTabSelectedImpl(final int position, boolean updataIndicator, boolean callListener) {
TabView view = getTabAt(position);
boolean selected;
if (selected = (view != mSelectedTab)) {
Expand All @@ -221,7 +228,7 @@ private void setTabSelectedImp(final int position, boolean updataIndicator, bool
}
view.setChecked(true);
if (updataIndicator) {
mTabStrip.moveIndicator(position);
mTabStrip.moveIndicatorWithAnimator(position);
}
mSelectedTab = view;
scrollToTab(position);
Expand Down Expand Up @@ -263,7 +270,7 @@ public void setTabMode(int mode) {
mTabStrip.post(new Runnable() {
@Override
public void run() {
mTabStrip.updataIndicatorMargin();
mTabStrip.updataIndicator();
}
});
}
Expand All @@ -287,7 +294,7 @@ public void setTabMargin(int margin) {
mTabStrip.post(new Runnable() {
@Override
public void run() {
mTabStrip.updataIndicatorMargin();
mTabStrip.updataIndicator();
}
});
}
Expand All @@ -311,7 +318,7 @@ public void setTabHeight(int height) {
mTabStrip.post(new Runnable() {
@Override
public void run() {
mTabStrip.updataIndicatorMargin();
mTabStrip.updataIndicator();
}
});
}
Expand Down Expand Up @@ -478,13 +485,13 @@ private void populateFromPagerAdapter() {
}

private class TabStrip extends LinearLayout {
private float mIndicatorY;
private float mIndicatorTopY;
private float mIndicatorX;
private float mIndicatorBottomY;
private int mLastWidth;
private int mIndicatorHeight;
private Paint mIndicatorPaint;
private RectF mIndicatorRect;
private AnimatorSet mIndicatorAnimatorSet;

public TabStrip(Context context) {
super(context);
Expand All @@ -497,26 +504,13 @@ public TabStrip(Context context) {
setIndicatorGravity();
}

private static final String TAG = "qch";
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
if (getChildCount() > 0) {
View childView = getChildAt(0);
mIndicatorHeight = childView.getMeasuredHeight();
if (mIndicatorBottomY < mIndicatorHeight) {
mIndicatorBottomY = mIndicatorHeight;
}
}
Log.i(TAG, "onMeasure: "+getMeasuredHeight());
}

protected void updataIndicatorMargin() {
int index = getSelectedTabPosition();
mIndicatorY = calcIndicatorY(index);
mIndicatorBottomY = mIndicatorY + mIndicatorHeight;
invalidate();
}


protected void setIndicatorGravity() {
if (mIndicatorGravity == Gravity.LEFT) {
mIndicatorX = 0;
Expand All @@ -543,16 +537,26 @@ public void run() {
});
}

private float calcIndicatorY(float offset) {
if (mTabMode == TAB_MODE_FIXED)
return offset * mIndicatorHeight;
return offset * (mIndicatorHeight + mTabMargin);
private void calcIndicatorY(float offset) {
int index = (int) Math.floor(offset);
View childView = getChildAt(index);
if (Math.floor(offset) != getChildCount() - 1 && Math.ceil(offset) != 0) {
View nextView = getChildAt(index + 1);
mIndicatorTopY = childView.getTop() + (nextView.getTop() - childView.getTop()) * (offset - index);
mIndicatorBottomY = childView.getBottom() + (nextView.getBottom() -
childView.getBottom()) * (offset - index);
} else {
mIndicatorTopY = childView.getTop();
mIndicatorBottomY = childView.getBottom();
}
}

protected void updataIndicator() {
moveIndicatorWithAnimator(getSelectedTabPosition());
}

protected void moveIndicator(float offset) {
mIndicatorY = calcIndicatorY(offset);
mIndicatorBottomY = mIndicatorY + mIndicatorHeight;
calcIndicatorY(offset);
invalidate();
}

Expand All @@ -561,68 +565,59 @@ protected void moveIndicator(float offset) {
*
* @param index tab location's index
*/
protected void moveIndicator(final int index) {
protected void moveIndicatorWithAnimator(int index) {
final int direction = index - getSelectedTabPosition();
final float target = calcIndicatorY(index);
final float targetBottom = target + mIndicatorHeight;
if (mIndicatorY == target) return;
View childView = getChildAt(index);
final float targetTop = childView.getTop();
final float targetBottom = childView.getBottom();
if (mIndicatorTopY == targetTop && mIndicatorBottomY == targetBottom) return;
if (mIndicatorAnimatorSet != null && mIndicatorAnimatorSet.isRunning()) {
mIndicatorAnimatorSet.end();
}
post(new Runnable() {
@Override
public void run() {
ValueAnimator anime = null;
ValueAnimator startAnime = null;
ValueAnimator endAnime = null;
if (direction > 0) {
anime = ValueAnimator.ofFloat(mIndicatorBottomY, targetBottom);
anime.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
startAnime = ValueAnimator.ofFloat(mIndicatorBottomY, targetBottom)
.setDuration(100);
startAnime.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
float value = Float.parseFloat(animation.getAnimatedValue().toString());
mIndicatorBottomY = value;
mIndicatorBottomY = Float.parseFloat(animation.getAnimatedValue().toString());
invalidate();
}
});
anime.addListener(new AnimatorListenerAdapter() {
endAnime = ValueAnimator.ofFloat(mIndicatorTopY, targetTop).setDuration(100);
endAnime.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationEnd(Animator animation) {
ValueAnimator anime2 = ValueAnimator.ofFloat(mIndicatorY, target);
anime2.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
float value = Float.parseFloat(animation.getAnimatedValue().toString());
mIndicatorY = value;
invalidate();
}
});
anime2.setDuration(100).start();
public void onAnimationUpdate(ValueAnimator animation) {
mIndicatorTopY = Float.parseFloat(animation.getAnimatedValue().toString());
invalidate();
}
});

} else if (direction < 0) {
anime = ValueAnimator.ofFloat(mIndicatorY, target);
anime.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
startAnime = ValueAnimator.ofFloat(mIndicatorTopY, targetTop).setDuration(100);
startAnime.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
mIndicatorY = Float.parseFloat(animation.getAnimatedValue().toString());
mIndicatorTopY = Float.parseFloat(animation.getAnimatedValue().toString());
invalidate();
}
});
anime.addListener(new AnimatorListenerAdapter() {
endAnime = ValueAnimator.ofFloat(mIndicatorBottomY, targetBottom).setDuration(100);
endAnime.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationEnd(Animator animation) {
ValueAnimator anime2 = ValueAnimator.ofFloat(mIndicatorBottomY, targetBottom);
anime2.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
mIndicatorBottomY = Float.parseFloat(animation.getAnimatedValue().toString());
invalidate();
}
});
anime2.setDuration(100).start();
public void onAnimationUpdate(ValueAnimator animation) {
mIndicatorBottomY = Float.parseFloat(animation.getAnimatedValue().toString());
invalidate();
}
});
}
if (anime != null) {
anime.setDuration(100).start();
}
mIndicatorAnimatorSet = new AnimatorSet();
mIndicatorAnimatorSet.play(endAnime).after(startAnime);
mIndicatorAnimatorSet.start();
}
});
}
Expand All @@ -632,7 +627,7 @@ protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
mIndicatorPaint.setColor(mColorIndicator);
mIndicatorRect.left = mIndicatorX;
mIndicatorRect.top = mIndicatorY;
mIndicatorRect.top = mIndicatorTopY;
mIndicatorRect.right = mIndicatorX + mIndicatorWidth;
mIndicatorRect.bottom = mIndicatorBottomY;
if (mIndicatorCorners != 0) {
Expand Down

0 comments on commit c5de4ef

Please sign in to comment.