Merge branch 'release/v1.0.5'

mikepenz · Feb 12, 2016 · 7a767aa · 7a767aa
2 parents 1cd871b + ddbcbde
commit 7a767aa
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 48 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.4@aar') {
+compile('com.mikepenz:fastadapter:1.0.5@aar') {
 	transitive = true
 }
 ```

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 104
-        versionName '1.0.4'
+        versionCode 105
+        versionName '1.0.5'
 
         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
@@ -41,9 +41,9 @@ public class AdvancedSampleActivity extends AppCompatActivity {
     private static final String[] headers = new String[]{"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"};
 
     //save our FastAdapter
-    private FastAdapter mFastAdapter;
-    private HeaderAdapter mHeaderAdapter;
-    private ItemAdapter mItemAdapter;
+    private FastAdapter<IItem> mFastAdapter;
+    private HeaderAdapter<SampleItem> mHeaderAdapter;
+    private ItemAdapter<ExpandableItem> mItemAdapter;
 
     private ActionModeHelper mActionModeHelper;
 
@@ -65,22 +65,22 @@ protected void onCreate(Bundle savedInstanceState) {
         new MaterializeBuilder().withActivity(this).build();
 
         //create our FastAdapter
-        mFastAdapter = new FastAdapter();
+        mFastAdapter = new FastAdapter<>();
 
         //we init our ActionModeHelper
         mActionModeHelper = new ActionModeHelper(mFastAdapter, R.menu.cab, new ActionBarCallBack());
 
         //create our adapters
         final StickyHeaderAdapter stickyHeaderAdapter = new StickyHeaderAdapter();
-        mItemAdapter = new ItemAdapter();
-        mHeaderAdapter = new HeaderAdapter();
+        mItemAdapter = new ItemAdapter<>();
+        mHeaderAdapter = new HeaderAdapter<>();
 
         //configure our mFastAdapter
         //as we provide id's for the items we want the hasStableIds enabled to speed up things
         mFastAdapter.setHasStableIds(true);
         mFastAdapter.withMultiSelect(true);
         mFastAdapter.withSelectOnLongClick(true);
-        mFastAdapter.withOnPreClickListener(new FastAdapter.OnClickListener() {
+        mFastAdapter.withOnPreClickListener(new FastAdapter.OnClickListener<IItem>() {
             @Override
             public boolean onClick(View v, IAdapter adapter, IItem item, int position) {
                 //we handle the default onClick behavior for the actionMode. This will return null if it didn't do anything and you can handle a normal onClick
@@ -98,7 +98,7 @@ public boolean onClick(View v, IAdapter adapter, IItem item, int position) {
             }
         });
 
-        mFastAdapter.withOnPreLongClickListener(new FastAdapter.OnLongClickListener() {
+        mFastAdapter.withOnPreLongClickListener(new FastAdapter.OnLongClickListener<IItem>() {
             @Override
             public boolean onLongClick(View v, IAdapter adapter, IItem item, int position) {
                 ActionMode actionMode = mActionModeHelper.onLongClick(AdvancedSampleActivity.this, position);
@@ -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<IItem> items = new ArrayList<>();
+        List<ExpandableItem> 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 SampleItem().withName("Test " + i).withHeader(headers[i / 5]));
+                items.add(new ExpandableItem().withName("Test " + i).withHeader(headers[i / 5]));
             }
         }
         mItemAdapter.set(items);

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/CheckBoxSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/CheckBoxSampleActivity.java
@@ -25,9 +25,6 @@
 public class CheckBoxSampleActivity extends AppCompatActivity {
     private static final String[] ALPHABET = new String[]{"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"};
 
-    //our recyclerView
-    private RecyclerView recyclerView;
-
     //save our FastAdapter
     private FastItemAdapter<CheckBoxSampleItem> fastItemAdapter;
 
@@ -78,7 +75,7 @@ public RecyclerView.ViewHolder onPreCreateViewHolder(ViewGroup parent, int viewT
 
             @Override
             public RecyclerView.ViewHolder onPostCreateViewHolder(final RecyclerView.ViewHolder viewHolder) {
-                mClickListenerHelper.listen(viewHolder, ((CheckBoxSampleItem.ViewHolder)viewHolder).checkBox, new ClickListenerHelper.OnClickListener<CheckBoxSampleItem>() {
+                mClickListenerHelper.listen(viewHolder, ((CheckBoxSampleItem.ViewHolder) viewHolder).checkBox, new ClickListenerHelper.OnClickListener<CheckBoxSampleItem>() {
                     @Override
                     public void onClick(View v, int position, CheckBoxSampleItem item) {
                         fastItemAdapter.toggleSelection(position);
@@ -89,7 +86,7 @@ public void onClick(View v, int position, CheckBoxSampleItem item) {
         });
 
         //get our recyclerView and do basic setup
-        recyclerView = (RecyclerView) findViewById(R.id.rv);
+        RecyclerView recyclerView = (RecyclerView) findViewById(R.id.rv);
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
         recyclerView.setItemAnimator(new DefaultItemAnimator());
         recyclerView.setAdapter(fastItemAdapter);

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/ExpandableSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/ExpandableSampleActivity.java
@@ -27,7 +27,7 @@
 
 public class ExpandableSampleActivity extends AppCompatActivity {
     //save our FastAdapter
-    private FastItemAdapter fastItemAdapter;
+    private FastItemAdapter<IItem> fastItemAdapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,10 +47,10 @@ protected void onCreate(Bundle savedInstanceState) {
         new MaterializeBuilder().withActivity(this).build();
 
         //create our FastAdapter
-        fastItemAdapter = new FastItemAdapter();
+        fastItemAdapter = new FastItemAdapter<>();
 
         //configure our fastAdapter
-        fastItemAdapter.withOnPreClickListener(new FastAdapter.OnClickListener() {
+        fastItemAdapter.withOnPreClickListener(new FastAdapter.OnClickListener<IItem>() {
             @Override
             public boolean onClick(View v, IAdapter adapter, IItem item, int position) {
                 if (item instanceof ExpandableItem) {

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/MultiTypeGenericItemActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/MultiTypeGenericItemActivity.java
@@ -53,18 +53,13 @@ protected void onCreate(Bundle savedInstanceState) {
         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 itemAdapter = new GenericItemAdapter(new Function() {
+        GenericItemAdapter<IconModel, GenericIconItem> itemAdapter = new GenericItemAdapter<>(new Function<IconModel, GenericIconItem>() {
             @Override
-            public Object apply(Object o) {
-                //depending on your logic you can now decide which model maps to which item.
-                if (o instanceof IconModel) {
-                    if (((IconModel) o).normal) {
-                        return new GenericIconItem((IconModel) o);
-                    } else {
-                        return new RightGenericIconItem((IconModel) o);
-                    }
+            public GenericIconItem apply(IconModel o) {
+                if (o.normal) {
+                    return new GenericIconItem(o);
                 } else {
-                    throw new IllegalArgumentException("The passed model can't be created within this Factory");
+                    return new RightGenericIconItem(o);
                 }
             }
         });

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/RadioButtonSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/RadioButtonSampleActivity.java
@@ -26,9 +26,6 @@
 public class RadioButtonSampleActivity extends AppCompatActivity {
     private static final String[] ALPHABET = new String[]{"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"};
 
-    //our recyclerView
-    private RecyclerView recyclerView;
-
     //save our FastAdapter
     private FastItemAdapter<RadioButtonSampleItem> fastItemAdapter;
 
@@ -79,7 +76,7 @@ public RecyclerView.ViewHolder onPreCreateViewHolder(ViewGroup parent, int viewT
 
             @Override
             public RecyclerView.ViewHolder onPostCreateViewHolder(final RecyclerView.ViewHolder viewHolder) {
-                mClickListenerHelper.listen(viewHolder, ((RadioButtonSampleItem.ViewHolder)viewHolder).radioButton, new ClickListenerHelper.OnClickListener<RadioButtonSampleItem>() {
+                mClickListenerHelper.listen(viewHolder, ((RadioButtonSampleItem.ViewHolder) viewHolder).radioButton, new ClickListenerHelper.OnClickListener<RadioButtonSampleItem>() {
                     @Override
                     public void onClick(View v, int position, RadioButtonSampleItem item) {
                         if (!item.isSelected()) {
@@ -98,7 +95,7 @@ public void onClick(View v, int position, RadioButtonSampleItem item) {
         });
 
         //get our recyclerView and do basic setup
-        recyclerView = (RecyclerView) findViewById(R.id.rv);
+        RecyclerView recyclerView = (RecyclerView) findViewById(R.id.rv);
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
         recyclerView.setItemAnimator(new DefaultItemAnimator());
         recyclerView.setAdapter(fastItemAdapter);

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/SimpleItemListActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/SimpleItemListActivity.java
@@ -37,9 +37,6 @@
 public class SimpleItemListActivity extends AppCompatActivity implements ItemTouchCallback {
     private static final String[] ALPHABET = new String[]{"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"};
 
-    //our recyclerView
-    private RecyclerView recyclerView;
-
     //save our FastAdapter
     private FastItemAdapter<SampleItem> fastItemAdapter;
 
@@ -86,7 +83,7 @@ public boolean filter(SampleItem item, CharSequence constraint) {
         });
 
         //get our recyclerView and do basic setup
-        recyclerView = (RecyclerView) findViewById(R.id.rv);
+        RecyclerView recyclerView = (RecyclerView) findViewById(R.id.rv);
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
         recyclerView.setItemAnimator(new DefaultItemAnimator());
         recyclerView.setAdapter(fastScrollIndicatorAdapter.wrap(fastItemAdapter));

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-beta2'
+        classpath 'com.android.tools.build:gradle:2.0.0-beta4'
         classpath 'com.novoda:bintray-release:0.3.4'
     }
 }

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

diff --git a/library/src/main/java/com/mikepenz/fastadapter/AbstractAdapter.java b/library/src/main/java/com/mikepenz/fastadapter/AbstractAdapter.java
@@ -19,7 +19,7 @@ public abstract class AbstractAdapter<Item extends IItem> extends RecyclerView.A
      * @param fastAdapter the FastAdapter which contains the base logic
      * @return this
      */
-    public AbstractAdapter<Item> wrap(FastAdapter<Item> fastAdapter) {
+    public AbstractAdapter wrap(FastAdapter fastAdapter) {
         //this.mParentAdapter = abstractAdapter;
         this.mFastAdapter = fastAdapter;
         this.mFastAdapter.registerAdapter(this);
@@ -32,7 +32,7 @@ public AbstractAdapter<Item> wrap(FastAdapter<Item> fastAdapter) {
      * @param abstractAdapter an AbstractWrapper which wraps another AbstractAdapter or FastAdapter
      * @return this
      */
-    public AbstractAdapter<Item> wrap(IAdapter<Item> abstractAdapter) {
+    public AbstractAdapter wrap(IAdapter abstractAdapter) {
         //this.mParentAdapter = abstractAdapter;
         this.mFastAdapter = abstractAdapter.getFastAdapter();
         this.mFastAdapter.registerAdapter(this);

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.4</string>
+    <string name="library_fastadapter_libraryVersion">1.0.5</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>