prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update koin

Browse Source
This commit is contained in:
Koitharu
2021-06-20 15:15:38 +03:00
parent cf7341b065
commit 867812b8e3
7 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/koitharu/kotatsu/details/DetailsModule.kt
View File

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

9
app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
View File

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

6
app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt
View File

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

4
app/src/main/java/org/koitharu/kotatsu/remotelist/RemoteListModule.kt
View File

@@ -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<MangaSource>())), get())
}
}

9
app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt
View File

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

4
app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
View File

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