Merge branch 'release/v5.3.5'

hamsaadev · Jul 14, 2016 · 09d3323 · 09d3323
2 parents 4bfc74e + 39cad05
commit 09d3323
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 29 deletions.
diff --git a/DEV/github/banner.png b/DEV/github/banner.png
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.4@aar') {
+compile('com.mikepenz:materialdrawer:5.3.5@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 534
-        versionName "5.3.4"
+        versionCode 535
+        versionName "5.3.5"
 
         setProperty("archivesBaseName", "-v$versionName-c$versionCode")
     }

diff --git a/app/src/main/java/com/mikepenz/materialdrawer/app/MiniDrawerActivity.java b/app/src/main/java/com/mikepenz/materialdrawer/app/MiniDrawerActivity.java
@@ -199,8 +199,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     public void onBackPressed() {
         //handle the back press :D close the drawer first and if the drawer is closed close the activity
-        if (result != null && result.isDrawerOpen()) {
-            result.closeDrawer();
+        if (crossFader != null && crossFader.isCrossFaded()) {
+            crossFader.crossFade();
         } else {
             super.onBackPressed();
         }

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Maven stuff
-VERSION_NAME=5.3.4
-VERSION_CODE=534
+VERSION_NAME=5.3.5
+VERSION_CODE=535
 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 534
-        versionName '5.3.4'
+        versionCode 535
+        versionName '5.3.5'
     }
     buildTypes {
         release {
@@ -42,7 +42,7 @@ 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.6@aar'
+    compile 'com.mikepenz:iconics-core:2.6.7@aar'
 
     // used to fill the RecyclerView with the DrawerItems
     // and provides single and multi selection, expandable items

diff --git a/library/src/main/java/com/mikepenz/materialdrawer/DrawerBuilder.java b/library/src/main/java/com/mikepenz/materialdrawer/DrawerBuilder.java
@@ -1770,6 +1770,13 @@ 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
      */

diff --git a/library/src/main/res/layout/material_drawer_item_mini.xml b/library/src/main/res/layout/material_drawer_item_mini.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/material_drawer_item_profile"
+    android:layout_width="@dimen/material_mini_drawer_item"
     android:layout_height="@dimen/material_mini_drawer_item"
     android:paddingBottom="@dimen/material_mini_drawer_item_padding"
-    android:paddingEnd="@dimen/material_drawer_padding"
-    android:paddingLeft="@dimen/material_drawer_padding"
-    android:paddingRight="@dimen/material_drawer_padding"
-    android:paddingStart="@dimen/material_drawer_padding"
+    android:paddingEnd="@dimen/material_mini_drawer_item_padding_sides"
+    android:paddingLeft="@dimen/material_mini_drawer_item_padding_sides"
+    android:paddingRight="@dimen/material_mini_drawer_item_padding_sides"
+    android:paddingStart="@dimen/material_mini_drawer_item_padding_sides"
     android:paddingTop="@dimen/material_mini_drawer_item_padding">
 
     <ImageView
@@ -16,7 +16,7 @@
         android:layout_height="@dimen/material_mini_drawer_item_icon"
         android:layout_gravity="center"
         android:padding="@dimen/material_mini_drawer_item_icon_padding"
-        android:scaleType="centerInside" />
+        android:scaleType="fitXY" />
 
     <TextView
         android:id="@+id/material_drawer_badge"
@@ -26,10 +26,10 @@
         android:fontFamily="sans-serif"
         android:gravity="center"
         android:lines="1"
+        android:maxLines="1"
         android:padding="1dp"
         android:paddingLeft="1dp"
         android:paddingRight="1dp"
-        android:singleLine="true"
         android:textSize="@dimen/material_mini_drawer_item_badge_text"
         tools:text="99" />
 </FrameLayout>
diff --git a/library/src/main/res/layout/material_drawer_item_mini_profile.xml b/library/src/main/res/layout/material_drawer_item_mini_profile.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/material_drawer_item_profile"
-    android:layout_height="@dimen/material_drawer_item_profile">
+    android:layout_width="@dimen/material_mini_drawer_item"
+    android:layout_height="@dimen/material_mini_drawer_item">
 
     <com.mikepenz.materialdrawer.view.BezelImageView
         android:id="@+id/material_drawer_icon"
-        android:layout_width="@dimen/material_drawer_item_profile_icon"
-        android:layout_height="@dimen/material_drawer_item_profile_icon"
+        android:layout_width="@dimen/material_mini_drawer_item_profile_icon"
+        android:layout_height="@dimen/material_mini_drawer_item_profile_icon"
         android:layout_gravity="center_vertical"
-        android:layout_marginBottom="@dimen/material_drawer_item_profile_icon_padding"
-        android:layout_marginEnd="@dimen/material_drawer_item_profile_icon_padding"
-        android:layout_marginLeft="@dimen/material_drawer_item_profile_icon_padding"
-        android:layout_marginRight="@dimen/material_drawer_item_profile_icon_padding"
-        android:layout_marginStart="@dimen/material_drawer_item_profile_icon_padding"
-        android:layout_marginTop="@dimen/material_drawer_item_profile_icon_padding"
+        android:layout_marginBottom="@dimen/material_mini_drawer_item_profile_icon_padding"
+        android:layout_marginEnd="@dimen/material_mini_drawer_item_profile_icon_padding"
+        android:layout_marginLeft="@dimen/material_mini_drawer_item_profile_icon_padding"
+        android:layout_marginRight="@dimen/material_mini_drawer_item_profile_icon_padding"
+        android:layout_marginStart="@dimen/material_mini_drawer_item_profile_icon_padding"
+        android:layout_marginTop="@dimen/material_mini_drawer_item_profile_icon_padding"
         android:clickable="false"
         android:elevation="1dp" />
 </LinearLayout>
diff --git a/library/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml
@@ -55,11 +55,14 @@
     <!-- Definition for the profile setting item -->
     <dimen name="material_drawer_item_profile_setting_icon_padding">24dp</dimen>
     <!-- Definition for the MiniDrawer item -->
-    <dimen name="material_mini_drawer_item">64dp</dimen>
+    <dimen name="material_mini_drawer_item">72dp</dimen>
     <dimen name="material_mini_drawer_item_padding">4dp</dimen>
+    <dimen name="material_mini_drawer_item_padding_sides">8dp</dimen>
     <dimen name="material_mini_drawer_item_icon">56dp</dimen>
     <dimen name="material_mini_drawer_item_icon_padding">16dp</dimen>
     <dimen name="material_mini_drawer_item_badge_text">12sp</dimen>
+    <dimen name="material_mini_drawer_item_profile_icon">40dp</dimen>
+    <dimen name="material_mini_drawer_item_profile_icon_padding">16dp</dimen>
 
     <!-- Definition for the section item -->
     <dimen name="material_drawer_item_section_text">14sp</dimen>

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