diff options
| author | Aurelien Hubert <aurel.hubert@gmail.com> | 2016-04-11 10:25:15 +0200 |
|---|---|---|
| committer | Aurelien Hubert <aurel.hubert@gmail.com> | 2016-04-11 10:25:15 +0200 |
| commit | ae990b69009438c310d83f4a82a5c45cfa361741 (patch) | |
| tree | dce000a3cde3027fcf1ac901b20c3a21112f0342 | |
| parent | 4d0fe0d9d1657347ef223410adef386d26b15f24 (diff) | |
| parent | 3f3e99c38a3520b25fcff25ae101b7ae658a3812 (diff) | |
| download | android_external_ahbottomnavigation-ae990b69009438c310d83f4a82a5c45cfa361741.tar.gz android_external_ahbottomnavigation-ae990b69009438c310d83f4a82a5c45cfa361741.tar.bz2 android_external_ahbottomnavigation-ae990b69009438c310d83f4a82a5c45cfa361741.zip | |
Merge pull request #36 from kaiguo/master
Fix setCurrentItem
| -rw-r--r-- | ahbottomnavigation/src/main/java/com/aurelhubert/ahbottomnavigation/AHBottomNavigation.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ahbottomnavigation/src/main/java/com/aurelhubert/ahbottomnavigation/AHBottomNavigation.java b/ahbottomnavigation/src/main/java/com/aurelhubert/ahbottomnavigation/AHBottomNavigation.java index d4be168..a417c73 100644 --- a/ahbottomnavigation/src/main/java/com/aurelhubert/ahbottomnavigation/AHBottomNavigation.java +++ b/ahbottomnavigation/src/main/java/com/aurelhubert/ahbottomnavigation/AHBottomNavigation.java @@ -791,15 +791,13 @@ public class AHBottomNavigation extends FrameLayout { Log.w(TAG, "The position is out of bounds of the items (" + items.size() + " elements)"); return; } - if (views.size() == 0) { - currentItem = position; + + if (items.size() == MIN_ITEMS || forceTitlesDisplay) { + updateItems(position, useCallback); } else { - if (items.size() == MIN_ITEMS || forceTitlesDisplay) { - updateItems(position, useCallback); - } else { - updateSmallItems(position, useCallback); - } + updateSmallItems(position, useCallback); } + } /** |