Merge branch 'release/v1.0.6'

mikepenz · Feb 15, 2016 · 2223bcc · 2223bcc
2 parents 7a767aa + 54d01c4
commit 2223bcc
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ You can try it out here [Google Play](https://play.google.com/store/apps/details
 #Include in your project
 ##Using Maven
 ```javascript
-compile('com.mikepenz:fastadapter:1.0.5@aar') {
+compile('com.mikepenz:fastadapter:1.0.6@aar') {
 	transitive = true
 }
 ```

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 105
-        versionName '1.0.5'
+        versionCode 106
+        versionName '1.0.6'
 
         applicationVariants.all { variant ->
             variant.outputs.each { output ->

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/AdvancedSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/AdvancedSampleActivity.java
@@ -43,7 +43,7 @@ public class AdvancedSampleActivity extends AppCompatActivity {
     //save our FastAdapter
     private FastAdapter<IItem> mFastAdapter;
     private HeaderAdapter<SampleItem> mHeaderAdapter;
-    private ItemAdapter<ExpandableItem> mItemAdapter;
+    private ItemAdapter<IItem> mItemAdapter;
 
     private ActionModeHelper mActionModeHelper;
 
@@ -147,7 +147,7 @@ public void onChanged() {
     private void setItems() {
         mHeaderAdapter.add(new SampleItem().withName("Header").withSelectable(false).withIdentifier(1));
         //fill with some sample data
-        List<ExpandableItem> items = new ArrayList<>();
+        List<IItem> items = new ArrayList<>();
         int size = new Random().nextInt(25) + 10;
         for (int i = 1; i <= size; i++) {
 
@@ -168,7 +168,7 @@ private void setItems() {
                 expandableItem.withSubItems(subItems);
                 items.add(expandableItem);
             } else {
-                items.add(new ExpandableItem().withName("Test " + i).withHeader(headers[i / 5]));
+                items.add(new SampleItem().withName("Test " + i).withHeader(headers[i / 5]));
             }
         }
         mItemAdapter.set(items);

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Maven stuff
-VERSION_NAME=1.0.5
-VERSION_CODE=105
+VERSION_NAME=1.0.6
+VERSION_CODE=106
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=FastAdapter Library

diff --git a/library/build.gradle b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 23
-        versionCode 105
-        versionName '1.0.5'
+        versionCode 106
+        versionName '1.0.6'
     }
     buildTypes {
         release {

diff --git a/library/src/main/java/com/mikepenz/fastadapter/adapters/ItemAdapter.java b/library/src/main/java/com/mikepenz/fastadapter/adapters/ItemAdapter.java
@@ -201,8 +201,8 @@ public void setNewList(List<Item> items) {
         if (mUseIdDistributor) {
             IdDistributor.checkIds(items);
         }
-        mItems = items;
-        mapPossibleTypes(items);
+        mItems = new ArrayList<>(items);
+        mapPossibleTypes(mItems);
         getFastAdapter().notifyAdapterDataSetChanged();
     }
 

diff --git a/library/src/main/res/values/library_fastadapter_strings.xml b/library/src/main/res/values/library_fastadapter_strings.xml
@@ -10,7 +10,7 @@
         <b>FastAdapter</b>, the bullet proof, fast and easy to use adapter library, which minimizes developing time to a fraction...
         ]]>
     </string>
-    <string name="library_fastadapter_libraryVersion">1.0.5</string>
+    <string name="library_fastadapter_libraryVersion">1.0.6</string>
     <string name="library_fastadapter_libraryWebsite">https://github.com/mikepenz/FastAdapter</string>
     <string name="library_fastadapter_licenseId">apache_2_0</string>
     <string name="library_fastadapter_isOpenSource">true</string>