Merge branch 'release/v5.4.0'

.travis.yml

@@ -8,7 +8,7 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-24.0.0
+    - build-tools-24.0.1
 
     # The SDK version used to compile your project
     - android-24

FAQ.md

@@ -16,3 +16,8 @@ Each question and it's answer is hosted in a separate file within the FAQ folder
 ##Testing
 
 * [How can I open the drawer from an instrumental test written with Espresso?](FAQ/opening-drawer-from-espresso.md)
+
+
+##CustomDrawerItem's
+
+* [A custom SecondaryDrawerItem that takes different name when its on disabled state](https://gist.github.com/AngleV/400377184386193c985d905bd97f2d40)

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.6@aar') {
+compile('com.mikepenz:materialdrawer:5.4.0@aar') {
 	transitive = true
 }
 ```
@@ -415,6 +415,9 @@ builder.withDrawerLayout(R.layout.material_drawer);
 * [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)
+* [Sporza Voetbal](http://play.google.com/store/apps/details?id=be.vrt.mobile.android.sporza.voetbal)
+* [Atmosphere](https://play.google.com/store/apps/details?id=com.peakpocketstudios.atmosphere)
+* [Slidechat](https://play.google.com/store/apps/details?id=com.taddu.adfree.slidechat)
 
 #Articles about the MaterialDrawer
 * [java-help.ru](http://java-help.ru/material-navigationdrawer/)

app/build.gradle

@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 536
-        versionName "5.3.6"
+        versionCode 540
+        versionName "5.4.0"
 
         setProperty("archivesBaseName", "-v$versionName-c$versionCode")
     }
@@ -53,7 +53,7 @@ dependencies {
 
     // used to generate the Open Source section
     // https://github.com/mikepenz/AboutLibraries
-    compile('com.mikepenz:aboutlibraries:5.7.0@aar') {
+    compile('com.mikepenz:aboutlibraries:5.7.1@aar') {
         transitive = true
         exclude module: "fastadapter"
     }
@@ -72,7 +72,7 @@ dependencies {
     // icon fonts used inside the sample
     // https://github.com/mikepenz/Android-Iconics
     compile 'com.mikepenz:google-material-typeface:2.2.0.1@aar'
-    compile 'com.mikepenz:fontawesome-typeface:4.4.0.1@aar'
+    compile 'com.mikepenz:fontawesome-typeface:4.6.0.3@aar'
     compile 'com.mikepenz:octicons-typeface:3.0.0.1@aar'
 
 

build.gradle

@@ -1,11 +1,11 @@
 buildscript {
     ext {
         setup = [compileSdk: 24,
-                 buildTools: "24.0.0",
+                 buildTools: "24.0.1",
                  minSdk    : 10,
                  targetSdk : 24]
 
-        versions = [supportLib: "24.0.0"]
+        versions = [supportLib: "24.1.1"]
     }
 
     repositories {

gradle.properties

@@ -1,6 +1,6 @@
 # Maven stuff
-VERSION_NAME=5.3.6
-VERSION_CODE=536
+VERSION_NAME=5.4.0
+VERSION_CODE=540
 GROUP=com.mikepenz
 POM_DESCRIPTION=MaterialDrawer Library
 POM_URL=https://github.com/mikepenz/MaterialDrawer

library/build.gradle

@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 536
-        versionName '5.3.6'
+        versionCode 540
+        versionName '5.4.0'
     }
     buildTypes {
         release {
@@ -42,10 +42,10 @@ dependencies {
     // used to provide out of the box icon font support. simplifies development,
     // and provides scalable icons. the core is very very light
     // https://github.com/mikepenz/Android-Iconics
-    compile 'com.mikepenz:iconics-core:2.6.7@aar'
+    compile 'com.mikepenz:iconics-core:2.7.2@aar'
 
     // 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.6.0@aar'
+    compile 'com.mikepenz:fastadapter:1.6.1@aar'
 }

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

@@ -1770,13 +1770,6 @@ public boolean onLongClick(View view, IAdapter<IDrawerItem> adapter, final IDraw
         }
     }
 
-    /**
-     * resets the DrawerBuilder's internal `mUsed` variable to false so the `DrawerBuilder` can be reused
-     */
-    public void reset() {
-        this.mUsed = false;
-    }
-
     /**
      * helper method to close the drawer delayed
      */

library/src/main/res/layout/material_drawer_compact_header.xml

@@ -65,7 +65,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif-medium"
                 android:lines="1"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:textSize="@dimen/material_drawer_account_header_text" />
 
             <TextView
@@ -74,7 +74,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:lines="1"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:textSize="@dimen/material_drawer_account_header_text" />
 
         </LinearLayout>

library/src/main/res/layout/material_drawer_header.xml

@@ -83,7 +83,7 @@
                 android:layout_marginLeft="@dimen/material_drawer_vertical_padding"
                 android:fontFamily="sans-serif-medium"
                 android:lines="1"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:textSize="@dimen/material_drawer_account_header_text" />
 
             <TextView
@@ -93,7 +93,7 @@
                 android:layout_marginLeft="@dimen/material_drawer_vertical_padding"
                 android:fontFamily="sans-serif"
                 android:lines="1"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:textSize="@dimen/material_drawer_account_header_text" />
 
         </LinearLayout>

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