Skip to content

Commit

Permalink
Version 2.2.0. Integrated Picasso
Browse files Browse the repository at this point in the history
  • Loading branch information
dexafree committed Feb 13, 2015
1 parent 85708bf commit 27f0653
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 118 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ In order to use MaterialList, you can either clone the project and import it as
```groovy
dependencies {
...
compile 'com.github.dexafree:materiallist:2.1.1'
compile 'com.github.dexafree:materiallist:2.2.0'
}
```

Expand All @@ -188,6 +188,7 @@ You can clone the project and compile it yourself (it includes a sample), or you
## Collaborations
* [Fabio Hellmann](https://github.com/FHellmann): Great pull request that added MaterialStaggeredGridView, animations, and refactored a lot of code. Thank you very much, really!
* [Ricardo Romero](https://github.com/RicardoRB): Integrating Picasso to the library

## Credits
* Jake Wharton: [SwipeToDismissNOA](https://github.com/JakeWharton/SwipeToDismissNOA)
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
//compile project(':materialList')
compile 'com.github.dexafree:materiallist:2.1.1'
compile project(':materialList')
//compile 'com.github.dexafree:materiallist:2.1.1'
//compile 'com.github.dexafree:materiallist-cards:2.0.7'
compile 'com.android.support:appcompat-v7:21.0.3'
}
2 changes: 2 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dexafree.materiallistviewexample" >

<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ private Card getRandomCard(final int position) {
card = new BigImageCard(this);
card.setDescription(description);
card.setTitle(title);
card.setDrawable(R.drawable.photo);
//card.setDrawable(R.drawable.photo);
card.setDrawable("https://assets-cdn.github.com/images/modules/logos_page/GitHub-Mark.png");
return card;

case 2:
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
android:paddingRight="@dimen/activity_horizontal_margin"
tools:context=".MainActivity">

<com.dexafree.materialList.view.MaterialGridView
<com.dexafree.materialList.view.MaterialListView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/material_listview"
android:numColumns="2"/>
android:id="@+id/material_listview"/>

</RelativeLayout>
</RelativeLayout>
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.android.tools.build:gradle:1.0.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

VERSION_NAME=2.1.1
VERSION_CODE=211
VERSION_NAME=2.2.0
VERSION_CODE=220
GROUP=com.github.dexafree

POM_DESCRIPTION=Android library aimed to get the beautiful CardViews that Google shows at its official design specifications
Expand Down
4 changes: 2 additions & 2 deletions materialList/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
defaultConfig {
minSdkVersion 10
targetSdkVersion 21
versionCode 211
versionName "2.1.1"
versionCode 220
versionName "2.2.0"
}
buildTypes {
release {
Expand Down

This file was deleted.

This file was deleted.

0 comments on commit 27f0653

Please sign in to comment.