Skip to content

Commit

Permalink
Merge branch 'release/v5.8.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikepenz committed Dec 9, 2016
2 parents a69fa62 + 1999856 commit c1eda0b
Show file tree
Hide file tree
Showing 24 changed files with 48 additions and 14 deletions.
3 changes: 2 additions & 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.8.0@aar') {
compile('com.mikepenz:materialdrawer:5.8.1@aar') {
transitive = true
}
```
Expand Down Expand Up @@ -423,6 +423,7 @@ builder.withDrawerLayout(R.layout.material_drawer);
* [I'm Reading Quran - Kur'an Okuyorum](https://play.google.com/store/apps/details?id=com.homemade.kuranokuma)
* [Makota Money Manager](https://play.google.com/store/apps/details?id=be.jatra.makota)
* [Companion for Band](https://github.com/adithya321/Companion-for-Band)
* [Chisme for Sensu](https://play.google.com/store/apps/details?id=com.antonionicolaspina.sensu)

#Articles about the MaterialDrawer
* [java-help.ru](http://java-help.ru/material-navigationdrawer/)
Expand Down
4 changes: 2 additions & 2 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 580
versionName "5.8.0"
versionCode 581
versionName "5.8.1"

setProperty("archivesBaseName", "-v$versionName-c$versionCode")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ public int getLayoutRes() {

@Override
public void bindView(ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

Context ctx = viewHolder.itemView.getContext();

//set the identifier from the drawerItem here. It can be used to run tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ protected void bindViewHelper(CustomBaseViewHolder viewHolder) {
//set the item selected if it is
viewHolder.itemView.setSelected(isSelected());

//
viewHolder.itemView.setTag(this);

//get the correct color for the background
int selectedColor = getSelectedColor(ctx);
//get the correct color for the text
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ public int getLayoutRes() {

@Override
public void bindView(ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

Context ctx = viewHolder.itemView.getContext();

//bind the basic view parts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ public int getLayoutRes() {

@Override
public void bindView(ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

Context ctx = viewHolder.itemView.getContext();

//set the identifier from the drawerItem here. It can be used to run tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ public int getLayoutRes() {

@Override
public void bindView(ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

Context ctx = viewHolder.itemView.getContext();

//bind the basic view parts
Expand Down
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.8.0
VERSION_CODE=580
VERSION_NAME=5.8.1
VERSION_CODE=581
GROUP=com.mikepenz
POM_DESCRIPTION=MaterialDrawer Library
POM_URL=https://github.com/mikepenz/MaterialDrawer
Expand Down
4 changes: 2 additions & 2 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 580
versionName '5.8.0'
versionCode 581
versionName '5.8.1'
}
buildTypes {
release {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ public int getLayoutRes() {

@Override
public void bindView(ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

Context ctx = viewHolder.itemView.getContext();
//bind the basic view parts
bindViewHelper(viewHolder);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.mikepenz.materialdrawer.model;

import android.content.Context;
import android.support.annotation.CallSuper;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
Expand Down Expand Up @@ -312,6 +313,12 @@ public View generateView(Context ctx, ViewGroup parent) {
return viewHolder.itemView;
}

@CallSuper
@Override
public void bindView(VH holder, List<Object> payloads) {
holder.itemView.setTag(this);
}

/**
* called when the view is unbound
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ public int getLayoutRes() {

@Override
public void bindView(final ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

//bind the basic view parts
bindViewHelper(viewHolder);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ public int getLayoutRes() {

@Override
public void bindView(final ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

//bind the basic view parts
bindViewHelper(viewHolder);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ protected void bindViewHelper(BaseViewHolder viewHolder) {
//set the item enabled if it is
viewHolder.itemView.setEnabled(isEnabled());

//
viewHolder.itemView.setTag(this);

//get the correct color for the background
int selectedColor = getSelectedColor(ctx);
//get the correct color for the text
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ public int getLayoutRes() {

@Override
public void bindView(ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

Context ctx = viewHolder.itemView.getContext();

//set the identifier from the drawerItem here. It can be used to run tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public int getLayoutRes() {

@Override
public void bindView(ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

Context ctx = viewHolder.itemView.getContext();

//set the identifier from the drawerItem here. It can be used to run tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ public class ExpandableBadgeDrawerItem extends BaseDescribeableDrawerItem<Expand
}

@Override public void bindView(ExpandableBadgeDrawerItem.ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

Context ctx = viewHolder.itemView.getContext();
//bind the basic view parts
bindViewHelper(viewHolder);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ public boolean onItemClick(View view, int position, IDrawerItem drawerItem) {

@Override
public void bindView(ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

Context ctx = viewHolder.itemView.getContext();
//bind the basic view parts
bindViewHelper(viewHolder);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ public int getLayoutRes() {

@Override
public void bindView(ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

Context ctx = viewHolder.itemView.getContext();

//set a different height for this item
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ public int getLayoutRes() {

@Override
public void bindView(ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

if (customHeight != null) {
RecyclerView.LayoutParams lp = (RecyclerView.LayoutParams) viewHolder.itemView.getLayoutParams();
lp.height = customHeight.asPixel(viewHolder.itemView.getContext());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@ public int getLayoutRes() {

@Override
public void bindView(ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

Context ctx = viewHolder.itemView.getContext();

//set the identifier from the drawerItem here. It can be used to run tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@ public int getLayoutRes() {

@Override
public void bindView(ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

//get the context
Context ctx = viewHolder.itemView.getContext();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ public Typeface getTypeface() {

@Override
public void bindView(ViewHolder viewHolder, List payloads) {
super.bindView(viewHolder, payloads);

Context ctx = viewHolder.itemView.getContext();

//set the identifier from the drawerItem here. It can be used to run tests
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.8.0</string>
<string name="library_materialdrawer_libraryVersion">5.8.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 c1eda0b

Please sign in to comment.