Skip to content

Commit b331fe4

Browse files
committed
Update 1.1.4
1 parent ab38909 commit b331fe4

File tree

5 files changed

+34
-11
lines changed

5 files changed

+34
-11
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
Or Gradle Maven Central:
3434

3535
```groovy
36-
compile 'com.github.devlight.navigationtabbar:library:1.1.3'
36+
compile 'com.github.devlight.navigationtabbar:library:1.1.4'
3737
```
3838

3939
Or Maven:
@@ -42,7 +42,7 @@ Or Maven:
4242
<dependency>
4343
<groupId>com.github.devlight.navigationtabbar</groupId>
4444
<artifactId>library</artifactId>
45-
<version>1.1.3</version>
45+
<version>1.1.4</version>
4646
<type>aar</type>
4747
</dependency>
4848
```

app/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
</intent-filter>
1818
</activity>
1919

20-
<activity android:name=".HorizontalNtbActivity"/>
20+
<activity android:name=".HorizontalNtbActivity"
21+
android:configChanges="orientation|keyboardHidden|screenSize"/>
2122
<activity android:name=".TopHorizontalNtbActivity"/>
2223
<activity android:name=".VerticalNtbActivity"/>
2324
<activity android:name=".SamplesNtbActivity"/>

app/src/main/java/com/gigamole/navigationtabbar/HorizontalNtbActivity.java

+9-5
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,20 @@ public Object instantiateItem(final ViewGroup container, final int position) {
8181
getResources().getDrawable(R.drawable.ic_fifth), Color.parseColor(colors[4]), "Medal"));
8282
navigationTabBar.setModels(models);
8383
navigationTabBar.setViewPager(viewPager, 2);
84-
85-
navigationTabBar.setOnTabBarSelectedIndexListener(new NavigationTabBar.OnTabBarSelectedIndexListener() {
84+
navigationTabBar.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
8685
@Override
87-
public void onStartTabSelected(final NavigationTabBar.Model model, final int index) {
86+
public void onPageScrolled(final int position, final float positionOffset, final int positionOffsetPixels) {
8887

8988
}
9089

9190
@Override
92-
public void onEndTabSelected(final NavigationTabBar.Model model, final int index) {
93-
model.hideBadge();
91+
public void onPageSelected(final int position) {
92+
navigationTabBar.getModels().get(position).hideBadge();
93+
}
94+
95+
@Override
96+
public void onPageScrollStateChanged(final int state) {
97+
9498
}
9599
});
96100

library/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ apply plugin: "com.jfrog.bintray"
1919
apply plugin: 'com.github.dcendents.android-maven'
2020
apply plugin: 'maven'
2121

22-
version = "1.1.3"
22+
version = "1.1.4"
2323

2424
android {
2525
compileSdkVersion 23
@@ -29,7 +29,7 @@ android {
2929
minSdkVersion 11
3030
targetSdkVersion 23
3131
versionCode 1
32-
versionName "1.1.3"
32+
versionName "1.1.4"
3333
}
3434
buildTypes {
3535
release {

library/src/main/java/com/gigamole/library/NavigationTabBar.java

+19-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import android.animation.Animator;
2020
import android.animation.ValueAnimator;
2121
import android.content.Context;
22+
import android.content.res.Configuration;
2223
import android.content.res.TypedArray;
2324
import android.graphics.Bitmap;
2425
import android.graphics.Canvas;
@@ -1186,7 +1187,7 @@ public Parcelable onSaveInstanceState() {
11861187
return savedState;
11871188
}
11881189

1189-
static class SavedState extends BaseSavedState {
1190+
private static class SavedState extends BaseSavedState {
11901191
int index;
11911192

11921193
public SavedState(Parcelable superState) {
@@ -1218,6 +1219,23 @@ public SavedState[] newArray(int size) {
12181219
};
12191220
}
12201221

1222+
@Override
1223+
protected void onConfigurationChanged(final Configuration newConfig) {
1224+
// Config view on rotate etc.
1225+
super.onConfigurationChanged(newConfig);
1226+
requestLayout();
1227+
1228+
// Refresh pointer and state after config changed to current
1229+
final int tempIndex = mIndex;
1230+
setModelIndex(INVALID_INDEX, true);
1231+
post(new Runnable() {
1232+
@Override
1233+
public void run() {
1234+
setModelIndex(tempIndex, true);
1235+
}
1236+
});
1237+
}
1238+
12211239
// Model class
12221240
public static class Model {
12231241

0 commit comments

Comments
 (0)