diff --git a/README.md b/README.md index ced1101..64d7a97 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-BottomNavigation-green.svg?style=true)](https://android-arsenal.com/details/1/3612) [![Build Status](https://travis-ci.org/Ashok-Varma/BottomNavigation.svg?branch=master)](https://travis-ci.org/Ashok-Varma/BottomNavigation) -[![codecov](https://codecov.io/gh/Ashok-Varma/BottomNavigation/branch/master/graph/badge.svg)](https://codecov.io/gh/Ashok-Varma/BottomNavigation) # BottomNavigation @@ -32,17 +31,17 @@ Download [the latest JAR][mavenAarDownload] or grab via Maven: com.ashokvarma.android bottom-navigation-bar - 1.2.0 + 1.2.1 pom ``` or Gradle: ```groovy -compile 'com.ashokvarma.android:bottom-navigation-bar:1.2.0' +compile 'com.ashokvarma.android:bottom-navigation-bar:1.2.1' ``` or Ivy: ```xml - + ``` @@ -205,5 +204,5 @@ limitations under the License. [googlePlayStoreLink]: https://play.google.com/store/apps/details?id=com.ashokvarma.bottomnavigation.sample [googlePage]: https://www.google.com/design/spec/components/bottom-navigation.html - [mavenAarDownload]: https://repo1.maven.org/maven2/com/ashokvarma/android/bottom-navigation-bar/1.2.0/bottom-navigation-bar-1.2.0.aar + [mavenAarDownload]: https://repo1.maven.org/maven2/com/ashokvarma/android/bottom-navigation-bar/1.2.1/bottom-navigation-bar-1.2.1.aar [mavenLatestJarDownload]: https://search.maven.org/remote_content?g=com.ashokvarma.android&a=bottom-navigation-bar&v=LATEST diff --git a/library/.gitignore b/bottom-navigation-bar/.gitignore similarity index 100% rename from library/.gitignore rename to bottom-navigation-bar/.gitignore diff --git a/library/bintray_lib.gradle b/bottom-navigation-bar/bintray_lib.gradle similarity index 84% rename from library/bintray_lib.gradle rename to bottom-navigation-bar/bintray_lib.gradle index 2945228..375c026 100644 --- a/library/bintray_lib.gradle +++ b/bottom-navigation-bar/bintray_lib.gradle @@ -32,18 +32,18 @@ artifacts { // Bintray Properties properties = new Properties() -def user = System.env.gradlePublishUser -def key = System.env.gradlePublishKey -def secret = System.env.gradlePublishSecret +def defUser = System.env.gradlePublishUser +def defKey = System.env.gradlePublishKey +def defSecret = System.env.gradlePublishSecret -if (!key || !user || !secret) { +if (!defKey || !defUser || !defSecret) { // This is for local build properties.load(project.rootProject.file('local.properties').newDataInputStream()) } else { // This is for remote build set System Properties in travis system - properties.setProperty("bintray.user", user) - properties.setProperty("bintray.apikey", key) - properties.setProperty("bintray.gpg.password", secret) + properties.setProperty("bintray.user", defUser) + properties.setProperty("bintray.apikey", defKey) + properties.setProperty("bintray.gpg.password", defSecret) } bintray { diff --git a/library/build.gradle b/bottom-navigation-bar/build.gradle similarity index 100% rename from library/build.gradle rename to bottom-navigation-bar/build.gradle diff --git a/library/install_lib.gradle b/bottom-navigation-bar/install_lib.gradle similarity index 100% rename from library/install_lib.gradle rename to bottom-navigation-bar/install_lib.gradle diff --git a/library/proguard-rules.pro b/bottom-navigation-bar/proguard-rules.pro similarity index 100% rename from library/proguard-rules.pro rename to bottom-navigation-bar/proguard-rules.pro diff --git a/library/src/main/AndroidManifest.xml b/bottom-navigation-bar/src/main/AndroidManifest.xml similarity index 100% rename from library/src/main/AndroidManifest.xml rename to bottom-navigation-bar/src/main/AndroidManifest.xml diff --git a/library/src/main/java/com/ashokvarma/bottomnavigation/BadgeItem.java b/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BadgeItem.java similarity index 100% rename from library/src/main/java/com/ashokvarma/bottomnavigation/BadgeItem.java rename to bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BadgeItem.java diff --git a/library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationBar.java b/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationBar.java similarity index 100% rename from library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationBar.java rename to bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationBar.java diff --git a/library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationHelper.java b/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationHelper.java similarity index 100% rename from library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationHelper.java rename to bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationHelper.java diff --git a/library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationItem.java b/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationItem.java similarity index 100% rename from library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationItem.java rename to bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationItem.java diff --git a/library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationTab.java b/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationTab.java similarity index 100% rename from library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationTab.java rename to bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationTab.java diff --git a/library/src/main/java/com/ashokvarma/bottomnavigation/FixedBottomNavigationTab.java b/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/FixedBottomNavigationTab.java similarity index 100% rename from library/src/main/java/com/ashokvarma/bottomnavigation/FixedBottomNavigationTab.java rename to bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/FixedBottomNavigationTab.java diff --git a/library/src/main/java/com/ashokvarma/bottomnavigation/ShiftingBottomNavigationTab.java b/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/ShiftingBottomNavigationTab.java similarity index 95% rename from library/src/main/java/com/ashokvarma/bottomnavigation/ShiftingBottomNavigationTab.java rename to bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/ShiftingBottomNavigationTab.java index 03f15cf..729a778 100644 --- a/library/src/main/java/com/ashokvarma/bottomnavigation/ShiftingBottomNavigationTab.java +++ b/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/ShiftingBottomNavigationTab.java @@ -72,9 +72,7 @@ public void unSelect(boolean setActiveColor, int animationDuration) { anim.setDuration(animationDuration); this.startAnimation(anim); -// labelView.animate().scaleY(0).scaleX(0).setDuration(animationDuration).start(); - labelView.setScaleY(0); - labelView.setScaleX(0); + labelView.animate().scaleY(0).scaleX(0).setDuration(0).start(); } // @Override diff --git a/library/src/main/java/com/ashokvarma/bottomnavigation/behaviour/BottomVerticalScrollBehavior.java b/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/behaviour/BottomVerticalScrollBehavior.java similarity index 100% rename from library/src/main/java/com/ashokvarma/bottomnavigation/behaviour/BottomVerticalScrollBehavior.java rename to bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/behaviour/BottomVerticalScrollBehavior.java diff --git a/library/src/main/java/com/ashokvarma/bottomnavigation/behaviour/VerticalScrollingBehavior.java b/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/behaviour/VerticalScrollingBehavior.java similarity index 100% rename from library/src/main/java/com/ashokvarma/bottomnavigation/behaviour/VerticalScrollingBehavior.java rename to bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/behaviour/VerticalScrollingBehavior.java diff --git a/library/src/main/java/com/ashokvarma/bottomnavigation/utils/Utils.java b/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/utils/Utils.java similarity index 100% rename from library/src/main/java/com/ashokvarma/bottomnavigation/utils/Utils.java rename to bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/utils/Utils.java diff --git a/library/src/main/res/layout/bottom_navigation_bar_container.xml b/bottom-navigation-bar/src/main/res/layout/bottom_navigation_bar_container.xml similarity index 100% rename from library/src/main/res/layout/bottom_navigation_bar_container.xml rename to bottom-navigation-bar/src/main/res/layout/bottom_navigation_bar_container.xml diff --git a/library/src/main/res/layout/fixed_bottom_navigation_item.xml b/bottom-navigation-bar/src/main/res/layout/fixed_bottom_navigation_item.xml similarity index 100% rename from library/src/main/res/layout/fixed_bottom_navigation_item.xml rename to bottom-navigation-bar/src/main/res/layout/fixed_bottom_navigation_item.xml diff --git a/library/src/main/res/layout/shifting_bottom_navigation_item.xml b/bottom-navigation-bar/src/main/res/layout/shifting_bottom_navigation_item.xml similarity index 100% rename from library/src/main/res/layout/shifting_bottom_navigation_item.xml rename to bottom-navigation-bar/src/main/res/layout/shifting_bottom_navigation_item.xml diff --git a/library/src/main/res/values/attrs.xml b/bottom-navigation-bar/src/main/res/values/attrs.xml similarity index 100% rename from library/src/main/res/values/attrs.xml rename to bottom-navigation-bar/src/main/res/values/attrs.xml diff --git a/library/src/main/res/values/dimens.xml b/bottom-navigation-bar/src/main/res/values/dimens.xml similarity index 100% rename from library/src/main/res/values/dimens.xml rename to bottom-navigation-bar/src/main/res/values/dimens.xml diff --git a/library/src/main/res/values/strings.xml b/bottom-navigation-bar/src/main/res/values/strings.xml similarity index 100% rename from library/src/main/res/values/strings.xml rename to bottom-navigation-bar/src/main/res/values/strings.xml diff --git a/library/src/main/res/values/styles.xml b/bottom-navigation-bar/src/main/res/values/styles.xml similarity index 100% rename from library/src/main/res/values/styles.xml rename to bottom-navigation-bar/src/main/res/values/styles.xml diff --git a/gradle.properties b/gradle.properties index 9bab9f0..2409984 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,8 +25,8 @@ ANDROID_BUILD_TOOLS_VERSION=23.0.3 ANDROID_BUILD_TARGET_SDK_VERSION=23 ANDROID_BUILD_MIN_SDK_VERSION=14 -APP_VERSION_NAME = 1.2.0 -APP_VERSION_CODE = 3 +APP_VERSION_NAME = 1.2.1 +APP_VERSION_CODE = 4 ANDROID_SUPPORT_LIBRARY_VERSION = 23.4.0 ANDROID_PLAY_SERVICES_VERSION = 8.4.0 \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle index 3ff9a24..5a88c5b 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -51,7 +51,7 @@ dependencies { testCompile 'junit:junit:4.12' compile "com.android.support:appcompat-v7:${supportLibraryVersion}" compile "com.android.support:design:${supportLibraryVersion}" - compile project(':library') + compile project(':bottom-navigation-bar') compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true; } diff --git a/settings.gradle b/settings.gradle index 52baf7e..5c941b3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':sample', ':library' +include ':sample', ':bottom-navigation-bar'