Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
nhaarman committed Sep 4, 2013
2 parents d9535d2 + 35d5798 commit 8b3b33f
Show file tree
Hide file tree
Showing 22 changed files with 551 additions and 167 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,5 @@ example/proguard-project.txt
*/.classpath
*.project
*proguard-project.txt
library/build.gradle

.gradle/
Binary file modified ListViewAnimationsExample.apk
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ License
[1]: https://play.google.com/store/apps/details?id=com.haarman.listviewanimations
[2]: http://nineoldandroids.com/
[3]: http://en.wikipedia.org/wiki/Decorator_pattern
[4]: https://github.com/nhaarman/ListViewAnimations/blob/master/com.haarman.listviewanimations-2.2.1.jar?raw=true
[4]: https://github.com/nhaarman/ListViewAnimations/blob/master/com.haarman.listviewanimations-2.2.3.jar?raw=true
[5]: https://gist.github.com/romannurik/2980593
[6]: https://play.google.com/store/apps/details?id=com.haarman.treinverkeer
[7]: https://www.twitter.com/niekfct
Expand Down
21 changes: 21 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
buildscript {
repositories {
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
}
}

allprojects {
group = 'com.haarman.listviewanimations'

repositories {
mavenCentral()
}

tasks.withType(Compile) {
options.encoding = 'UTF-8'
}
}
Binary file removed com.haarman.listviewanimations-2.2.1.jar
Binary file not shown.
Binary file added com.haarman.listviewanimations-2.2.3.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions example/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.haarman.listviewanimations"
android:versionCode="18"
android:versionName="2.2.1">
android:versionCode="20"
android:versionName="2.2.3">

<uses-sdk
android:minSdkVersion="8"
Expand Down
20 changes: 20 additions & 0 deletions example/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
apply plugin: 'android'

dependencies {
compile 'com.android.support:support-v4:18.0.0'
compile project(":library")
}

android {
compileSdkVersion 18
buildToolsVersion '18.0.1'

sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
}
}
Binary file added example/res/drawable-hdpi/ic_github.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added example/res/drawable-mdpi/ic_github.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added example/res/drawable-xhdpi/ic_github.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added example/res/drawable-xxhdpi/ic_github.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions example/res/menu/menu_main.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >

<item
android:id="@+id/menu_main_github"
android:showAsAction="always"
android:icon="@drawable/ic_github"
android:title="@string/menu_github"/>

</menu>
1 change: 1 addition & 0 deletions example/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<resources>

<string name="app_name">ListViewAnimationsExample</string>
<string name="menu_github">Github</string>
<string name="swingin">Animation in adapters</string>
<string name="itemmanipulation">Item manipulation</string>
<string name="bottomin">Bottom in</string>
Expand Down
73 changes: 48 additions & 25 deletions example/src/com/haarman/listviewanimations/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,37 +17,60 @@

import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;

import com.haarman.listviewanimations.animationinexamples.AnimationInExamplesActivity;
import com.haarman.listviewanimations.itemmanipulationexamples.ItemManipulationsExamplesActivity;

public class MainActivity extends Activity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
}

public void onGoogleCardsExampleClicked(View view) {
Intent intent = new Intent(this, GoogleCardsActivity.class);
startActivity(intent);
}

public void onGridViewExampleClicked(View view) {
Intent intent = new Intent(this, GridViewActivity.class);
startActivity(intent);
}

public void onSwingInClicked(View view) {
Intent intent = new Intent(this, AnimationInExamplesActivity.class);
startActivity(intent);
}

public void onItemManipulationClicked(View view) {
Intent intent = new Intent(this, ItemManipulationsExamplesActivity.class);
startActivity(intent);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_main, menu);
return super.onCreateOptionsMenu(menu);
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_main_github:
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse("http://nhaarman.github.io/ListViewAnimations?ref=app"));
startActivity(intent);
return true;
}

return super.onOptionsItemSelected(item);
}

public void onGoogleCardsExampleClicked(View view) {
Intent intent = new Intent(this, GoogleCardsActivity.class);
startActivity(intent);
}

public void onGridViewExampleClicked(View view) {
Intent intent = new Intent(this, GridViewActivity.class);
startActivity(intent);
}

public void onSwingInClicked(View view) {
Intent intent = new Intent(this, AnimationInExamplesActivity.class);
startActivity(intent);
}

public void onItemManipulationClicked(View view) {
Intent intent = new Intent(this, ItemManipulationsExamplesActivity.class);
startActivity(intent);
}

}
4 changes: 2 additions & 2 deletions library/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.haarman.listviewanimations"
android:versionCode="18"
android:versionName="2.2.1" >
android:versionCode="20"
android:versionName="2.2.3" >

<uses-sdk
android:minSdkVersion="8"
Expand Down
21 changes: 21 additions & 0 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apply plugin:'android-library'

dependencies {
compile 'com.android.support:support-v4:18.0.0'
compile 'com.nineoldandroids:library:2.4.+'
}

android {
compileSdkVersion 18
buildToolsVersion '18.0.1'

sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
}
}
Loading

0 comments on commit 8b3b33f

Please sign in to comment.