Skip to content

Commit

Permalink
Merge branch 'release/v1.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikepenz committed Apr 4, 2016
2 parents 1e4070f + 18afebf commit 482e885
Show file tree
Hide file tree
Showing 42 changed files with 1,350 additions and 35 deletions.
7 changes: 7 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ FastAdapter contributors (sorted alphabeticaly)

* EndlessScroll-Listener (EndlessScroll Sample)
* Improvements to the `SimpleDragCallback`
* Add additional tests
* Add `FastAdapterDialog`
* Add additional default `Items`

* **[Mattias Isegran Bergander](https://github.com/mattiasbe)**

Expand All @@ -22,3 +25,7 @@ FastAdapter contributors (sorted alphabeticaly)
* **[Shubham Chaudhary](https://github.com/shubhamchaudhary)**

* Basic Unit-Tests

* **[jasonsparc](https://github.com/jasonsparc)**

* Added `EndlessScrollHelper`
4 changes: 4 additions & 0 deletions MIGRATION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
###Upgrade Notes

#### v1.x.x -> v1.4.0
* with v1.4.0 by default a FastAdapter is now `withSelectable(false)` (for normal lists) if you have selection enabled in your list, add `withSelectable(true)` to your `FastAdapter`, `FastItemAdapter` or `GenericFastItemAdapter``
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,18 @@ You can try it out here [Google Play](https://play.google.com/store/apps/details

The library is split up into core, and extensions. The core functions are included in the following dependency.
```gradle
compile('com.mikepenz:fastadapter:1.3.0@aar') {
compile('com.mikepenz:fastadapter:1.4.0@aar') {
transitive = true
}
```

All additions are included in the following dependency.
```gradle
compile 'com.mikepenz:fastadapter-extensions:1.3.0@aar'
compile 'com.mikepenz:fastadapter-extensions:1.4.0@aar'
```

> If you upgrade from < 1.4.0 follow the [MIGRATION GUIDE](https://github.com/mikepenz/FastAdapter/blob/develop/MIGRATION.md)

##How to use
###1. Implement your item (the easy way)
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ android {
defaultConfig {
minSdkVersion 11
targetSdkVersion 23
versionCode 130
versionName '1.3.0'
versionCode 140
versionName '1.4.0'

applicationVariants.all { variant ->
variant.outputs.each { output ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ protected void onCreate(Bundle savedInstanceState) {

//configure our mFastAdapter
//as we provide id's for the items we want the hasStableIds enabled to speed up things
mFastAdapter.withSelectable(true);
mFastAdapter.withMultiSelect(true);
mFastAdapter.withSelectOnLongClick(true);
mFastAdapter.withOnPreClickListener(new FastAdapter.OnClickListener<IItem>() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ protected void onCreate(Bundle savedInstanceState) {

//create our FastAdapter which will manage everything
fastItemAdapter = new FastItemAdapter<>();
fastItemAdapter.withSelectable(true);

//configure our fastAdapter
fastItemAdapter.withOnClickListener(new FastAdapter.OnClickListener<CheckBoxSampleItem>() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ protected void onCreate(Bundle savedInstanceState) {

//create our FastAdapter which will manage everything
fastItemAdapter = new FastItemAdapter<>();
fastItemAdapter.withSelectable(true);

//create our FooterAdapter which will manage the progress items
footerAdapter = new FooterAdapter<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {

//create our FastAdapter
fastItemAdapter = new FastItemAdapter<>();
fastItemAdapter.withSelectable(true);

//get our recyclerView and do basic setup
RecyclerView rv = (RecyclerView) findViewById(R.id.rv);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public int compare(final ITypeface object1, final ITypeface object2) {

ArrayList<IItem> icons = new ArrayList<>();
for (String icon : font.getIcons()) {
icons.add(new IconItem().withIcon(font.getIcon(icon)).withSelectable(false));
icons.add(new IconItem().withIcon(font.getIcon(icon)));
}
expandableItem.withSubItems(icons);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public void commitRemove(Set<Integer> positions, ArrayList<FastAdapter.RelativeI
//configure our mFastAdapter
//as we provide id's for the items we want the hasStableIds enabled to speed up things
mFastAdapter.setHasStableIds(true);
mFastAdapter.withSelectable(true);
mFastAdapter.withMultiSelect(true);
mFastAdapter.withSelectOnLongClick(true);
mFastAdapter.withOnPreClickListener(new FastAdapter.OnClickListener<SampleItem>() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {

//create our FastAdapter which will manage everything
fastItemAdapter = new FastItemAdapter<>();
fastItemAdapter.withSelectable(true);

//configure our fastAdapter
fastItemAdapter.withOnClickListener(new FastAdapter.OnClickListener<RadioButtonSampleItem>() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ public boolean onItemClick(View view, int position, IDrawerItem drawerItem) {

//create our FastAdapter which will manage everything
mFastAdapter = new FastAdapter<>();
mFastAdapter.withSelectable(true);
mFastAdapter.withMultiSelect(true);
mFastAdapter.withSelectOnLongClick(false);
//create our ItemAdapter which will host our items
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ protected void onCreate(Bundle savedInstanceState) {

//create our FastAdapter which will manage everything
fastItemAdapter = new FastItemAdapter<>();
fastItemAdapter.withSelectable(true);

final FastScrollIndicatorAdapter<SampleItem> fastScrollIndicatorAdapter = new FastScrollIndicatorAdapter<>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ protected void onCreate(Bundle savedInstanceState) {

//create our FastAdapter which will manage everything
fastItemAdapter = new FastItemAdapter<>();
fastItemAdapter.withSelectable(true);

//configure our fastAdapter
fastItemAdapter.withOnClickListener(new FastAdapter.OnClickListener<SampleItem>() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {

//create our FastAdapter
fastAdapter = new FastAdapter();
fastAdapter.withSelectable(true);

//create our adapters
final StickyHeaderAdapter stickyHeaderAdapter = new StickyHeaderAdapter();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
import com.mikepenz.fastadapter.IItemAdapter;
import com.mikepenz.fastadapter.adapters.FastItemAdapter;
import com.mikepenz.fastadapter.app.items.SwipeableItem;
import com.mikepenz.fastadapter_extensions.swipe.SimpleSwipeCallback;
import com.mikepenz.fastadapter_extensions.swipe.SimpleSwipeDragCallback;
import com.mikepenz.fastadapter_extensions.drag.ItemTouchCallback;
import com.mikepenz.fastadapter_extensions.drag.SimpleDragCallback;
import com.mikepenz.fastadapter_extensions.swipe.SimpleSwipeCallback;
import com.mikepenz.fastadapter_extensions.swipe.SimpleSwipeDragCallback;
import com.mikepenz.iconics.IconicsDrawable;
import com.mikepenz.material_design_iconic_typeface_library.MaterialDesignIconic;
import com.mikepenz.materialize.MaterializeBuilder;
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildscript {
// project and then reference this from the modules
ext {
compileSdkVersion = 23
buildToolsVersion = "23.0.2"
buildToolsVersion = "23.0.3"
supportLibVersion = "23.2.1"
}

Expand Down
6 changes: 4 additions & 2 deletions library-extensions/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
defaultConfig {
minSdkVersion 10
targetSdkVersion 23
versionCode 130
versionName '1.3.0'
versionCode 1400
versionName '1.4.0'
}
buildTypes {
release {
Expand All @@ -33,4 +33,6 @@ dependencies {
compile project(':library')
compile "com.android.support:design:${rootProject.ext.supportLibVersion}"
compile "com.android.support:support-annotations:${rootProject.ext.supportLibVersion}"

compile 'com.mikepenz:materialize:0.8.6@aar'
}
4 changes: 2 additions & 2 deletions library-extensions/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ POM_NAME=FastAdapter Library-Extensions
POM_ARTIFACT_ID=fastadapter-extensions
POM_PACKAGING=aar

VERSION_NAME=1.3.0
VERSION_CODE=130
VERSION_NAME=1.4.0
VERSION_CODE=1400
Loading

0 comments on commit 482e885

Please sign in to comment.