From d4d97610dbf5422acf01e61c7d3cf5510c92a5de Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Wed, 1 Jun 2016 22:14:46 +0200 Subject: [PATCH 1/5] * fix `setDescription` does not set the value correctly --- .../mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java b/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java index 90868baea..d2a51b7b5 100644 --- a/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java +++ b/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java @@ -179,7 +179,7 @@ public StringHolder getDescription() { } public void setDescription(String description) { - this.email = email; + this.email = new StringHolder(description); } @Override From 67a8fe7ce50a80eeb469ec573beac47528909499 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Wed, 1 Jun 2016 22:18:05 +0200 Subject: [PATCH 2/5] * allow to make the `ProfileSeetingDrawerItem` selectable so it can be included in the `Dropdown` * FIX #1313 --- .../materialdrawer/model/ProfileSettingDrawerItem.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java b/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java index d2a51b7b5..5df2c188f 100644 --- a/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java +++ b/library/src/main/java/com/mikepenz/materialdrawer/model/ProfileSettingDrawerItem.java @@ -43,6 +43,8 @@ public class ProfileSettingDrawerItem extends AbstractDrawerItem Date: Wed, 1 Jun 2016 22:44:38 +0200 Subject: [PATCH 3/5] * correctly detect if the view is in RTL mode --- .../main/java/com/mikepenz/materialdrawer/DrawerBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/com/mikepenz/materialdrawer/DrawerBuilder.java b/library/src/main/java/com/mikepenz/materialdrawer/DrawerBuilder.java index 0cd438916..b04e205c6 100644 --- a/library/src/main/java/com/mikepenz/materialdrawer/DrawerBuilder.java +++ b/library/src/main/java/com/mikepenz/materialdrawer/DrawerBuilder.java @@ -18,6 +18,7 @@ import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; import android.support.v4.view.GravityCompat; +import android.support.v4.view.ViewCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.view.SupportMenuInflater; @@ -1564,7 +1565,7 @@ private void createContent() { //set the shadow for the drawer if (Build.VERSION.SDK_INT < 21 && mDrawerLayout != null) { - if (mDrawerGravity == GravityCompat.START) { + if (ViewCompat.getLayoutDirection(mRootView) == ViewCompat.LAYOUT_DIRECTION_LTR) { mDrawerLayout.setDrawerShadow(R.drawable.material_drawer_shadow_right, mDrawerGravity); } else { mDrawerLayout.setDrawerShadow(R.drawable.material_drawer_shadow_left, mDrawerGravity); From 5eecc22ae2b3c13985a58ac8e678832468a6deaf Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Wed, 1 Jun 2016 22:59:11 +0200 Subject: [PATCH 4/5] * fix RTL layout of the `CompactHeader` * FIX #1311 --- .../layout/material_drawer_compact_header.xml | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/library/src/main/res/layout/material_drawer_compact_header.xml b/library/src/main/res/layout/material_drawer_compact_header.xml index 1bb5907a2..63fae0804 100644 --- a/library/src/main/res/layout/material_drawer_compact_header.xml +++ b/library/src/main/res/layout/material_drawer_compact_header.xml @@ -8,10 +8,11 @@ android:layout_height="@dimen/material_drawer_account_header_height_compact" android:scaleType="fitXY" /> - + android:layout_height="@dimen/material_drawer_account_header_height_compact" + android:orientation="horizontal"> - + \ No newline at end of file From b1bdbe4dcad057cb8cd5bb43caf509bbe15a4f0f Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Thu, 2 Jun 2016 00:00:35 +0200 Subject: [PATCH 5/5] * [release] v5.2.9 --- README.md | 2 +- app/build.gradle | 4 ++-- gradle.properties | 4 ++-- library/build.gradle | 4 ++-- .../src/main/res/values/library_materialdrawer_strings.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 3c9e3d7c8..8dc00578d 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.2.8@aar') { +compile('com.mikepenz:materialdrawer:5.2.9@aar') { transitive = true } ``` diff --git a/app/build.gradle b/app/build.gradle index 2a089f609..a7c59d7c3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { defaultConfig { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk - versionCode 528 - versionName "5.2.8" + versionCode 529 + versionName "5.2.9" setProperty("archivesBaseName", "-v$versionName-c$versionCode") } diff --git a/gradle.properties b/gradle.properties index b737a3881..2f84c7538 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Maven stuff -VERSION_NAME=5.2.8 -VERSION_CODE=528 +VERSION_NAME=5.2.9 +VERSION_CODE=529 GROUP=com.mikepenz POM_DESCRIPTION=MaterialDrawer Library diff --git a/library/build.gradle b/library/build.gradle index bf2146f87..2176b94f3 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -8,8 +8,8 @@ android { defaultConfig { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk - versionCode 528 - versionName '5.2.8' + versionCode 529 + versionName '5.2.9' } buildTypes { release { diff --git a/library/src/main/res/values/library_materialdrawer_strings.xml b/library/src/main/res/values/library_materialdrawer_strings.xml index 02e7f00f2..f99faa4fe 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.2.8 + 5.2.9 https://github.com/mikepenz/MaterialDrawer apache_2_0 true