Skip to content

Commit f651bd9

Browse files
committed
Added missing classes
1 parent 17ac59a commit f651bd9

File tree

5 files changed

+35
-5
lines changed

5 files changed

+35
-5
lines changed

app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void onFabPressed(View view) {
3838
TransitionSecondActivity.class);
3939

4040
ActivityOptions transitionActivityOptions = ActivityOptions.makeSceneTransitionAnimation(
41-
this, Pair.create(mFabButton, "fab"), Pair.create(mHeader, "holder1"));
41+
TransitionFirstActivity.this,Pair.create(mFabButton, "fab"), Pair.create(mHeader, "holder1"));
4242

4343
startActivity(i, transitionActivityOptions.toBundle());
4444
}

app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ protected void onCreate(Bundle savedInstanceState) {
2727

2828
rowContainer = (LinearLayout) findViewById(R.id.row_container2);
2929

30-
Slide slideExitTransition = new Slide(Gravity.TOP);
30+
Slide slideExitTransition = new Slide(Gravity.BOTTOM);
3131
slideExitTransition.excludeTarget(android.R.id.navigationBarBackground, true);
3232
slideExitTransition.excludeTarget(android.R.id.statusBarBackground, true);
33-
getWindow().setEnterTransition(slideExitTransition);
3433

3534

3635
getWindow().getEnterTransition().addListener(new TransitionAdapter() {
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package com.saulmm.material.utils;
2+
3+
import android.transition.Transition;
4+
5+
public class TransitionAdapter implements Transition.TransitionListener {
6+
7+
@Override
8+
public void onTransitionStart(Transition transition) {
9+
10+
}
11+
12+
@Override
13+
public void onTransitionEnd(Transition transition) {
14+
15+
}
16+
17+
@Override
18+
public void onTransitionCancel(Transition transition) {
19+
20+
}
21+
22+
@Override
23+
public void onTransitionPause(Transition transition) {
24+
25+
}
26+
27+
@Override
28+
public void onTransitionResume(Transition transition) {
29+
30+
}
31+
}

app/src/main/res/layout/activity_transition_first.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
android:id="@+id/fab_button"
1919
android:layout_width="@dimen/fab_size"
2020
android:layout_height="@dimen/fab_size"
21+
android:transitionName="fab"
22+
2123
android:layout_marginTop="-26dp"
2224
android:layout_marginRight="@dimen/activity_horizontal_margin"
2325
android:layout_below="@+id/activity_transition_header"
@@ -26,7 +28,6 @@
2628
android:background="@drawable/ripple_round"
2729
android:stateListAnimator="@anim/fab_anim"
2830
android:onClick="onFabPressed"
29-
android:transitionName="fab"
3031
/>
3132

3233
<RelativeLayout

app/src/main/res/values-v21/styles.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<item name="android:colorPrimaryDark">@color/color_set_1_primary</item>
2727
<item name="android:colorPrimary">@color/color_set_1_primary</item>
2828
<item name="android:colorAccent">@color/color_set_1_accent</item>
29-
<item name="android:windowExitTransition">@android:transition/slide_top</item>
3029
</style>
3130

3231
<style name="theme1" parent="AppTheme">

0 commit comments

Comments
 (0)