From 2ea958406ef5bbca30c0f750c1be386d950f0d0d Mon Sep 17 00:00:00 2001 From: Gerard Paligot Date: Fri, 22 Dec 2023 20:23:35 +0100 Subject: [PATCH] fix(di): use the correct dsl to create ViewModels. --- .../gdglille/devfest/android/theme/m3/main/di/MainModule.kt | 5 +++-- .../devfest/android/theme/m3/partners/di/PartnersModule.kt | 5 +++-- .../devfest/android/theme/m3/speakers/di/SpeakersModule.kt | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/theme-m3/main/main-di/src/main/kotlin/org/gdglille/devfest/android/theme/m3/main/di/MainModule.kt b/theme-m3/main/main-di/src/main/kotlin/org/gdglille/devfest/android/theme/m3/main/di/MainModule.kt index 7737edc98..f2ffd71ae 100644 --- a/theme-m3/main/main-di/src/main/kotlin/org/gdglille/devfest/android/theme/m3/main/di/MainModule.kt +++ b/theme-m3/main/main-di/src/main/kotlin/org/gdglille/devfest/android/theme/m3/main/di/MainModule.kt @@ -9,6 +9,7 @@ import org.gdglille.devfest.android.theme.m3.partners.di.partnersModule import org.gdglille.devfest.android.theme.m3.schedules.di.scheduleModule import org.gdglille.devfest.android.theme.m3.speakers.di.speakersModule import org.gdglille.devfest.repositoriesModule +import org.koin.androidx.viewmodel.dsl.viewModel import org.koin.dsl.module val mainModule = module { @@ -21,6 +22,6 @@ val mainModule = module { scheduleModule, speakersModule ) - single { MainNavigationViewModel(get(), get()) } - single { MainViewModel(get()) } + viewModel { MainNavigationViewModel(get(), get()) } + viewModel { MainViewModel(get()) } } diff --git a/theme-m3/partners/partners-di/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/di/PartnersModule.kt b/theme-m3/partners/partners-di/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/di/PartnersModule.kt index 1763bf71d..c33363d19 100644 --- a/theme-m3/partners/partners-di/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/di/PartnersModule.kt +++ b/theme-m3/partners/partners-di/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/di/PartnersModule.kt @@ -3,10 +3,11 @@ package org.gdglille.devfest.android.theme.m3.partners.di import org.gdglille.devfest.android.theme.m3.partners.feature.PartnerDetailViewModel import org.gdglille.devfest.android.theme.m3.partners.feature.PartnersViewModel import org.gdglille.devfest.repositoriesModule +import org.koin.androidx.viewmodel.dsl.viewModel import org.koin.dsl.module val partnersModule = module { includes(repositoriesModule) - single { PartnersViewModel(get()) } - single { parametersHolder -> PartnerDetailViewModel(parametersHolder.get(), get()) } + viewModel { PartnersViewModel(get()) } + viewModel { parametersHolder -> PartnerDetailViewModel(parametersHolder.get(), get()) } } diff --git a/theme-m3/speakers/speakers-di/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/di/SpeakersModule.kt b/theme-m3/speakers/speakers-di/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/di/SpeakersModule.kt index 03ffe3392..2fd2f9ebe 100644 --- a/theme-m3/speakers/speakers-di/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/di/SpeakersModule.kt +++ b/theme-m3/speakers/speakers-di/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/di/SpeakersModule.kt @@ -3,10 +3,11 @@ package org.gdglille.devfest.android.theme.m3.speakers.di import org.gdglille.devfest.android.theme.m3.speakers.feature.SpeakerDetailViewModel import org.gdglille.devfest.android.theme.m3.speakers.feature.SpeakersListViewModel import org.gdglille.devfest.repositoriesModule +import org.koin.androidx.viewmodel.dsl.viewModel import org.koin.dsl.module val speakersModule = module { includes(repositoriesModule) - single { SpeakersListViewModel(get()) } - single { parameters -> SpeakerDetailViewModel(parameters.get(), get(), get()) } + viewModel { SpeakersListViewModel(get()) } + viewModel { parameters -> SpeakerDetailViewModel(parameters.get(), get(), get()) } }