diff --git a/data/src/commonMain/graphql/fragments/CategoryFragments.graphql b/data/src/commonMain/graphql/fragments/CategoryFragments.graphql index ead5188e..68d115d5 100644 --- a/data/src/commonMain/graphql/fragments/CategoryFragments.graphql +++ b/data/src/commonMain/graphql/fragments/CategoryFragments.graphql @@ -9,4 +9,7 @@ fragment CategoryFragment on CategoryType { key value } + mangas { + totalCount + } } diff --git a/data/src/commonMain/kotlin/ca/gosyer/jui/data/category/CategoryRepositoryImpl.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/category/CategoryRepositoryImpl.kt index 6ad03b50..e378c123 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/jui/data/category/CategoryRepositoryImpl.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/category/CategoryRepositoryImpl.kt @@ -76,7 +76,9 @@ class CategoryRepositoryImpl( .toFlow() .map { val data = it.dataAssertNoErrors - data.categories.nodes.map { it.categoryFragment.toCategory() } + data.categories.nodes + .filterNot { it.categoryFragment.id == 0 && it.categoryFragment.mangas.totalCount == 0 } + .map { it.categoryFragment.toCategory() } } override fun createCategory(name: String): Flow = diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ReaderMenuViewModel.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ReaderMenuViewModel.kt index a934ba5a..32fabf42 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ReaderMenuViewModel.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/ReaderMenuViewModel.kt @@ -8,7 +8,6 @@ package ca.gosyer.jui.ui.reader import ca.gosyer.jui.core.lang.launchDefault import ca.gosyer.jui.core.prefs.getAsFlow -import ca.gosyer.jui.domain.chapter.interactor.GetChapter import ca.gosyer.jui.domain.chapter.interactor.GetChapterPages import ca.gosyer.jui.domain.chapter.interactor.GetChapters import ca.gosyer.jui.domain.chapter.interactor.UpdateChapter @@ -36,6 +35,7 @@ import ca.gosyer.jui.ui.reader.model.ReaderPageSeparator import ca.gosyer.jui.ui.reader.model.ViewerChapters import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ViewModel +import com.diamondedge.logging.logging import io.ktor.http.decodeURLQueryComponent import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList @@ -66,14 +66,12 @@ import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import me.tatarka.inject.annotations.Assisted import me.tatarka.inject.annotations.Inject -import com.diamondedge.logging.logging @Inject class ReaderMenuViewModel( private val readerPreferences: ReaderPreferences, private val getManga: GetManga, private val getChapters: GetChapters, - private val getChapter: GetChapter, private val getChapterPages: GetChapterPages, private val updateChapter: UpdateChapter, private val updateMangaMeta: UpdateMangaMeta,