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

Migrate to AdapterDelegates

Browse Source
This commit is contained in:
Koitharu
2020-11-19 20:43:36 +02:00
parent 7d24286c55
commit 7e76e10591
44 changed files with 613 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
View File

@@ -2,16 +2,17 @@ package org.koitharu.kotatsu.local
import org.koin.android.ext.koin.androidContext
import org.koin.android.viewmodel.dsl.viewModel
import org.koin.dsl.bind
import org.koin.core.qualifier.named
import org.koin.dsl.module
import org.koitharu.kotatsu.core.parser.MangaRepository
import org.koitharu.kotatsu.core.model.MangaSource
import org.koitharu.kotatsu.local.domain.LocalMangaRepository
import org.koitharu.kotatsu.local.ui.LocalListViewModel
val localModule
get() = module {
single { LocalMangaRepository(androidContext()) } bind MangaRepository::class
single { LocalMangaRepository(androidContext()) }
factory(named(MangaSource.LOCAL)) { get<LocalMangaRepository>() }
viewModel { LocalListViewModel(get(), get(), get(), androidContext()) }
}

27
app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
View File

@@ -3,13 +3,21 @@ package org.koitharu.kotatsu.local.ui
import android.content.Context
import android.net.Uri
import android.os.Build
import androidx.lifecycle.asLiveData
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.withContext
import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
import org.koitharu.kotatsu.core.model.Manga
import org.koitharu.kotatsu.core.prefs.AppSettings
import org.koitharu.kotatsu.core.prefs.ListMode
import org.koitharu.kotatsu.history.domain.HistoryRepository
import org.koitharu.kotatsu.list.ui.MangaListViewModel
import org.koitharu.kotatsu.list.ui.model.toGridModel
import org.koitharu.kotatsu.list.ui.model.toListDetailedModel
import org.koitharu.kotatsu.list.ui.model.toListModel
import org.koitharu.kotatsu.local.domain.LocalMangaRepository
import org.koitharu.kotatsu.utils.MangaShortcut
import org.koitharu.kotatsu.utils.MediaStoreCompat
@@ -23,9 +31,18 @@ class LocalListViewModel(
private val historyRepository: HistoryRepository,
private val settings: AppSettings,
private val context: Context
) : MangaListViewModel() {
) : MangaListViewModel(settings) {
val onMangaRemoved = SingleLiveEvent<Manga>()
private val mangaList = MutableStateFlow<List<Manga>>(emptyList())
override val content = combine(mangaList, createListModeFlow()) { list, mode ->
when(mode) {
ListMode.LIST -> list.map { it.toListModel() }
ListMode.DETAILED_LIST -> list.map { it.toListDetailedModel() }
ListMode.GRID -> list.map { it.toGridModel() }
}
}.asLiveData(viewModelScope.coroutineContext + Dispatchers.Default)
init {
loadList()
@@ -51,9 +68,8 @@ class LocalListViewModel(
source.copyTo(output)
}
} ?: throw IOException("Cannot open input stream: $uri")
repository.getList(0)
}
content.value = list
loadList()
}
}
@@ -75,10 +91,9 @@ class LocalListViewModel(
private fun loadList() {
launchLoadingJob {
val list = withContext(Dispatchers.Default) {
repository.getList(0)
withContext(Dispatchers.Default) {
mangaList.value = repository.getList(0)
}
content.value = list
}
}
}