Merge branch 'release/v0.9.2'

mikepenz · Jan 20, 2016 · 8b55616 · 8b55616
2 parents 56eed90 + 2a06e61
commit 8b55616
Show file tree

Hide file tree

Showing 24 changed files with 85 additions and 89 deletions.
diff --git a/DEV/functiongraphic/functiongraphic.png b/DEV/functiongraphic/functiongraphic.png
diff --git a/DEV/functiongraphic/functiongraphic.psd b/DEV/functiongraphic/functiongraphic.psd
diff --git a/DEV/github/screenshots1.jpg b/DEV/github/screenshots1.jpg
diff --git a/DEV/github/screenshots1.png b/DEV/github/screenshots1.png
diff --git a/DEV/screenshots/Screenshot_20160119-231900.png b/DEV/screenshots/Screenshot_20160119-231900.png
diff --git a/DEV/screenshots/Screenshot_20160119-231905.png b/DEV/screenshots/Screenshot_20160119-231905.png
diff --git a/DEV/screenshots/Screenshot_20160119-231914.png b/DEV/screenshots/Screenshot_20160119-231914.png
diff --git a/DEV/screenshots/Screenshot_20160119-231928.png b/DEV/screenshots/Screenshot_20160119-231928.png
diff --git a/DEV/screenshots/Screenshot_20160119-231945.png b/DEV/screenshots/Screenshot_20160119-231945.png
diff --git a/DEV/screenshots/Screenshot_20160119-231952.png b/DEV/screenshots/Screenshot_20160119-231952.png
diff --git a/DEV/screenshots/Screenshot_20160119-231959.png b/DEV/screenshots/Screenshot_20160119-231959.png
diff --git a/README.md b/README.md
@@ -23,12 +23,16 @@ Beside being blazing fast, minimizing the code you need to write, it is also rea
  - More to come...
 
 #Preview
