From 2d3f4cca6579ffb9e46f451be564e69177091a56 Mon Sep 17 00:00:00 2001 From: Roland Date: Thu, 14 Jul 2016 12:53:30 +0400 Subject: [PATCH 1/3] Added new project that uses this library --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8883a2866..2152ac7a1 100644 --- a/README.md +++ b/README.md @@ -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/) From fa6523671d8c5f69e48365013407fd318a042abc Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Thu, 14 Jul 2016 19:31:00 +0200 Subject: [PATCH 2/3] * allow to set the icon as `Bitmap` (this does not support a different icon for the selected state!) * FIX #1391 --- .../materialdrawer/model/BasePrimaryDrawerItem.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/BasePrimaryDrawerItem.java b/library/src/main/java/com/mikepenz/materialdrawer/model/BasePrimaryDrawerItem.java index a6e957390..10a5bf2c9 100644 --- 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); From 72705f15c527386d2f5cdfb72d2f45ade65384e0 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Thu, 14 Jul 2016 20:02:03 +0200 Subject: [PATCH 3/3] * [release] v5.3.6 --- README.md | 2 +- app/build.gradle | 4 ++-- gradle.properties | 4 ++-- library/build.gradle | 4 ++-- .../src/main/res/values/library_materialdrawer_strings.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index de4a8dc0c..b8dca8b62 100644 --- 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 } ``` diff --git a/app/build.gradle b/app/build.gradle index 98e8400e1..1e6a9c087 100644 --- 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 index 6f77b8689..a774cdc65 100644 --- 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 index d045274d9..d2ed93185 100644 --- 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/res/values/library_materialdrawer_strings.xml b/library/src/main/res/values/library_materialdrawer_strings.xml index 16f81f45e..e1c7073a5 100755 --- a/library/src/main/res/values/library_materialdrawer_strings.xml +++ b/library/src/main/res/values/library_materialdrawer_strings.xml @@ -10,7 +10,7 @@ MaterialDrawer the flexible, easy to use, all in one drawer library for your Android project. ]]> - 5.3.5 + 5.3.6 https://github.com/mikepenz/MaterialDrawer apache_2_0 true