* reset the res name if the string name is used and back

FIX mikepenz#227
carlos-mg89 · Apr 20, 2015 · 0b9e841 · 0b9e841
1 parent b79b156
commit 0b9e841
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/BaseDrawerItem.java b/library/src/main/java/com/mikepenz/materialdrawer/model/BaseDrawerItem.java
@@ -81,11 +81,13 @@ public T withSelectedIcon(int selectedIconRes) {
 
     public T withName(String name) {
         this.name = name;
+        this.nameRes = -1;
         return (T) this;
     }
 
     public T withName(int nameRes) {
         this.nameRes = nameRes;
+        this.name = null;
         return (T) this;
     }
 
@@ -315,6 +317,7 @@ public String getName() {
     @Override
     public void setName(String name) {
         this.name = name;
+        this.nameRes = -1;
     }
 
     public int getNameRes() {
@@ -324,6 +327,7 @@ public int getNameRes() {
     @Override
     public void setNameRes(int nameRes) {
         this.nameRes = nameRes;
+        this.name = null;
     }
 
     @Override

diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/SectionDrawerItem.java b/library/src/main/java/com/mikepenz/materialdrawer/model/SectionDrawerItem.java
@@ -32,11 +32,13 @@ public class SectionDrawerItem implements IDrawerItem, Nameable<SectionDrawerIte
 
     public SectionDrawerItem withName(String name) {
         this.name = name;
+        this.nameRes = -1;
         return this;
     }
 
     public SectionDrawerItem withName(int nameRes) {
         this.nameRes = nameRes;
+        this.name = null;
         return this;
     }
 
@@ -91,11 +93,13 @@ public int getNameRes() {
     @Override
     public void setName(String name) {
         this.name = name;
+        this.nameRes = -1;
     }
 
     @Override
     public void setNameRes(int nameRes) {
         this.nameRes = nameRes;
+        this.name = null;
     }
 
     @Override