diff --git a/app/src/main/java/com/saulmm/material/MyActivity.java b/app/src/main/java/com/saulmm/material/MyActivity.java index f30b64d..7dd3d97 100644 --- a/app/src/main/java/com/saulmm/material/MyActivity.java +++ b/app/src/main/java/com/saulmm/material/MyActivity.java @@ -31,11 +31,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_my); - Explode ex = new Explode(); - ex.setPropagation(new CircularPropagation()); - - getWindow().setExitTransition(ex); - getWindow().setEnterTransition(ex); + Utils.configureWindowEnterExitTransition(getWindow());; // Fab Button int fabSize = getResources().getDimensionPixelSize(R.dimen.fab_size); @@ -57,13 +53,9 @@ protected void onCreate(Bundle savedInstanceState) { View.OnClickListener fabClickListener = new View.OnClickListener() { @Override public void onClick(View view) { - ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(MyActivity.this, - Pair.create(holderView, "holder2"), - Pair.create(fabButton, "fab")); - - Intent i = new Intent (MyActivity.this, MyActivity2.class); - startActivity(i); + Intent i = new Intent (MyActivity.this, MyActivity2.class); + startActivity(i); } }; } diff --git a/app/src/main/java/com/saulmm/material/MyActivity2.java b/app/src/main/java/com/saulmm/material/MyActivity2.java index 7f3be50..3db9121 100644 --- a/app/src/main/java/com/saulmm/material/MyActivity2.java +++ b/app/src/main/java/com/saulmm/material/MyActivity2.java @@ -29,11 +29,8 @@ protected void onCreate(Bundle savedInstanceState) { int fabSize = getResources().getDimensionPixelSize(R.dimen.fab_size); Outline fabOutLine = new Outline(); - Explode ex = new Explode(); - ex.setPropagation(new CircularPropagation()); + Utils.configureWindowEnterExitTransition(getWindow()); - getWindow().setExitTransition(ex); - getWindow().setEnterTransition(ex); fabOutLine.setOval(0, 0, fabSize, fabSize); } diff --git a/app/src/main/java/com/saulmm/material/Utils.java b/app/src/main/java/com/saulmm/material/Utils.java new file mode 100644 index 0000000..7c54699 --- /dev/null +++ b/app/src/main/java/com/saulmm/material/Utils.java @@ -0,0 +1,24 @@ +package com.saulmm.material; + +import android.transition.CircularPropagation; +import android.transition.Explode; +import android.view.Window; + +/** + * Created by saulmm on 16/10/14. + */ +public class Utils { + + public static void configureWindowEnterExitTransition (Window w) { + + Explode ex = new Explode(); + + CircularPropagation c = new CircularPropagation(); + c.setPropagationSpeed(2f); + + ex.setPropagation(c); + + w.setExitTransition(ex); + w.setEnterTransition(ex); + } +}