From 2572568ae342e7ce1c0a00ba2b3fad77216eac56 Mon Sep 17 00:00:00 2001 From: Yunarta Kartawahyudi Date: Tue, 26 Apr 2016 01:24:38 +0800 Subject: [PATCH 1/2] Small fix so mIncludeSecondaryDrawerItems works in MiniDrawer --- .../main/java/com/mikepenz/materialdrawer/MiniDrawer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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); From 640b1ccbdd58f627c458cbf24e28ce5ec624faf4 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Mon, 25 Apr 2016 22:23:29 +0200 Subject: [PATCH 2/2] Update MIGRATION.md * add note about the fact that the `SecondaryDrawerItem` extends the `PrimaryDrawerItem` now --- MIGRATION.md | 3 +++ 1 file changed, 3 insertions(+) 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)