Release 1.3.1

armcha · armcha · commit a9e456b5208a · 2016-09-15T12:06:20.000+04:00
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.0'
+compile 'com.github.armcha:SpaceNavigationView:1.3.1'
 ```
 Maven:
 ```xml
 <dependency>
   <groupId>com.github.armcha</groupId>
   <artifactId>SpaceNavigationView</artifactId>
-  <version>1.3.0</version>
+  <version>1.3.1</version>
   <type>pom</type>
 </dependency>
 ```
@@ -255,9 +255,20 @@ Now you can change space navigation view background color if it already set up
 ```
 ![](screens/gif3.gif)
 
+If you want to show full badge text or show 9+
+```java
+      spaceNavigationView.shouldShowFullBadgeText(true);
+```
+
+[10]: https://github.com/armcha/Space-Navigation-View/issues/16
+[11]: https://github.com/armcha/Space-Navigation-View/issues/18
 
 ##Versions
 
+##1.4.0
+* Added method shouldShowFullBadgeText
+* Fixed issue [#16][10] , [#18][11]
+
 ##1.3.0
 * Added SpaceOnLongClickListener
 * Added changeSpaceBackgroundColor method
diff --git a/Sample/src/main/java/com/luseen/spacenavigationview/MainActivity.java b/Sample/src/main/java/com/luseen/spacenavigationview/MainActivity.java
@@ -34,23 +34,22 @@ protected void onCreate(Bundle savedInstanceState) {
         //spaceNavigationView.addSpaceItem(new SpaceItem("LIKE", R.drawable.bell));
         //spaceNavigationView.addSpaceItem(new SpaceItem("ACCOUNT", R.drawable.account));
         //spaceNavigationView.showIconOnly();
+        spaceNavigationView.shouldShowFullBadgeText(true);
 
         spaceNavigationView.setSpaceOnClickListener(new SpaceOnClickListener() {
             @Override
             public void onCentreButtonClick() {
-                spaceNavigationView.changeSpaceBackgroundColor(ContextCompat.getColor(MainActivity.this,R.color.colorAccent));
                 Log.d("onCentreButtonClick ", "onCentreButtonClick");
+                spaceNavigationView.shouldShowFullBadgeText(true);
             }
 
             @Override
             public void onItemClick(int itemIndex, String itemName) {
-                spaceNavigationView.changeCenterButtonIcon(R.drawable.magnify);
                 Log.d("onItemClick ", "" + itemIndex + " " + itemName);
             }
 
             @Override
             public void onItemReselected(int itemIndex, String itemName) {
-                spaceNavigationView.changeSpaceBackgroundColor(ContextCompat.getColor(MainActivity.this,R.color.colorPrimary));
                 Log.d("onItemReselected ", "" + itemIndex + " " + itemName);
             }
         });
@@ -75,7 +74,7 @@ public void onItemLongClick(int itemIndex, String itemName) {
             @Override
             public void onClick(int position) {
                 if (position == 0) {
-                    spaceNavigationView.showBadgeAtIndex(1, 4, ContextCompat.getColor(MainActivity.this, R.color.badge_background_color));
+                    spaceNavigationView.showBadgeAtIndex(1, 54, ContextCompat.getColor(MainActivity.this, R.color.badge_background_color));
                 } else if (position == 1) {
                     spaceNavigationView.hideBudgeAtIndex(1);
                 }
diff --git a/Sample/src/main/res/layout/activity_main.xml b/Sample/src/main/res/layout/activity_main.xml
@@ -17,5 +17,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="bottom" />
-
 </FrameLayout>
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0-rc1'
+        classpath 'com.android.tools.build:gradle:2.2.0-rc2'
         classpath 'com.novoda:bintray-release:0.3.4'
     }
 }
diff --git a/spacelib/build.gradle b/spacelib/build.gradle
@@ -24,15 +24,15 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:24.2.0'
-    compile 'com.android.support:support-v4:24.2.0'
-    compile 'com.android.support:design:24.2.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:support-v4:24.2.1'
+    compile 'com.android.support:design:24.2.1'
 }
 
 publish {
     groupId = 'com.github.armcha'
     artifactId = 'SpaceNavigationView'
-    publishVersion = '1.3.0'
+    publishVersion = '1.3.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/BadgeHelper.java b/spacelib/src/main/java/com/luseen/spacenavigation/BadgeHelper.java
@@ -33,11 +33,14 @@ class BadgeHelper {
      * @param view      target badge
      * @param badgeItem BadgeItem object
      */
-    static void showBadge(RelativeLayout view, BadgeItem badgeItem) {
+    static void showBadge(RelativeLayout view, BadgeItem badgeItem, boolean shouldShowBadgeWithNinePlus) {
 
         Utils.changeViewVisibilityVisible(view);
         TextView badgeTextView = (TextView) view.findViewById(R.id.badge_text_view);
-        badgeTextView.setText(badgeItem.getBadgeText());
+        if (shouldShowBadgeWithNinePlus)
+            badgeTextView.setText(badgeItem.getBadgeText());
+        else
+            badgeTextView.setText(badgeItem.getFullBadgeText());
 
         view.setScaleX(0);
         view.setScaleY(0);
@@ -80,15 +83,18 @@ public void onAnimationEnd(final View view) {
      * @param view      target budge
      * @param badgeItem BadgeItem object
      */
-    static void forceShowBadge(RelativeLayout view, BadgeItem badgeItem) {
+    static void forceShowBadge(RelativeLayout view, BadgeItem badgeItem, boolean shouldShowBadgeWithNinePlus) {
         Utils.changeViewVisibilityVisible(view);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             view.setBackground(makeShapeDrawable(badgeItem.getBadgeColor()));
         } else {
             view.setBackgroundDrawable(makeShapeDrawable(badgeItem.getBadgeColor()));
         }
         TextView badgeTextView = (TextView) view.findViewById(R.id.badge_text_view);
-        badgeTextView.setText(badgeItem.getBadgeText());
+        if (shouldShowBadgeWithNinePlus)
+            badgeTextView.setText(badgeItem.getBadgeText());
+        else
+            badgeTextView.setText(badgeItem.getFullBadgeText());
     }
 
     /**
diff --git a/spacelib/src/main/java/com/luseen/spacenavigation/BadgeItem.java b/spacelib/src/main/java/com/luseen/spacenavigation/BadgeItem.java
@@ -46,6 +46,10 @@ int getIntBadgeText() {
         return badgeText;
     }
 
+    String getFullBadgeText() {
+        return String.valueOf(badgeText);
+    }
+
     String getBadgeText() {
         String badgeStringText;
         if (badgeText > BADGE_TEXT_MAX_NUMBER) {
diff --git a/spacelib/src/main/java/com/luseen/spacenavigation/SpaceNavigationView.java b/spacelib/src/main/java/com/luseen/spacenavigation/SpaceNavigationView.java
@@ -57,6 +57,8 @@ public class SpaceNavigationView extends RelativeLayout {
 
     private static final String SPACE_BACKGROUND_COLOR_KEY = "backgroundColorKey";
 
+    private static final String BADGE_FULL_TEXT_KEY = "badgeFullTextKey";
+
     private static final int NOT_DEFINED = -777; //random number, not - 1 because it is Color.WHITE
 
     private static final int MAX_SPACE_ITEM_SIZE = 4;
@@ -127,6 +129,8 @@ public class SpaceNavigationView extends RelativeLayout {
 
     private boolean isCustomFont = false;
 
+    private boolean shouldShowBadgeWithNinePlus = true;
+
     /**
      * Constructors
      */
@@ -584,11 +588,21 @@ private void restoreCurrentItem() {
     @SuppressWarnings("unchecked")
     private void restoreBadges() {
         Bundle restoredBundle = savedInstanceState;
-        if (restoredBundle != null && restoredBundle.containsKey(BUDGES_ITEM_BUNDLE_KEY)) {
-            badgeSaveInstanceHashMap = (HashMap<Integer, Object>) savedInstanceState.getSerializable(BUDGES_ITEM_BUNDLE_KEY);
-            if (badgeSaveInstanceHashMap != null) {
-                for (Integer integer : badgeSaveInstanceHashMap.keySet()) {
-                    BadgeHelper.forceShowBadge(badgeList.get(integer), (BadgeItem) badgeSaveInstanceHashMap.get(integer));
+
+        if (restoredBundle != null) {
+            if (restoredBundle.containsKey(BADGE_FULL_TEXT_KEY)) {
+                shouldShowBadgeWithNinePlus = restoredBundle.getBoolean(BADGE_FULL_TEXT_KEY);
+            }
+
+            if (restoredBundle.containsKey(BUDGES_ITEM_BUNDLE_KEY)) {
+                badgeSaveInstanceHashMap = (HashMap<Integer, Object>) savedInstanceState.getSerializable(BUDGES_ITEM_BUNDLE_KEY);
+                if (badgeSaveInstanceHashMap != null) {
+                    for (Integer integer : badgeSaveInstanceHashMap.keySet()) {
+                        BadgeHelper.forceShowBadge(
+                                badgeList.get(integer),
+                                (BadgeItem) badgeSaveInstanceHashMap.get(integer),
+                                shouldShowBadgeWithNinePlus);
+                    }
                 }
             }
         }
@@ -667,6 +681,7 @@ public void onSaveInstanceState(Bundle outState) {
         outState.putInt(CURRENT_SELECTED_ITEM_BUNDLE_KEY, currentSelectedItem);
         outState.putInt(CENTRE_BUTTON_ICON_KEY, centreButtonIcon);
         outState.putInt(SPACE_BACKGROUND_COLOR_KEY, spaceBackgroundColor);
+        outState.putBoolean(BADGE_FULL_TEXT_KEY, shouldShowBadgeWithNinePlus);
 
         if (badgeSaveInstanceHashMap.size() > 0)
             outState.putSerializable(BUDGES_ITEM_BUNDLE_KEY, badgeSaveInstanceHashMap);
@@ -831,7 +846,7 @@ public void showBadgeAtIndex(int itemIndex, int badgeText, @ColorInt int badgeCo
             }
 
             BadgeItem badgeItem = new BadgeItem(itemIndex, badgeText, badgeColor);
-            BadgeHelper.showBadge(badgeView, badgeItem);
+            BadgeHelper.showBadge(badgeView, badgeItem, shouldShowBadgeWithNinePlus);
             badgeSaveInstanceHashMap.put(itemIndex, badgeItem);
         }
     }
@@ -872,7 +887,10 @@ public void changeBadgeTextAtIndex(int badgeIndex, int badgeText) {
                 (((BadgeItem) badgeSaveInstanceHashMap.get(badgeIndex)).getIntBadgeText() != badgeText)) {
             BadgeItem currentBadgeItem = (BadgeItem) badgeSaveInstanceHashMap.get(badgeIndex);
             BadgeItem badgeItemForSave = new BadgeItem(badgeIndex, badgeText, currentBadgeItem.getBadgeColor());
-            BadgeHelper.forceShowBadge(badgeList.get(badgeIndex), badgeItemForSave);
+            BadgeHelper.forceShowBadge(
+                    badgeList.get(badgeIndex),
+                    badgeItemForSave,
+                    shouldShowBadgeWithNinePlus);
             badgeSaveInstanceHashMap.put(badgeIndex, badgeItemForSave);
         }
     }
@@ -955,4 +973,14 @@ public void changeSpaceBackgroundColor(@ColorInt int color) {
         setBackgroundColors();
         centreContent.changeBackgroundColor(color);
     }
+
+
+    /**
+     * If you want to show full badge text or show 9+
+     *
+     * @param shouldShowBadgeWithNinePlus false for full text
+     */
+    public void shouldShowFullBadgeText(boolean shouldShowBadgeWithNinePlus) {
+        this.shouldShowBadgeWithNinePlus = shouldShowBadgeWithNinePlus;
+    }
 }
diff --git a/spacelib/src/main/res/layout/space_item_view.xml b/spacelib/src/main/res/layout/space_item_view.xml
@@ -16,13 +16,13 @@
         <ImageView
             android:id="@+id/space_icon"
             android:layout_width="@dimen/space_item_icon_default_size"
-            android:layout_height="@dimen/space_item_icon_default_size"
-            android:layout_centerVertical="true" />
+            android:layout_height="@dimen/space_item_icon_default_size" />
 
         <TextView
             android:id="@+id/space_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_marginLeft="10dp"
             android:lines="1"
             android:textSize="@dimen/space_item_text_default_size"
@@ -35,8 +35,8 @@
         android:layout_height="16dp"
         android:layout_alignParentTop="true"
         android:layout_marginLeft="@dimen/badge_left_margin"
-        android:layout_marginTop="3dp"
         android:layout_marginRight="2dp"
+        android:layout_marginTop="3dp"
         android:layout_toRightOf="@+id/main_content"
         android:visibility="gone">
 
@@ -45,7 +45,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:text="3"
             android:textColor="@android:color/white"
             android:textSize="10sp"
             android:textStyle="bold" />

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-rc1'`
	`7`	`+ classpath 'com.android.tools.build:gradle:2.2.0-rc2'`
`8`	`8`	`classpath 'com.novoda:bintray-release:0.3.4'`
`9`	`9`	`}`
`10`	`10`	`}`