Merge pull request #6 from skydoves/migrate/compose-beta08

Migrate to Compose beta08

app/build.gradle

@@ -97,7 +97,7 @@ dependencies {
     implementation "com.github.skydoves:landscapist-coil:$versions.landscapistVersion"
 
     // compose insets
-    implementation "dev.chrisbanes.accompanist:accompanist-insets:$versions.accompanistVersion"
+    implementation "com.google.accompanist:accompanist-insets:$versions.accompanistVersion"
 
     // compose compatibles
     implementation "com.github.skydoves:orchestra-balloon:$versions.orchestraVersion"

app/src/main/java/com/skydoves/disneycompose/ui/main/Main.kt

@@ -20,16 +20,15 @@ import android.widget.Toast
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.hilt.navigation.compose.hiltNavGraphViewModel
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.navArgument
-import androidx.navigation.compose.navigate
 import androidx.navigation.compose.rememberNavController
+import com.google.accompanist.insets.ProvideWindowInsets
 import com.skydoves.disneycompose.ui.details.PosterDetails
 import com.skydoves.disneycompose.ui.posters.Posters
-import dev.chrisbanes.accompanist.insets.ProvideWindowInsets
 
 @Composable
 fun DisneyMain() {
@@ -39,7 +38,7 @@ fun DisneyMain() {
   ProvideWindowInsets {
     NavHost(navController = navController, startDestination = NavScreen.Home.route) {
       composable(NavScreen.Home.route) { backStackEntry ->
-        val viewModel = hiltNavGraphViewModel<MainViewModel>(backStackEntry = backStackEntry)
+        val viewModel = hiltViewModel<MainViewModel>(backStackEntry = backStackEntry)
         Posters(
           viewModel = viewModel,
           selectPoster = {
@@ -56,15 +55,15 @@ fun DisneyMain() {
           navArgument(NavScreen.PosterDetails.argument0) { type = NavType.LongType }
         )
       ) { backStackEntry ->
-        val viewModel = hiltNavGraphViewModel<MainViewModel>(backStackEntry = backStackEntry)
+        val viewModel = hiltViewModel<MainViewModel>(backStackEntry = backStackEntry)
 
         val posterId =
           backStackEntry.arguments?.getLong(NavScreen.PosterDetails.argument0) ?: return@composable
 
         viewModel.getPoster(posterId)
 
         PosterDetails(viewModel = viewModel) {
-          navController.popBackStack(navController.graph.startDestination, false)
+          navController.popBackStack(NavScreen.Home.route, false)
         }
       }
     }

app/src/main/java/com/skydoves/disneycompose/ui/posters/HomePosters.kt

@@ -33,11 +33,11 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
+import com.google.accompanist.insets.statusBarsPadding
 import com.skydoves.disneycompose.model.Poster
 import com.skydoves.disneycompose.ui.custom.StaggeredVerticalGrid
 import com.skydoves.disneycompose.ui.theme.DisneyComposeTheme
 import com.skydoves.disneycompose.utils.NetworkImage
-import dev.chrisbanes.accompanist.insets.statusBarsPadding
 
 @Composable
 fun HomePosters(

app/src/main/java/com/skydoves/disneycompose/ui/posters/LibraryPosters.kt

@@ -38,11 +38,11 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
+import com.google.accompanist.insets.statusBarsPadding
 import com.skydoves.disneycompose.model.Poster
 import com.skydoves.disneycompose.ui.custom.StaggeredVerticalGrid
 import com.skydoves.disneycompose.ui.theme.DisneyComposeTheme
 import com.skydoves.disneycompose.utils.NetworkImage
-import dev.chrisbanes.accompanist.insets.statusBarsPadding
 
 @Composable
 fun LibraryPosters(

app/src/main/java/com/skydoves/disneycompose/ui/posters/Posters.kt

@@ -46,13 +46,13 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.constraintlayout.compose.ConstraintLayout
+import com.google.accompanist.insets.navigationBarsHeight
+import com.google.accompanist.insets.navigationBarsPadding
 import com.skydoves.disneycompose.R
 import com.skydoves.disneycompose.extensions.visible
 import com.skydoves.disneycompose.model.Poster
 import com.skydoves.disneycompose.ui.main.MainViewModel
 import com.skydoves.disneycompose.ui.theme.purple200
-import dev.chrisbanes.accompanist.insets.navigationBarsHeight
-import dev.chrisbanes.accompanist.insets.navigationBarsPadding
 
 @Composable
 fun Posters(

app/src/main/java/com/skydoves/disneycompose/ui/posters/RadioPosters.kt

@@ -41,10 +41,10 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
+import com.google.accompanist.insets.statusBarsPadding
 import com.skydoves.disneycompose.model.Poster
 import com.skydoves.disneycompose.ui.theme.DisneyComposeTheme
 import com.skydoves.disneycompose.utils.NetworkImage
-import dev.chrisbanes.accompanist.insets.statusBarsPadding
 
 @Composable
 fun RadioPosters(

build.gradle

@@ -3,7 +3,7 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter()
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$versions.gradleBuildTool"
@@ -17,8 +17,7 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter()
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
     }
 }
 

dependencies.gradle

@@ -4,28 +4,27 @@ ext.versions = [
     versionCode          : 3,
     versionName          : '1.0.2',
 
-    gradleBuildTool      : '7.0.0-alpha10',
-    spotlessGradle       : '5.9.0',
-    kotlin               : '1.4.32',
+    gradleBuildTool      : '7.0.0-beta03',
+    spotlessGradle       : '5.12.3',
+    kotlin               : '1.5.10',
 
     // material
     materialVersion      : '1.3.0-alpha03',
 
     // compose
-    composeVersion       : '1.0.0-beta06',
-    constraintVersion    : '1.0.0-alpha03',
-    composeToolVersion   : '1.0.0-alpha07',
-    composeNavVersion    : '1.0.0-alpha10',
-    activityVersion      : '1.3.0-alpha03',
+    composeVersion       : '1.0.0-beta09',
+    constraintVersion    : '1.0.0-alpha07',
+    activityVersion      : '1.3.0-beta01',
+    composeNavVersion    : '2.4.0-alpha02',
 
     // compose image loading
-    landscapistVersion   : '1.2.1',
+    landscapistVersion   : '1.2.4',
 
     // compose compatibles
-    orchestraVersion     : '1.0.4',
+    orchestraVersion     : '1.0.7',
 
     // compose insets
-    accompanistVersion   : '0.6.2',
+    accompanistVersion   : '0.10.0',
 
     // androidx jetpack
     coreKtx              : '1.5.0-alpha03',
@@ -40,9 +39,9 @@ ext.versions = [
     startupVersion       : '1.0.0',
 
     // di
-    hiltCoreVersion      : '2.35',
-    hiltVersion          : '1.0.0-beta01',
-    hiltComposeNavigation: '1.0.0-alpha01',
+    hiltCoreVersion      : '2.36',
+    hiltVersion          : '1.0.0',
+    hiltComposeNavigation: '1.0.0-alpha02',
 
     // network
     retrofitVersion      : '2.9.0',
@@ -53,7 +52,7 @@ ext.versions = [
     coroutinesVersion    : '1.4.1',
 
     // whatIf
-    whatIfVersion        : '1.0.9',
+    whatIfVersion        : '1.1.0',
 
     // debugging
     timberVersion        : '4.7.1',

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Mar 12 20:11:34 KST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME