Skip to content
This repository was archived by the owner on Feb 8, 2022. It is now read-only.

Commit a75030b

Browse files
author
florent champigny
committed
updated sample
1 parent c990b78 commit a75030b

23 files changed

Lines changed: 101 additions & 108 deletions

‎app/src/main/AndroidManifest.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
android:label="@string/app_name"
99
android:supportsRtl="true"
1010
android:theme="@style/AppTheme">
11-
<activity android:name=".MainActivity">
11+
<activity android:name=".ExpectAnimMainActivity">
1212
<intent-filter>
1313
<action android:name="android.intent.action.MAIN" />
1414

1515
<category android:name="android.intent.category.LAUNCHER" />
1616
</intent-filter>
1717
</activity>
18-
<activity android:name=".ScrollActivity"/>
19-
<activity android:name=".SampleActivity"/>
20-
<activity android:name=".RotationActivity"/>
21-
<activity android:name=".SetNowActivity"/>
22-
<activity android:name=".FlipActivity"/>
23-
<activity android:name=".AlphaActivity" />
24-
<activity android:name=".ConcatActivity" />
18+
<activity android:name=".ExpectAnimScrollActivity"/>
19+
<activity android:name=".ExpectAnimSampleActivity"/>
20+
<activity android:name=".ExpectAnimRotationActivity"/>
21+
<activity android:name=".ExpectAnimSetNowActivity"/>
22+
<activity android:name=".ExpectAnimFlipActivity"/>
23+
<activity android:name=".ExpectAnimAlphaActivity" />
24+
<activity android:name=".ExpectAnimConcatActivity" />
2525
</application>
2626

2727
</manifest>

app/src/main/java/com/github/florent37/expectanim/sample/AlphaActivity.java renamed to app/src/main/java/com/github/florent37/expectanim/sample/ExpectAnimAlphaActivity.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,18 @@
1111
import butterknife.ButterKnife;
1212
import butterknife.OnClick;
1313

14-
import static com.github.florent37.expectanim.core.Expectations.flippedHorizontally;
15-
import static com.github.florent37.expectanim.core.Expectations.flippedHorizontallyAndVertically;
16-
import static com.github.florent37.expectanim.core.Expectations.flippedVertically;
1714
import static com.github.florent37.expectanim.core.Expectations.invisible;
1815
import static com.github.florent37.expectanim.core.Expectations.visible;
19-
import static com.github.florent37.expectanim.core.Expectations.withCameraDistance;
2016

