Merge branch 'release/v5.3.6'

hamsaadev · Jul 14, 2016 · 9b1dbf6 · 9b1dbf6
2 parents 09d3323 + 72705f1
commit 9b1dbf6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ You can find some frequently asked questions and other resources in the [WIKI /
 ##1. Provide the gradle dependency
 
 ```gradle
-compile('com.mikepenz:materialdrawer:5.3.5@aar') {
+compile('com.mikepenz:materialdrawer:5.3.6@aar') {
 	transitive = true
 }
 ```
@@ -414,6 +414,7 @@ builder.withDrawerLayout(R.layout.material_drawer);
 * [Facepunch Droid](https://play.google.com/store/apps/details?id=com.apps.anker.facepunchdroid)
 * [World Tourist Attractions](https://play.google.com/store/apps/details?id=indian.fig.whatsaround)
 * [HipCar](https://play.google.com/store/apps/details?id=com.hipcar.android)
+* [AS Sales Management](https://play.google.com/store/apps/details?id=com.armsoft.mtrade)
 
 #Articles about the MaterialDrawer
 * [java-help.ru](http://java-help.ru/material-navigationdrawer/)

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 535
-        versionName "5.3.5"
+        versionCode 536
+        versionName "5.3.6"
 
         setProperty("archivesBaseName", "-v$versionName-c$versionCode")
     }

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Maven stuff
-VERSION_NAME=5.3.5
-VERSION_CODE=535
+VERSION_NAME=5.3.6
+VERSION_CODE=536
 GROUP=com.mikepenz
 POM_DESCRIPTION=MaterialDrawer Library
 POM_URL=https://github.com/mikepenz/MaterialDrawer

diff --git a/library/build.gradle b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 535
-        versionName '5.3.5'
+        versionCode 536
+        versionName '5.3.6'
     }
     buildTypes {
         release {

diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/BasePrimaryDrawerItem.java b/library/src/main/java/com/mikepenz/materialdrawer/model/BasePrimaryDrawerItem.java
@@ -97,8 +97,12 @@ protected void bindViewHelper(BaseViewHolder viewHolder) {
 
         //get the drawables for our icon and set it
         Drawable icon = ImageHolder.decideIcon(getIcon(), ctx, iconColor, isIconTinted(), 1);
-        Drawable selectedIcon = ImageHolder.decideIcon(getSelectedIcon(), ctx, selectedIconColor, isIconTinted(), 1);
-        ImageHolder.applyMultiIconTo(icon, iconColor, selectedIcon, selectedIconColor, isIconTinted(), viewHolder.icon);
+        if (icon != null) {
+            Drawable selectedIcon = ImageHolder.decideIcon(getSelectedIcon(), ctx, selectedIconColor, isIconTinted(), 1);
+            ImageHolder.applyMultiIconTo(icon, iconColor, selectedIcon, selectedIconColor, isIconTinted(), viewHolder.icon);
+        } else {
+            ImageHolder.applyDecidedIconOrSetGone(getIcon(), viewHolder.icon, iconColor, isIconTinted(), 1);
+        }
 
         //for android API 17 --> Padding not applied via xml
         DrawerUIUtils.setDrawerVerticalPadding(viewHolder.view, level);

diff --git a/library/src/main/res/values/library_materialdrawer_strings.xml b/library/src/main/res/values/library_materialdrawer_strings.xml
@@ -10,7 +10,7 @@
         <b>MaterialDrawer</b> the flexible, easy to use, all in one drawer library for your Android project.
         ]]>
     </string>
-    <string name="library_materialdrawer_libraryVersion">5.3.5</string>
+    <string name="library_materialdrawer_libraryVersion">5.3.6</string>
     <string name="library_materialdrawer_libraryWebsite">https://github.com/mikepenz/MaterialDrawer</string>
     <string name="library_materialdrawer_licenseId">apache_2_0</string>
     <string name="library_materialdrawer_isOpenSource">true</string>