Merge branch 'release/v5.2.2'

MIGRATION.md

@@ -1,5 +1,8 @@
 ###Upgrade Notes
 
+#### v5.2.0 -> v5.2.1
+* the `SecondaryDrawerItem` is now a subclass of the `PrimaryDrawerItem` (extends `PrimaryDrawerItem`). If you have an `if` which checks for the type with `instanceOf` make sure you check for the `SecondaryDrawerItem` first. (`secondaryDrawerItem instanceOf PrimaryDrawerItem == true`)
+
 #### v5.1.6 -> 5.1.8
 * if you use the `FastAdapter` please check out the release notes of v1.4.0 (https://github.com/mikepenz/FastAdapter/releases/tag/v1.4.0)
 

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.2.1@aar') {
+compile('com.mikepenz:materialdrawer:5.2.2@aar') {
 	transitive = true
 }
 ```

app/build.gradle

@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 521
-        versionName "5.2.1"
+        versionCode 522
+        versionName "5.2.2"
 
         setProperty("archivesBaseName", "-v$versionName-c$versionCode")
     }

gradle.properties

@@ -1,6 +1,6 @@
 # Maven stuff
-VERSION_NAME=5.2.1
-VERSION_CODE=521
+VERSION_NAME=5.2.2
+VERSION_CODE=522
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=MaterialDrawer Library

library/build.gradle

@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 521
-        versionName '5.2.1'
+        versionCode 522
+        versionName '5.2.2'
     }
     buildTypes {
         release {

library/src/main/java/com/mikepenz/materialdrawer/MiniDrawer.java

@@ -238,10 +238,10 @@ public FastAdapter.OnLongClickListener getOnMiniDrawerItemLongClickListener() {
      * @return
      */
     public IDrawerItem generateMiniDrawerItem(IDrawerItem drawerItem) {
-        if (drawerItem instanceof PrimaryDrawerItem) {
+        if (drawerItem instanceof SecondaryDrawerItem) {
+            return mIncludeSecondaryDrawerItems ? new MiniDrawerItem((SecondaryDrawerItem) drawerItem).withEnableSelectedBackground(mEnableSelectedMiniDrawerItemBackground) : null;
+        } else if (drawerItem instanceof PrimaryDrawerItem) {
             return new MiniDrawerItem((PrimaryDrawerItem) drawerItem).withEnableSelectedBackground(mEnableSelectedMiniDrawerItemBackground);
-        } else if (drawerItem instanceof SecondaryDrawerItem && mIncludeSecondaryDrawerItems) {
-            return new MiniDrawerItem((SecondaryDrawerItem) drawerItem).withEnableSelectedBackground(mEnableSelectedMiniDrawerItemBackground);
         } else if (drawerItem instanceof ProfileDrawerItem) {
             MiniProfileDrawerItem mpdi = new MiniProfileDrawerItem((ProfileDrawerItem) drawerItem);
             mpdi.withEnabled(mEnableProfileClick);

library/src/main/java/com/mikepenz/materialdrawer/model/BasePrimaryDrawerItem.java

@@ -62,6 +62,9 @@ protected void bindViewHelper(BaseViewHolder viewHolder) {
         //set the item selected if it is
         viewHolder.itemView.setSelected(isSelected());
 
+        //set the item enabled if it is
+        viewHolder.itemView.setEnabled(isEnabled());
+
         //
         viewHolder.itemView.setTag(this);
 

library/src/main/java/com/mikepenz/materialdrawer/model/MiniDrawerItem.java

@@ -126,6 +126,9 @@ public void bindView(ViewHolder viewHolder) {
         //set the identifier from the drawerItem here. It can be used to run tests
         viewHolder.itemView.setId(hashCode());
 
+        //set the item enabled if it is
+        viewHolder.itemView.setEnabled(isEnabled());
+
         //set the item selected if it is
         viewHolder.itemView.setSelected(isSelected());
 

library/src/main/java/com/mikepenz/materialdrawer/model/MiniProfileDrawerItem.java

@@ -139,6 +139,9 @@ public void bindView(ViewHolder viewHolder) {
         //set the identifier from the drawerItem here. It can be used to run tests
         viewHolder.itemView.setId(hashCode());
 
+        //set the item enabled if it is
+        viewHolder.itemView.setEnabled(isEnabled());
+
         //set the icon
         ImageHolder.applyToOrSetInvisible(getIcon(), viewHolder.icon);
 

library/src/main/java/com/mikepenz/materialdrawer/model/ProfileDrawerItem.java

@@ -199,6 +199,9 @@ public void bindView(ViewHolder viewHolder) {
         //set the identifier from the drawerItem here. It can be used to run tests
         viewHolder.itemView.setId(hashCode());
 
+        //set the item enabled if it is
+        viewHolder.itemView.setEnabled(isEnabled());
+
         //set the item selected if it is
         viewHolder.itemView.setSelected(isSelected());
 

library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java

@@ -206,6 +206,9 @@ public void bindView(ViewHolder viewHolder) {
         //set the identifier from the drawerItem here. It can be used to run tests
         viewHolder.itemView.setId(hashCode());
 
+        //set the item enabled if it is
+        viewHolder.itemView.setEnabled(isEnabled());
+
         //set the item selected if it is
         viewHolder.itemView.setSelected(isSelected());
 

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.2.1</string>
+    <string name="library_materialdrawer_libraryVersion">5.2.2</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>