Update to compose 1.0.1

pushpalroy · Aug 19, 2021 · e6041f5 · e6041f5
1 parent 91be4b8
commit e6041f5
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 38 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,13 +12,13 @@ def localProperties = new Properties()
 localProperties.load(new FileInputStream(rootProject.file("local.properties")))
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 31
   buildToolsVersion "30.0.3"
 
   defaultConfig {
     applicationId "com.falbler.jetflix"
     minSdkVersion 21
-    targetSdkVersion 30
+    targetSdkVersion 31
     versionCode 1
     versionName "1.0"
     vectorDrawables.useSupportLibrary true

diff --git a/app/src/main/java/com/fabler/jetflix/ui/components/Image.kt b/app/src/main/java/com/fabler/jetflix/ui/components/Image.kt
@@ -8,14 +8,14 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.unit.dp
+import coil.compose.rememberImagePainter
 import com.fabler.jetflix.ui.theme.JetFlixTheme
-import com.google.accompanist.coil.rememberCoilPainter
 
 @Composable
 fun CircularRemoteImage(
@@ -30,8 +30,8 @@ fun CircularRemoteImage(
     modifier = modifier
   ) {
     Image(
-      painter = rememberCoilPainter(
-        request = imageUrl
+      painter = rememberImagePainter(
+        data = imageUrl
       ),
       contentScale = ContentScale.Crop,
       modifier = Modifier.fillMaxSize(),
@@ -75,8 +75,8 @@ fun RoundedCornerRemoteImage(
     modifier = modifier
   ) {
     Image(
-      painter = rememberCoilPainter(
-        request = imageUrl
+      painter = rememberImagePainter(
+        data = imageUrl
       ),
       contentScale = ContentScale.Crop,
       modifier = Modifier.fillMaxSize(),
@@ -97,8 +97,8 @@ fun FullScreenRemoteImage(
     modifier = modifier
   ) {
     Image(
-      painter = rememberCoilPainter(
-        request = imageUrl
+      painter = rememberImagePainter(
+        data = imageUrl
       ),
       contentScale = ContentScale.Crop,
       modifier = Modifier.fillMaxSize(),

diff --git a/app/src/main/java/com/fabler/jetflix/ui/dashboard/comingSoon/ComingSoon.kt b/app/src/main/java/com/fabler/jetflix/ui/dashboard/comingSoon/ComingSoon.kt
@@ -6,24 +6,25 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.airbnb.lottie.compose.LottieAnimation
-import com.airbnb.lottie.compose.LottieAnimationSpec.RawRes
+import com.airbnb.lottie.compose.LottieCompositionSpec
+import com.airbnb.lottie.compose.rememberLottieComposition
 import com.fabler.jetflix.R.raw
 
 @Composable
 fun ComingSoon(modifier: Modifier = Modifier) {
-  val animationSpec = remember { RawRes(raw.coming_soon) }
+  val composition by rememberLottieComposition(LottieCompositionSpec.RawRes(raw.coming_soon))
   Box(
     modifier = Modifier
       .fillMaxWidth()
       .fillMaxHeight()
   ) {
     LottieAnimation(
-      animationSpec,
+      composition,
       modifier = Modifier
         .size(250.dp)
         .padding(10.dp)

diff --git a/app/src/main/java/com/fabler/jetflix/ui/dashboard/downloads/Downloads.kt b/app/src/main/java/com/fabler/jetflix/ui/dashboard/downloads/Downloads.kt
@@ -6,24 +6,25 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.airbnb.lottie.compose.LottieAnimation
-import com.airbnb.lottie.compose.LottieAnimationSpec.RawRes
+import com.airbnb.lottie.compose.LottieCompositionSpec.RawRes
+import com.airbnb.lottie.compose.rememberLottieComposition
 import com.fabler.jetflix.R.raw
 
 @Composable
 fun Downloads(modifier: Modifier = Modifier) {
-  val animationSpec = remember { RawRes(raw.download) }
+  val composition by rememberLottieComposition(RawRes(raw.download))
   Box(
     modifier = Modifier
       .fillMaxWidth()
       .fillMaxHeight()
   ) {
     LottieAnimation(
-      animationSpec,
+      composition,
       modifier = Modifier
         .size(250.dp)
         .padding(10.dp)

diff --git a/app/src/main/java/com/fabler/jetflix/ui/dashboard/playSomething/PlaySomething.kt b/app/src/main/java/com/fabler/jetflix/ui/dashboard/playSomething/PlaySomething.kt
@@ -6,24 +6,25 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.airbnb.lottie.compose.LottieAnimation
-import com.airbnb.lottie.compose.LottieAnimationSpec.RawRes
+import com.airbnb.lottie.compose.LottieCompositionSpec.RawRes
+import com.airbnb.lottie.compose.rememberLottieComposition
 import com.fabler.jetflix.R.raw
 
 @Composable
 fun PlaySomething(modifier: Modifier = Modifier) {
-  val animationSpec = remember { RawRes(raw.play) }
+  val composition by rememberLottieComposition(RawRes(raw.play))
   Box(
     modifier = Modifier
       .fillMaxWidth()
       .fillMaxHeight()
   ) {
     LottieAnimation(
-      animationSpec,
+      composition,
       modifier = Modifier
         .size(250.dp)
         .padding(10.dp)

diff --git a/app/src/main/java/com/fabler/jetflix/ui/moviedetail/component/MoreLikeThis.kt b/app/src/main/java/com/fabler/jetflix/ui/moviedetail/component/MoreLikeThis.kt
@@ -9,13 +9,14 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.airbnb.lottie.compose.LottieAnimation
-import com.airbnb.lottie.compose.LottieAnimationSpec
-import com.fabler.jetflix.R
+import com.airbnb.lottie.compose.LottieCompositionSpec.RawRes
+import com.airbnb.lottie.compose.rememberLottieComposition
+import com.fabler.jetflix.R.raw
 import com.fabler.jetflix.domain.model.Movie
 import com.fabler.jetflix.ui.components.SmallMovieItem
 import com.fabler.jetflix.ui.viewmodel.ViewModelProvider
@@ -64,14 +65,14 @@ fun PhotoGrid(modifier: Modifier = Modifier, movies: List<Movie?>) {
 
 @Composable
 fun TrailersAndMore(modifier: Modifier = Modifier) {
-  val animationSpec = remember { LottieAnimationSpec.RawRes(R.raw.working) }
+  val composition by rememberLottieComposition(RawRes(raw.working))
   Box(
     modifier = Modifier
       .fillMaxWidth()
       .fillMaxHeight()
   ) {
     LottieAnimation(
-      animationSpec,
+      composition,
       modifier = Modifier
         .size(250.dp)
         .padding(10.dp)

diff --git a/buildSrc/src/main/java/com/fabler/jetflix/Dependencies.kt b/buildSrc/src/main/java/com/fabler/jetflix/Dependencies.kt
@@ -5,13 +5,14 @@ object Versions {
 }
 
 object Libs {
-  private const val agpVersion = "7.0.0-beta03"
+  private const val agpVersion = "7.0.0"
   const val androidGradlePlugin = "com.android.tools.build:gradle:$agpVersion"
   const val junit = "junit:junit:4.13"
 
   object Accompanist {
-    const val version = "0.12.0"
-    const val coil = "com.google.accompanist:accompanist-coil:$version"
+    private const val version = "0.17.0"
+    private const val coilVersion = "0.15.0"
+    const val coil = "com.google.accompanist:accompanist-coil:$coilVersion"
     const val insets = "com.google.accompanist:accompanist-insets:$version"
     const val systemuicontroller = "com.google.accompanist:accompanist-systemuicontroller:$version"
   }
@@ -38,30 +39,30 @@ object Libs {
   }
 
   object Kotlin {
-    const val version = "1.5.10"
+    const val version = "1.5.21"
     const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
     const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
     const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
   }
 
   object Coroutines {
-    private const val version = "1.4.1"
+    private const val version = "1.5.1"
     const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
     const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
     const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
   }
 
   object LottieView {
-    private const val lottieVersion = "3.7.0"
-    private const val lottieComposeVersion = "1.0.0-beta07-1"
+    private const val lottieVersion = "4.1.0"
+    private const val lottieComposeVersion = "4.1.1-SNAPSHOT"
     const val lottie = "com.airbnb.android:lottie:${lottieVersion}"
     const val lottieCompose = "com.airbnb.android:lottie-compose:${lottieComposeVersion}"
   }
 
   object AndroidX {
     private const val appCompatVer = "1.3.0"
-    private const val coreKtxVer = "1.6.0-alpha03"
-    private const val navComposeVer = "2.4.0-alpha03"
+    private const val coreKtxVer = "1.6.0"
+    private const val navComposeVer = "2.4.0-alpha05"
     const val appcompat = "androidx.appcompat:$appCompatVer"
     const val coreKtx = "androidx.core:core-ktx:$coreKtxVer"
     const val navigation = "androidx.navigation:navigation-compose:$navComposeVer"
@@ -73,7 +74,7 @@ object Libs {
 
     object Compose {
       const val snapshot = ""
-      const val composeVer = "1.0.0-beta09"
+      const val composeVer = "1.0.1"
 
       const val runtime = "androidx.compose.runtime:runtime:$composeVer"
       const val runtimeLiveData = "androidx.compose.runtime:runtime-livedata:$composeVer"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Feb 12 03:27:51 IST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME