[Jetcaster] Hide deprecation warnings for animations

Author: JolandaVerhoef

Jetcaster/app/build.gradle

@@ -88,7 +88,6 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerVersion Libs.Kotlin.version
         kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
     }
 }

Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt

@@ -358,6 +358,7 @@ private fun FollowedPodcastCarouselItem(
             if (podcastImageUrl != null) {
                 CoilImage(
                     data = podcastImageUrl,
+                    contentDescription = null,
                     contentScale = ContentScale.Crop,
                     loading = { /* TODO do something better here */ },
                     modifier = Modifier

Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/category/PodcastCategory.kt

@@ -147,6 +147,7 @@ fun EpisodeListItem(
             // If we have an image Url, we can show it using [CoilImage]
             CoilImage(
                 data = podcast.imageUrl,
+                contentDescription = null,
                 fadeIn = true,
                 contentScale = ContentScale.Crop,
                 loading = { /* TODO do something better here */ },
@@ -330,6 +331,7 @@ private fun TopPodcastRowItem(
             if (podcastImageUrl != null) {
                 CoilImage(
                     data = podcastImageUrl,
+                    contentDescription = null,
                     fadeIn = true,
                     contentScale = ContentScale.Crop,
                     loading = { /* TODO do something better here */ },

Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:Suppress("DEPRECATION")
+
 package com.example.jetcaster.ui.home.discover
 
 import androidx.compose.animation.core.FloatPropKey
@@ -22,7 +24,6 @@ import androidx.compose.animation.core.LinearOutSlowInEasing
 import androidx.compose.animation.core.TransitionDefinition
 import androidx.compose.animation.core.transitionDefinition
 import androidx.compose.animation.core.tween
-import androidx.compose.animation.core.updateTransition
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -36,11 +37,11 @@ import androidx.compose.material.Tab
 import androidx.compose.material.TabPosition
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.emptyContent
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.onCommit
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
@@ -111,9 +112,10 @@ fun Discover(
                 )
             }
 
-            onCommit(selectedCategory) {
+            DisposableEffect(selectedCategory) {
                 // Update our tracking of the previously selected category
                 previousSelectedCategory = selectedCategory
+                onDispose {}
             }
         }
     } else {

Jetcaster/app/src/main/java/com/example/jetcaster/ui/theme/Type.kt

@@ -18,17 +18,17 @@ package com.example.jetcaster.ui.theme
 
 import androidx.compose.material.Typography
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.font.font
-import androidx.compose.ui.text.font.fontFamily
 import androidx.compose.ui.unit.sp
 import com.example.jetcaster.R
 
-private val Montserrat = fontFamily(
-    font(R.font.montserrat_light, FontWeight.Light),
-    font(R.font.montserrat_regular, FontWeight.Normal),
-    font(R.font.montserrat_medium, FontWeight.Medium),
-    font(R.font.montserrat_semibold, FontWeight.SemiBold)
+private val Montserrat = FontFamily(
+    Font(R.font.montserrat_light, FontWeight.Light),
+    Font(R.font.montserrat_regular, FontWeight.Normal),
+    Font(R.font.montserrat_medium, FontWeight.Medium),
+    Font(R.font.montserrat_semibold, FontWeight.SemiBold)
 )
 
 val JetcasterTypography = Typography(

Jetcaster/app/src/main/java/com/example/jetcaster/util/Buttons.kt

@@ -16,8 +16,8 @@
 
 package com.example.jetcaster.util
 
-import androidx.compose.animation.animateAsState
-import androidx.compose.animation.core.animateAsState
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.AmbientContentColor
@@ -56,19 +56,19 @@ fun ToggleFollowPodcastIconButton(
                 isFollowed -> stringResource(R.string.cd_unfollow)
                 else -> stringResource(R.string.cd_follow)
             },
-            tint = animateAsState(
+            tint = animateColorAsState(
                 when {
                     isFollowed -> AmbientContentColor.current
                     else -> Color.Black.copy(alpha = ContentAlpha.high)
                 }
             ).value,
             modifier = Modifier
                 .shadow(
-                    elevation = animateAsState(if (isFollowed) 0.dp else 1.dp).value,
+                    elevation = animateDpAsState(if (isFollowed) 0.dp else 1.dp).value,
                     shape = MaterialTheme.shapes.small
                 )
                 .background(
-                    color = animateAsState(
+                    color = animateColorAsState(
                         when {
                             isFollowed -> MaterialTheme.colors.surface.copy(0.38f)
                             else -> Color.White

Jetcaster/app/src/main/java/com/example/jetcaster/util/DynamicTheming.kt

@@ -18,7 +18,7 @@ package com.example.jetcaster.util
 
 import android.content.Context
 import androidx.collection.LruCache
-import androidx.compose.animation.animateAsState
+import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.spring
 import androidx.compose.material.MaterialTheme
@@ -61,11 +61,11 @@ fun DynamicThemePrimaryColorsFromImage(
     content: @Composable () -> Unit
 ) {
     val colors = MaterialTheme.colors.copy(
-        primary = animateAsState(
+        primary = animateColorAsState(
             dominantColorState.color,
             spring(stiffness = Spring.StiffnessLow)
         ).value,
-        onPrimary = animateAsState(
+        onPrimary = animateColorAsState(
             dominantColorState.onColor,
             spring(stiffness = Spring.StiffnessLow)
         ).value

Jetcaster/app/src/main/java/com/example/jetcaster/util/ItemSwitcher.kt

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:Suppress("DEPRECATION")
+
 package com.example.jetcaster.util
 
 import androidx.compose.animation.asDisposableClock
@@ -22,9 +24,9 @@ import androidx.compose.animation.core.TransitionState
 import androidx.compose.animation.core.createAnimation
 import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.invalidate
 import androidx.compose.runtime.key
-import androidx.compose.runtime.onCommit
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.AmbientAnimationClock
@@ -72,7 +74,7 @@ fun <T> ItemSwitcher(
                     )
                 }
 
-                onCommit(visible) {
+                DisposableEffect(visible) {
                     anim.onStateChangeFinished = { _ ->
                         if (key == state.current) {
                             // leave only the current in the list
@@ -87,6 +89,8 @@ fun <T> ItemSwitcher(
                         else -> ItemTransitionState.BecomingNotVisible
                     }
                     anim.toState(targetState)
+
+                    onDispose { }
                 }
 
                 children(anim)
@@ -118,7 +122,7 @@ private class ItemTransitionInnerState<T> {
 
 private data class ItemTransitionItem<T>(
     val key: T,
-    val content: ItemTransitionContent
+    @Suppress("TYPEALIAS_EXPANSION_DEPRECATION") val content: ItemTransitionContent
 )
 
 private typealias ItemTransitionContent = @Composable (children: @Composable (TransitionState) -> Unit) -> Unit

Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt

@@ -29,7 +29,7 @@ object Libs {
     const val material = "com.google.android.material:material:1.1.0"
 
     object Accompanist {
-        private const val version = "0.4.2"
+        private const val version = "0.5.0"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
         const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
     }