Transition all the things.

– Switch SearchActivity animations to use transitions. – Introduce StartAnimatable & CircularReveal transitions.
heartinfei · Aug 16, 2016 · 210dc82 · 210dc82
1 parent 3e8da4a
commit 210dc82
Show file tree

Hide file tree

Showing 26 changed files with 777 additions and 353 deletions.
diff --git a/app/src/main/java/io/plaidapp/ui/DesignerNewsLogin.java b/app/src/main/java/io/plaidapp/ui/DesignerNewsLogin.java
@@ -70,8 +70,8 @@
 import io.plaidapp.data.prefs.DesignerNewsPrefs;
 import io.plaidapp.ui.transitions.FabTransform;
 import io.plaidapp.ui.transitions.MorphTransform;
-import io.plaidapp.util.AnimUtils;
 import io.plaidapp.util.ScrimUtil;
+import io.plaidapp.util.TransitionUtils;
 import io.plaidapp.util.glide.CircleTransform;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -107,8 +107,7 @@ protected void onCreate(Bundle savedInstanceState) {
                     getResources().getDimensionPixelSize(R.dimen.dialog_corners));
         }
         if (getWindow().getSharedElementEnterTransition() != null) {
-            getWindow().getSharedElementEnterTransition().addListener(new AnimUtils
-                    .TransitionListenerAdapter() {
+            getWindow().getSharedElementEnterTransition().addListener(new TransitionUtils.TransitionListenerAdapter() {
                 @Override
                 public void onTransitionEnd(Transition transition) {
                     finishSetup();

diff --git a/app/src/main/java/io/plaidapp/ui/DribbbleShot.java b/app/src/main/java/io/plaidapp/ui/DribbbleShot.java
@@ -91,10 +91,10 @@
 import io.plaidapp.ui.widget.FabOverlapTextView;
 import io.plaidapp.ui.widget.ForegroundImageView;
 import io.plaidapp.ui.widget.ParallaxScrimageView;
-import io.plaidapp.util.AnimUtils;
 import io.plaidapp.util.ColorUtils;
 import io.plaidapp.util.HtmlUtils;
 import io.plaidapp.util.ImeUtils;
+import io.plaidapp.util.TransitionUtils;
 import io.plaidapp.util.ViewOffsetHelper;
 import io.plaidapp.util.ViewUtils;
 import io.plaidapp.util.customtabs.CustomTabActivityHelper;
@@ -594,7 +594,7 @@ public void onClick(View view) {
     };
 
     private Transition.TransitionListener shotReturnHomeListener =
-            new AnimUtils.TransitionListenerAdapter() {
+            new TransitionUtils.TransitionListenerAdapter() {
         @Override
         public void onTransitionStart(Transition transition) {
             super.onTransitionStart(transition);

diff --git a/app/src/main/java/io/plaidapp/ui/FeedAdapter.java b/app/src/main/java/io/plaidapp/ui/FeedAdapter.java
@@ -78,8 +78,8 @@
 import io.plaidapp.data.prefs.SourceManager;
 import io.plaidapp.ui.transitions.ReflowText;
 import io.plaidapp.ui.widget.BadgedFourThreeImageView;
-import io.plaidapp.util.AnimUtils;
 import io.plaidapp.util.ObservableColorMatrix;
+import io.plaidapp.util.TransitionUtils;
 import io.plaidapp.util.ViewUtils;
 import io.plaidapp.util.customtabs.CustomTabActivityHelper;
 import io.plaidapp.util.glide.DribbbleTarget;
@@ -615,7 +615,7 @@ private void setGridItemContentTransitions(View gridItem) {
 
         Transition reenter = TransitionInflater.from(host)
                 .inflateTransition(R.transition.grid_overlap_fab_reenter);
-        reenter.addListener(new AnimUtils.TransitionListenerAdapter() {
+        reenter.addListener(new TransitionUtils.TransitionListenerAdapter() {
 
             @Override
             public void onTransitionEnd(Transition transition) {

diff --git a/app/src/main/java/io/plaidapp/ui/HomeActivity.java b/app/src/main/java/io/plaidapp/ui/HomeActivity.java
@@ -337,14 +337,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 drawer.openDrawer(GravityCompat.END);
                 return true;
             case R.id.menu_search:
-                // get the icon's location on screen to pass through to the search screen
                 View searchMenuView = toolbar.findViewById(R.id.menu_search);
-                int[] loc = new int[2];
-                searchMenuView.getLocationOnScreen(loc);
-                startActivityForResult(SearchActivity.createStartIntent(this, loc[0], loc[0] +
-                        (searchMenuView.getWidth() / 2)), RC_SEARCH, ActivityOptions
-                        .makeSceneTransitionAnimation(this).toBundle());
-                searchMenuView.setAlpha(0f);
+                Bundle options = ActivityOptions.makeSceneTransitionAnimation(this, searchMenuView,
+                        getString(R.string.transition_search_back)).toBundle();
+                startActivityForResult(new Intent(this, SearchActivity.class), RC_SEARCH, options);
                 return true;
             case R.id.menu_dribbble_login:
                 if (!dribbblePrefs.isLoggedIn()) {