Motion: Rename to "Container transform"

yaraki · yaraki · commit 8ab6a76cd9bd · 2021-09-29T13:18:04.000+09:00
Rename "Navigation &gt; Fade through" to "Navigation &gt; Container transform".
diff --git a/Motion/.idea/misc.xml b/Motion/.idea/misc.xml
diff --git a/Motion/README.md b/Motion/README.md
@@ -45,6 +45,6 @@ package.
 
 <img src="screenshots/sharedelement.gif" height="400" alt="sharedelement"/>
 
-### [Navigation > Fade through](app/src/main/java/com/example/android/motion/demo/navfadethrough)
+### [Navigation > Container transform](app/src/main/java/com/example/android/motion/demo/containertransform)
 
-<img src="screenshots/navigationfadethrough.gif" height="400" alt="navfadethrough"/>
+<img src="screenshots/containertransform.gif" height="400" alt="containertransform"/>
diff --git a/Motion/app/src/main/AndroidManifest.xml b/Motion/app/src/main/AndroidManifest.xml
@@ -174,8 +174,8 @@
         </activity>
 
         <activity
-            android:name=".demo.navfadethrough.NavFadeThroughActivity"
-            android:label="@string/nav_fade_through_label"
+            android:name=".demo.containertransform.ContainerTransformActivity"
+            android:label="@string/container_transform_label"
             android:theme="@style/Theme.Motion.Translucent">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -184,10 +184,10 @@
 
             <meta-data
                 android:name="com.example.android.motion.demo.DESCRIPTION"
-                android:value="@string/nav_fade_through_description" />
+                android:value="@string/container_transform_description" />
             <meta-data
                 android:name="com.example.android.motion.demo.APIS"
-                android:resource="@array/nav_fade_through_apis" />
+                android:resource="@array/container_transform_apis" />
         </activity>
 
     </application>
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseArticleFragment.kt b/Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseArticleFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.android.motion.demo.navfadethrough
+package com.example.android.motion.demo.containertransform
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseArticleViewModel.kt b/Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseArticleViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.android.motion.demo.navfadethrough
+package com.example.android.motion.demo.containertransform
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseCardFragment.kt b/Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseCardFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.android.motion.demo.navfadethrough
+package com.example.android.motion.demo.containertransform
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseCardViewModel.kt b/Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseCardViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.android.motion.demo.navfadethrough
+package com.example.android.motion.demo.containertransform
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/containertransform/ContainerTransformActivity.kt b/Motion/app/src/main/java/com/example/android/motion/demo/containertransform/ContainerTransformActivity.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.example.android.motion.demo.navfadethrough
+package com.example.android.motion.demo.containertransform
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.example.android.motion.R
 import com.example.android.motion.ui.EdgeToEdge
 
-class NavFadeThroughActivity : AppCompatActivity() {
+class ContainerTransformActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.nav_fade_through_activity)
+        setContentView(R.layout.container_transform_activity)
         EdgeToEdge.setUpRoot(findViewById(R.id.nav_host))
     }
 }
diff --git a/Motion/app/src/main/res/layout/cheese_card_fragment.xml b/Motion/app/src/main/res/layout/cheese_card_fragment.xml
@@ -32,7 +32,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:title="@string/nav_fade_through_label" />
+            app:title="@string/container_transform_label" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/Motion/app/src/main/res/layout/container_transform_activity.xml b/Motion/app/src/main/res/layout/container_transform_activity.xml
@@ -22,4 +22,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:defaultNavHost="true"
-    app:navGraph="@navigation/nav_fade_through" />
+    app:navGraph="@navigation/container_transform" />
diff --git a/Motion/app/src/main/res/navigation/container_transform.xml b/Motion/app/src/main/res/navigation/container_transform.xml
@@ -17,12 +17,12 @@
 <navigation
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/nav_fade_through"
+    android:id="@+id/container_transform"
     app:startDestination="@id/cheeseCardFragment">
 
     <fragment
         android:id="@+id/cheeseCardFragment"
-        android:name="com.example.android.motion.demo.navfadethrough.CheeseCardFragment"
+        android:name="com.example.android.motion.demo.containertransform.CheeseCardFragment"
         android:label="CheeseCardFragment">
         <action
             android:id="@+id/action_article"
@@ -31,7 +31,7 @@
 
     <fragment
         android:id="@+id/cheeseArticleFragment"
-        android:name="com.example.android.motion.demo.navfadethrough.CheeseArticleFragment"
+        android:name="com.example.android.motion.demo.containertransform.CheeseArticleFragment"
         android:label="CheeseArticleFragment">
         <argument
             android:name="cheeseId"
diff --git a/Motion/app/src/main/res/values/demos.xml b/Motion/app/src/main/res/values/demos.xml
@@ -110,13 +110,14 @@
     </string-array>
 
     <!-- Nav Fade Through -->
-    <string name="nav_fade_through_label">Navigation > Fade through</string>
-    <string name="nav_fade_through_description">
+    <string name="container_transform_label">Navigation > Container transform</string>
+    <string name="container_transform_description">
         To simplify overlapping motion, consider substituting a focal element with a fade through
         transition.
     </string>
-    <string-array name="nav_fade_through_apis">
+    <string-array name="container_transform_apis">
         <item>Transition</item>
+        <item>MaterialContainerTransform</item>
         <item>FragmentNavigator.Extras</item>
     </string-array>
 
diff --git a/Motion/screenshots/containertransform.gif b/Motion/screenshots/containertransform.gif
