[WIP] FastAdapter V3

.travis.yml

@@ -20,7 +20,17 @@ android:
 jdk:
   - oraclejdk8
 
-script: ./gradlew clean test
+before_script:
+  - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
+  - emulator -avd test -no-skin -no-audio -no-window &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
+
+script: 
+  - ./gradlew clean test
+  - ./gradlew build --stacktrace
+  - adb devices
+  - ./gradlew connectedAndroidTest
 
 branches:
   except:

README.md

@@ -176,7 +176,7 @@ fastAdapter.filter("yourSearchTerm");
 fastAdapter.withFilterPredicate(new IItemAdapter.Predicate<Item>() {
             @Override
             public boolean filter(Item item, CharSequence constraint) {
-                return item.getName().startsWith(String.valueOf(constraint));
+                return !item.getName().startsWith(String.valueOf(constraint));
             }
 });
 ```

app/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'realm-android'
+apply plugin: 'com.getkeepsafe.dexcount'
 //wrap with try and catch so the build is working even if the signing stuff is missing
 try {
     apply from: '../../../signing.gradle'
@@ -10,6 +11,10 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
 
+    dexOptions {
+        javaMaxHeapSize "2g"
+    }
+
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25

app/src/main/java/com/mikepenz/fastadapter/app/CheckBoxSampleActivity.java

@@ -84,7 +84,7 @@ public boolean onClick(View v, IAdapter<CheckBoxSampleItem> adapter, CheckBoxSam
                 x++;
             }
         }
-        fastItemAdapter.add(items);
+        fastItemAdapter.items().add(items);
 
         //restore selections (this has to be done after the items were added
         fastItemAdapter.withSavedInstanceState(savedInstanceState);

app/src/main/java/com/mikepenz/fastadapter/app/EndlessScrollListActivity.java

@@ -78,7 +78,7 @@ public boolean onClick(View v, IAdapter<SimpleItem> adapter, SimpleItem item, in
         });
 
         //configure the itemAdapter
-        fastItemAdapter.withFilterPredicate(new IItemAdapter.Predicate<SimpleItem>() {
+        fastItemAdapter.items().withFilterPredicate(new IItemAdapter.Predicate<SimpleItem>() {
             @Override
             public boolean filter(SimpleItem item, CharSequence constraint) {
                 //return true if we should filter it out
@@ -87,7 +87,7 @@ public boolean filter(SimpleItem item, CharSequence constraint) {
             }
         });
 
-        fastItemAdapter.getItemAdapter().withItemFilterListener(this);
+        fastItemAdapter.items().withItemFilterListener(this);
 
         //get our recyclerView and do basic setup
         RecyclerView recyclerView = (RecyclerView) findViewById(R.id.rv);
@@ -106,7 +106,7 @@ public void onLoadMore(final int currentPage) {
                     public void run() {
                         footerAdapter.clear();
                         for (int i = 1; i < 16; i++) {
-                            fastItemAdapter.add(fastItemAdapter.getAdapterItemCount(), new SimpleItem().withName("Item " + i + " Page " + currentPage));
+                            fastItemAdapter.items().add(fastItemAdapter.items().getAdapterItemCount(), new SimpleItem().withName("Item " + i + " Page " + currentPage));
                         }
                     }
                 }, 2000);
@@ -118,7 +118,7 @@ public void run() {
         for (int i = 1; i < 16; i++) {
             items.add(new SimpleItem().withName("Item " + i + " Page " + 1));
         }
-        fastItemAdapter.add(items);
+        fastItemAdapter.items().add(items);
 
         //add drag and drop for item
         touchCallback = new SimpleDragCallback(this);
@@ -169,14 +169,14 @@ public boolean onCreateOptionsMenu(Menu menu) {
                 @Override
                 public boolean onQueryTextSubmit(String s) {
                     touchCallback.setIsDragEnabled(false);
-                    fastItemAdapter.filter(s);
+                    fastItemAdapter.items().filter(s);
                     return true;
                 }
 
 
                 @Override
                 public boolean onQueryTextChange(String s) {
-                    fastItemAdapter.filter(s);
+                    fastItemAdapter.items().filter(s);
                     touchCallback.setIsDragEnabled(TextUtils.isEmpty(s));
                     return true;
                 }
@@ -190,7 +190,7 @@ public boolean onQueryTextChange(String s) {
 
     @Override
     public boolean itemTouchOnMove(int oldPosition, int newPosition) {
-        Collections.swap(fastItemAdapter.getAdapterItems(), oldPosition, newPosition); // change position
+        Collections.swap(fastItemAdapter.items().getAdapterItems(), oldPosition, newPosition); // change position
         fastItemAdapter.notifyAdapterItemMoved(oldPosition, newPosition);
         return true;
     }

app/src/main/java/com/mikepenz/fastadapter/app/ExpandableMultiselectDeleteSampleActivity.java

@@ -115,7 +115,7 @@ public boolean onLongClick(View v, IAdapter<IItem> adapter, IItem item, int posi
                 .withTitleProvider(new ActionModeHelper.ActionModeTitleProvider() {
                     @Override
                     public String getTitle(int selected) {
-                        return selected + "/" + SubItemUtil.countItems(fastItemAdapter.getItemAdapter(), false);
+                        return selected + "/" + SubItemUtil.countItems(fastItemAdapter.items(), false);
                     }
                 })
                 // important so that the helper knows, that is should use the SubItemUtil for validating its state
@@ -185,7 +185,7 @@ public int getSelectedSubItems() {
                 items.add(sampleItem);
             }
         }
-        fastItemAdapter.add(items);
+        fastItemAdapter.items().add(items);
         fastItemAdapter.expand();
 
         fastItemAdapter.withSelectionListener(new ISelectionListener() {
@@ -194,7 +194,7 @@ public void onSelectionChanged(IItem item, boolean selected) {
                 if (item instanceof SimpleSubItem) {
                     IItem headerItem = ((SimpleSubItem) item).getParent();
                     if (headerItem != null) {
-                        int pos = fastItemAdapter.getAdapterPosition(headerItem);
+                        int pos = fastItemAdapter.items().getAdapterPosition(headerItem);
                         // Important: notify the header directly, not via the notifyadapterItemChanged!
                         // we just want to update the view and we are sure, nothing else has to be done
                         fastItemAdapter.notifyItemChanged(pos);

app/src/main/java/com/mikepenz/fastadapter/app/ExpandableSampleActivity.java

@@ -77,7 +77,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 items.add(new SimpleSubItem().withName("Test " + i).withIdentifier(100 + i));
             }
         }
-        fastItemAdapter.add(items);
+        fastItemAdapter.items().add(items);
 
         //restore selections (this has to be done after the items were added
         fastItemAdapter.withSavedInstanceState(savedInstanceState);

app/src/main/java/com/mikepenz/fastadapter/app/IconGridActivity.java

@@ -9,10 +9,9 @@
 import android.view.MenuItem;
 import android.view.View;
 
-import com.mikepenz.fastadapter.IItem;
-import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter;
 import com.mikepenz.fastadapter.app.items.IconItem;
 import com.mikepenz.fastadapter.app.items.expandable.SimpleSubExpandableItem;
+import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter;
 import com.mikepenz.iconics.Iconics;
 import com.mikepenz.iconics.context.IconicsLayoutInflater;
 import com.mikepenz.iconics.typeface.ITypeface;
@@ -26,7 +25,7 @@
 
 public class IconGridActivity extends AppCompatActivity {
     //save our FastAdapter
-    private FastItemAdapter fastItemAdapter;
+    private FastItemAdapter<SimpleSubExpandableItem> fastItemAdapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,7 +46,7 @@ protected void onCreate(Bundle savedInstanceState) {
         new MaterializeBuilder().withActivity(this).build();
 
         //create our FastAdapter which will manage everything
-        fastItemAdapter = new FastItemAdapter();
+        fastItemAdapter = new FastItemAdapter<>();
 
         //get our recyclerView and do basic setup
         RecyclerView rv = (RecyclerView) findViewById(R.id.rv);
@@ -91,7 +90,7 @@ public int compare(final ITypeface object1, final ITypeface object2) {
                     .withName(font.getFontName())
                     .withIdentifier(count);
 
-            ArrayList<IItem> icons = new ArrayList<>();
+            ArrayList<IconItem> icons = new ArrayList<>();
             for (String icon : font.getIcons()) {
                 IconItem iconItem = new IconItem();
                 iconItem.withIcon(font.getIcon(icon));
@@ -104,7 +103,7 @@ public int compare(final ITypeface object1, final ITypeface object2) {
         }
 
         //fill with some sample data
-        fastItemAdapter.add(items);
+        fastItemAdapter.items().add(items);
 
         //if first start we want to expand the item with ID 2
         if (savedInstanceState != null) {

app/src/main/java/com/mikepenz/fastadapter/app/ImageListActivity.java

@@ -69,7 +69,7 @@ public boolean onClick(View v, IAdapter<ImageItem> adapter, ImageItem item, int
         rv.setAdapter(mFastItemAdapter);
 
         //fill with some sample data
-        mFastItemAdapter.add(ImageDummyData.getImageItems());
+        mFastItemAdapter.items().add(ImageDummyData.getImageItems());
 
         //restore selections (this has to be done after the items were added
         mFastItemAdapter.withSavedInstanceState(savedInstanceState);

app/src/main/java/com/mikepenz/fastadapter/app/MopubAdsActivity.java

@@ -48,7 +48,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mAdapter.withOnClickListener(this);
 
         for (int i = 65; i <= 90; i++) {
-            mAdapter.add(new LetterItem(String.valueOf((char) i)));
+            mAdapter.items().add(new LetterItem(String.valueOf((char) i)));
         }
 
         ViewBinder viewBinder = new ViewBinder.Builder(R.layout.native_ad_item)

app/src/main/java/com/mikepenz/fastadapter/app/MultiTypeGenericItemActivity.java

@@ -8,12 +8,11 @@
 import android.view.MenuItem;
 import android.view.View;
 
-import com.mikepenz.fastadapter.FastAdapter;
-import com.mikepenz.fastadapter.adapters.GenericItemAdapter;
 import com.mikepenz.fastadapter.app.generic.GenericIconItem;
 import com.mikepenz.fastadapter.app.generic.IconModel;
 import com.mikepenz.fastadapter.app.generic.RightGenericIconItem;
 import com.mikepenz.fastadapter.app.generic.RightIconModel;
+import com.mikepenz.fastadapter.commons.adapters.GenericFastItemAdapter;
 import com.mikepenz.fastadapter.utils.Function;
 import com.mikepenz.iconics.Iconics;
 import com.mikepenz.iconics.typeface.ITypeface;
@@ -27,7 +26,7 @@
 
 public class MultiTypeGenericItemActivity extends AppCompatActivity {
     //save our FastAdapter
-    private FastAdapter fastAdapter;
+    private GenericFastItemAdapter<IconModel, GenericIconItem> genericFastItemAdapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -45,17 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
         //create our FastAdapter which will manage everything
-        fastAdapter = new FastAdapter();
-        fastAdapter.withSelectable(true);
-
-        //get our recyclerView and do basic setup
-        RecyclerView rv = (RecyclerView) findViewById(R.id.rv);
-
-        //init our gridLayoutManager and configure RV
-        GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 3);
-
-        //if you need multiple items for different models you can also do this be defining a Function which get's the model object and returns the item (extends IItem)
-        GenericItemAdapter<IconModel, GenericIconItem> itemAdapter = new GenericItemAdapter<>(new Function<IconModel, GenericIconItem>() {
+        genericFastItemAdapter = new GenericFastItemAdapter<>(new Function<IconModel, GenericIconItem>() {
             @Override
             public GenericIconItem apply(IconModel o) {
                 if (o instanceof RightIconModel) {
@@ -65,10 +54,17 @@ public GenericIconItem apply(IconModel o) {
                 }
             }
         });
+        genericFastItemAdapter.withSelectable(true);
+
+        //get our recyclerView and do basic setup
+        RecyclerView rv = (RecyclerView) findViewById(R.id.rv);
+
+        //init our gridLayoutManager and configure RV
+        GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 3);
 
         rv.setLayoutManager(gridLayoutManager);
         rv.setItemAnimator(new SlideDownAlphaAnimator());
-        rv.setAdapter(itemAdapter.wrap(fastAdapter));
+        rv.setAdapter(genericFastItemAdapter);
 
         //order fonts by their name
         List<ITypeface> mFonts = new ArrayList<>(Iconics.getRegisteredFonts(this));
@@ -94,10 +90,10 @@ public int compare(final ITypeface object1, final ITypeface object2) {
         }
 
         //fill with some sample data
-        itemAdapter.addModel(models);
+        genericFastItemAdapter.items().addModel(models);
 
         //restore selections (this has to be done after the items were added
-        fastAdapter.withSavedInstanceState(savedInstanceState);
+        genericFastItemAdapter.withSavedInstanceState(savedInstanceState);
 
         //set the back arrow in the toolbar
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -107,7 +103,7 @@ 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 adapter to the bundel
-        outState = fastAdapter.saveInstanceState(outState);
+        outState = genericFastItemAdapter.saveInstanceState(outState);
         super.onSaveInstanceState(outState);
     }
 

app/src/main/java/com/mikepenz/fastadapter/app/MultiselectSampleActivity.java

@@ -33,7 +33,7 @@ public class MultiselectSampleActivity extends AppCompatActivity {
     //save our FastAdapter
     private FastAdapter<SimpleItem> mFastAdapter;
 
-    private UndoHelper mUndoHelper;
+    private UndoHelper<SimpleItem> mUndoHelper;
 
     private ActionModeHelper mActionModeHelper;
 
@@ -55,7 +55,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mFastAdapter = new FastAdapter<>();
 
         //
-        mUndoHelper = new UndoHelper(mFastAdapter, new UndoHelper.UndoListener<SimpleItem>() {
+        mUndoHelper = new UndoHelper<>(mFastAdapter, new UndoHelper.UndoListener<SimpleItem>() {
             @Override
             public void commitRemove(Set<Integer> positions, ArrayList<FastAdapter.RelativeInfo<SimpleItem>> removed) {
                 Log.e("UndoHelper", "Positions: " + positions.toString() + " Removed: " + removed.size());
@@ -168,7 +168,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     /**
      * Our ActionBarCallBack to showcase the CAB
      */
-    class ActionBarCallBack implements ActionMode.Callback {
+    private class ActionBarCallBack implements ActionMode.Callback {
 
         @Override
         public boolean onActionItemClicked(ActionMode mode, MenuItem item) {

app/src/main/java/com/mikepenz/fastadapter/app/RadioButtonSampleActivity.java

@@ -85,7 +85,7 @@ public boolean onClick(View v, IAdapter<RadioButtonSampleItem> adapter, RadioBut
                 x++;
             }
         }
-        fastItemAdapter.add(items);
+        fastItemAdapter.items().add(items);
 
         //restore selections (this has to be done after the items were added
         fastItemAdapter.withSavedInstanceState(savedInstanceState);