Skip to content

Commit 09d06ae

Browse files
authored
Merge pull request #185 from octacode/test1
FEAT: Reducing External dependencies com.daimajia.androidanimations:library:1.1.3@aar
2 parents 71a8764 + be1480e commit 09d06ae

3 files changed

Lines changed: 18 additions & 10 deletions

File tree

source-code/app/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ android {
4747
lintOptions {
4848
abortOnError false
4949
}
50+
sourceSets { main { res.srcDirs = ['src/main/res', 'src/main/res/anim'] } }
5051
}
5152

5253
dependencies {
@@ -77,8 +78,6 @@ dependencies {
7778
compile files('libs/axml.jar')
7879
compile 'com.viewpagerindicator:library:2.4.1@aar'
7980
compile 'com.nineoldandroids:library:2.4.0'
80-
compile 'com.daimajia.easing:library:1.0.1@aar'
81-
compile 'com.daimajia.androidanimations:library:1.1.3@aar'
8281
compile 'com.squareup.picasso:picasso:2.5.2'
8382
compile 'org.jsoup:jsoup:1.9.1'
8483
androidTestCompile 'com.android.support:support-annotations:23.4.0'

source-code/app/src/main/java/org/buildmlearn/toolkit/activity/FirstRunActivity.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import android.support.v7.app.AppCompatActivity;
88
import android.view.KeyEvent;
99
import android.view.View;
10+
import android.view.animation.Animation;
11+
import android.view.animation.AnimationUtils;
1012
import android.widget.EditText;
1113
import android.widget.Toast;
1214

1315
import com.crashlytics.android.Crashlytics;
14-
import com.daimajia.androidanimations.library.Techniques;
15-
import com.daimajia.androidanimations.library.YoYo;
1616

1717
import org.buildmlearn.toolkit.R;
1818
import org.buildmlearn.toolkit.constant.Constants;
@@ -46,13 +46,9 @@ protected void onCreate(Bundle savedInstanceState) {
4646

4747

4848
findViewById(R.id.focus_thief).clearFocus();
49-
YoYo.with(Techniques.BounceInUp)
50-
.duration(2700)
51-
.playOn(findViewById(R.id.first_name));
52-
53-
49+
Animation anim_bounceinup=AnimationUtils.loadAnimation(getBaseContext(),R.anim.bounceinup);
5450
name = (EditText) findViewById(R.id.first_name);
55-
51+
name.startAnimation(anim_bounceinup);
5652

5753
name.setOnKeyListener(new View.OnKeyListener() {
5854
@Override
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:fillAfter="true"
4+
android:interpolator="@android:anim/bounce_interpolator">
5+
6+
<scale
7+
android:duration="2700"
8+
android:fromXScale="1.0"
9+
android:fromYScale="1.8"
10+
android:toXScale="1.0"
11+
android:toYScale="1.0"/>
12+
13+
</set>

0 commit comments

Comments
 (0)