From f02fd7d46493eaa87acebb9a84f8887ee4066877 Mon Sep 17 00:00:00 2001 From: Maxwell Date: Mon, 30 Dec 2024 17:22:17 +0200 Subject: [PATCH] chore: update imports and api usages for stateViewModel --- .../helper/config/ConfigurationHelper.kt | 3 ++- .../anitrend/navigation/drawer/koin/Modules.kt | 2 +- .../core/service/AniTrendLifecycleService.kt | 16 +++++++--------- app/src/main/kotlin/co/anitrend/koin/Modules.kt | 2 +- .../plugins/components/ProjectConfiguration.kt | 1 + .../airing/component/content/AiringContent.kt | 7 ++----- .../kotlin/co/anitrend/airing/koin/Modules.kt | 2 +- .../main/kotlin/co/anitrend/auth/koin/Modules.kt | 2 +- .../kotlin/co/anitrend/episode/koin/Modules.kt | 4 ++-- .../main/kotlin/co/anitrend/feed/koin/Modules.kt | 2 +- .../kotlin/co/anitrend/forum/koin/Modules.kt | 2 +- .../kotlin/co/anitrend/viewer/koin/Modules.kt | 4 ++-- .../co/anitrend/media/carousel/koin/Modules.kt | 2 +- .../media/discover/filter/koin/Modules.kt | 4 ++-- .../co/anitrend/media/discover/koin/Modules.kt | 2 +- .../kotlin/co/anitrend/media/koin/Modules.kt | 2 +- .../sheet/compose/MediaListEditorComponents.kt | 1 - .../co/anitrend/medialist/editor/koin/Modules.kt | 4 ++-- .../component/container/MediaListContainer.kt | 7 ++----- .../component/content/MediaListContent.kt | 10 +++------- .../kotlin/co/anitrend/medialist/koin/Modules.kt | 4 ++-- .../main/kotlin/co/anitrend/news/koin/Modules.kt | 4 ++-- .../co/anitrend/notification/koin/Modules.kt | 2 +- .../kotlin/co/anitrend/profile/koin/Modules.kt | 4 ++-- .../component/content/ReviewDiscoverContent.kt | 8 +++----- .../co/anitrend/review/discover/koin/Modules.kt | 4 ++-- .../kotlin/co/anitrend/review/koin/Modules.kt | 2 +- .../co/anitrend/suggestion/koin/Modules.kt | 2 +- 28 files changed, 48 insertions(+), 61 deletions(-) diff --git a/android-core/src/main/kotlin/co/anitrend/core/android/settings/helper/config/ConfigurationHelper.kt b/android-core/src/main/kotlin/co/anitrend/core/android/settings/helper/config/ConfigurationHelper.kt index c8c742027..1510826a6 100644 --- a/android-core/src/main/kotlin/co/anitrend/core/android/settings/helper/config/ConfigurationHelper.kt +++ b/android-core/src/main/kotlin/co/anitrend/core/android/settings/helper/config/ConfigurationHelper.kt @@ -18,6 +18,7 @@ package co.anitrend.core.android.settings.helper.config import android.content.Context +import androidx.activity.enableEdgeToEdge import androidx.annotation.StyleRes import androidx.fragment.app.FragmentActivity import co.anitrend.core.android.settings.common.IConfigurationSettings @@ -97,4 +98,4 @@ internal class ConfigurationHelper( ) } } -} \ No newline at end of file +} diff --git a/android-navigation/src/main/kotlin/co/anitrend/navigation/drawer/koin/Modules.kt b/android-navigation/src/main/kotlin/co/anitrend/navigation/drawer/koin/Modules.kt index 21bcceff9..270748dac 100644 --- a/android-navigation/src/main/kotlin/co/anitrend/navigation/drawer/koin/Modules.kt +++ b/android-navigation/src/main/kotlin/co/anitrend/navigation/drawer/koin/Modules.kt @@ -34,7 +34,7 @@ import co.anitrend.navigation.drawer.component.viewmodel.state.AccountState import co.anitrend.navigation.drawer.provider.FeatureProvider import org.koin.android.ext.koin.androidContext import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.bind import org.koin.dsl.module diff --git a/app-core/src/main/kotlin/co/anitrend/core/service/AniTrendLifecycleService.kt b/app-core/src/main/kotlin/co/anitrend/core/service/AniTrendLifecycleService.kt index ec1cc246b..28e70f432 100644 --- a/app-core/src/main/kotlin/co/anitrend/core/service/AniTrendLifecycleService.kt +++ b/app-core/src/main/kotlin/co/anitrend/core/service/AniTrendLifecycleService.kt @@ -28,17 +28,15 @@ abstract class AniTrendLifecycleService : LifecycleService(), AndroidScopeCompon override val scope by newScope() override fun onCreate() { + runCatching { Timber.v("Created service scope: $scope") } super.onCreate() - runCatching { - Timber.v("Opening service scope: $scope") - } } - override fun onDestroy() { - super.onDestroy() - runCatching { - Timber.v("Closing service scope: $scope") - closeScope() - } + /** + * Called before closing a scope, on onDestroy + */ + override fun onCloseScope() { + Timber.v("Closing service scope: $scope") + super.onCloseScope() } } diff --git a/app/src/main/kotlin/co/anitrend/koin/Modules.kt b/app/src/main/kotlin/co/anitrend/koin/Modules.kt index 85715754e..dbba51ab0 100644 --- a/app/src/main/kotlin/co/anitrend/koin/Modules.kt +++ b/app/src/main/kotlin/co/anitrend/koin/Modules.kt @@ -26,7 +26,7 @@ import co.anitrend.core.koin.helper.DynamicFeatureModuleHelper import co.anitrend.navigation.MainRouter import co.anitrend.provider.FeatureProvider import org.koin.android.ext.koin.androidContext -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val analyticsModule = module { diff --git a/buildSrc/src/main/java/co/anitrend/buildSrc/plugins/components/ProjectConfiguration.kt b/buildSrc/src/main/java/co/anitrend/buildSrc/plugins/components/ProjectConfiguration.kt index 2a9b1a29e..f43b990d8 100644 --- a/buildSrc/src/main/java/co/anitrend/buildSrc/plugins/components/ProjectConfiguration.kt +++ b/buildSrc/src/main/java/co/anitrend/buildSrc/plugins/components/ProjectConfiguration.kt @@ -197,6 +197,7 @@ internal fun Project.configureAndroid(): Unit = baseExtension().run { if (isAppModule() || isCoreModule()) { compilerArgumentOptions.apply { add("-opt-in=org.koin.core.component.KoinApiExtension") + add("-opt-in=org.koin.viewmodel.KoinInternalApi") add("-opt-in=org.koin.core.KoinExperimentalAPI") } } diff --git a/feature-airing/src/main/kotlin/co/anitrend/airing/component/content/AiringContent.kt b/feature-airing/src/main/kotlin/co/anitrend/airing/component/content/AiringContent.kt index 919baafad..1bceff40f 100644 --- a/feature-airing/src/main/kotlin/co/anitrend/airing/component/content/AiringContent.kt +++ b/feature-airing/src/main/kotlin/co/anitrend/airing/component/content/AiringContent.kt @@ -30,14 +30,13 @@ import co.anitrend.core.android.assureParamNotMissing import co.anitrend.core.android.helpers.date.AniTrendDateHelper import co.anitrend.core.android.settings.extensions.flowUpdating import co.anitrend.core.component.content.list.AniTrendListContent -import co.anitrend.core.extensions.orEmpty import co.anitrend.data.settings.customize.ICustomizationSettings import co.anitrend.data.settings.customize.common.PreferredViewMode import co.anitrend.domain.media.entity.Media import com.maxkeppeler.sheets.calendar.CalendarSheet import com.maxkeppeler.sheets.calendar.SelectionMode import kotlinx.coroutines.launch -import org.koin.androidx.viewmodel.ext.android.stateViewModel +import org.koin.androidx.viewmodel.ext.android.viewModel import org.threeten.bp.Instant class AiringContent( @@ -48,9 +47,7 @@ class AiringContent( override val supportViewAdapter: SupportAdapter ) : AniTrendListContent() { - private val viewModel by stateViewModel( - state = { arguments.orEmpty() } - ) + private val viewModel by viewModel() override val defaultSpanSize: Int get() = getSpanSizeByPreference( diff --git a/feature-airing/src/main/kotlin/co/anitrend/airing/koin/Modules.kt b/feature-airing/src/main/kotlin/co/anitrend/airing/koin/Modules.kt index 35670871a..6971a5bba 100644 --- a/feature-airing/src/main/kotlin/co/anitrend/airing/koin/Modules.kt +++ b/feature-airing/src/main/kotlin/co/anitrend/airing/koin/Modules.kt @@ -28,7 +28,7 @@ import co.anitrend.core.koin.helper.DynamicFeatureModuleHelper import co.anitrend.navigation.AiringRouter import org.koin.android.ext.koin.androidContext import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val fragmentModule = module { diff --git a/feature-auth/src/main/kotlin/co/anitrend/auth/koin/Modules.kt b/feature-auth/src/main/kotlin/co/anitrend/auth/koin/Modules.kt index 8b4a6e2ee..5e4e91ceb 100644 --- a/feature-auth/src/main/kotlin/co/anitrend/auth/koin/Modules.kt +++ b/feature-auth/src/main/kotlin/co/anitrend/auth/koin/Modules.kt @@ -30,7 +30,7 @@ import co.anitrend.core.koin.helper.DynamicFeatureModuleHelper import co.anitrend.navigation.AuthRouter import org.koin.android.ext.koin.androidContext import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val fragmentModule = module { diff --git a/feature-episode/src/main/kotlin/co/anitrend/episode/koin/Modules.kt b/feature-episode/src/main/kotlin/co/anitrend/episode/koin/Modules.kt index 95994473f..715520e18 100644 --- a/feature-episode/src/main/kotlin/co/anitrend/episode/koin/Modules.kt +++ b/feature-episode/src/main/kotlin/co/anitrend/episode/koin/Modules.kt @@ -30,7 +30,7 @@ import co.anitrend.episode.provider.FeatureProvider import co.anitrend.navigation.EpisodeRouter import org.koin.android.ext.koin.androidContext import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.core.qualifier.named import org.koin.dsl.module @@ -77,4 +77,4 @@ private val featureModule = module { internal val moduleHelper = DynamicFeatureModuleHelper( listOf(fragmentModule, viewModelModule, featureModule) -) \ No newline at end of file +) diff --git a/feature-feed/src/main/kotlin/co/anitrend/feed/koin/Modules.kt b/feature-feed/src/main/kotlin/co/anitrend/feed/koin/Modules.kt index f4298a8c4..51b98bc13 100644 --- a/feature-feed/src/main/kotlin/co/anitrend/feed/koin/Modules.kt +++ b/feature-feed/src/main/kotlin/co/anitrend/feed/koin/Modules.kt @@ -25,7 +25,7 @@ import co.anitrend.feed.component.viewmodel.state.FeedState import co.anitrend.feed.provider.FeatureProvider import co.anitrend.navigation.FeedRouter import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val fragmentModule = module { diff --git a/feature-forum/src/main/kotlin/co/anitrend/forum/koin/Modules.kt b/feature-forum/src/main/kotlin/co/anitrend/forum/koin/Modules.kt index 0ed39c7e1..a330c71a4 100644 --- a/feature-forum/src/main/kotlin/co/anitrend/forum/koin/Modules.kt +++ b/feature-forum/src/main/kotlin/co/anitrend/forum/koin/Modules.kt @@ -25,7 +25,7 @@ import co.anitrend.forum.component.viewmodel.state.ForumState import co.anitrend.forum.provider.FeatureProvider import co.anitrend.navigation.ForumRouter import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val fragmentModule = module { diff --git a/feature-image-viewer/src/main/kotlin/co/anitrend/viewer/koin/Modules.kt b/feature-image-viewer/src/main/kotlin/co/anitrend/viewer/koin/Modules.kt index dcf8fea99..d766c826f 100644 --- a/feature-image-viewer/src/main/kotlin/co/anitrend/viewer/koin/Modules.kt +++ b/feature-image-viewer/src/main/kotlin/co/anitrend/viewer/koin/Modules.kt @@ -23,7 +23,7 @@ import co.anitrend.navigation.ImageViewerRouter import co.anitrend.viewer.component.viewmodel.ImageViewerViewModel import co.anitrend.viewer.provider.FeatureProvider import org.koin.android.ext.koin.androidContext -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val viewModelModule = module { @@ -42,4 +42,4 @@ private val featureModule = module { internal val moduleHelper = DynamicFeatureModuleHelper( listOf(viewModelModule, featureModule) -) \ No newline at end of file +) diff --git a/feature-media-carousel/src/main/kotlin/co/anitrend/media/carousel/koin/Modules.kt b/feature-media-carousel/src/main/kotlin/co/anitrend/media/carousel/koin/Modules.kt index e3efb42e5..ce0b0681c 100644 --- a/feature-media-carousel/src/main/kotlin/co/anitrend/media/carousel/koin/Modules.kt +++ b/feature-media-carousel/src/main/kotlin/co/anitrend/media/carousel/koin/Modules.kt @@ -28,7 +28,7 @@ import co.anitrend.media.carousel.provider.FeatureProvider import co.anitrend.navigation.MediaCarouselRouter import org.koin.android.ext.koin.androidContext import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val coreModule = module { diff --git a/feature-media-discover-filter/src/main/kotlin/co/anitrend/media/discover/filter/koin/Modules.kt b/feature-media-discover-filter/src/main/kotlin/co/anitrend/media/discover/filter/koin/Modules.kt index 92d9da200..e952f0859 100644 --- a/feature-media-discover-filter/src/main/kotlin/co/anitrend/media/discover/filter/koin/Modules.kt +++ b/feature-media-discover-filter/src/main/kotlin/co/anitrend/media/discover/filter/koin/Modules.kt @@ -33,7 +33,7 @@ import co.anitrend.media.discover.filter.provider.FeatureProvider import co.anitrend.navigation.MediaDiscoverFilterRouter import org.koin.android.ext.koin.androidContext import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val fragmentModule = module { @@ -68,7 +68,7 @@ private val fragmentModule = module { } private val viewModelModule = module { - viewModel { + viewModel { GenreViewModel( state = GenreViewModelState( interactor = get() diff --git a/feature-media-discover/src/main/kotlin/co/anitrend/media/discover/koin/Modules.kt b/feature-media-discover/src/main/kotlin/co/anitrend/media/discover/koin/Modules.kt index 872b75e03..b8a4602e6 100644 --- a/feature-media-discover/src/main/kotlin/co/anitrend/media/discover/koin/Modules.kt +++ b/feature-media-discover/src/main/kotlin/co/anitrend/media/discover/koin/Modules.kt @@ -29,7 +29,7 @@ import co.anitrend.media.discover.provider.FeatureProvider import co.anitrend.navigation.MediaDiscoverRouter import org.koin.android.ext.koin.androidContext import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val fragmentModule = module { diff --git a/feature-media/src/main/kotlin/co/anitrend/media/koin/Modules.kt b/feature-media/src/main/kotlin/co/anitrend/media/koin/Modules.kt index 5bab7a92e..8e66d6489 100644 --- a/feature-media/src/main/kotlin/co/anitrend/media/koin/Modules.kt +++ b/feature-media/src/main/kotlin/co/anitrend/media/koin/Modules.kt @@ -22,7 +22,7 @@ import co.anitrend.media.component.viewmodel.MediaViewModel import co.anitrend.media.component.viewmodel.state.MediaState import co.anitrend.media.provider.FeatureProvider import co.anitrend.navigation.MediaRouter -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val viewModelModule = module { diff --git a/feature-medialist-editor/src/main/kotlin/co/anitrend/medialist/editor/component/sheet/compose/MediaListEditorComponents.kt b/feature-medialist-editor/src/main/kotlin/co/anitrend/medialist/editor/component/sheet/compose/MediaListEditorComponents.kt index 2a1ce817e..37c162b19 100644 --- a/feature-medialist-editor/src/main/kotlin/co/anitrend/medialist/editor/component/sheet/compose/MediaListEditorComponents.kt +++ b/feature-medialist-editor/src/main/kotlin/co/anitrend/medialist/editor/component/sheet/compose/MediaListEditorComponents.kt @@ -33,7 +33,6 @@ import co.anitrend.domain.media.entity.Media import co.anitrend.medialist.editor.component.sheet.viewmodel.state.MediaListEditorState import coil.ImageLoader import coil.compose.rememberAsyncImagePainter -import org.koin.androidx.compose.get import org.koin.compose.koinInject diff --git a/feature-medialist-editor/src/main/kotlin/co/anitrend/medialist/editor/koin/Modules.kt b/feature-medialist-editor/src/main/kotlin/co/anitrend/medialist/editor/koin/Modules.kt index 5ed7d7058..00da1d3a4 100644 --- a/feature-medialist-editor/src/main/kotlin/co/anitrend/medialist/editor/koin/Modules.kt +++ b/feature-medialist-editor/src/main/kotlin/co/anitrend/medialist/editor/koin/Modules.kt @@ -25,7 +25,7 @@ import co.anitrend.medialist.editor.component.sheet.viewmodel.state.MediaListEdi import co.anitrend.medialist.editor.provider.FeatureProvider import co.anitrend.navigation.MediaListEditorRouter import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val fragmentModule = module { @@ -57,4 +57,4 @@ private val featureModule = module { internal val moduleHelper = DynamicFeatureModuleHelper( listOf(fragmentModule, viewModelModule, featureModule) -) \ No newline at end of file +) diff --git a/feature-medialist/src/main/kotlin/co/anitrend/medialist/component/container/MediaListContainer.kt b/feature-medialist/src/main/kotlin/co/anitrend/medialist/component/container/MediaListContainer.kt index e20fd240a..5390bfe42 100644 --- a/feature-medialist/src/main/kotlin/co/anitrend/medialist/component/container/MediaListContainer.kt +++ b/feature-medialist/src/main/kotlin/co/anitrend/medialist/component/container/MediaListContainer.kt @@ -28,7 +28,6 @@ import androidx.lifecycle.repeatOnLifecycle import co.anitrend.arch.ui.view.widget.model.StateLayoutConfig import co.anitrend.core.android.assureParamNotMissing import co.anitrend.core.component.content.AniTrendContent -import co.anitrend.core.extensions.orEmpty import co.anitrend.domain.user.entity.attribute.MediaListInfo import co.anitrend.medialist.R import co.anitrend.medialist.component.container.adapter.MediaListPageAdapter @@ -37,7 +36,7 @@ import co.anitrend.medialist.component.container.viewmodel.UserViewModel import co.anitrend.medialist.databinding.MediaListContainerBinding import com.google.android.material.tabs.TabLayoutMediator import kotlinx.coroutines.launch -import org.koin.androidx.viewmodel.ext.android.stateViewModel +import org.koin.androidx.viewmodel.ext.android.viewModel import timber.log.Timber class MediaListContainer( @@ -46,9 +45,7 @@ class MediaListContainer( override val inflateLayout: Int = R.layout.media_list_container ) : AniTrendContent() { - private val viewModel by stateViewModel( - state = { arguments.orEmpty() } - ) + private val viewModel by viewModel() private fun updateViewPagerState(mediaListInfo: List) { if (requireBinding().viewPager.adapter?.itemCount != mediaListInfo.size) { diff --git a/feature-medialist/src/main/kotlin/co/anitrend/medialist/component/content/MediaListContent.kt b/feature-medialist/src/main/kotlin/co/anitrend/medialist/component/content/MediaListContent.kt index 493e15610..16c044606 100644 --- a/feature-medialist/src/main/kotlin/co/anitrend/medialist/component/content/MediaListContent.kt +++ b/feature-medialist/src/main/kotlin/co/anitrend/medialist/component/content/MediaListContent.kt @@ -28,13 +28,12 @@ import co.anitrend.arch.ui.view.widget.model.StateLayoutConfig import co.anitrend.core.android.assureParamNotMissing import co.anitrend.core.android.settings.extensions.flowUpdating import co.anitrend.core.component.content.list.AniTrendListContent -import co.anitrend.core.extensions.orEmpty import co.anitrend.data.settings.customize.ICustomizationSettings import co.anitrend.data.settings.customize.common.PreferredViewMode import co.anitrend.domain.media.entity.Media import co.anitrend.medialist.component.content.viewmodel.MediaListViewModel import kotlinx.coroutines.launch -import org.koin.androidx.viewmodel.ext.android.stateViewModel +import org.koin.androidx.viewmodel.ext.android.viewModel class MediaListContent( private val settings: ICustomizationSettings, @@ -42,9 +41,7 @@ class MediaListContent( override val supportViewAdapter: SupportAdapter ) : AniTrendListContent() { - private val viewModel by stateViewModel( - state = { arguments.orEmpty() } - ) + private val viewModel by viewModel() override val defaultSpanSize: Int get() = getSpanSizeByPreference( @@ -105,8 +102,7 @@ class MediaListContent( onPostModelChange(it) } viewModel.filter.observe(viewLifecycleOwner) { - if (it != null) - viewModelState().invoke(it) + it?.let(viewModelState()::invoke) } } diff --git a/feature-medialist/src/main/kotlin/co/anitrend/medialist/koin/Modules.kt b/feature-medialist/src/main/kotlin/co/anitrend/medialist/koin/Modules.kt index 2f893434b..cdc80a611 100644 --- a/feature-medialist/src/main/kotlin/co/anitrend/medialist/koin/Modules.kt +++ b/feature-medialist/src/main/kotlin/co/anitrend/medialist/koin/Modules.kt @@ -31,7 +31,7 @@ import co.anitrend.medialist.provider.FeatureProvider import co.anitrend.navigation.MediaListRouter import org.koin.android.ext.koin.androidContext import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val fragmentModule = module { @@ -83,4 +83,4 @@ private val featureModule = module { internal val moduleHelper = DynamicFeatureModuleHelper( listOf(fragmentModule, viewModelModule, featureModule) -) \ No newline at end of file +) diff --git a/feature-news/src/main/kotlin/co/anitrend/news/koin/Modules.kt b/feature-news/src/main/kotlin/co/anitrend/news/koin/Modules.kt index 12322f24b..f05a8cebe 100644 --- a/feature-news/src/main/kotlin/co/anitrend/news/koin/Modules.kt +++ b/feature-news/src/main/kotlin/co/anitrend/news/koin/Modules.kt @@ -36,7 +36,7 @@ import io.noties.markwon.linkify.LinkifyPlugin import org.commonmark.node.Paragraph import org.koin.android.ext.koin.androidContext import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.core.qualifier.named import org.koin.dsl.module import timber.log.Timber @@ -105,4 +105,4 @@ private val featureModule = module { internal val moduleHelper = DynamicFeatureModuleHelper( listOf(coreModule, fragmentModule, viewModelModule, presenterModule, featureModule) -) \ No newline at end of file +) diff --git a/feature-notification/src/main/kotlin/co/anitrend/notification/koin/Modules.kt b/feature-notification/src/main/kotlin/co/anitrend/notification/koin/Modules.kt index ad8280058..4b23fbd63 100644 --- a/feature-notification/src/main/kotlin/co/anitrend/notification/koin/Modules.kt +++ b/feature-notification/src/main/kotlin/co/anitrend/notification/koin/Modules.kt @@ -25,7 +25,7 @@ import co.anitrend.notification.component.viewmodel.NotificationViewModel import co.anitrend.notification.component.viewmodel.state.NotificationState import co.anitrend.notification.provider.FeatureProvider import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val fragmentModule = module { diff --git a/feature-profile/src/main/kotlin/co/anitrend/profile/koin/Modules.kt b/feature-profile/src/main/kotlin/co/anitrend/profile/koin/Modules.kt index 75cdf4703..e642224d2 100644 --- a/feature-profile/src/main/kotlin/co/anitrend/profile/koin/Modules.kt +++ b/feature-profile/src/main/kotlin/co/anitrend/profile/koin/Modules.kt @@ -24,7 +24,7 @@ import co.anitrend.profile.component.viewmodel.ProfileViewModel import co.anitrend.profile.component.viewmodel.state.ProfileState import co.anitrend.profile.provider.FeatureProvider import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val coreModule = module { @@ -57,4 +57,4 @@ private val featureModule = module { internal val moduleHelper = DynamicFeatureModuleHelper( listOf(fragmentModule, viewModelModule, featureModule) -) \ No newline at end of file +) diff --git a/feature-review-discover/src/main/kotlin/co/anitrend/review/discover/component/content/ReviewDiscoverContent.kt b/feature-review-discover/src/main/kotlin/co/anitrend/review/discover/component/content/ReviewDiscoverContent.kt index aa1580d4b..572adbde0 100644 --- a/feature-review-discover/src/main/kotlin/co/anitrend/review/discover/component/content/ReviewDiscoverContent.kt +++ b/feature-review-discover/src/main/kotlin/co/anitrend/review/discover/component/content/ReviewDiscoverContent.kt @@ -24,10 +24,10 @@ import co.anitrend.arch.recycler.adapter.SupportAdapter import co.anitrend.arch.ui.view.widget.model.StateLayoutConfig import co.anitrend.core.android.assureParamNotMissing import co.anitrend.core.component.content.list.AniTrendListContent -import co.anitrend.core.extensions.orEmpty import co.anitrend.domain.review.entity.Review import co.anitrend.review.discover.component.content.viewmodel.ReviewDiscoverViewModel -import org.koin.androidx.viewmodel.ext.android.stateViewModel +import org.koin.androidx.viewmodel.ext.android.viewModel +import org.koin.viewmodel.toExtras class ReviewDiscoverContent( override val stateConfig: StateLayoutConfig, @@ -36,9 +36,7 @@ class ReviewDiscoverContent( override val defaultSpanSize: Int = co.anitrend.core.android.R.integer.column_x1 ) : AniTrendListContent() { - private val viewModel by stateViewModel( - state = { arguments.orEmpty() } - ) + private val viewModel by viewModel() override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { super.onCreateOptionsMenu(menu, inflater) diff --git a/feature-review-discover/src/main/kotlin/co/anitrend/review/discover/koin/Modules.kt b/feature-review-discover/src/main/kotlin/co/anitrend/review/discover/koin/Modules.kt index 83ccf6923..9f26bfe0d 100644 --- a/feature-review-discover/src/main/kotlin/co/anitrend/review/discover/koin/Modules.kt +++ b/feature-review-discover/src/main/kotlin/co/anitrend/review/discover/koin/Modules.kt @@ -27,7 +27,7 @@ import co.anitrend.review.discover.component.content.viewmodel.state.ReviewDisco import co.anitrend.review.discover.provider.FeatureProvider import org.koin.android.ext.koin.androidContext import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val fragmentModule = module { @@ -64,4 +64,4 @@ private val featureModule = module { internal val moduleHelper = DynamicFeatureModuleHelper( listOf(fragmentModule, viewModelModule, featureModule) -) \ No newline at end of file +) diff --git a/feature-review/src/main/kotlin/co/anitrend/review/koin/Modules.kt b/feature-review/src/main/kotlin/co/anitrend/review/koin/Modules.kt index 4894af3de..93d149280 100644 --- a/feature-review/src/main/kotlin/co/anitrend/review/koin/Modules.kt +++ b/feature-review/src/main/kotlin/co/anitrend/review/koin/Modules.kt @@ -25,7 +25,7 @@ import co.anitrend.review.component.viewmodel.ReviewViewModel import co.anitrend.review.component.viewmodel.state.ReviewState import co.anitrend.review.provider.FeatureProvider import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val fragmentModule = module { diff --git a/feature-suggestion/src/main/kotlin/co/anitrend/suggestion/koin/Modules.kt b/feature-suggestion/src/main/kotlin/co/anitrend/suggestion/koin/Modules.kt index c076094c2..6691c7f5f 100644 --- a/feature-suggestion/src/main/kotlin/co/anitrend/suggestion/koin/Modules.kt +++ b/feature-suggestion/src/main/kotlin/co/anitrend/suggestion/koin/Modules.kt @@ -25,7 +25,7 @@ import co.anitrend.suggestion.component.viewmodel.SuggestionViewModel import co.anitrend.suggestion.component.viewmodel.state.SuggestionState import co.anitrend.suggestion.provider.FeatureProvider import org.koin.androidx.fragment.dsl.fragment -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module private val fragmentModule = module {