Update koin

app/build.gradle

@@ -13,8 +13,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 30
-		versionCode 364
+		versionCode 365
-		versionName '1.0.1'
+		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:3.1.0'
-	implementation 'io.insert-koin:koin-android-ext:3.0.2'
+	implementation 'io.coil-kt:coil-base:1.2.2'
-	implementation 'io.coil-kt:coil-base:1.2.1'
 	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'
 }

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) ->
+		viewModel { intent ->
-			DetailsViewModel(intent, get(), get(), get(), get(), get(), get())
+			DetailsViewModel(intent.get(), get(), get(), get(), get(), get(), get())
 		}
 	}

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) ->
+		viewModel { categoryId ->
-			FavouritesListViewModel(categoryId, get(), get())
+			FavouritesListViewModel(categoryId.get(), get(), get())
 		}
 		viewModel { FavouritesCategoriesViewModel(get()) }
-		viewModel { (manga: Manga) ->
+		viewModel { manga ->
-			MangaCategoriesViewModel(manga, get())
+			MangaCategoriesViewModel(manga.get(), get())
 		}
 	}

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?) ->
+		viewModel { params ->
-			ReaderViewModel(intent, state, get(), get(), get(), get())
+			ReaderViewModel(params[0], params[1], get(), get(), get(), get())
 		}
 	}

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) ->
+		viewModel { source ->
-			RemoteListViewModel(get(named(source)), get())
+			RemoteListViewModel(get(named(source.get<MangaSource>())), get())
 		}
 	}

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) ->
+		viewModel { params ->
-			SearchViewModel(get(named(source)), query, get())
+			SearchViewModel(get(named(params[0])), params[1], get())
 		}
-		viewModel { (query: String) ->
+		viewModel { query ->
-			GlobalSearchViewModel(query, get(), get())
+			GlobalSearchViewModel(query.get(), get(), get())
 		}
 		viewModel { SearchSuggestionViewModel(get()) }
 	}

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()) }
 	}