Merge branch 'release/v5.3.0'

hamsaadev · Jun 6, 2016 · 5faba89 · 5faba89
2 parents 5a443c6 + c727f7e
commit 5faba89
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 12 deletions.
diff --git 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.9@aar') {
+compile('com.mikepenz:materialdrawer:5.3.0@aar') {
 	transitive = true
 }
 ```
@@ -413,6 +413,7 @@ builder.withDrawerLayout(R.layout.material_drawer);
 * [Tabe3 News Reader](https://play.google.com/store/apps/details?id=com.tabe3.news)
 * [Facepunch Droid](https://play.google.com/store/apps/details?id=com.apps.anker.facepunchdroid)
 * [World Tourist Attractions](https://play.google.com/store/apps/details?id=indian.fig.whatsaround)
+* [HipCar](https://play.google.com/store/apps/details?id=com.hipcar.android)
 
 #Articles about the MaterialDrawer
 * [java-help.ru](http://java-help.ru/material-navigationdrawer/)

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 529
-        versionName "5.2.9"
+        versionCode 530
+        versionName "5.3.0"
 
         setProperty("archivesBaseName", "-v$versionName-c$versionCode")
     }

diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,7 @@
 # Maven stuff
-VERSION_NAME=5.2.9
-VERSION_CODE=529
+VERSION_NAME=5.3.0
+VERSION_CODE=530
 GROUP=com.mikepenz
-
 POM_DESCRIPTION=MaterialDrawer Library
 POM_URL=https://github.com/mikepenz/MaterialDrawer
 POM_SCM_URL=https://github.com/mikepenz/MaterialDrawer

diff --git a/library/build.gradle b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 529
-        versionName '5.2.9'
+        versionCode 530
+        versionName '5.3.0'
     }
     buildTypes {
         release {

diff --git a/library/src/main/java/com/mikepenz/materialdrawer/Drawer.java b/library/src/main/java/com/mikepenz/materialdrawer/Drawer.java
@@ -179,7 +179,7 @@ public Materialize getMaterialize() {
      */
     public MiniDrawer getMiniDrawer() {
         if (mDrawerBuilder.mMiniDrawer == null) {
-            mDrawerBuilder.mMiniDrawer = new MiniDrawer().withDrawer(this).withAccountHeader(mDrawerBuilder.mAccountHeader);
+            mDrawerBuilder.mMiniDrawer = new MiniDrawer().withDrawer(this).withAccountHeader(mDrawerBuilder.mAccountHeader).withPositionBasedStateManagement(mDrawerBuilder.mPositionBasedStateManagement);
         }
         return mDrawerBuilder.mMiniDrawer;
     }

diff --git a/library/src/main/java/com/mikepenz/materialdrawer/DrawerBuilder.java b/library/src/main/java/com/mikepenz/materialdrawer/DrawerBuilder.java
@@ -863,11 +863,24 @@ public DrawerBuilder withHasStableIds(boolean hasStableIds) {
     }
 
     // an adapter to use for the list
+    protected boolean mPositionBasedStateManagement = true;
     protected FastAdapter<IDrawerItem> mAdapter;
     protected HeaderAdapter<IDrawerItem> mHeaderAdapter = new HeaderAdapter<>();
     protected ItemAdapter<IDrawerItem> mItemAdapter = new ItemAdapter<>();
     protected FooterAdapter<IDrawerItem> mFooterAdapter = new FooterAdapter<>();
 
+    /**
+     * This allows to disable the default position based statemanagment of the FastAdapter and switch to the
+     * new identifier based state managment
+     *
+     * @param positionBasedStateManagement enable / disable the positionBasedStateManagement
+     * @return this
+     */
+    public DrawerBuilder withPositionBasedStateManagement(boolean positionBasedStateManagement) {
+        this.mPositionBasedStateManagement = positionBasedStateManagement;
+        return this;
+    }
+
     /**
      * Define a custom Adapter which will be used in the drawer
      * NOTE: this is not recommender
@@ -894,6 +907,7 @@ protected FastAdapter<IDrawerItem> getAdapter() {
             mAdapter.withSelectable(true);
             mAdapter.withAllowDeselection(false);
             mAdapter.setHasStableIds(mHasStableIds);
+            mAdapter.withPositionBasedStateManagement(mPositionBasedStateManagement);
 
             //we wrap our main Adapter with the item hosting adapter
             mHeaderAdapter.wrap(mItemAdapter.wrap(mFooterAdapter.wrap(mAdapter)));
@@ -1485,7 +1499,7 @@ public Drawer buildView() {
         //we only want to hook a Drawer to the MiniDrawer if it is the main drawer, not the appended one
         if (!mAppended && mGenerateMiniDrawer) {
             // if we should create a MiniDrawer we have to do this now
-            mMiniDrawer = new MiniDrawer().withDrawer(result).withAccountHeader(mAccountHeader);
+            mMiniDrawer = new MiniDrawer().withDrawer(result).withAccountHeader(mAccountHeader).withPositionBasedStateManagement(mPositionBasedStateManagement);
         }
 
         //forget the reference to the activity

diff --git a/library/src/main/java/com/mikepenz/materialdrawer/MiniDrawer.java b/library/src/main/java/com/mikepenz/materialdrawer/MiniDrawer.java
@@ -103,6 +103,21 @@ public MiniDrawer withInRTL(boolean inRTL) {
         return this;
     }
 
+
+    protected boolean mPositionBasedStateManagement = true;
+
+    /**
+     * This allows to disable the default position based statemanagment of the FastAdapter and switch to the
+     * new identifier based state managment
+     *
+     * @param positionBasedStateManagement enable / disable the positionBasedStateManagement
+     * @return this
+     */
+    public MiniDrawer withPositionBasedStateManagement(boolean positionBasedStateManagement) {
+        this.mPositionBasedStateManagement = positionBasedStateManagement;
+        return this;
+    }
+
     private boolean mIncludeSecondaryDrawerItems = false;
 
     /**
@@ -298,6 +313,7 @@ public View build(Context ctx) {
         mAdapter = new FastItemAdapter<>();
         mAdapter.withSelectable(true);
         mAdapter.withAllowDeselection(false);
+        mAdapter.withPositionBasedStateManagement(mPositionBasedStateManagement);
         mRecyclerView.setAdapter(mAdapter);
 
         //if the activity with the drawer should be fullscreen add the padding for the statusbar
@@ -415,13 +431,16 @@ public void createItems() {
             if (getDrawerItems() != null) {
                 //migrate to miniDrawerItems
                 int length = getDrawerItems().size();
+
+                int position = 0;
                 for (int i = 0; i < length; i++) {
                     IDrawerItem miniDrawerItem = generateMiniDrawerItem(getDrawerItems().get(i));
                     if (miniDrawerItem != null) {
                         if (miniDrawerItem.isSelected()) {
-                            select = i;
+                            select = position;
                         }
                         mAdapter.add(miniDrawerItem);
+                        position = position + 1;
                     }
                 }
 

diff --git a/library/src/main/res/values/library_materialdrawer_strings.xml b/library/src/main/res/values/library_materialdrawer_strings.xml
@@ -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.2.9</string>
+    <string name="library_materialdrawer_libraryVersion">5.3.0</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>