Motion: Replace deprecated APIs

Change-Id: Ia2aefc3e2aa5ba57222a3424b6a94cca8c1756ca

Author: yaraki

Motion/.idea/misc.xml

@@ -19,12 +19,12 @@ apply plugin: 'kotlin-android'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId 'com.example.android.motion'
         minSdkVersion 14
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName '1.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -51,16 +51,16 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.fragment:fragment-ktx:1.3.6'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.transition:transition:1.4.1'
     implementation 'androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
 
-    def lifecycle_version = '2.3.1'
+    def lifecycle_version = '2.4.0'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 

Motion/app/build.gradle

@@ -36,6 +36,7 @@
 
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:theme="@style/Theme.Motion.CardUi">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -45,6 +46,7 @@
 
         <activity
             android:name=".demo.dissolve.DissolveActivity"
+            android:exported="true"
             android:label="@string/dissolve_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -61,6 +63,7 @@
 
         <activity
             android:name=".demo.fadethrough.FadeThroughActivity"
+            android:exported="true"
             android:label="@string/fade_through_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -77,6 +80,7 @@
 
         <activity
             android:name=".demo.fabtransformation.FabTransformationActivity"
+            android:exported="true"
             android:label="@string/fab_transformation_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -93,6 +97,7 @@
 
         <activity
             android:name=".demo.reorder.ReorderActivity"
+            android:exported="true"
             android:label="@string/reorder_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -109,6 +114,7 @@
 
         <activity
             android:name=".demo.stagger.StaggerActivity"
+            android:exported="true"
             android:label="@string/stagger_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -125,6 +131,7 @@
 
         <activity
             android:name=".demo.loading.LoadingActivity"
+            android:exported="true"
             android:label="@string/loading_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -141,6 +148,7 @@
 
         <activity
             android:name=".demo.oscillation.OscillationActivity"
+            android:exported="true"
             android:label="@string/oscillation_label"
             android:theme="@style/Theme.Motion.CardUi">
             <intent-filter>
@@ -158,6 +166,7 @@
 
         <activity
             android:name=".demo.sharedelement.SharedElementActivity"
+            android:exported="true"
             android:label="@string/shared_element_label"
             android:theme="@style/Theme.Motion.Translucent">
             <intent-filter>
@@ -175,6 +184,7 @@
 
         <activity
             android:name=".demo.containertransform.ContainerTransformActivity"
+            android:exported="true"
             android:label="@string/container_transform_label"
             android:theme="@style/Theme.Motion.Translucent">
             <intent-filter>

Motion/app/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@ package com.example.android.motion
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.appcompat.widget.Toolbar
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.commitNow
 import com.example.android.motion.ui.EdgeToEdge
 import com.example.android.motion.ui.demolist.DemoListFragment
@@ -32,7 +33,7 @@ class MainActivity : AppCompatActivity() {
         setSupportActionBar(toolbar)
 
         // Configure edge-to-edge display.
-        EdgeToEdge.setUpRoot(findViewById(R.id.main))
+        WindowCompat.setDecorFitsSystemWindows(window, false)
         EdgeToEdge.setUpAppBar(findViewById(R.id.app_bar), toolbar)
 
         // Set up the fragment.

Motion/app/src/main/java/com/example/android/motion/MainActivity.kt

@@ -28,6 +28,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.ViewGroupCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.core.widget.NestedScrollView
@@ -82,19 +83,20 @@ class CheeseArticleFragment : Fragment() {
 
         // Adjust the edge-to-edge display.
         ViewCompat.setOnApplyWindowInsetsListener(view) { _, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             toolbar.updateLayoutParams<CollapsingToolbarLayout.LayoutParams> {
-                topMargin = insets.systemWindowInsetTop
+                topMargin = systemBars.top
             }
             // The collapsed app bar gets taller by the toolbar's top margin. The CoordinatorLayout
             // has to have a bottom margin of the same amount so that the scrolling content is
             // completely visible.
             scroll.updateLayoutParams<CoordinatorLayout.LayoutParams> {
-                bottomMargin = insets.systemWindowInsetTop
+                bottomMargin = systemBars.top
             }
             content.updatePadding(
-                left = insets.systemWindowInsetLeft,
-                right = insets.systemWindowInsetRight,
-                bottom = insets.systemWindowInsetBottom
+                left = systemBars.left,
+                right = systemBars.right,
+                bottom = systemBars.bottom
             )
             insets
         }

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

@@ -27,6 +27,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.ViewGroupCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
@@ -76,13 +77,14 @@ class CheeseCardFragment : Fragment() {
         val name: TextView = view.findViewById(R.id.name)
 
         ViewCompat.setOnApplyWindowInsetsListener(view.parent as View) { _, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             toolbar.updateLayoutParams<AppBarLayout.LayoutParams> {
-                topMargin = insets.systemWindowInsetTop
+                topMargin = systemBars.top
             }
             content.updatePadding(
-                left = insets.systemWindowInsetLeft,
-                right = insets.systemWindowInsetRight,
-                bottom = insets.systemWindowInsetBottom
+                left = systemBars.left,
+                right = systemBars.right,
+                bottom = systemBars.bottom
             )
             insets
         }

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

@@ -18,14 +18,14 @@ package com.example.android.motion.demo.containertransform
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowCompat
 import com.example.android.motion.R
-import com.example.android.motion.ui.EdgeToEdge
 
 class ContainerTransformActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.container_transform_activity)
-        EdgeToEdge.setUpRoot(findViewById(R.id.nav_host))
+        WindowCompat.setDecorFitsSystemWindows(window, false)
     }
 }

