[Motion] Update container transform to use new motion system.

PiperOrigin-RevId: 444848054
material-components · Apr 27, 2022 · f2f454b · f2f454b
1 parent 0e4e44e
commit f2f454b
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 9 deletions.
diff --git a/catalog/java/io/material/catalog/transition/ContainerTransformConfigurationHelper.java b/catalog/java/io/material/catalog/transition/ContainerTransformConfigurationHelper.java
@@ -99,7 +99,9 @@ void configure(MaterialContainerTransform transform, boolean entering) {
     if (duration != NO_DURATION) {
       transform.setDuration(duration);
     }
-    transform.setInterpolator(getInterpolator());
+    if (getInterpolator() != null) {
+      transform.setInterpolator(getInterpolator());
+    }
     if (isArcMotionEnabled()) {
       transform.setPathMotion(new MaterialArcMotion());
     }
@@ -116,7 +118,9 @@ void configure(
     if (duration != NO_DURATION) {
       transform.setDuration(duration);
     }
-    transform.setInterpolator(getInterpolator());
+    if (getInterpolator() != null) {
+      transform.setInterpolator(getInterpolator());
+    }
     if (isArcMotionEnabled()) {
       transform.setPathMotion(
           new com.google.android.material.transition.platform.MaterialArcMotion());
@@ -302,6 +306,8 @@ private void setUpBottomSheetInterpolation(View view) {
         setTextFloat(view.findViewById(R.id.y1_edit_text), currentInterp.controlY1);
         setTextFloat(view.findViewById(R.id.x2_edit_text), currentInterp.controlX2);
         setTextFloat(view.findViewById(R.id.y2_edit_text), currentInterp.controlY2);
+      } else {
+        interpolationGroup.check(R.id.radio_default);
       }
 
       // Show/hide custom text input fields depending on initial checked radio button.
@@ -452,9 +458,12 @@ private void setUpBottomSheetConfirmationButtons(View view, BottomSheetDialog di
               } else if (checkedRadioButtonId == R.id.radio_bounce) {
                 interpolator = new BounceInterpolator();
                 dialog.dismiss();
-              } else {
+              } else if (checkedRadioButtonId == R.id.radio_fast_out_slow_in) {
                 interpolator = new FastOutSlowInInterpolator();
                 dialog.dismiss();
+              } else {
+                interpolator = null;
+                dialog.dismiss();
               }
             });
 

diff --git a/...og/java/io/material/catalog/transition/res/layout/cat_transition_configuration_layout.xml b/...og/java/io/material/catalog/transition/res/layout/cat_transition_configuration_layout.xml
@@ -164,12 +164,18 @@
           android:animateLayoutChanges="true"
           android:orientation="vertical">
 
+        <RadioButton
+          android:id="@+id/radio_default"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:text="@string/cat_transition_config_default"
+          android:checked="true"/>
+
         <RadioButton
             android:id="@+id/radio_fast_out_slow_in"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/cat_transition_config_fast_out_slow_in_title"
-            android:checked="true"/>
+            android:text="@string/cat_transition_config_fast_out_slow_in_title"/>
 
         <RadioButton
           android:id="@+id/radio_overshoot"

diff --git a/catalog/java/io/material/catalog/transition/res/values/strings.xml b/catalog/java/io/material/catalog/transition/res/values/strings.xml
@@ -51,6 +51,7 @@ Phasellus in aliquet mi. Pellentesque habitant morbi tristique senectus et netus
   <string name="cat_transition_config_enter_duration_title">Enter Duration</string>
   <string name="cat_transition_config_return_duration_title">Return Duration</string>
   <string name="cat_transition_config_interpolation_title">Interpolation</string>
+  <string name="cat_transition_config_default">Default</string>
   <string name="cat_transition_config_fast_out_slow_in_title">FastOutSlowIn</string>
   <string name="cat_transition_config_overshoot">Overshoot</string>
   <string name="cat_transition_config_anticipate_overshoot">AnticipateOvershoot</string>

diff --git a/lib/java/com/google/android/material/transition/MaterialContainerTransform.java b/lib/java/com/google/android/material/transition/MaterialContainerTransform.java
@@ -1005,9 +1005,12 @@ public void onTransitionEnd(@NonNull Transition transition) {
 
   private void maybeApplyThemeValues(Context context, boolean entering) {
     TransitionUtils.maybeApplyThemeInterpolator(
-        this, context, R.attr.motionEasingStandard, AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR);
+        this,
+        context,
+        R.attr.motionEasingEmphasizedInterpolator,
+        AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR);
     TransitionUtils.maybeApplyThemeDuration(
-        this, context, entering ? R.attr.motionDurationLong1 : R.attr.motionDurationMedium2);
+        this, context, entering ? R.attr.motionDurationExtraLong2 : R.attr.motionDurationMedium4);
     if (!pathMotionCustom) {
       TransitionUtils.maybeApplyThemePath(this, context, R.attr.motionPath);
     }

diff --git a/lib/java/com/google/android/material/transition/platform/MaterialContainerTransform.java b/lib/java/com/google/android/material/transition/platform/MaterialContainerTransform.java
@@ -1010,9 +1010,12 @@ public void onTransitionEnd(@NonNull Transition transition) {
 
   private void maybeApplyThemeValues(Context context, boolean entering) {
     TransitionUtils.maybeApplyThemeInterpolator(
-        this, context, R.attr.motionEasingStandard, AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR);
+        this,
+        context,
+        R.attr.motionEasingEmphasizedInterpolator,
+        AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR);
     TransitionUtils.maybeApplyThemeDuration(
-        this, context, entering ? R.attr.motionDurationLong1 : R.attr.motionDurationMedium2);
+        this, context, entering ? R.attr.motionDurationExtraLong2 : R.attr.motionDurationMedium4);
     if (!pathMotionCustom) {
       TransitionUtils.maybeApplyThemePath(this, context, R.attr.motionPath);
     }