diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cb31280..2f892c57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Change Log =============================================================================== -Version 1.6.0 *(2014-XX-XX)* +Version 1.6.0 *(2014-05-06)* ---------------------------- * LIB: Added a `CardCursorMultiChoiceAdapter` [(doc)](/doc/CARDLIST.md#using-a-cardlist-in-multichoicemode-and-cursoradapter) * LIB-EXTRA: Added a `CardListDragDropView`, a cardList with drag and drop support: [(doc)](/doc/DRAGDROPLIST.md) diff --git a/README.md b/README.md index 76933405..7566cb14 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,7 @@ Acknowledgements * Thanks to [Roman Nurik][1] for [Android-SwipeToDismiss][2] classes and [UndoBarController][3] classes. * Thanks to [Niek Haarman][4] for some ideas and code taken from his [ListViewAnimations][5]. * Thanks to [Chris Banes][6] for [ForegroundLinearLayout][7] class (See this [post][8] for more info). +* Thanks to [Taylor Ling][9] for drag and drop icon. Credits @@ -118,4 +119,5 @@ Google and the Google Maps logo are registered trademarks of Google Inc., used w [5]: https://github.com/nhaarman/ListViewAnimations [6]: https://plus.google.com/+ChrisBanes [7]: https://gist.github.com/chrisbanes/9091754 - [8]: https://plus.google.com/+AndroidDevelopers/posts/aHPVDtr6mcp \ No newline at end of file + [8]: https://plus.google.com/+AndroidDevelopers/posts/aHPVDtr6mcp + [9]: https://plus.google.com/+TaylorLing \ No newline at end of file diff --git a/demo/README.md b/demo/README.md index 193255e5..1d0ffb0c 100644 --- a/demo/README.md +++ b/demo/README.md @@ -44,6 +44,7 @@ Extras demo uses these open source libraries: * [AndroidStaggeredGrid][16] by [Etsy][17] * Thanks to [JakeWharton][18] for some ideas and code taken from his [u2020][19]. +* Thanks to [Taylor Ling][20] for drag and drop icon. Credits ------- @@ -103,4 +104,5 @@ License [17]: https://github.com/etsy [18]: http://jakewharton.com/ [19]: https://github.com/JakeWharton/u2020 + [20]: https://plus.google.com/+TaylorLing diff --git a/demo/images/dragdrop.png b/demo/images/dragdrop.png new file mode 100644 index 00000000..49e69e19 Binary files /dev/null and b/demo/images/dragdrop.png differ diff --git a/doc/DRAGDROPLIST.md b/doc/DRAGDROPLIST.md index 8c97b025..a50e4fc5 100644 --- a/doc/DRAGDROPLIST.md +++ b/doc/DRAGDROPLIST.md @@ -14,6 +14,8 @@ In this page you can find info about: This feature is base on [ListViewAnimation](https://github.com/nhaarman/ListViewAnimations) provided by [Niek Haarman](https://plus.google.com/+NiekHaarman). Check the [`build.gradle`](/library-extra/build.gradle) to know the last version used. +The library-extra provides a `@drawable/card_drag` icon kindly offered by [Taylor Ling](https://plus.google.com/+TaylorLing). + ![Screen](/demo/images/demo/dragdrop.png) @@ -36,7 +38,7 @@ You have to customize the layout used for each item in ListView using the attr: I suggest you using a ImageView with a "standard" drag and drop icon. -The library-extra provide a `@drawable/card_drag` icon kindly offered by [Taylor Ling](https://plus.google.com/+TaylorLing). +The library-extra provides a `@drawable/card_drag` icon kindly offered by [Taylor Ling](https://plus.google.com/+TaylorLing). Example: ``` xml diff --git a/gradle.properties b/gradle.properties index e186fd59..beaa54c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -VERSION_NAME=1.5.1-SNAPSHOT -VERSION_CODE=30 +VERSION_NAME=1.6.1-SNAPSHOT +VERSION_CODE=31 GROUP=com.github.gabrielemariotti.cards POM_DESCRIPTION=Android Library to build a UI Card