From 190e7c73cb81b40c905d67311c5ab9116c82e062 Mon Sep 17 00:00:00 2001 From: Roc Boronat Date: Thu, 9 Jun 2016 19:13:32 +0200 Subject: [PATCH 1/5] Create a Q&A file talking about referencing the drawer from Espresso --- FAQ/opening-drawer-from-espresso.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 FAQ/opening-drawer-from-espresso.md diff --git a/FAQ/opening-drawer-from-espresso.md b/FAQ/opening-drawer-from-espresso.md new file mode 100644 index 000000000..5fb7459ba --- /dev/null +++ b/FAQ/opening-drawer-from-espresso.md @@ -0,0 +1,10 @@ +### Q: How to open the drawer from an instrumental test written with Espresso? +### A: + +First, you need a add `espresso-contrib` to your project. It has the needed `DrawerActions` class. + +`androidTestCompile 'com.android.support.test.espresso:espresso-contrib:2.2.2'` + +Then, you need to open the drawer with his `openDrawer()` method and the drawer layout ID. The generated one is `R.id.material_drawer_layout` + +`DrawerActions.openDrawer(R.id.material_drawer_layout);` From e3a9ca3b8f654e3e90c5aedbd3c900c79c49c67d Mon Sep 17 00:00:00 2001 From: Roc Boronat Date: Thu, 9 Jun 2016 19:15:58 +0200 Subject: [PATCH 2/5] Add the just created Q&A to the FAQ.md, solve typos and remove empty sections --- FAQ.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/FAQ.md b/FAQ.md index 7e49ea0c6..ae93b68bc 100644 --- a/FAQ.md +++ b/FAQ.md @@ -11,11 +11,8 @@ Each question and it's answer is hosted in a separate file within the FAQ folder ##AccountHeader -* [How can i use the AccountHeader with just one profile and disable the dropdown?](FAQ/accountheader_single_profile_without_dropdown.md) +* [How can I use the AccountHeader with just one profile and disable the dropdown?](FAQ/accountheader_single_profile_without_dropdown.md) -##Addons - -##Resources - -##Links +##Testing +* [How can I open the drawer from an instrumental test written with Espresso?](FAQ/opening-drawer-from-espresso.md) From 330ccdea0b60f45ea000f144fc3a46011e3fbfe5 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Sat, 18 Jun 2016 17:54:44 +0200 Subject: [PATCH 3/5] * completely fix the shadow behavior with RTL / LTR and in MultiDrawer mode --- .../main/java/com/mikepenz/materialdrawer/DrawerBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/mikepenz/materialdrawer/DrawerBuilder.java b/library/src/main/java/com/mikepenz/materialdrawer/DrawerBuilder.java index 8b92c9bcd..f8f8274f4 100644 --- a/library/src/main/java/com/mikepenz/materialdrawer/DrawerBuilder.java +++ b/library/src/main/java/com/mikepenz/materialdrawer/DrawerBuilder.java @@ -1580,9 +1580,9 @@ private void createContent() { //set the shadow for the drawer if (Build.VERSION.SDK_INT < 21 && mDrawerLayout != null) { if (ViewCompat.getLayoutDirection(mRootView) == ViewCompat.LAYOUT_DIRECTION_LTR) { - mDrawerLayout.setDrawerShadow(R.drawable.material_drawer_shadow_right, mDrawerGravity); + mDrawerLayout.setDrawerShadow(mDrawerGravity == GravityCompat.START ? R.drawable.material_drawer_shadow_right : R.drawable.material_drawer_shadow_left, mDrawerGravity); } else { - mDrawerLayout.setDrawerShadow(R.drawable.material_drawer_shadow_left, mDrawerGravity); + mDrawerLayout.setDrawerShadow(mDrawerGravity == GravityCompat.START ? R.drawable.material_drawer_shadow_left : R.drawable.material_drawer_shadow_right, mDrawerGravity); } } From db9d5a31a99e2fb995fcdf9e1e04e8972affd202 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Sat, 18 Jun 2016 19:15:28 +0200 Subject: [PATCH 4/5] * change to target SDK 24 * change to compileSDK 24 * change to buildTools 24 * change to supportLibs 24 * update to gradle 2.14 * update android-iconics to v2.6.6 * udpate fastadapter to v1.5.5 * update materialize to v0.9.0 --- app/build.gradle | 2 +- build.gradle | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8b1a8f151..d816d6313 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,7 @@ dependencies { // used to generate the Open Source section // https://github.com/mikepenz/AboutLibraries - compile('com.mikepenz:aboutlibraries:5.6.6@aar') { + compile('com.mikepenz:aboutlibraries:5.6.8@aar') { transitive = true exclude module: "fastadapter" } diff --git a/build.gradle b/build.gradle index 066e36df2..d0a4500d1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ buildscript { ext { - setup = [compileSdk: 23, - buildTools: "23.0.3", + setup = [compileSdk: 24, + buildTools: "24.0.0", minSdk : 10, - targetSdk : 23] + targetSdk : 24] - versions = [supportLib: "23.4.0"] + versions = [supportLib: "24.0.0"] } repositories { @@ -27,5 +27,5 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '2.13' + gradleVersion = '2.14' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cc781747e..fbecb19c7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue May 10 18:14:12 CEST 2016 +#Sat Jun 18 19:13:54 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip diff --git a/library/build.gradle b/library/build.gradle index 4cf8f12c8..a43fc35f6 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -37,15 +37,15 @@ dependencies { // contains util classes to support various android versions, and clean up code // comes with the awesome "Holder"-Pattern // https://github.com/mikepenz/Materialize - compile 'com.mikepenz:materialize:0.8.8@aar' + compile 'com.mikepenz:materialize:0.9.0@aar' // 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.0@aar' + compile 'com.mikepenz:iconics-core:2.6.6@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.5.2@aar' + compile 'com.mikepenz:fastadapter:1.5.5@aar' } From ae60c3fe61862a0a018b552268b3ba191248937b Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Sat, 18 Jun 2016 19:17:05 +0200 Subject: [PATCH 5/5] * [release] v5.3.1 --- 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 610f80c40..1b8e27f3c 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.0@aar') { +compile('com.mikepenz:materialdrawer:5.3.1@aar') { transitive = true } ``` diff --git a/app/build.gradle b/app/build.gradle index d816d6313..23a20400e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { defaultConfig { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk - versionCode 530 - versionName "5.3.0" + versionCode 531 + versionName "5.3.1" setProperty("archivesBaseName", "-v$versionName-c$versionCode") } diff --git a/gradle.properties b/gradle.properties index 63a853b37..675d553d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Maven stuff -VERSION_NAME=5.3.0 -VERSION_CODE=530 +VERSION_NAME=5.3.1 +VERSION_CODE=531 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 a43fc35f6..b1505074e 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -8,8 +8,8 @@ android { defaultConfig { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk - versionCode 530 - versionName '5.3.0' + versionCode 531 + versionName '5.3.1' } 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 5acf44788..fb7f2589b 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.0 + 5.3.1 https://github.com/mikepenz/MaterialDrawer apache_2_0 true