Merge branch 'release/v0.6.0'

mikepenz · Jan 11, 2016 · 8c8b823 · 8c8b823
2 parents 9ab18a4 + 46e7414
commit 8c8b823
Show file tree

Hide file tree

Showing 13 changed files with 135 additions and 106 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@ Beside being blazing fast, minimizing the code you need to write, it is also rea
 ##A quick overview:
 - Click / Long-Click listeners
 - Selection / Multi-Selection
+- Collapsable items
 - Write less code, get better results
 - Headers
 - Footers
@@ -25,7 +26,7 @@ Beside being blazing fast, minimizing the code you need to write, it is also rea
 #Include in your project
 ##Using Maven
 ```javascript
-compile('com.mikepenz:fastadapter:0.5.6@aar') {
+compile('com.mikepenz:fastadapter:0.6.0@aar') {
 	transitive = true
 }
 ```

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 56
-        versionName '0.5.6'
+        versionCode 60
+        versionName '0.6.0'
 
         applicationVariants.all { variant ->
             variant.outputs.each { output ->
@@ -52,7 +52,7 @@ dependencies {
 
     //used to generate the drawer on the left
     //https://github.com/mikepenz/MaterialDrawer
-    compile('com.mikepenz:materialdrawer:5.0.0.fastAdapter.b5-SNAPSHOT@aar') {
+    compile('com.mikepenz:materialdrawer:4.6.3@aar') {
         transitive = true
         exclude module: "fastadapter"
     }

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/CollapsibleSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/CollapsibleSampleActivity.java
@@ -51,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) {
             public boolean onClick(View v, IAdapter adapter, IItem item, int position) {
                 if (item instanceof SampleItem) {
                     if (((SampleItem) item).getSubItems() != null) {
-                        fastAdapter.toggleCollapsible(position);
+                        fastAdapter.toggleExpandable(position);
                         return true;
                     }
                 }

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/IconGridActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/IconGridActivity.java
@@ -54,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 .withSavedInstance(savedInstanceState)
                 .withShowDrawerOnFirstLaunch(true)
                 .addDrawerItems(
-                        new PrimaryDrawerItem().withName(R.string.sample_simple).withSelectable(false).withIdentifier(6).withIcon(MaterialDesignIconic.Icon.gmi_wallpaper),
+                        new PrimaryDrawerItem().withName(R.string.sample_simple).withSelectable(false).withIdentifier(6).withIcon(MaterialDesignIconic.Icon.gmi_format_align_justify),
                         new PrimaryDrawerItem().withName(R.string.sample_image_list).withSelectable(false).withIdentifier(5).withIcon(MaterialDesignIconic.Icon.gmi_wallpaper),
                         new PrimaryDrawerItem().withName(R.string.sample_multi_select).withSelectable(false).withIdentifier(1).withIcon(MaterialDesignIconic.Icon.gmi_select_all),
                         new PrimaryDrawerItem().withName(R.string.sample_collapsible).withSelectable(false).withIdentifier(2).withIcon(MaterialDesignIconic.Icon.gmi_check_all),
@@ -104,7 +104,7 @@ public boolean onItemClick(View view, int position, IDrawerItem drawerItem) {
             public boolean onClick(View v, IAdapter adapter, IItem item, int position) {
                 if (item instanceof SampleItem) {
                     if (((SampleItem) item).getSubItems() != null) {
-                        fastAdapter.toggleCollapsible(position);
+                        fastAdapter.toggleExpandable(position);
                         return true;
                     }
                 }

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/items/SampleItem.java b/app/src/main/java/com/mikepenz/fastadapter/app/items/SampleItem.java
@@ -7,7 +7,7 @@
 import android.view.View;
 import android.widget.TextView;
 
-import com.mikepenz.fastadapter.ICollapsible;
+import com.mikepenz.fastadapter.IExpandable;
 import com.mikepenz.fastadapter.IItem;
 import com.mikepenz.fastadapter.app.R;
 import com.mikepenz.fastadapter.items.AbstractItem;
@@ -24,14 +24,14 @@
 /**
  * Created by mikepenz on 28.12.15.
  */
-public class SampleItem extends AbstractItem<SampleItem, SampleItem.ViewHolder> implements ICollapsible<SampleItem, IItem> {
+public class SampleItem extends AbstractItem<SampleItem, SampleItem.ViewHolder> implements IExpandable<SampleItem, IItem> {
 
     public String header;
     public StringHolder name;
     public StringHolder description;
 
     private List<IItem> mSubItems;
-    private boolean mCollapsed = true;
+    private boolean mExpanded = false;
 
     public SampleItem withHeader(String header) {
         this.header = header;
@@ -59,13 +59,13 @@ public SampleItem withDescription(@StringRes int descriptionRes) {
     }
 
     @Override
-    public boolean isCollapsed() {
-        return mCollapsed;
+    public boolean isExpanded() {
+        return mExpanded;
     }
 
     @Override
-    public SampleItem withCollapsed(boolean collapsed) {
-        mCollapsed = collapsed;
+    public SampleItem withIsExpanded(boolean expaned) {
+        mExpanded = expaned;
         return this;
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -19,8 +19,8 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 
 # Maven stuff
-VERSION_NAME=0.5.6
-VERSION_CODE=56
+VERSION_NAME=0.6.0
+VERSION_CODE=60
 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 56
-        versionName '0.5.6'
+        versionCode 60
+        versionName '0.6.0'
     }
     buildTypes {
         release {