diff --git a/DEV/github/banner.png b/DEV/github/banner.png index 6ce050ac6..b05686e24 100644 Binary files a/DEV/github/banner.png and b/DEV/github/banner.png differ diff --git a/README.md b/README.md index 8883a2866..bcbab798f 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.3.4@aar') { +compile('com.mikepenz:materialdrawer:5.3.5@aar') { transitive = true } ``` diff --git a/app/build.gradle b/app/build.gradle index 090a03b31..98e8400e1 100644 --- 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 index ef1a952a9..8b3aee6d9 100755 --- 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 index cbf9c0bf2..6f77b8689 100644 --- 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 index 46a71bc05..d045274d9 100644 --- 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 index 0675c5c48..fdb07f6f1 100644 --- 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 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 index 40b8f4f78..f69f10e15 100755 --- 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 @@ + android:scaleType="fitXY" /> \ No newline at end of file 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 index 8076ab13f..539d1ddf4 100755 --- 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 @@ + android:layout_width="@dimen/material_mini_drawer_item" + android:layout_height="@dimen/material_mini_drawer_item"> \ No newline at end of file diff --git a/library/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml index 2fd4116b4..0cb1952f7 100755 --- a/library/src/main/res/values/dimens.xml +++ b/library/src/main/res/values/dimens.xml @@ -55,11 +55,14 @@ 24dp - 64dp + 72dp 4dp + 8dp 56dp 16dp 12sp + 40dp + 16dp 14sp diff --git a/library/src/main/res/values/library_materialdrawer_strings.xml b/library/src/main/res/values/library_materialdrawer_strings.xml index 45afc8634..16f81f45e 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.3.4 + 5.3.5 https://github.com/mikepenz/MaterialDrawer apache_2_0 true