From e58435e47c6140581cd57a3ab03d6fc5ee4c986a Mon Sep 17 00:00:00 2001 From: Ashok-Varma Date: Thu, 19 May 2016 21:41:49 +0530 Subject: [PATCH] Restructured whole project for better navigation --- README.md | 3 +++ {app => library}/.gitignore | 0 .../build.gradle | 0 {app => library}/proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../bottomnavigation/BadgeItem.java | 7 ++--- .../bottomnavigation/BottomNavigationBar.java | 7 ++--- .../BottomNavigationHelper.java | 0 .../BottomNavigationItem.java | 4 +-- .../bottomnavigation/BottomNavigationTab.java | 0 .../FixedBottomNavigationTab.java | 0 .../ShiftingBottomNavigationTab.java | 0 .../BottomVerticalScrollBehavior.java | 0 .../behaviour/VerticalScrollingBehavior.java | 0 .../bottomnavigation/utils/Utils.java | 0 .../bottom_navigation_bar_container.xml | 0 .../layout/fixed_bottom_navigation_item.xml | 1 + .../shifting_bottom_navigation_item.xml | 1 + .../src/main/res/values/attrs.xml | 0 .../src/main/res/values/dimens.xml | 0 library/src/main/res/values/strings.xml | 4 +++ .../src/main/res/values/styles.xml | 0 {bottom-navigation-bar => sample}/.gitignore | 0 {app => sample}/build.gradle | 2 +- .../proguard-rules.pro | 0 {app => sample}/src/main/AndroidManifest.xml | 4 ++- .../sample/BottomNavigationActivity.java | 0 .../res/drawable-hdpi/ic_book_white_24dp.png | Bin .../drawable-hdpi/ic_favorite_white_24dp.png | Bin .../ic_find_replace_white_24dp.png | Bin .../res/drawable-hdpi/ic_home_white_24dp.png | Bin .../drawable-hdpi/ic_launch_white_24dp.png | Bin .../res/drawable-hdpi/ic_link_white_24dp.png | Bin .../ic_location_on_white_24dp.png | Bin .../ic_music_note_white_24dp.png | Bin .../res/drawable-hdpi/ic_tv_white_24dp.png | Bin .../ic_videogame_asset_white_24dp.png | Bin .../res/drawable-mdpi/ic_book_white_24dp.png | Bin .../drawable-mdpi/ic_favorite_white_24dp.png | Bin .../ic_find_replace_white_24dp.png | Bin .../res/drawable-mdpi/ic_home_white_24dp.png | Bin .../drawable-mdpi/ic_launch_white_24dp.png | Bin .../res/drawable-mdpi/ic_link_white_24dp.png | Bin .../ic_location_on_white_24dp.png | Bin .../ic_music_note_white_24dp.png | Bin .../res/drawable-mdpi/ic_tv_white_24dp.png | Bin .../ic_videogame_asset_white_24dp.png | Bin .../res/drawable-xhdpi/ic_book_white_24dp.png | Bin .../drawable-xhdpi/ic_favorite_white_24dp.png | Bin .../ic_find_replace_white_24dp.png | Bin .../res/drawable-xhdpi/ic_home_white_24dp.png | Bin .../drawable-xhdpi/ic_launch_white_24dp.png | Bin .../res/drawable-xhdpi/ic_link_white_24dp.png | Bin .../ic_location_on_white_24dp.png | Bin .../ic_music_note_white_24dp.png | Bin .../res/drawable-xhdpi/ic_tv_white_24dp.png | Bin .../ic_videogame_asset_white_24dp.png | Bin .../drawable-xxhdpi/ic_book_white_24dp.png | Bin .../ic_favorite_white_24dp.png | Bin .../ic_find_replace_white_24dp.png | Bin .../drawable-xxhdpi/ic_home_white_24dp.png | Bin .../drawable-xxhdpi/ic_launch_white_24dp.png | Bin .../drawable-xxhdpi/ic_link_white_24dp.png | Bin .../ic_location_on_white_24dp.png | Bin .../ic_music_note_white_24dp.png | Bin .../res/drawable-xxhdpi/ic_tv_white_24dp.png | Bin .../ic_videogame_asset_white_24dp.png | Bin .../drawable-xxxhdpi/ic_book_white_24dp.png | Bin .../ic_favorite_white_24dp.png | Bin .../ic_find_replace_white_24dp.png | Bin .../drawable-xxxhdpi/ic_home_white_24dp.png | Bin .../drawable-xxxhdpi/ic_launch_white_24dp.png | Bin .../drawable-xxxhdpi/ic_link_white_24dp.png | Bin .../ic_location_on_white_24dp.png | Bin .../ic_music_note_white_24dp.png | Bin .../res/drawable-xxxhdpi/ic_tv_white_24dp.png | Bin .../ic_videogame_asset_white_24dp.png | Bin .../res/layout/activity_bottom_navigation.xml | 24 +++++++++--------- .../src/main/res/menu/home_menu.xml | 2 +- .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-ldpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../src/main/res/values-w820dp/dimens.xml | 0 .../src/main/res/values/colors.xml | 0 .../src/main/res/values/dimens.xml | 0 .../src/main/res/values/strings.xml | 11 ++++++++ .../src/main/res/values/styles.xml | 0 settings.gradle | 2 +- 91 files changed, 48 insertions(+), 24 deletions(-) rename {app => library}/.gitignore (100%) rename {bottom-navigation-bar => library}/build.gradle (100%) rename {app => library}/proguard-rules.pro (100%) rename {bottom-navigation-bar => library}/src/main/AndroidManifest.xml (100%) rename {bottom-navigation-bar => library}/src/main/java/com/ashokvarma/bottomnavigation/BadgeItem.java (98%) rename {bottom-navigation-bar => library}/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationBar.java (98%) rename {bottom-navigation-bar => library}/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationHelper.java (100%) rename {bottom-navigation-bar => library}/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationItem.java (98%) rename {bottom-navigation-bar => library}/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationTab.java (100%) rename {bottom-navigation-bar => library}/src/main/java/com/ashokvarma/bottomnavigation/FixedBottomNavigationTab.java (100%) rename {bottom-navigation-bar => library}/src/main/java/com/ashokvarma/bottomnavigation/ShiftingBottomNavigationTab.java (100%) rename {bottom-navigation-bar => library}/src/main/java/com/ashokvarma/bottomnavigation/behaviour/BottomVerticalScrollBehavior.java (100%) rename {bottom-navigation-bar => library}/src/main/java/com/ashokvarma/bottomnavigation/behaviour/VerticalScrollingBehavior.java (100%) rename {bottom-navigation-bar => library}/src/main/java/com/ashokvarma/bottomnavigation/utils/Utils.java (100%) rename {bottom-navigation-bar => library}/src/main/res/layout/bottom_navigation_bar_container.xml (100%) rename {bottom-navigation-bar => library}/src/main/res/layout/fixed_bottom_navigation_item.xml (97%) rename {bottom-navigation-bar => library}/src/main/res/layout/shifting_bottom_navigation_item.xml (97%) rename {bottom-navigation-bar => library}/src/main/res/values/attrs.xml (100%) rename {bottom-navigation-bar => library}/src/main/res/values/dimens.xml (100%) create mode 100644 library/src/main/res/values/strings.xml rename {bottom-navigation-bar => library}/src/main/res/values/styles.xml (100%) rename {bottom-navigation-bar => sample}/.gitignore (100%) rename {app => sample}/build.gradle (97%) rename {bottom-navigation-bar => sample}/proguard-rules.pro (100%) rename {app => sample}/src/main/AndroidManifest.xml (99%) rename {app => sample}/src/main/java/com/ashokvarma/bottomnavigation/sample/BottomNavigationActivity.java (100%) rename {app => sample}/src/main/res/drawable-hdpi/ic_book_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-hdpi/ic_favorite_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-hdpi/ic_find_replace_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-hdpi/ic_home_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-hdpi/ic_launch_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-hdpi/ic_link_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-hdpi/ic_music_note_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-hdpi/ic_tv_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-hdpi/ic_videogame_asset_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-mdpi/ic_book_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-mdpi/ic_favorite_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-mdpi/ic_find_replace_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-mdpi/ic_home_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-mdpi/ic_launch_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-mdpi/ic_link_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-mdpi/ic_music_note_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-mdpi/ic_tv_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-mdpi/ic_videogame_asset_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xhdpi/ic_book_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xhdpi/ic_favorite_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xhdpi/ic_find_replace_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xhdpi/ic_home_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xhdpi/ic_launch_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xhdpi/ic_link_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xhdpi/ic_music_note_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xhdpi/ic_tv_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xhdpi/ic_videogame_asset_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxhdpi/ic_favorite_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxhdpi/ic_find_replace_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxhdpi/ic_home_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxhdpi/ic_launch_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxhdpi/ic_link_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxhdpi/ic_music_note_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxhdpi/ic_tv_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxhdpi/ic_videogame_asset_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxxhdpi/ic_favorite_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxxhdpi/ic_find_replace_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxxhdpi/ic_home_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxxhdpi/ic_launch_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxxhdpi/ic_link_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxxhdpi/ic_music_note_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxxhdpi/ic_tv_white_24dp.png (100%) rename {app => sample}/src/main/res/drawable-xxxhdpi/ic_videogame_asset_white_24dp.png (100%) rename {app => sample}/src/main/res/layout/activity_bottom_navigation.xml (87%) rename {app => sample}/src/main/res/menu/home_menu.xml (88%) rename {app => sample}/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {app => sample}/src/main/res/mipmap-ldpi/ic_launcher.png (100%) rename {app => sample}/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {app => sample}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {app => sample}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {app => sample}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {app => sample}/src/main/res/values-w820dp/dimens.xml (100%) rename {app => sample}/src/main/res/values/colors.xml (100%) rename {app => sample}/src/main/res/values/dimens.xml (100%) rename {app => sample}/src/main/res/values/strings.xml (97%) rename {app => sample}/src/main/res/values/styles.xml (100%) diff --git a/README.md b/README.md index 31fdda0..c500abd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-BottomNavigation-green.svg?style=true)](https://android-arsenal.com/details/1/3612) + + # BottomNavigation **get sample apk from [Google Play Store][googlePlayStoreLink]** diff --git a/app/.gitignore b/library/.gitignore similarity index 100% rename from app/.gitignore rename to library/.gitignore diff --git a/bottom-navigation-bar/build.gradle b/library/build.gradle similarity index 100% rename from bottom-navigation-bar/build.gradle rename to library/build.gradle diff --git a/app/proguard-rules.pro b/library/proguard-rules.pro similarity index 100% rename from app/proguard-rules.pro rename to library/proguard-rules.pro diff --git a/bottom-navigation-bar/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml similarity index 100% rename from bottom-navigation-bar/src/main/AndroidManifest.xml rename to library/src/main/AndroidManifest.xml diff --git a/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BadgeItem.java b/library/src/main/java/com/ashokvarma/bottomnavigation/BadgeItem.java similarity index 98% rename from bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BadgeItem.java rename to library/src/main/java/com/ashokvarma/bottomnavigation/BadgeItem.java index 1a1918b..ed72a1e 100644 --- a/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BadgeItem.java +++ b/library/src/main/java/com/ashokvarma/bottomnavigation/BadgeItem.java @@ -4,6 +4,7 @@ import android.graphics.Color; import android.support.annotation.ColorRes; import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewPropertyAnimatorCompat; import android.support.v4.view.ViewPropertyAnimatorListener; @@ -224,7 +225,7 @@ protected BadgeItem setTextView(TextView mTextView) { */ protected int getBackgroundColor(Context context) { if (this.mBackgroundColorResource != 0) { - return context.getResources().getColor(mBackgroundColorResource); + return ContextCompat.getColor(context, mBackgroundColorResource); } else if (!TextUtils.isEmpty(mBackgroundColorCode)) { return Color.parseColor(mBackgroundColorCode); } else { @@ -238,7 +239,7 @@ protected int getBackgroundColor(Context context) { */ protected int getTextColor(Context context) { if (this.mTextColorResource != 0) { - return context.getResources().getColor(mTextColorResource); + return ContextCompat.getColor(context, mTextColorResource); } else if (!TextUtils.isEmpty(mTextColorCode)) { return Color.parseColor(mTextColorCode); } else { @@ -259,7 +260,7 @@ protected CharSequence getText() { */ protected int getBorderColor(Context context) { if (this.mBorderColorResource != 0) { - return context.getResources().getColor(mBorderColorResource); + return ContextCompat.getColor(context, mBorderColorResource); } else if (!TextUtils.isEmpty(mBorderColorCode)) { return Color.parseColor(mBorderColorCode); } else { diff --git a/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationBar.java b/library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationBar.java similarity index 98% rename from bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationBar.java rename to library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationBar.java index b85ac1f..5473c41 100644 --- a/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationBar.java +++ b/library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationBar.java @@ -8,6 +8,7 @@ import android.support.annotation.ColorRes; import android.support.annotation.IntDef; import android.support.design.widget.CoordinatorLayout; +import android.support.v4.content.ContextCompat; import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewPropertyAnimatorCompat; import android.support.v4.view.animation.LinearOutSlowInInterpolator; @@ -256,7 +257,7 @@ public BottomNavigationBar setBackgroundStyle(@BackgroundStyle int backgroundSty * @return this, to allow builder pattern */ public BottomNavigationBar setActiveColor(@ColorRes int activeColor) { - this.mActiveColor = getContext().getResources().getColor(activeColor); + this.mActiveColor = ContextCompat.getColor(getContext(), activeColor); return this; } @@ -274,7 +275,7 @@ public BottomNavigationBar setActiveColor(String activeColorCode) { * @return this, to allow builder pattern */ public BottomNavigationBar setInActiveColor(@ColorRes int inActiveColor) { - this.mInActiveColor = getContext().getResources().getColor(inActiveColor); + this.mInActiveColor = ContextCompat.getColor(getContext(), inActiveColor); return this; } @@ -292,7 +293,7 @@ public BottomNavigationBar setInActiveColor(String inActiveColorCode) { * @return this, to allow builder pattern */ public BottomNavigationBar setBarBackgroundColor(@ColorRes int backgroundColor) { - this.mBackgroundColor = getContext().getResources().getColor(backgroundColor); + this.mBackgroundColor = ContextCompat.getColor(getContext(), backgroundColor); return this; } diff --git a/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationHelper.java b/library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationHelper.java similarity index 100% rename from bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationHelper.java rename to library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationHelper.java diff --git a/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationItem.java b/library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationItem.java similarity index 98% rename from bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationItem.java rename to library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationItem.java index f98d640..6ef7089 100644 --- a/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationItem.java +++ b/library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationItem.java @@ -217,7 +217,7 @@ protected boolean isInActiveIconAvailable() { */ protected int getActiveColor(Context context) { if (this.mActiveColorResource != 0) { - return context.getResources().getColor(mActiveColorResource); + return ContextCompat.getColor(context, mActiveColorResource); } else if (!TextUtils.isEmpty(mActiveColorCode)) { return Color.parseColor(mActiveColorCode); } else if (this.mActiveColor != 0) { @@ -233,7 +233,7 @@ protected int getActiveColor(Context context) { */ protected int getInActiveColor(Context context) { if (this.mInActiveColorResource != 0) { - return context.getResources().getColor(mInActiveColorResource); + return ContextCompat.getColor(context, mInActiveColorResource); } else if (!TextUtils.isEmpty(mInActiveColorCode)) { return Color.parseColor(mInActiveColorCode); } else if (this.mInActiveColor != 0) { diff --git a/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationTab.java b/library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationTab.java similarity index 100% rename from bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationTab.java rename to library/src/main/java/com/ashokvarma/bottomnavigation/BottomNavigationTab.java diff --git a/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/FixedBottomNavigationTab.java b/library/src/main/java/com/ashokvarma/bottomnavigation/FixedBottomNavigationTab.java similarity index 100% rename from bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/FixedBottomNavigationTab.java rename to library/src/main/java/com/ashokvarma/bottomnavigation/FixedBottomNavigationTab.java diff --git a/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/ShiftingBottomNavigationTab.java b/library/src/main/java/com/ashokvarma/bottomnavigation/ShiftingBottomNavigationTab.java similarity index 100% rename from bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/ShiftingBottomNavigationTab.java rename to library/src/main/java/com/ashokvarma/bottomnavigation/ShiftingBottomNavigationTab.java diff --git a/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/behaviour/BottomVerticalScrollBehavior.java b/library/src/main/java/com/ashokvarma/bottomnavigation/behaviour/BottomVerticalScrollBehavior.java similarity index 100% rename from bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/behaviour/BottomVerticalScrollBehavior.java rename to library/src/main/java/com/ashokvarma/bottomnavigation/behaviour/BottomVerticalScrollBehavior.java diff --git a/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/behaviour/VerticalScrollingBehavior.java b/library/src/main/java/com/ashokvarma/bottomnavigation/behaviour/VerticalScrollingBehavior.java similarity index 100% rename from bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/behaviour/VerticalScrollingBehavior.java rename to library/src/main/java/com/ashokvarma/bottomnavigation/behaviour/VerticalScrollingBehavior.java diff --git a/bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/utils/Utils.java b/library/src/main/java/com/ashokvarma/bottomnavigation/utils/Utils.java similarity index 100% rename from bottom-navigation-bar/src/main/java/com/ashokvarma/bottomnavigation/utils/Utils.java rename to library/src/main/java/com/ashokvarma/bottomnavigation/utils/Utils.java diff --git a/bottom-navigation-bar/src/main/res/layout/bottom_navigation_bar_container.xml b/library/src/main/res/layout/bottom_navigation_bar_container.xml similarity index 100% rename from bottom-navigation-bar/src/main/res/layout/bottom_navigation_bar_container.xml rename to library/src/main/res/layout/bottom_navigation_bar_container.xml diff --git a/bottom-navigation-bar/src/main/res/layout/fixed_bottom_navigation_item.xml b/library/src/main/res/layout/fixed_bottom_navigation_item.xml similarity index 97% rename from bottom-navigation-bar/src/main/res/layout/fixed_bottom_navigation_item.xml rename to library/src/main/res/layout/fixed_bottom_navigation_item.xml index 3872adc..ee85506 100644 --- a/bottom-navigation-bar/src/main/res/layout/fixed_bottom_navigation_item.xml +++ b/library/src/main/res/layout/fixed_bottom_navigation_item.xml @@ -18,6 +18,7 @@ android:id="@+id/fixed_bottom_navigation_icon" android:layout_width="@dimen/fixed_icon_grid" android:layout_height="@dimen/fixed_icon_grid" + android:contentDescription="@string/icon" android:layout_gravity="center" android:gravity="center" android:scaleType="fitXY" /> diff --git a/bottom-navigation-bar/src/main/res/layout/shifting_bottom_navigation_item.xml b/library/src/main/res/layout/shifting_bottom_navigation_item.xml similarity index 97% rename from bottom-navigation-bar/src/main/res/layout/shifting_bottom_navigation_item.xml rename to library/src/main/res/layout/shifting_bottom_navigation_item.xml index c266e4b..3d784f5 100644 --- a/bottom-navigation-bar/src/main/res/layout/shifting_bottom_navigation_item.xml +++ b/library/src/main/res/layout/shifting_bottom_navigation_item.xml @@ -20,6 +20,7 @@ android:layout_width="@dimen/shifting_icon_grid" android:layout_height="@dimen/shifting_icon_grid" android:layout_gravity="center" + android:contentDescription="@string/icon" android:gravity="center" android:scaleType="fitXY" /> diff --git a/bottom-navigation-bar/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml similarity index 100% rename from bottom-navigation-bar/src/main/res/values/attrs.xml rename to library/src/main/res/values/attrs.xml diff --git a/bottom-navigation-bar/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml similarity index 100% rename from bottom-navigation-bar/src/main/res/values/dimens.xml rename to library/src/main/res/values/dimens.xml diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml new file mode 100644 index 0000000..f4f3ed4 --- /dev/null +++ b/library/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + icon + \ No newline at end of file diff --git a/bottom-navigation-bar/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml similarity index 100% rename from bottom-navigation-bar/src/main/res/values/styles.xml rename to library/src/main/res/values/styles.xml diff --git a/bottom-navigation-bar/.gitignore b/sample/.gitignore similarity index 100% rename from bottom-navigation-bar/.gitignore rename to sample/.gitignore diff --git a/app/build.gradle b/sample/build.gradle similarity index 97% rename from app/build.gradle rename to sample/build.gradle index 5a88c5b..3ff9a24 100644 --- a/app/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(':bottom-navigation-bar') + compile project(':library') compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true; } diff --git a/bottom-navigation-bar/proguard-rules.pro b/sample/proguard-rules.pro similarity index 100% rename from bottom-navigation-bar/proguard-rules.pro rename to sample/proguard-rules.pro diff --git a/app/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml similarity index 99% rename from app/src/main/AndroidManifest.xml rename to sample/src/main/AndroidManifest.xml index 9900126..238b0f2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ + + - + \ No newline at end of file diff --git a/app/src/main/java/com/ashokvarma/bottomnavigation/sample/BottomNavigationActivity.java b/sample/src/main/java/com/ashokvarma/bottomnavigation/sample/BottomNavigationActivity.java similarity index 100% rename from app/src/main/java/com/ashokvarma/bottomnavigation/sample/BottomNavigationActivity.java rename to sample/src/main/java/com/ashokvarma/bottomnavigation/sample/BottomNavigationActivity.java diff --git a/app/src/main/res/drawable-hdpi/ic_book_white_24dp.png b/sample/src/main/res/drawable-hdpi/ic_book_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_book_white_24dp.png rename to sample/src/main/res/drawable-hdpi/ic_book_white_24dp.png diff --git a/app/src/main/res/drawable-hdpi/ic_favorite_white_24dp.png b/sample/src/main/res/drawable-hdpi/ic_favorite_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_favorite_white_24dp.png rename to sample/src/main/res/drawable-hdpi/ic_favorite_white_24dp.png diff --git a/app/src/main/res/drawable-hdpi/ic_find_replace_white_24dp.png b/sample/src/main/res/drawable-hdpi/ic_find_replace_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_find_replace_white_24dp.png rename to sample/src/main/res/drawable-hdpi/ic_find_replace_white_24dp.png diff --git a/app/src/main/res/drawable-hdpi/ic_home_white_24dp.png b/sample/src/main/res/drawable-hdpi/ic_home_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_home_white_24dp.png rename to sample/src/main/res/drawable-hdpi/ic_home_white_24dp.png diff --git a/app/src/main/res/drawable-hdpi/ic_launch_white_24dp.png b/sample/src/main/res/drawable-hdpi/ic_launch_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_launch_white_24dp.png rename to sample/src/main/res/drawable-hdpi/ic_launch_white_24dp.png diff --git a/app/src/main/res/drawable-hdpi/ic_link_white_24dp.png b/sample/src/main/res/drawable-hdpi/ic_link_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_link_white_24dp.png rename to sample/src/main/res/drawable-hdpi/ic_link_white_24dp.png diff --git a/app/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png b/sample/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png rename to sample/src/main/res/drawable-hdpi/ic_location_on_white_24dp.png diff --git a/app/src/main/res/drawable-hdpi/ic_music_note_white_24dp.png b/sample/src/main/res/drawable-hdpi/ic_music_note_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_music_note_white_24dp.png rename to sample/src/main/res/drawable-hdpi/ic_music_note_white_24dp.png diff --git a/app/src/main/res/drawable-hdpi/ic_tv_white_24dp.png b/sample/src/main/res/drawable-hdpi/ic_tv_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_tv_white_24dp.png rename to sample/src/main/res/drawable-hdpi/ic_tv_white_24dp.png diff --git a/app/src/main/res/drawable-hdpi/ic_videogame_asset_white_24dp.png b/sample/src/main/res/drawable-hdpi/ic_videogame_asset_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_videogame_asset_white_24dp.png rename to sample/src/main/res/drawable-hdpi/ic_videogame_asset_white_24dp.png diff --git a/app/src/main/res/drawable-mdpi/ic_book_white_24dp.png b/sample/src/main/res/drawable-mdpi/ic_book_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_book_white_24dp.png rename to sample/src/main/res/drawable-mdpi/ic_book_white_24dp.png diff --git a/app/src/main/res/drawable-mdpi/ic_favorite_white_24dp.png b/sample/src/main/res/drawable-mdpi/ic_favorite_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_favorite_white_24dp.png rename to sample/src/main/res/drawable-mdpi/ic_favorite_white_24dp.png diff --git a/app/src/main/res/drawable-mdpi/ic_find_replace_white_24dp.png b/sample/src/main/res/drawable-mdpi/ic_find_replace_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_find_replace_white_24dp.png rename to sample/src/main/res/drawable-mdpi/ic_find_replace_white_24dp.png diff --git a/app/src/main/res/drawable-mdpi/ic_home_white_24dp.png b/sample/src/main/res/drawable-mdpi/ic_home_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_home_white_24dp.png rename to sample/src/main/res/drawable-mdpi/ic_home_white_24dp.png diff --git a/app/src/main/res/drawable-mdpi/ic_launch_white_24dp.png b/sample/src/main/res/drawable-mdpi/ic_launch_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_launch_white_24dp.png rename to sample/src/main/res/drawable-mdpi/ic_launch_white_24dp.png diff --git a/app/src/main/res/drawable-mdpi/ic_link_white_24dp.png b/sample/src/main/res/drawable-mdpi/ic_link_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_link_white_24dp.png rename to sample/src/main/res/drawable-mdpi/ic_link_white_24dp.png diff --git a/app/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png b/sample/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png rename to sample/src/main/res/drawable-mdpi/ic_location_on_white_24dp.png diff --git a/app/src/main/res/drawable-mdpi/ic_music_note_white_24dp.png b/sample/src/main/res/drawable-mdpi/ic_music_note_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_music_note_white_24dp.png rename to sample/src/main/res/drawable-mdpi/ic_music_note_white_24dp.png diff --git a/app/src/main/res/drawable-mdpi/ic_tv_white_24dp.png b/sample/src/main/res/drawable-mdpi/ic_tv_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_tv_white_24dp.png rename to sample/src/main/res/drawable-mdpi/ic_tv_white_24dp.png diff --git a/app/src/main/res/drawable-mdpi/ic_videogame_asset_white_24dp.png b/sample/src/main/res/drawable-mdpi/ic_videogame_asset_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_videogame_asset_white_24dp.png rename to sample/src/main/res/drawable-mdpi/ic_videogame_asset_white_24dp.png diff --git a/app/src/main/res/drawable-xhdpi/ic_book_white_24dp.png b/sample/src/main/res/drawable-xhdpi/ic_book_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_book_white_24dp.png rename to sample/src/main/res/drawable-xhdpi/ic_book_white_24dp.png diff --git a/app/src/main/res/drawable-xhdpi/ic_favorite_white_24dp.png b/sample/src/main/res/drawable-xhdpi/ic_favorite_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_favorite_white_24dp.png rename to sample/src/main/res/drawable-xhdpi/ic_favorite_white_24dp.png diff --git a/app/src/main/res/drawable-xhdpi/ic_find_replace_white_24dp.png b/sample/src/main/res/drawable-xhdpi/ic_find_replace_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_find_replace_white_24dp.png rename to sample/src/main/res/drawable-xhdpi/ic_find_replace_white_24dp.png diff --git a/app/src/main/res/drawable-xhdpi/ic_home_white_24dp.png b/sample/src/main/res/drawable-xhdpi/ic_home_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_home_white_24dp.png rename to sample/src/main/res/drawable-xhdpi/ic_home_white_24dp.png diff --git a/app/src/main/res/drawable-xhdpi/ic_launch_white_24dp.png b/sample/src/main/res/drawable-xhdpi/ic_launch_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_launch_white_24dp.png rename to sample/src/main/res/drawable-xhdpi/ic_launch_white_24dp.png diff --git a/app/src/main/res/drawable-xhdpi/ic_link_white_24dp.png b/sample/src/main/res/drawable-xhdpi/ic_link_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_link_white_24dp.png rename to sample/src/main/res/drawable-xhdpi/ic_link_white_24dp.png diff --git a/app/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png b/sample/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png rename to sample/src/main/res/drawable-xhdpi/ic_location_on_white_24dp.png diff --git a/app/src/main/res/drawable-xhdpi/ic_music_note_white_24dp.png b/sample/src/main/res/drawable-xhdpi/ic_music_note_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_music_note_white_24dp.png rename to sample/src/main/res/drawable-xhdpi/ic_music_note_white_24dp.png diff --git a/app/src/main/res/drawable-xhdpi/ic_tv_white_24dp.png b/sample/src/main/res/drawable-xhdpi/ic_tv_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_tv_white_24dp.png rename to sample/src/main/res/drawable-xhdpi/ic_tv_white_24dp.png diff --git a/app/src/main/res/drawable-xhdpi/ic_videogame_asset_white_24dp.png b/sample/src/main/res/drawable-xhdpi/ic_videogame_asset_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_videogame_asset_white_24dp.png rename to sample/src/main/res/drawable-xhdpi/ic_videogame_asset_white_24dp.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png b/sample/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png rename to sample/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_favorite_white_24dp.png b/sample/src/main/res/drawable-xxhdpi/ic_favorite_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_favorite_white_24dp.png rename to sample/src/main/res/drawable-xxhdpi/ic_favorite_white_24dp.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_find_replace_white_24dp.png b/sample/src/main/res/drawable-xxhdpi/ic_find_replace_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_find_replace_white_24dp.png rename to sample/src/main/res/drawable-xxhdpi/ic_find_replace_white_24dp.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_home_white_24dp.png b/sample/src/main/res/drawable-xxhdpi/ic_home_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_home_white_24dp.png rename to sample/src/main/res/drawable-xxhdpi/ic_home_white_24dp.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_launch_white_24dp.png b/sample/src/main/res/drawable-xxhdpi/ic_launch_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_launch_white_24dp.png rename to sample/src/main/res/drawable-xxhdpi/ic_launch_white_24dp.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_link_white_24dp.png b/sample/src/main/res/drawable-xxhdpi/ic_link_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_link_white_24dp.png rename to sample/src/main/res/drawable-xxhdpi/ic_link_white_24dp.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png b/sample/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png rename to sample/src/main/res/drawable-xxhdpi/ic_location_on_white_24dp.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_music_note_white_24dp.png b/sample/src/main/res/drawable-xxhdpi/ic_music_note_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_music_note_white_24dp.png rename to sample/src/main/res/drawable-xxhdpi/ic_music_note_white_24dp.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_tv_white_24dp.png b/sample/src/main/res/drawable-xxhdpi/ic_tv_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_tv_white_24dp.png rename to sample/src/main/res/drawable-xxhdpi/ic_tv_white_24dp.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_videogame_asset_white_24dp.png b/sample/src/main/res/drawable-xxhdpi/ic_videogame_asset_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_videogame_asset_white_24dp.png rename to sample/src/main/res/drawable-xxhdpi/ic_videogame_asset_white_24dp.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png b/sample/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png rename to sample/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_favorite_white_24dp.png b/sample/src/main/res/drawable-xxxhdpi/ic_favorite_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_favorite_white_24dp.png rename to sample/src/main/res/drawable-xxxhdpi/ic_favorite_white_24dp.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_find_replace_white_24dp.png b/sample/src/main/res/drawable-xxxhdpi/ic_find_replace_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_find_replace_white_24dp.png rename to sample/src/main/res/drawable-xxxhdpi/ic_find_replace_white_24dp.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_home_white_24dp.png b/sample/src/main/res/drawable-xxxhdpi/ic_home_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_home_white_24dp.png rename to sample/src/main/res/drawable-xxxhdpi/ic_home_white_24dp.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launch_white_24dp.png b/sample/src/main/res/drawable-xxxhdpi/ic_launch_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_launch_white_24dp.png rename to sample/src/main/res/drawable-xxxhdpi/ic_launch_white_24dp.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_link_white_24dp.png b/sample/src/main/res/drawable-xxxhdpi/ic_link_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_link_white_24dp.png rename to sample/src/main/res/drawable-xxxhdpi/ic_link_white_24dp.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png b/sample/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png rename to sample/src/main/res/drawable-xxxhdpi/ic_location_on_white_24dp.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_music_note_white_24dp.png b/sample/src/main/res/drawable-xxxhdpi/ic_music_note_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_music_note_white_24dp.png rename to sample/src/main/res/drawable-xxxhdpi/ic_music_note_white_24dp.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_tv_white_24dp.png b/sample/src/main/res/drawable-xxxhdpi/ic_tv_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_tv_white_24dp.png rename to sample/src/main/res/drawable-xxxhdpi/ic_tv_white_24dp.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_videogame_asset_white_24dp.png b/sample/src/main/res/drawable-xxxhdpi/ic_videogame_asset_white_24dp.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_videogame_asset_white_24dp.png rename to sample/src/main/res/drawable-xxxhdpi/ic_videogame_asset_white_24dp.png diff --git a/app/src/main/res/layout/activity_bottom_navigation.xml b/sample/src/main/res/layout/activity_bottom_navigation.xml similarity index 87% rename from app/src/main/res/layout/activity_bottom_navigation.xml rename to sample/src/main/res/layout/activity_bottom_navigation.xml index 5770b6d..27818c4 100644 --- a/app/src/main/res/layout/activity_bottom_navigation.xml +++ b/sample/src/main/res/layout/activity_bottom_navigation.xml @@ -25,7 +25,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:text="MODE_FIXED" /> + android:text="@string/mode_fixed" /> + android:text="@string/mode_shifting" /> + android:text="@string/bs_static" /> + android:text="@string/bs_ripple" /> + android:text="@string/_3_items" /> + android:text="@string/_4_items" /> + android:text="@string/_5_items" /> + android:text="@string/auto_hide_badge" /> + android:text="@string/toggle_hide" />