From 867812b8e3138ddc5620f4d152ae9673987caeb9 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sun, 20 Jun 2021 15:15:38 +0300 Subject: [PATCH] Update koin --- app/build.gradle | 11 +++++------ .../org/koitharu/kotatsu/details/DetailsModule.kt | 5 ++--- .../koitharu/kotatsu/favourites/FavouritesModule.kt | 9 ++++----- .../java/org/koitharu/kotatsu/reader/ReaderModule.kt | 6 ++---- .../koitharu/kotatsu/remotelist/RemoteListModule.kt | 4 ++-- .../java/org/koitharu/kotatsu/search/SearchModule.kt | 9 ++++----- .../org/koitharu/kotatsu/settings/SettingsModule.kt | 4 +++- 7 files changed, 22 insertions(+), 26 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2bc93b43f..8571e25d4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId 'org.koitharu.kotatsu' minSdkVersion 21 targetSdkVersion 30 - versionCode 364 - versionName '1.0.1' + versionCode 365 + versionName '1.1' kapt { arguments { @@ -93,9 +93,8 @@ dependencies { implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.0' implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.0' - implementation 'io.insert-koin:koin-android:3.0.2' - implementation 'io.insert-koin:koin-android-ext:3.0.2' - implementation 'io.coil-kt:coil-base:1.2.1' + implementation 'io.insert-koin:koin-android:3.1.0' + implementation 'io.coil-kt:coil-base:1.2.2' implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0' implementation 'com.github.solkin:disk-lru-cache:1.2' @@ -103,5 +102,5 @@ dependencies { testImplementation 'junit:junit:4.13.2' testImplementation 'org.json:json:20210307' - testImplementation 'io.insert-koin:koin-test-junit4:3.0.2' + testImplementation 'io.insert-koin:koin-test-junit4:3.1.0' } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt b/app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt index bc8ec0a3d..7e3bd8622 100644 --- a/app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt +++ b/app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt @@ -2,13 +2,12 @@ package org.koitharu.kotatsu.details import org.koin.androidx.viewmodel.dsl.viewModel import org.koin.dsl.module -import org.koitharu.kotatsu.base.domain.MangaIntent import org.koitharu.kotatsu.details.ui.DetailsViewModel val detailsModule get() = module { - viewModel { (intent: MangaIntent) -> - DetailsViewModel(intent, get(), get(), get(), get(), get(), get()) + viewModel { intent -> + DetailsViewModel(intent.get(), get(), get(), get(), get(), get(), get()) } } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt index c0237f1cf..4db6c0c27 100644 --- a/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt +++ b/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt @@ -2,7 +2,6 @@ package org.koitharu.kotatsu.favourites import org.koin.androidx.viewmodel.dsl.viewModel import org.koin.dsl.module -import org.koitharu.kotatsu.core.model.Manga import org.koitharu.kotatsu.favourites.domain.FavouritesRepository import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel import org.koitharu.kotatsu.favourites.ui.categories.select.MangaCategoriesViewModel @@ -13,11 +12,11 @@ val favouritesModule single { FavouritesRepository(get()) } - viewModel { (categoryId: Long) -> - FavouritesListViewModel(categoryId, get(), get()) + viewModel { categoryId -> + FavouritesListViewModel(categoryId.get(), get(), get()) } viewModel { FavouritesCategoriesViewModel(get()) } - viewModel { (manga: Manga) -> - MangaCategoriesViewModel(manga, get()) + viewModel { manga -> + MangaCategoriesViewModel(manga.get(), get()) } } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt index d031b9aec..74ea5b618 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt @@ -3,9 +3,7 @@ package org.koitharu.kotatsu.reader import org.koin.androidx.viewmodel.dsl.viewModel import org.koin.dsl.module import org.koitharu.kotatsu.base.domain.MangaDataRepository -import org.koitharu.kotatsu.base.domain.MangaIntent import org.koitharu.kotatsu.local.data.PagesCache -import org.koitharu.kotatsu.reader.ui.ReaderState import org.koitharu.kotatsu.reader.ui.ReaderViewModel val readerModule @@ -14,7 +12,7 @@ val readerModule single { MangaDataRepository(get()) } single { PagesCache(get()) } - viewModel { (intent: MangaIntent, state: ReaderState?) -> - ReaderViewModel(intent, state, get(), get(), get(), get()) + viewModel { params -> + ReaderViewModel(params[0], params[1], get(), get(), get(), get()) } } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt b/app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt index 802d35ab9..4555fe10e 100644 --- a/app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt +++ b/app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt @@ -9,7 +9,7 @@ import org.koitharu.kotatsu.remotelist.ui.RemoteListViewModel val remoteListModule get() = module { - viewModel { (source: MangaSource) -> - RemoteListViewModel(get(named(source)), get()) + viewModel { source -> + RemoteListViewModel(get(named(source.get())), get()) } } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt b/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt index da6239420..587d2cdef 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt @@ -4,7 +4,6 @@ import org.koin.android.ext.koin.androidContext import org.koin.androidx.viewmodel.dsl.viewModel import org.koin.core.qualifier.named import org.koin.dsl.module -import org.koitharu.kotatsu.core.model.MangaSource import org.koitharu.kotatsu.search.domain.MangaSearchRepository import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider import org.koitharu.kotatsu.search.ui.SearchViewModel @@ -18,11 +17,11 @@ val searchModule factory { MangaSuggestionsProvider.createSuggestions(androidContext()) } - viewModel { (source: MangaSource, query: String) -> - SearchViewModel(get(named(source)), query, get()) + viewModel { params -> + SearchViewModel(get(named(params[0])), params[1], get()) } - viewModel { (query: String) -> - GlobalSearchViewModel(query, get(), get()) + viewModel { query -> + GlobalSearchViewModel(query.get(), get(), get()) } viewModel { SearchSuggestionViewModel(get()) } } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt b/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt index 435847a8e..24fe705d3 100644 --- a/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt +++ b/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt @@ -20,7 +20,9 @@ val settingsModule single { AppSettings(androidContext()) } viewModel { BackupViewModel(get(), androidContext()) } - viewModel { (uri: Uri?) -> RestoreViewModel(uri, get(), androidContext()) } + viewModel { params -> + RestoreViewModel(params.getOrNull(Uri::class), get(), androidContext()) + } viewModel { ProtectSetupViewModel(get()) } viewModel { OnboardViewModel(get()) } } \ No newline at end of file