Merge remote-tracking branch 'master/master'

ankitpopli1891 · ankitpopli1891 · commit 69bf4f01660d · 2016-10-14T22:36:08.000+05:30
diff --git a/.idea/dictionaries/Chatikyan.xml b/.idea/dictionaries/Chatikyan.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/README.md b/README.md
@@ -28,14 +28,14 @@ Download sample [apk][7]
 
 Gradle:
 ```groovy
-compile 'com.github.armcha:SpaceNavigationView:1.3.2'
+compile 'com.github.armcha:SpaceNavigationView:1.4.0'
 ```
 Maven:
 ```xml
 <dependency>
   <groupId>com.github.armcha</groupId>
   <artifactId>SpaceNavigationView</artifactId>
-  <version>1.3.2</version>
+  <version>1.4.0</version>
   <type>pom</type>
 </dependency>
 ```
@@ -264,13 +264,22 @@ Set centre button icon color
 ```java
 spaceNavigationView.setCentreButtonIconColor(ContextCompat.getColor(context,R.color.yourColor));
 ```
+If you want to disable default white color filter, just call
+```java
+spaceNavigationView.setCentreButtonIconColorFilterEnabled(false);
+```
 
 [10]: https://github.com/armcha/Space-Navigation-View/issues/16
 [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
 
 ##Versions
 
+##1.4.0
+* Added method do disable centre button default color filter
+* Fixed issue [#25][13]
+
 ##1.3.2
 * Added method setCentreButtonIconColor [#17][12]
 
diff --git a/Sample/build.gradle b/Sample/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    buildToolsVersion "24.0.3"
     defaultConfig {
         applicationId "com.luseen.spacenavigationview"
         minSdkVersion 14
diff --git a/Sample/src/main/java/com/luseen/spacenavigationview/MainActivity.java b/Sample/src/main/java/com/luseen/spacenavigationview/MainActivity.java
@@ -1,6 +1,7 @@
 package com.luseen.spacenavigationview;
 
 import android.os.Bundle;
+import android.support.design.widget.Snackbar;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.GridLayoutManager;
@@ -26,15 +27,15 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
         spaceNavigationView = (SpaceNavigationView) findViewById(R.id.space);
         spaceNavigationView.initWithSaveInstanceState(savedInstanceState);
-        spaceNavigationView.addSpaceItem(new SpaceItem("HOME", R.drawable.home));
+        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));
 
@@ -46,6 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
             public void onCentreButtonClick() {
                 Log.d("onCentreButtonClick ", "onCentreButtonClick");
                 spaceNavigationView.shouldShowFullBadgeText(true);
+                //Snackbar.make(spaceNavigationView,"Deleted Saved Selection.", Snackbar.LENGTH_LONG).show();
             }
 
             @Override
@@ -71,6 +73,17 @@ public void onItemLongClick(int itemIndex, String itemName) {
             }
         });
 
+        setUpRecyclerView();
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        spaceNavigationView.onSaveInstanceState(outState);
+    }
+
+    private void setUpRecyclerView() {
+        RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
         RecyclerAdapter adapter = new RecyclerAdapter(dummyStrings());
         recyclerView.setHasFixedSize(true);
         recyclerView.setLayoutManager(new GridLayoutManager(this, 2));
@@ -85,13 +98,6 @@ public void onClick(int position) {
                 }
             }
         });
-
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        spaceNavigationView.onSaveInstanceState(outState);
     }
 
     private List<String> dummyStrings() {
diff --git a/Sample/src/main/res/drawable/account.png b/Sample/src/main/res/drawable/account.png
diff --git a/Sample/src/main/res/values-v21/styles.xml b/Sample/src/main/res/values-v21/styles.xml
@@ -0,0 +1,9 @@
+<resources>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.1'
         classpath 'com.novoda:bintray-release:0.3.4'
     }
 }
diff --git a/spacelib/build.gradle b/spacelib/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.novoda.bintray-release'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    buildToolsVersion "24.0.3"
 
     defaultConfig {
         minSdkVersion 14
@@ -32,7 +32,7 @@ dependencies {
 publish {
     groupId = 'com.github.armcha'
     artifactId = 'SpaceNavigationView'
-    publishVersion = '1.3.2'
+    publishVersion = '1.4.0'
     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
@@ -25,6 +25,7 @@
 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;
@@ -42,6 +43,7 @@
 import java.util.HashMap;
 import java.util.List;
 
+//@CoordinatorLayout.DefaultBehavior(SpaceNavigationViewBehavior.class)
 public class SpaceNavigationView extends RelativeLayout {
 
     private static final String TAG = "SpaceNavigationView";
diff --git a/spacelib/src/main/java/com/luseen/spacenavigation/SpaceNavigationViewBehavior.java b/spacelib/src/main/java/com/luseen/spacenavigation/SpaceNavigationViewBehavior.java
@@ -0,0 +1,38 @@
+package com.luseen.spacenavigation;
+
+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<V extends View> extends CoordinatorLayout.Behavior<V> {
+
+    public SpaceNavigationViewBehavior(Context context, AttributeSet attrs) {
+        super();
+    }
+
+    public SpaceNavigationViewBehavior() {
+        super();
+    }
+
+    @Override
+    public boolean layoutDependsOn(CoordinatorLayout parent, V child, View dependency) {
+        return dependency instanceof Snackbar.SnackbarLayout;
+    }
+
+    @Override
+    public boolean onDependentViewChanged(CoordinatorLayout parent, final V child, View dependency) {
+        float translationY = Math.min(0, dependency.getTranslationY() - dependency.getHeight());
+        child.setTranslationY(translationY);
+        return true;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`jcenter()`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`		`- classpath 'com.android.tools.build:gradle:2.2.0'`
	`7`	`+ classpath 'com.android.tools.build:gradle:2.2.1'`
`8`	`8`	`classpath 'com.novoda:bintray-release:0.3.4'`
`9`	`9`	`}`
`10`	`10`	`}`