Merge branch 'release/v5.3.4'

hamsaadev · Jul 7, 2016 · 4bfc74e · 4bfc74e
2 parents 00ae51b + ea03786
commit 4bfc74e
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 9 deletions.
diff --git a/MIGRATION.md b/MIGRATION.md
@@ -1,5 +1,8 @@
 ###Upgrade Notes
 
+#### v5.3.3 -> 5.3.4
+* If you use the `FastAdapter` please read the upgrade notes for v1.6.0 (https://github.com/mikepenz/FastAdapter/releases/tag/v1.6.0)
+
 #### v5.3.1 -> v5.3.2
 * the `withOnMiniDrawerItemClickListener` was renamed to `withOnMiniDrawerItemOnClickListener`
 * added new separate `OnMiniDrawerItemClickListener` which allows to hook into the default behavior, and prevent it if necessary

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

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

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Maven stuff
-VERSION_NAME=5.3.3
-VERSION_CODE=533
+VERSION_NAME=5.3.4
+VERSION_CODE=534
 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 533
-        versionName '5.3.3'
+        versionCode 534
+        versionName '5.3.4'
     }
     buildTypes {
         release {
@@ -47,5 +47,5 @@ dependencies {
     // used to fill the RecyclerView with the DrawerItems
     // and provides single and multi selection, expandable items
     // https://github.com/mikepenz/FastAdapter
-    compile 'com.mikepenz:fastadapter:1.5.8@aar'
+    compile 'com.mikepenz:fastadapter:1.6.0@aar'
 }
diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/AbstractDrawerItem.java b/library/src/main/java/com/mikepenz/materialdrawer/model/AbstractDrawerItem.java
@@ -243,6 +243,17 @@ public boolean isExpanded() {
         return mExpanded;
     }
 
+
+    /**
+     * overwrite this method and return true if the item should auto expand on click, false if you want to disable this
+     *
+     * @return true if this item should auto expand in the adapter
+     */
+    @Override
+    public boolean isAutoExpanding() {
+        return true;
+    }
+
     /**
      * the abstract method to retrieve the ViewHolder factory
      * The ViewHolder factory implementation should look like (see the commented code above)

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