Motion/app/src/main/java/com/example/android/motion/demo/containertransform/ContainerTransformActivity.kt

@@ -21,6 +21,7 @@ import android.widget.ImageView
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
+import androidx.core.view.WindowCompat
 import androidx.transition.TransitionManager
 import com.example.android.motion.R
 import com.example.android.motion.demo.FAST_OUT_SLOW_IN
@@ -42,7 +43,7 @@ class DissolveActivity : AppCompatActivity() {
         val next: MaterialButton = findViewById(R.id.next)
 
         setSupportActionBar(toolbar)
-        EdgeToEdge.setUpRoot(findViewById(R.id.root))
+        WindowCompat.setDecorFitsSystemWindows(window, false)
         EdgeToEdge.setUpAppBar(findViewById(R.id.app_bar), toolbar)
         EdgeToEdge.setUpScrollingContent(findViewById(R.id.content))
 

Motion/app/src/main/java/com/example/android/motion/demo/dissolve/DissolveActivity.kt

@@ -26,6 +26,8 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import com.bumptech.glide.Glide
@@ -81,19 +83,20 @@ class FabTransformationActivity : AppCompatActivity() {
         setSupportActionBar(toolbar)
 
         // Set up edge-to-edge display.
-        EdgeToEdge.setUpRoot(root)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
         EdgeToEdge.setUpAppBar(findViewById(R.id.app_bar), toolbar)
         val fabMargin = resources.getDimensionPixelSize(R.dimen.spacing_medium)
         ViewCompat.setOnApplyWindowInsetsListener(root) { _, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             fab.updateLayoutParams<CoordinatorLayout.LayoutParams> {
-                leftMargin = fabMargin + insets.systemWindowInsetLeft
-                rightMargin = fabMargin + insets.systemWindowInsetRight
-                bottomMargin = fabMargin + insets.systemWindowInsetBottom
+                leftMargin = fabMargin + systemBars.left
+                rightMargin = fabMargin + systemBars.right
+                bottomMargin = fabMargin + systemBars.bottom
             }
             sheet.updateLayoutParams<CoordinatorLayout.LayoutParams> {
-                leftMargin = fabMargin + insets.systemWindowInsetLeft
-                rightMargin = fabMargin + insets.systemWindowInsetRight
-                bottomMargin = fabMargin + insets.systemWindowInsetBottom
+                leftMargin = fabMargin + systemBars.left
+                rightMargin = fabMargin + systemBars.right
+                bottomMargin = fabMargin + systemBars.bottom
             }
             insets
         }

Motion/app/src/main/java/com/example/android/motion/demo/fabtransformation/FabTransformationActivity.kt

@@ -21,6 +21,7 @@ import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.WindowCompat
 import androidx.core.view.isVisible
 import androidx.transition.TransitionManager
 import com.bumptech.glide.Glide
@@ -48,7 +49,7 @@ class FadeThroughActivity : AppCompatActivity() {
 
         // Set up the layout.
         setSupportActionBar(toolbar)
-        EdgeToEdge.setUpRoot(findViewById(R.id.root))
+        WindowCompat.setDecorFitsSystemWindows(window, false)
         EdgeToEdge.setUpAppBar(findViewById(R.id.app_bar), toolbar)
         EdgeToEdge.setUpScrollingContent(findViewById(R.id.content))
         Glide.with(icon).load(R.drawable.cheese_2).transform(CircleCrop()).into(icon)