+##Demo
+You can try it out here [Google Play](https://play.google.com/store/apps/details?id=com.mikepenz.fastadapter.app) (or download the latest release from GitHub)
+
 ##Screenshots
+![Image](https://raw.githubusercontent.com/mikepenz/FastAdapter/develop/DEV/github/screenshots1.jpg)
 
 #Include in your project
 ##Using Maven
 ```javascript
-compile('com.mikepenz:fastadapter:0.9.1@aar') {
+compile('com.mikepenz:fastadapter:0.9.2@aar') {
 	transitive = true
 }
 ```
@@ -83,22 +87,14 @@ public class SampleItem extends AbstractItem<SampleItem, SampleItem.ViewHolder>
 ###2. Set the Adapter to the RecyclerView
 ```java
 //create our FastAdapter which will manage everything
-FastAdapter fastAdapter = new FastAdapter();
-
-//create our ItemAdapter which will host our items
-ItemAdapter itemAdapter = new ItemAdapter();
-
-//find the RecyclerView
-RecyclerView rv = (RecyclerView) findViewById(R.id.rv);
+FastItemAdapter fastAdapter = new FastItemAdapter();
 
 //set our adapters to the RecyclerView
 //we wrap our FastAdapter inside the ItemAdapter -> This allows us to chain adapters for more complex useCases
-rv.setAdapter(itemAdapter.wrap(fastAdapter));
-
-//GENERATE or FETCH YOUR ITEMS...
+recyclerView.setAdapter(fastAdapter);
 
 //set the items to your ItemAdapter
-itemAdapter.add(ITEMS);
+fastAdapter.add(ITEMS);
 ```
 
 ## Libs used in sample app:

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 91
-        versionName '0.9.1'
+        versionCode 92
+        versionName '0.9.2'
 
         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.b11-SNAPSHOT@aar') {
+    compile('com.mikepenz:materialdrawer:5.0.0.fastAdapter.b12-SNAPSHOT@aar') {
         transitive = true
         exclude module: "fastadapter"
     }

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/AdvancedSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/AdvancedSampleActivity.java
@@ -72,7 +72,7 @@ protected void onCreate(Bundle savedInstanceState) {
         //as we provide id's for the items we want the hasStableIds enabled to speed up things
         mFastAdapter.setHasStableIds(true);
         mFastAdapter.withMultiSelect(true);
-        mFastAdapter.withMultiSelectOnLongClick(true);
+        mFastAdapter.withSelectOnLongClick(true);
         mFastAdapter.withOnPreClickListener(new FastAdapter.OnClickListener() {
             @Override
             public boolean onClick(View v, IAdapter adapter, IItem item, int position) {
@@ -179,7 +179,6 @@ class ActionBarCallBack implements ActionMode.Callback {
         @Override
         public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
             //logic if an item was clicked
-
             //return false as we want default behavior to go on
             return false;
         }

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/IconGridActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/IconGridActivity.java
@@ -18,7 +18,6 @@
 import com.mikepenz.iconics.Iconics;
 import com.mikepenz.iconics.typeface.ITypeface;
 import com.mikepenz.itemanimators.SlideDownAlphaAnimator;
-import com.mikepenz.materialdrawer.Drawer;
 import com.mikepenz.materialize.MaterializeBuilder;
 
 import java.util.ArrayList;
@@ -27,8 +26,6 @@
 import java.util.List;
 
 public class IconGridActivity extends AppCompatActivity {
-    //save our header or result
-    private Drawer result = null;
     //save our FastAdapter
     private FastItemAdapter fastItemAdapter;
 
@@ -123,8 +120,6 @@ public int compare(final ITypeface object1, final ITypeface object2) {
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
-        //add the values which need to be saved from the drawer to the bundle
-        outState = result.saveInstanceState(outState);
         //add the values which need to be saved from the adapter to the bundel
         outState = fastItemAdapter.saveInstanceState(outState);
         super.onSaveInstanceState(outState);

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/MultiselectSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/MultiselectSampleActivity.java
@@ -76,7 +76,7 @@ public void commitRemove(Set<Integer> positions, ArrayList<FastAdapter.RelativeI
         //as we provide id's for the items we want the hasStableIds enabled to speed up things
         mFastAdapter.setHasStableIds(true);
         mFastAdapter.withMultiSelect(true);
-        mFastAdapter.withMultiSelectOnLongClick(true);
+        mFastAdapter.withSelectOnLongClick(true);
         mFastAdapter.withOnPreClickListener(new FastAdapter.OnClickListener<SampleItem>() {
             @Override
             public boolean onClick(View v, IAdapter<SampleItem> adapter, SampleItem item, int position) {

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/SampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/SampleActivity.java
@@ -119,7 +119,7 @@ public boolean onItemClick(View view, int position, IDrawerItem drawerItem) {
         //create our FastAdapter which will manage everything
         mFastAdapter = new FastAdapter<>();
         mFastAdapter.withMultiSelect(true);
-        mFastAdapter.withMultiSelectOnLongClick(false);
+        mFastAdapter.withSelectOnLongClick(false);
         //create our ItemAdapter which will host our items
         mItemAdapter = new ItemAdapter<>();
 

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/SimpleItemListActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/SimpleItemListActivity.java
@@ -83,7 +83,7 @@ public boolean onClick(View v, IAdapter<SampleItem> adapter, SampleItem item, in
             public boolean filter(SampleItem item, CharSequence constraint) {
                 //return true if we should filter it out
                 //return false to keep it
-                return !item.name.getText().toLowerCase().contains(constraint);
+                return !item.name.getText().toLowerCase().contains(constraint.toString().toLowerCase());
             }
         });
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Maven stuff
-VERSION_NAME=0.9.1
-VERSION_CODE=91
+VERSION_NAME=0.9.2
+VERSION_CODE=92
 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 91
-        versionName '0.9.1'
+        versionCode 92
+        versionName '0.9.2'
     }
     buildTypes {
         release {