Skip to content
This repository was archived by the owner on Dec 9, 2024. It is now read-only.

Commit 8ab6a76

Browse files
committed
Motion: Rename to "Container transform"
Rename "Navigation > Fade through" to "Navigation > Container transform".
1 parent 9748cd7 commit 8ab6a76

File tree

13 files changed

+30
-21
lines changed

13 files changed

+30
-21
lines changed

Motion/.idea/misc.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Motion/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ package.
4545

4646
<img src="screenshots/sharedelement.gif" height="400" alt="sharedelement"/>
4747

48-
### [Navigation > Fade through](app/src/main/java/com/example/android/motion/demo/navfadethrough)
48+
### [Navigation > Container transform](app/src/main/java/com/example/android/motion/demo/containertransform)
4949

50-
<img src="screenshots/navigationfadethrough.gif" height="400" alt="navfadethrough"/>
50+
<img src="screenshots/containertransform.gif" height="400" alt="containertransform"/>

Motion/app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@
174174
</activity>
175175

176176
<activity
177-
android:name=".demo.navfadethrough.NavFadeThroughActivity"
178-
android:label="@string/nav_fade_through_label"
177+
android:name=".demo.containertransform.ContainerTransformActivity"
178+
android:label="@string/container_transform_label"
179179
android:theme="@style/Theme.Motion.Translucent">
180180
<intent-filter>
181181
<action android:name="android.intent.action.MAIN" />
@@ -184,10 +184,10 @@
184184

185185
<meta-data
186186
android:name="com.example.android.motion.demo.DESCRIPTION"
187-
android:value="@string/nav_fade_through_description" />
187+
android:value="@string/container_transform_description" />
188188
<meta-data
189189
android:name="com.example.android.motion.demo.APIS"
190-
android:resource="@array/nav_fade_through_apis" />
190+
android:resource="@array/container_transform_apis" />
191191
</activity>
192192

193193
</application>

Motion/app/src/main/java/com/example/android/motion/demo/navfadethrough/CheeseArticleFragment.kt renamed to Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseArticleFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.example.android.motion.demo.navfadethrough
17+
package com.example.android.motion.demo.containertransform
1818

1919
import android.os.Bundle
2020
import android.view.LayoutInflater

Motion/app/src/main/java/com/example/android/motion/demo/navfadethrough/CheeseArticleViewModel.kt renamed to Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseArticleViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.example.android.motion.demo.navfadethrough
17+
package com.example.android.motion.demo.containertransform
1818

1919
import androidx.lifecycle.LiveData
2020
import androidx.lifecycle.MutableLiveData

Motion/app/src/main/java/com/example/android/motion/demo/navfadethrough/CheeseCardFragment.kt renamed to Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseCardFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.example.android.motion.demo.navfadethrough
17+
package com.example.android.motion.demo.containertransform
1818

1919
import android.os.Bundle
2020
import android.view.LayoutInflater

Motion/app/src/main/java/com/example/android/motion/demo/navfadethrough/CheeseCardViewModel.kt renamed to Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseCardViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.example.android.motion.demo.navfadethrough
17+
package com.example.android.motion.demo.containertransform
1818

1919
import androidx.lifecycle.LiveData
2020
import androidx.lifecycle.MutableLiveData

Motion/app/src/main/java/com/example/android/motion/demo/navfadethrough/NavFadeThroughActivity.kt renamed to Motion/app/src/main/java/com/example/android/motion/demo/containertransform/ContainerTransformActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.example.android.motion.demo.navfadethrough
17+
package com.example.android.motion.demo.containertransform
1818

1919
import android.os.Bundle
2020
import androidx.appcompat.app.AppCompatActivity
2121
import com.example.android.motion.R
2222
import com.example.android.motion.ui.EdgeToEdge
2323

24-
class NavFadeThroughActivity : AppCompatActivity() {
24+
class ContainerTransformActivity : AppCompatActivity() {
2525

2626
override fun onCreate(savedInstanceState: Bundle?) {
2727
super.onCreate(savedInstanceState)
28-
setContentView(R.layout.nav_fade_through_activity)
28+
setContentView(R.layout.container_transform_activity)
2929
EdgeToEdge.setUpRoot(findViewById(R.id.nav_host))
3030
}
3131
}

Motion/app/src/main/res/layout/cheese_card_fragment.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
android:id="@+id/toolbar"
3333
android:layout_width="match_parent"
3434
android:layout_height="?attr/actionBarSize"
35-
app:title="@string/nav_fade_through_label" />
35+
app:title="@string/container_transform_label" />
3636

3737
</com.google.android.material.appbar.AppBarLayout>
3838

Motion/app/src/main/res/layout/nav_fade_through_activity.xml renamed to Motion/app/src/main/res/layout/container_transform_activity.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
android:layout_width="match_parent"
2323
android:layout_height="match_parent"
2424
app:defaultNavHost="true"
25-
app:navGraph="@navigation/nav_fade_through" />
25+
app:navGraph="@navigation/container_transform" />

0 commit comments

Comments
 (0)