21-
public class AlphaActivity extends AppCompatActivity {
17+
public class ExpectAnimAlphaActivity extends AppCompatActivity {
2218

2319
@BindView(R.id.image_1)
2420
View image1;
2521

2622
@Override
2723
protected void onCreate(Bundle savedInstanceState) {
2824
super.onCreate(savedInstanceState);
29-
setContentView(R.layout.activity_alpha);
25+
setContentView(R.layout.expectanim_activity_alpha);
3026
ButterKnife.bind(this);
3127
}
3228

app/src/main/java/com/github/florent37/expectanim/sample/ConcatActivity.java renamed to app/src/main/java/com/github/florent37/expectanim/sample/ExpectAnimConcatActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import static com.github.florent37.expectanim.core.Expectations.flippedVertically;
1616
import static com.github.florent37.expectanim.core.Expectations.withCameraDistance;
1717

18-
public class ConcatActivity extends AppCompatActivity {
18+
public class ExpectAnimConcatActivity extends AppCompatActivity {
1919

2020
@BindView(R.id.image_1)
2121
View image1;
@@ -31,7 +31,7 @@ public class ConcatActivity extends AppCompatActivity {
3131
@Override
3232
protected void onCreate(Bundle savedInstanceState) {
3333
super.onCreate(savedInstanceState);
34-
setContentView(R.layout.activity_flip);
34+
setContentView(R.layout.expectanim_activity_flip);
3535
ButterKnife.bind(this);
3636

3737
this.expectAnimMove = ExpectAnim.concat(

app/src/main/java/com/github/florent37/expectanim/sample/FlipActivity.java renamed to app/src/main/java/com/github/florent37/expectanim/sample/ExpectAnimFlipActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import static com.github.florent37.expectanim.core.Expectations.flippedVertically;
1616
import static com.github.florent37.expectanim.core.Expectations.withCameraDistance;
1717

18-
public class FlipActivity extends AppCompatActivity {
18+
public class ExpectAnimFlipActivity extends AppCompatActivity {
1919

2020
@BindView(R.id.image_1)
2121
View image1;
@@ -31,7 +31,7 @@ public class FlipActivity extends AppCompatActivity {
3131
@Override
3232
protected void onCreate(Bundle savedInstanceState) {
3333
super.onCreate(savedInstanceState);
34-
setContentView(R.layout.activity_flip);
34+
setContentView(R.layout.expectanim_activity_flip);
3535
ButterKnife.bind(this);
3636

3737
this.expectAnimMove = new ExpectAnim()

app/src/main/java/com/github/florent37/expectanim/sample/MainActivity.java renamed to app/src/main/java/com/github/florent37/expectanim/sample/ExpectAnimMainActivity.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,58 +4,55 @@
44
import android.os.Bundle;
55
import android.support.v7.app.AppCompatActivity;
66

7-
import com.github.florent37.expectanim.ExpectAnim;
8-
97
import butterknife.ButterKnife;
108
import butterknife.OnClick;
119

1210
import static com.github.florent37.expectanim.core.Expectations.height;
13-
import static com.github.florent37.expectanim.core.Expectations.invisible;
1411
import static com.github.florent37.expectanim.core.Expectations.scale;
1512

1613

17-
public class MainActivity extends AppCompatActivity {
14+
public class ExpectAnimMainActivity extends AppCompatActivity {
1815

1916
@Override
2017
protected void onCreate(Bundle savedInstanceState) {
2118
super.onCreate(savedInstanceState);
22-
setContentView(R.layout.activity_main);
19+
setContentView(R.layout.expectanim_activity_main);
2320
ButterKnife.bind(this);
2421
}
2522

2623
@OnClick(R.id.sample)
2724
public void onSampleClicked() {
28-
startActivity(new Intent(this, SampleActivity.class));
25+
startActivity(new Intent(this, ExpectAnimSampleActivity.class));
2926
}
3027

3128
@OnClick(R.id.scroll)
3229
public void onScrollClicked() {
33-
startActivity(new Intent(this, ScrollActivity.class));
30+
startActivity(new Intent(this, ExpectAnimScrollActivity.class));
3431
}
3532

3633
@OnClick(R.id.rotation)
3734
public void onRotationClicked() {
38-
startActivity(new Intent(this, RotationActivity.class));
35+
startActivity(new Intent(this, ExpectAnimRotationActivity.class));
3936
}
4037

4138
@OnClick(R.id.flip)
4239
public void onFlipClicked() {
43-
startActivity(new Intent(this, FlipActivity.class));
40+
startActivity(new Intent(this, ExpectAnimFlipActivity.class));
4441
}
4542

4643
@OnClick(R.id.setnow)
4744
public void onSetNowClicked() {
48-
startActivity(new Intent(this, SetNowActivity.class));
45+
startActivity(new Intent(this, ExpectAnimSetNowActivity.class));
4946
}
5047

5148
@OnClick(R.id.visible)
5249
public void onVisibleClicked() {
53-
startActivity(new Intent(this, AlphaActivity.class));
50+
startActivity(new Intent(this, ExpectAnimAlphaActivity.class));
5451
}
5552

5653
@OnClick(R.id.concat)
5754
public void onConcatClicked() {
58-
startActivity(new Intent(this, ConcatActivity.class));
55+
startActivity(new Intent(this, ExpectAnimConcatActivity.class));
5956
}
6057

6158
}

app/src/main/java/com/github/florent37/expectanim/sample/RotationActivity.java renamed to app/src/main/java/com/github/florent37/expectanim/sample/ExpectAnimRotationActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import static com.github.florent37.expectanim.core.Expectations.topOfParent;
1919
import static com.github.florent37.expectanim.core.Expectations.rotated;
2020

21-
public class RotationActivity extends AppCompatActivity {
21+
public class ExpectAnimRotationActivity extends AppCompatActivity {
2222

2323
@BindView(R.id.text1)
2424
View text1;
@@ -34,7 +34,7 @@ public class RotationActivity extends AppCompatActivity {
3434
@Override
3535
protected void onCreate(Bundle savedInstanceState) {
3636
super.onCreate(savedInstanceState);
37-
setContentView(R.layout.activity_rotation);
37+
setContentView(R.layout.expectanim_activity_rotation);
3838
ButterKnife.bind(this);
3939

4040
this.expectAnimMove = new ExpectAnim()

app/src/main/java/com/github/florent37/expectanim/sample/SampleActivity.java renamed to app/src/main/java/com/github/florent37/expectanim/sample/ExpectAnimSampleActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import static com.github.florent37.expectanim.core.Expectations.width;
2828

2929

30-
public class SampleActivity extends AppCompatActivity {
30+
public class ExpectAnimSampleActivity extends AppCompatActivity {
3131

3232
@BindView(R.id.name)
3333
View name;
@@ -50,7 +50,7 @@ public class SampleActivity extends AppCompatActivity {
5050
@Override
5151
protected void onCreate(Bundle savedInstanceState) {
5252
super.onCreate(savedInstanceState);
53-
setContentView(R.layout.activity_sample);
53+
setContentView(R.layout.expectanim_activity_sample);
5454
ButterKnife.bind(this);
5555

5656
new ExpectAnim()

app/src/main/java/com/github/florent37/expectanim/sample/ScrollActivity.java renamed to app/src/main/java/com/github/florent37/expectanim/sample/ExpectAnimScrollActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import static com.github.florent37.expectanim.core.Expectations.topOfParent;
2323

2424

25-
public class ScrollActivity extends AppCompatActivity {
25+
public class ExpectAnimScrollActivity extends AppCompatActivity {
2626

2727
@BindView(R.id.username)
2828
View username;
@@ -44,7 +44,7 @@ public class ScrollActivity extends AppCompatActivity {
4444
@Override
4545
protected void onCreate(Bundle savedInstanceState) {
4646
super.onCreate(savedInstanceState);
47-
setContentView(R.layout.activity_scroll);
47+
setContentView(R.layout.expectanim_activity_scroll);
4848
ButterKnife.bind(this);
4949

5050
this.expectAnimMove = new ExpectAnim()

app/src/main/java/com/github/florent37/expectanim/sample/SetNowActivity.java renamed to app/src/main/java/com/github/florent37/expectanim/sample/ExpectAnimSetNowActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
import static com.github.florent37.expectanim.core.Expectations.invisible;
1313

1414

15-
public class SetNowActivity extends AppCompatActivity {
15+
public class ExpectAnimSetNowActivity extends AppCompatActivity {
1616

1717
@BindView(R.id.follow)
1818
View view;
1919

2020
@Override
2121
protected void onCreate(Bundle savedInstanceState) {
2222
super.onCreate(savedInstanceState);
23-
setContentView(R.layout.activity_set_now);
23+
setContentView(R.layout.expectanim_activity_set_now);
2424
ButterKnife.bind(this);
2525

2626
new ExpectAnim()

app/src/main/res/drawable/circle.xml renamed to app/src/main/res/drawable/expectanim_circle.xml

File renamed without changes.

0 commit comments

Comments
 (0)