diff --git a/MIGRATION.md b/MIGRATION.md index 8375746b6..15acce521 100644 --- a/MIGRATION.md +++ b/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) diff --git a/README.md b/README.md index 0a754d729..1ef7d4e61 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.2.1@aar') { +compile('com.mikepenz:materialdrawer:5.2.2@aar') { transitive = true } ``` diff --git a/app/build.gradle b/app/build.gradle index 4a443d5c7..6b5257400 100644 --- a/app/build.gradle +++ b/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") } diff --git a/gradle.properties b/gradle.properties index 418ec8ea0..c585d75df 100644 --- a/gradle.properties +++ b/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 diff --git a/library/build.gradle b/library/build.gradle index d06f42162..e0b940259 100644 --- a/library/build.gradle +++ b/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 { diff --git a/library/src/main/java/com/mikepenz/materialdrawer/MiniDrawer.java b/library/src/main/java/com/mikepenz/materialdrawer/MiniDrawer.java index 534d25664..0606ea0e9 100644 --- a/library/src/main/java/com/mikepenz/materialdrawer/MiniDrawer.java +++ b/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); 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 98422381a..a6e957390 100644 --- a/library/src/main/java/com/mikepenz/materialdrawer/model/BasePrimaryDrawerItem.java +++ b/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); diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/MiniDrawerItem.java b/library/src/main/java/com/mikepenz/materialdrawer/model/MiniDrawerItem.java index 9ac6f0616..b2eae7b72 100644 --- a/library/src/main/java/com/mikepenz/materialdrawer/model/MiniDrawerItem.java +++ b/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()); diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/MiniProfileDrawerItem.java b/library/src/main/java/com/mikepenz/materialdrawer/model/MiniProfileDrawerItem.java index 9b07ed3ed..602bdaf12 100644 --- a/library/src/main/java/com/mikepenz/materialdrawer/model/MiniProfileDrawerItem.java +++ b/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); diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileDrawerItem.java b/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileDrawerItem.java index eb7d5f9a0..e3498dcb4 100644 --- a/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileDrawerItem.java +++ b/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()); diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java b/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java index 5c56c9d1f..90868baea 100644 --- a/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java +++ b/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()); diff --git a/library/src/main/res/values/library_materialdrawer_strings.xml b/library/src/main/res/values/library_materialdrawer_strings.xml index b4a741822..6733fd85d 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.2.1 + 5.2.2 https://github.com/mikepenz/MaterialDrawer apache_2_0 true