Skip to content

Commit

Permalink
Merge branch 'release/v5.3.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikepenz committed Jun 18, 2016
2 parents 5faba89 + ae60c3f commit 7b6ed51
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 27 deletions.
9 changes: 3 additions & 6 deletions FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
10 changes: 10 additions & 0 deletions FAQ/opening-drawer-from-espresso.md
Original file line number Diff line number Diff line change
@@ -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);`
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
```
Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down Expand Up @@ -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"
}
Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -27,5 +27,5 @@ allprojects {
}

task wrapper(type: Wrapper) {
gradleVersion = '2.13'
gradleVersion = '2.14'
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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'
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.0</string>
<string name="library_materialdrawer_libraryVersion">5.3.1</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>
Expand Down

0 comments on commit 7b6ed51

Please sign in to comment.