diff --git a/README.md b/README.md index 49130ef..813f3b5 100644 --- a/README.md +++ b/README.md @@ -28,14 +28,14 @@ Download sample [apk][7] Gradle: ```groovy -compile 'com.github.armcha:SpaceNavigationView:1.4.0' +compile 'com.github.armcha:SpaceNavigationView:1.4.1' ``` Maven: ```xml com.github.armcha SpaceNavigationView - 1.4.0 + 1.4.1 pom ``` @@ -134,6 +134,7 @@ Customize with xml app:centre_button_color="@color/centre_button_color" app:inactive_item_color="@color/white" app:space_background_color="@color/colorPrimary" + app:centre_button_icon="@drawable/my_drawable" app:space_item_icon_size="@dimen/space_item_icon_default_size" app:space_item_icon_only_size="@dimen/space_item_icon_only_size" app:space_item_text_size="@dimen/space_item_text_default_size" /> @@ -148,6 +149,7 @@ Customize with xml | space_item_icon_size | item icon size | | space_item_icon_only_size | item icon size on ```showIconOnly()``` mode | | space_item_text_size | item text size | +| centre_button_icon | allow changing center icon from layout | Change space navigation background ```java @@ -273,9 +275,15 @@ spaceNavigationView.setCentreButtonIconColorFilterEnabled(false); [11]: https://github.com/armcha/Space-Navigation-View/issues/18 [12]: https://github.com/armcha/Space-Navigation-View/issues/17 [13]: https://github.com/armcha/Space-Navigation-View/issues/25 +[14]: https://github.com/armcha/Space-Navigation-View/issues/29 +[15]: https://github.com/ankitpopli1891 ##Versions +##1.4.1 +* Changing center icon from layout +* Fixed issue [#29][14] Thanks to [ankitpopli1891][15] + ##1.4.0 * Added method do disable centre button default color filter * Fixed issue [#25][13] diff --git a/Sample/src/main/java/com/luseen/spacenavigationview/MainActivity.java b/Sample/src/main/java/com/luseen/spacenavigationview/MainActivity.java index e62862e..6aa2269 100644 --- a/Sample/src/main/java/com/luseen/spacenavigationview/MainActivity.java +++ b/Sample/src/main/java/com/luseen/spacenavigationview/MainActivity.java @@ -31,23 +31,14 @@ protected void onCreate(Bundle savedInstanceState) { spaceNavigationView.initWithSaveInstanceState(savedInstanceState); spaceNavigationView.addSpaceItem(new SpaceItem("HOME", R.drawable.account)); spaceNavigationView.addSpaceItem(new SpaceItem("SEARCH", R.drawable.magnify)); - //spaceNavigationView.addSpaceItem(new SpaceItem("LIKE", R.drawable.bell)); - //spaceNavigationView.addSpaceItem(new SpaceItem("ACCOUNT", R.drawable.account)); - //spaceNavigationView.showIconOnly(); spaceNavigationView.shouldShowFullBadgeText(true); spaceNavigationView.setCentreButtonIconColorFilterEnabled(false); - //spaceNavigationView.setCentreButtonIconColor(ContextCompat.getColor(this,R.color.colorPrimary)); - - //spaceNavigationView.setCentreButtonIconColorFilterEnabled(false); - //spaceNavigationView.setCentreButtonIcon(R.mipmap.ic_launcher); - spaceNavigationView.setSpaceOnClickListener(new SpaceOnClickListener() { @Override public void onCentreButtonClick() { Log.d("onCentreButtonClick ", "onCentreButtonClick"); spaceNavigationView.shouldShowFullBadgeText(true); - //Snackbar.make(spaceNavigationView,"Deleted Saved Selection.", Snackbar.LENGTH_LONG).show(); } @Override diff --git a/spacelib/build.gradle b/spacelib/build.gradle index 5586166..f4271a3 100644 --- a/spacelib/build.gradle +++ b/spacelib/build.gradle @@ -32,7 +32,7 @@ dependencies { publish { groupId = 'com.github.armcha' artifactId = 'SpaceNavigationView' - publishVersion = '1.4.0' + publishVersion = '1.4.1' desc = 'Spaces Navigation View' licences = ['MIT'] website = 'https://github.com/armcha/Space-Navigation-View' diff --git a/spacelib/src/main/java/com/luseen/spacenavigation/SpaceNavigationView.java b/spacelib/src/main/java/com/luseen/spacenavigation/SpaceNavigationView.java index 2e77adf..1fbfd66 100644 --- a/spacelib/src/main/java/com/luseen/spacenavigation/SpaceNavigationView.java +++ b/spacelib/src/main/java/com/luseen/spacenavigation/SpaceNavigationView.java @@ -25,7 +25,6 @@ import android.os.Build; import android.os.Bundle; import android.support.annotation.ColorInt; -import android.support.design.widget.CoordinatorLayout; import android.support.design.widget.FloatingActionButton; import android.support.v4.content.ContextCompat; import android.util.AttributeSet; @@ -43,7 +42,6 @@ import java.util.HashMap; import java.util.List; -//@CoordinatorLayout.DefaultBehavior(SpaceNavigationViewBehavior.class) public class SpaceNavigationView extends RelativeLayout { private static final String TAG = "SpaceNavigationView"; @@ -292,7 +290,7 @@ private void initAndAddViewsToMainView() { fab.setBackgroundTintList(ColorStateList.valueOf(centreButtonColor)); fab.setImageResource(centreButtonIcon); - if(isCentreButtonIconColorFilterEnabled) + if (isCentreButtonIconColorFilterEnabled) fab.getDrawable().setColorFilter(centreButtonIconColor, PorterDuff.Mode.SRC_IN); fab.setOnClickListener(new OnClickListener() { @@ -1005,6 +1003,11 @@ public void shouldShowFullBadgeText(boolean shouldShowBadgeWithNinePlus) { this.shouldShowBadgeWithNinePlus = shouldShowBadgeWithNinePlus; } + /** + * set centre button color + * + * @param color target color + */ public void setCentreButtonIconColor(@ColorInt int color) { centreButtonIconColor = color; } diff --git a/spacelib/src/main/java/com/luseen/spacenavigation/SpaceNavigationViewBehavior.java b/spacelib/src/main/java/com/luseen/spacenavigation/SpaceNavigationViewBehavior.java index ee01cba..ff6a3bd 100644 --- a/spacelib/src/main/java/com/luseen/spacenavigation/SpaceNavigationViewBehavior.java +++ b/spacelib/src/main/java/com/luseen/spacenavigation/SpaceNavigationViewBehavior.java @@ -3,18 +3,13 @@ import android.content.Context; import android.support.design.widget.CoordinatorLayout; import android.support.design.widget.Snackbar; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.ViewPropertyAnimatorCompat; -import android.support.v4.view.animation.LinearOutSlowInInterpolator; import android.util.AttributeSet; import android.view.View; -import android.view.animation.Interpolator; /** * Created by Chatikyan on 13.10.2016. */ - -public class SpaceNavigationViewBehavior extends CoordinatorLayout.Behavior { +class SpaceNavigationViewBehavior extends CoordinatorLayout.Behavior { public SpaceNavigationViewBehavior(Context context, AttributeSet attrs) { super();