From 665ddfce244666e2a6679b9ca1a5363b49a623b7 Mon Sep 17 00:00:00 2001 From: Vitali Olshevski Date: Sat, 27 Jan 2024 19:32:48 +0200 Subject: [PATCH] Dependency updates Missed several libraries in the previous commit. --- gradle/libs.versions.toml | 6 +++--- .../navigation/reimagined/sample/koin/ui/MainScreen.kt | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5d7003f4..609cb3fc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ android-sdk-min = "21" android-sdk-target = "34" android-sdk-compile = "34" -dagger = "2.47" +dagger = "2.50" compose-compiler = "1.5.8" lifecycle = "2.7.0" @@ -28,7 +28,7 @@ hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dag javapoet = "com.squareup:javapoet:1.13.0" lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "lifecycle" } lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" } -koin-compose = "io.insert-koin:koin-androidx-compose:3.4.6" +koin-compose = "io.insert-koin:koin-androidx-compose:3.5.3" # test libraries espresso-core = "androidx.test.espresso:espresso-core:3.5.1" @@ -41,7 +41,7 @@ android-gradle-plugin = "com.android.tools.build:gradle:8.2.2" kotlin-gradle-plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" [plugins] -anvil = { id = "com.squareup.anvil", version = "2.4.7" } +anvil = { id = "com.squareup.anvil", version = "2.4.9" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" } versions = { id = "com.github.ben-manes.versions", version = "0.51.0" } diff --git a/samples-di/koin/src/main/kotlin/dev/olshevski/navigation/reimagined/sample/koin/ui/MainScreen.kt b/samples-di/koin/src/main/kotlin/dev/olshevski/navigation/reimagined/sample/koin/ui/MainScreen.kt index 3f1ce26a..bdedf27c 100644 --- a/samples-di/koin/src/main/kotlin/dev/olshevski/navigation/reimagined/sample/koin/ui/MainScreen.kt +++ b/samples-di/koin/src/main/kotlin/dev/olshevski/navigation/reimagined/sample/koin/ui/MainScreen.kt @@ -11,7 +11,6 @@ import dev.olshevski.navigation.reimagined.NavHost import dev.olshevski.navigation.reimagined.navigate import dev.olshevski.navigation.reimagined.rememberNavController import dev.olshevski.navigation.reimagined.sample.koin.R -import org.koin.androidx.compose.getViewModel import org.koin.androidx.compose.koinViewModel import org.koin.core.parameter.parametersOf @@ -35,12 +34,14 @@ fun MainScreen() = ScreenLayout( navController.navigate(MainDestination.Second(DemoId)) } ) + is MainDestination.Second -> SecondScreen( id = destination.id, onOpenThirdScreenButtonClick = { navController.navigate(MainDestination.Third(DemoText)) } ) + is MainDestination.Third -> ThirdScreen(destination.text) } } @@ -52,7 +53,7 @@ private fun FirstScreen( ) = ContentLayout( title = stringResource(R.string.first_screen_title) ) { - val viewModel = getViewModel() + val viewModel = koinViewModel() Button( onClick = { onOpenSecondScreenButtonClick() } @@ -68,7 +69,7 @@ private fun SecondScreen( ) = ContentLayout( title = stringResource(R.string.second_screen_title, id) ) { - val viewModel = getViewModel { parametersOf(id) } + val viewModel = koinViewModel { parametersOf(id) } Button( onClick = { onOpenThirdScreenButtonClick() }