diff --git a/app/src/main/java/eu/kanade/domain/DomainModule.kt b/app/src/main/java/eu/kanade/domain/DomainModule.kt index f01281ea2..03c28cd0c 100644 --- a/app/src/main/java/eu/kanade/domain/DomainModule.kt +++ b/app/src/main/java/eu/kanade/domain/DomainModule.kt @@ -1,15 +1,5 @@ package eu.kanade.domain -import eu.kanade.data.source.anime.AnimeSourceRepositoryImpl -import eu.kanade.data.source.manga.MangaSourceRepositoryImpl -import eu.kanade.domain.category.anime.interactor.CreateAnimeCategoryWithName -import eu.kanade.domain.category.anime.interactor.ResetAnimeCategoryFlags -import eu.kanade.domain.category.anime.interactor.SetDisplayModeForAnimeCategory -import eu.kanade.domain.category.anime.interactor.SetSortModeForAnimeCategory -import eu.kanade.domain.category.manga.interactor.CreateMangaCategoryWithName -import eu.kanade.domain.category.manga.interactor.ResetMangaCategoryFlags -import eu.kanade.domain.category.manga.interactor.SetDisplayModeForMangaCategory -import eu.kanade.domain.category.manga.interactor.SetSortModeForMangaCategory import eu.kanade.domain.download.anime.interactor.DeleteAnimeDownload import eu.kanade.domain.download.manga.interactor.DeleteChapterDownload import eu.kanade.domain.entries.anime.interactor.SetAnimeViewerFlags @@ -22,31 +12,22 @@ import eu.kanade.domain.extension.anime.interactor.GetAnimeExtensionsByType import eu.kanade.domain.extension.manga.interactor.GetExtensionSources import eu.kanade.domain.extension.manga.interactor.GetMangaExtensionLanguages import eu.kanade.domain.extension.manga.interactor.GetMangaExtensionsByType -import eu.kanade.domain.history.anime.interactor.GetNextEpisodes -import eu.kanade.domain.history.manga.interactor.GetNextChapters import eu.kanade.domain.items.chapter.interactor.SetReadStatus import eu.kanade.domain.items.chapter.interactor.SyncChaptersWithSource import eu.kanade.domain.items.chapter.interactor.SyncChaptersWithTrackServiceTwoWay -import eu.kanade.domain.items.episode.interactor.SetAnimeDefaultEpisodeFlags import eu.kanade.domain.items.episode.interactor.SetSeenStatus import eu.kanade.domain.items.episode.interactor.SyncEpisodesWithSource import eu.kanade.domain.items.episode.interactor.SyncEpisodesWithTrackServiceTwoWay import eu.kanade.domain.source.anime.interactor.GetAnimeSourcesWithFavoriteCount -import eu.kanade.domain.source.anime.interactor.GetAnimeSourcesWithNonLibraryAnime import eu.kanade.domain.source.anime.interactor.GetEnabledAnimeSources import eu.kanade.domain.source.anime.interactor.GetLanguagesWithAnimeSources -import eu.kanade.domain.source.anime.interactor.GetRemoteAnime import eu.kanade.domain.source.anime.interactor.ToggleAnimeSource import eu.kanade.domain.source.anime.interactor.ToggleAnimeSourcePin -import eu.kanade.domain.source.anime.repository.AnimeSourceRepository import eu.kanade.domain.source.manga.interactor.GetEnabledMangaSources import eu.kanade.domain.source.manga.interactor.GetLanguagesWithMangaSources import eu.kanade.domain.source.manga.interactor.GetMangaSourcesWithFavoriteCount -import eu.kanade.domain.source.manga.interactor.GetMangaSourcesWithNonLibraryManga -import eu.kanade.domain.source.manga.interactor.GetRemoteManga import eu.kanade.domain.source.manga.interactor.ToggleMangaSource import eu.kanade.domain.source.manga.interactor.ToggleMangaSourcePin -import eu.kanade.domain.source.manga.repository.MangaSourceRepository import eu.kanade.domain.source.service.SetMigrateSorting import eu.kanade.domain.source.service.ToggleLanguage import tachiyomi.data.category.anime.AnimeCategoryRepositoryImpl @@ -58,23 +39,33 @@ import tachiyomi.data.history.manga.MangaHistoryRepositoryImpl import tachiyomi.data.items.chapter.ChapterRepositoryImpl import tachiyomi.data.items.episode.EpisodeRepositoryImpl import tachiyomi.data.source.anime.AnimeSourceDataRepositoryImpl +import tachiyomi.data.source.anime.AnimeSourceRepositoryImpl import tachiyomi.data.source.manga.MangaSourceDataRepositoryImpl +import tachiyomi.data.source.manga.MangaSourceRepositoryImpl import tachiyomi.data.track.anime.AnimeTrackRepositoryImpl import tachiyomi.data.track.manga.MangaTrackRepositoryImpl import tachiyomi.data.updates.anime.AnimeUpdatesRepositoryImpl import tachiyomi.data.updates.manga.MangaUpdatesRepositoryImpl +import tachiyomi.domain.category.anime.interactor.CreateAnimeCategoryWithName import tachiyomi.domain.category.anime.interactor.DeleteAnimeCategory import tachiyomi.domain.category.anime.interactor.GetAnimeCategories import tachiyomi.domain.category.anime.interactor.RenameAnimeCategory import tachiyomi.domain.category.anime.interactor.ReorderAnimeCategory +import tachiyomi.domain.category.anime.interactor.ResetAnimeCategoryFlags import tachiyomi.domain.category.anime.interactor.SetAnimeCategories +import tachiyomi.domain.category.anime.interactor.SetDisplayModeForAnimeCategory +import tachiyomi.domain.category.anime.interactor.SetSortModeForAnimeCategory import tachiyomi.domain.category.anime.interactor.UpdateAnimeCategory import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository +import tachiyomi.domain.category.manga.interactor.CreateMangaCategoryWithName import tachiyomi.domain.category.manga.interactor.DeleteMangaCategory import tachiyomi.domain.category.manga.interactor.GetMangaCategories import tachiyomi.domain.category.manga.interactor.RenameMangaCategory import tachiyomi.domain.category.manga.interactor.ReorderMangaCategory +import tachiyomi.domain.category.manga.interactor.ResetMangaCategoryFlags +import tachiyomi.domain.category.manga.interactor.SetDisplayModeForMangaCategory import tachiyomi.domain.category.manga.interactor.SetMangaCategories +import tachiyomi.domain.category.manga.interactor.SetSortModeForMangaCategory import tachiyomi.domain.category.manga.interactor.UpdateMangaCategory import tachiyomi.domain.category.manga.repository.MangaCategoryRepository import tachiyomi.domain.entries.anime.interactor.GetAnime @@ -96,26 +87,36 @@ import tachiyomi.domain.entries.manga.interactor.ResetMangaViewerFlags import tachiyomi.domain.entries.manga.interactor.SetMangaChapterFlags import tachiyomi.domain.entries.manga.repository.MangaRepository import tachiyomi.domain.history.anime.interactor.GetAnimeHistory +import tachiyomi.domain.history.anime.interactor.GetNextEpisodes import tachiyomi.domain.history.anime.interactor.RemoveAnimeHistory import tachiyomi.domain.history.anime.interactor.UpsertAnimeHistory import tachiyomi.domain.history.anime.repository.AnimeHistoryRepository import tachiyomi.domain.history.manga.interactor.GetMangaHistory +import tachiyomi.domain.history.manga.interactor.GetNextChapters import tachiyomi.domain.history.manga.interactor.GetTotalReadDuration import tachiyomi.domain.history.manga.interactor.RemoveMangaHistory import tachiyomi.domain.history.manga.interactor.UpsertMangaHistory import tachiyomi.domain.history.manga.repository.MangaHistoryRepository import tachiyomi.domain.items.chapter.interactor.GetChapter import tachiyomi.domain.items.chapter.interactor.GetChapterByMangaId +import tachiyomi.domain.items.chapter.interactor.SetMangaDefaultChapterFlags import tachiyomi.domain.items.chapter.interactor.ShouldUpdateDbChapter import tachiyomi.domain.items.chapter.interactor.UpdateChapter import tachiyomi.domain.items.chapter.repository.ChapterRepository import tachiyomi.domain.items.episode.interactor.GetEpisode import tachiyomi.domain.items.episode.interactor.GetEpisodeByAnimeId +import tachiyomi.domain.items.episode.interactor.SetAnimeDefaultEpisodeFlags import tachiyomi.domain.items.episode.interactor.ShouldUpdateDbEpisode import tachiyomi.domain.items.episode.interactor.UpdateEpisode import tachiyomi.domain.items.episode.repository.EpisodeRepository +import tachiyomi.domain.source.anime.interactor.GetAnimeSourcesWithNonLibraryAnime +import tachiyomi.domain.source.anime.interactor.GetRemoteAnime import tachiyomi.domain.source.anime.repository.AnimeSourceDataRepository +import tachiyomi.domain.source.anime.repository.AnimeSourceRepository +import tachiyomi.domain.source.manga.interactor.GetMangaSourcesWithNonLibraryManga +import tachiyomi.domain.source.manga.interactor.GetRemoteManga import tachiyomi.domain.source.manga.repository.MangaSourceDataRepository +import tachiyomi.domain.source.manga.repository.MangaSourceRepository import tachiyomi.domain.track.anime.interactor.DeleteAnimeTrack import tachiyomi.domain.track.anime.interactor.GetAnimeTracks import tachiyomi.domain.track.anime.interactor.GetTracksPerAnime @@ -186,7 +187,7 @@ class DomainModule : InjektModule { addFactory { ResetMangaViewerFlags(get()) } addFactory { SetMangaChapterFlags(get()) } addFactory { - eu.kanade.domain.items.chapter.interactor.SetMangaDefaultChapterFlags( + SetMangaDefaultChapterFlags( get(), get(), get(), diff --git a/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetAnimeSourcesWithFavoriteCount.kt b/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetAnimeSourcesWithFavoriteCount.kt index 46dbdd586..2aede9abe 100644 --- a/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetAnimeSourcesWithFavoriteCount.kt +++ b/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetAnimeSourcesWithFavoriteCount.kt @@ -1,11 +1,11 @@ package eu.kanade.domain.source.anime.interactor -import eu.kanade.domain.source.anime.repository.AnimeSourceRepository import eu.kanade.domain.source.service.SetMigrateSorting import eu.kanade.domain.source.service.SourcePreferences import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import tachiyomi.domain.source.anime.model.AnimeSource +import tachiyomi.domain.source.anime.repository.AnimeSourceRepository import tachiyomi.source.local.entries.anime.LocalAnimeSource import java.text.Collator import java.util.Collections diff --git a/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetEnabledAnimeSources.kt b/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetEnabledAnimeSources.kt index 5bde5bc2d..d6a332c79 100644 --- a/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetEnabledAnimeSources.kt +++ b/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetEnabledAnimeSources.kt @@ -1,6 +1,5 @@ package eu.kanade.domain.source.anime.interactor -import eu.kanade.domain.source.anime.repository.AnimeSourceRepository import eu.kanade.domain.source.service.SourcePreferences import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine @@ -8,6 +7,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged import tachiyomi.domain.source.anime.model.AnimeSource import tachiyomi.domain.source.anime.model.Pin import tachiyomi.domain.source.anime.model.Pins +import tachiyomi.domain.source.anime.repository.AnimeSourceRepository import tachiyomi.source.local.entries.anime.LocalAnimeSource class GetEnabledAnimeSources( diff --git a/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetLanguagesWithAnimeSources.kt b/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetLanguagesWithAnimeSources.kt index fcde642e2..3b5564bbf 100644 --- a/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetLanguagesWithAnimeSources.kt +++ b/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetLanguagesWithAnimeSources.kt @@ -1,11 +1,11 @@ package eu.kanade.domain.source.anime.interactor -import eu.kanade.domain.source.anime.repository.AnimeSourceRepository import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.tachiyomi.util.system.LocaleHelper import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import tachiyomi.domain.source.anime.model.AnimeSource +import tachiyomi.domain.source.anime.repository.AnimeSourceRepository class GetLanguagesWithAnimeSources( private val repository: AnimeSourceRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetEnabledMangaSources.kt b/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetEnabledMangaSources.kt index f6aa92c8f..2c8a2b63f 100644 --- a/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetEnabledMangaSources.kt +++ b/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetEnabledMangaSources.kt @@ -1,6 +1,5 @@ package eu.kanade.domain.source.manga.interactor -import eu.kanade.domain.source.manga.repository.MangaSourceRepository import eu.kanade.domain.source.service.SourcePreferences import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine @@ -8,6 +7,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged import tachiyomi.domain.source.manga.model.Pin import tachiyomi.domain.source.manga.model.Pins import tachiyomi.domain.source.manga.model.Source +import tachiyomi.domain.source.manga.repository.MangaSourceRepository import tachiyomi.source.local.entries.manga.LocalMangaSource class GetEnabledMangaSources( diff --git a/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetLanguagesWithMangaSources.kt b/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetLanguagesWithMangaSources.kt index 9bbb67a11..f76c0d886 100644 --- a/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetLanguagesWithMangaSources.kt +++ b/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetLanguagesWithMangaSources.kt @@ -1,11 +1,11 @@ package eu.kanade.domain.source.manga.interactor -import eu.kanade.domain.source.manga.repository.MangaSourceRepository import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.tachiyomi.util.system.LocaleHelper import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import tachiyomi.domain.source.manga.model.Source +import tachiyomi.domain.source.manga.repository.MangaSourceRepository class GetLanguagesWithMangaSources( private val repository: MangaSourceRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetMangaSourcesWithFavoriteCount.kt b/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetMangaSourcesWithFavoriteCount.kt index ba20f094a..9dc574f40 100644 --- a/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetMangaSourcesWithFavoriteCount.kt +++ b/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetMangaSourcesWithFavoriteCount.kt @@ -1,11 +1,11 @@ package eu.kanade.domain.source.manga.interactor -import eu.kanade.domain.source.manga.repository.MangaSourceRepository import eu.kanade.domain.source.service.SetMigrateSorting import eu.kanade.domain.source.service.SourcePreferences import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import tachiyomi.domain.source.manga.model.Source +import tachiyomi.domain.source.manga.repository.MangaSourceRepository import tachiyomi.source.local.entries.manga.LocalMangaSource import java.text.Collator import java.util.Collections diff --git a/app/src/main/java/eu/kanade/presentation/browse/anime/GlobalAnimeSearchScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/anime/GlobalAnimeSearchScreen.kt index c837eb96d..426f0e909 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/anime/GlobalAnimeSearchScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/anime/GlobalAnimeSearchScreen.kt @@ -59,7 +59,7 @@ fun GlobalAnimeSearchScreen( } @Composable -fun GlobalAnimeSearchContent( +private fun GlobalAnimeSearchContent( items: Map, contentPadding: PaddingValues, getAnime: @Composable (AnimeCatalogueSource, Anime) -> State, diff --git a/app/src/main/java/eu/kanade/presentation/browse/anime/components/BrowseAnimeSourceComfortableGrid.kt b/app/src/main/java/eu/kanade/presentation/browse/anime/components/BrowseAnimeSourceComfortableGrid.kt index 9c19f1b31..907156ea5 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/anime/components/BrowseAnimeSourceComfortableGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/anime/components/BrowseAnimeSourceComfortableGrid.kt @@ -58,7 +58,7 @@ fun BrowseAnimeSourceComfortableGrid( } @Composable -fun BrowseAnimeSourceComfortableGridItem( +private fun BrowseAnimeSourceComfortableGridItem( anime: Anime, onClick: () -> Unit = {}, onLongClick: () -> Unit = onClick, diff --git a/app/src/main/java/eu/kanade/presentation/browse/anime/components/BrowseAnimeSourceList.kt b/app/src/main/java/eu/kanade/presentation/browse/anime/components/BrowseAnimeSourceList.kt index 8aeb5e2cf..662288068 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/anime/components/BrowseAnimeSourceList.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/anime/components/BrowseAnimeSourceList.kt @@ -53,7 +53,7 @@ fun BrowseAnimeSourceList( } @Composable -fun BrowseAnimeSourceListItem( +private fun BrowseAnimeSourceListItem( anime: Anime, onClick: () -> Unit = {}, onLongClick: () -> Unit = onClick, diff --git a/app/src/main/java/eu/kanade/presentation/browse/manga/GlobalMangaSearchScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/manga/GlobalMangaSearchScreen.kt index 18ce69e94..30308f6ce 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/manga/GlobalMangaSearchScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/manga/GlobalMangaSearchScreen.kt @@ -59,7 +59,7 @@ fun GlobalMangaSearchScreen( } @Composable -fun GlobalSearchContent( +private fun GlobalSearchContent( items: Map, contentPadding: PaddingValues, getManga: @Composable (CatalogueSource, Manga) -> State, diff --git a/app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseMangaSourceComfortableGrid.kt b/app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseMangaSourceComfortableGrid.kt index 79b334221..33d738a1b 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseMangaSourceComfortableGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseMangaSourceComfortableGrid.kt @@ -57,7 +57,7 @@ fun BrowseMangaSourceComfortableGrid( } @Composable -fun BrowseMangaSourceComfortableGridItem( +private fun BrowseMangaSourceComfortableGridItem( manga: Manga, onClick: () -> Unit = {}, onLongClick: () -> Unit = onClick, diff --git a/app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseMangaSourceList.kt b/app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseMangaSourceList.kt index 6f8af32ee..f4bf07f41 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseMangaSourceList.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseMangaSourceList.kt @@ -52,7 +52,7 @@ fun BrowseMangaSourceList( } @Composable -fun BrowseMangaSourceListItem( +private fun BrowseMangaSourceListItem( manga: Manga, onClick: () -> Unit = {}, onLongClick: () -> Unit = onClick, diff --git a/app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseSourceLoadingItem.kt b/app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseSourceLoadingItem.kt index aeee75aeb..86aa68401 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseSourceLoadingItem.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseSourceLoadingItem.kt @@ -10,7 +10,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp @Composable -fun BrowseSourceLoadingItem() { +internal fun BrowseSourceLoadingItem() { Row( modifier = Modifier .fillMaxWidth() diff --git a/app/src/main/java/eu/kanade/presentation/entries/anime/components/AnimeEpisodeListItem.kt b/app/src/main/java/eu/kanade/presentation/entries/anime/components/AnimeEpisodeListItem.kt index 2f6fd805e..3c2d7794b 100644 --- a/app/src/main/java/eu/kanade/presentation/entries/anime/components/AnimeEpisodeListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/entries/anime/components/AnimeEpisodeListItem.kt @@ -1,16 +1,18 @@ package eu.kanade.presentation.entries.anime.components import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.sizeIn -import androidx.compose.foundation.layout.width import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Bookmark +import androidx.compose.material.icons.filled.Circle import androidx.compose.material3.Icon +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ProvideTextStyle import androidx.compose.material3.Text @@ -63,9 +65,25 @@ fun AnimeEpisodeListItem( ) .padding(start = 16.dp, top = 12.dp, end = 8.dp, bottom = 12.dp), ) { - Column(modifier = Modifier.weight(1f)) { - Row(verticalAlignment = Alignment.CenterVertically) { + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(6.dp), + ) { + Row( + horizontalArrangement = Arrangement.spacedBy(2.dp), + verticalAlignment = Alignment.CenterVertically, + ) { var textHeight by remember { mutableStateOf(0) } + if (!seen) { + Icon( + imageVector = Icons.Filled.Circle, + contentDescription = stringResource(R.string.unread), + modifier = Modifier + .height(8.dp) + .padding(end = 4.dp), + tint = MaterialTheme.colorScheme.primary, + ) + } if (bookmark) { Icon( imageVector = Icons.Filled.Bookmark, @@ -74,11 +92,11 @@ fun AnimeEpisodeListItem( .sizeIn(maxHeight = with(LocalDensity.current) { textHeight.toDp() - 2.dp }), tint = MaterialTheme.colorScheme.primary, ) - Spacer(modifier = Modifier.width(2.dp)) } Text( text = title, style = MaterialTheme.typography.bodyMedium, + color = LocalContentColor.current.copy(alpha = textAlpha), maxLines = 1, overflow = TextOverflow.Ellipsis, onTextLayout = { textHeight = it.size.height }, @@ -86,11 +104,12 @@ fun AnimeEpisodeListItem( ) } - Spacer(modifier = Modifier.height(6.dp)) - - Row(modifier = Modifier.alpha(textSubtitleAlpha)) { + Row { ProvideTextStyle( - value = MaterialTheme.typography.bodyMedium.copy(fontSize = 12.sp), + value = MaterialTheme.typography.bodyMedium.copy( + fontSize = 12.sp, + color = LocalContentColor.current.copy(alpha = textSubtitleAlpha), + ), ) { if (date != null) { Text( diff --git a/app/src/main/java/eu/kanade/presentation/entries/manga/components/MangaChapterListItem.kt b/app/src/main/java/eu/kanade/presentation/entries/manga/components/MangaChapterListItem.kt index 6253495c3..82f1ba06b 100644 --- a/app/src/main/java/eu/kanade/presentation/entries/manga/components/MangaChapterListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/entries/manga/components/MangaChapterListItem.kt @@ -1,16 +1,17 @@ package eu.kanade.presentation.entries.manga.components import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.sizeIn -import androidx.compose.foundation.layout.width import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Bookmark +import androidx.compose.material.icons.filled.Circle import androidx.compose.material3.Icon +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ProvideTextStyle import androidx.compose.material3.Text @@ -63,9 +64,25 @@ fun MangaChapterListItem( ) .padding(start = 16.dp, top = 12.dp, end = 8.dp, bottom = 12.dp), ) { - Column(modifier = Modifier.weight(1f)) { - Row(verticalAlignment = Alignment.CenterVertically) { + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(6.dp), + ) { + Row( + horizontalArrangement = Arrangement.spacedBy(2.dp), + verticalAlignment = Alignment.CenterVertically, + ) { var textHeight by remember { mutableStateOf(0) } + if (!read) { + Icon( + imageVector = Icons.Filled.Circle, + contentDescription = stringResource(R.string.unread), + modifier = Modifier + .height(8.dp) + .padding(end = 4.dp), + tint = MaterialTheme.colorScheme.primary, + ) + } if (bookmark) { Icon( imageVector = Icons.Filled.Bookmark, @@ -74,11 +91,11 @@ fun MangaChapterListItem( .sizeIn(maxHeight = with(LocalDensity.current) { textHeight.toDp() - 2.dp }), tint = MaterialTheme.colorScheme.primary, ) - Spacer(modifier = Modifier.width(2.dp)) } Text( text = title, style = MaterialTheme.typography.bodyMedium, + color = LocalContentColor.current.copy(alpha = textAlpha), maxLines = 1, overflow = TextOverflow.Ellipsis, onTextLayout = { textHeight = it.size.height }, @@ -86,11 +103,12 @@ fun MangaChapterListItem( ) } - Spacer(modifier = Modifier.height(6.dp)) - - Row(modifier = Modifier.alpha(textSubtitleAlpha)) { + Row { ProvideTextStyle( - value = MaterialTheme.typography.bodyMedium.copy(fontSize = 12.sp), + value = MaterialTheme.typography.bodyMedium.copy( + fontSize = 12.sp, + color = LocalContentColor.current.copy(alpha = textSubtitleAlpha), + ), ) { if (date != null) { Text( diff --git a/app/src/main/java/eu/kanade/presentation/library/anime/AnimeLibrarySettingsDialog.kt b/app/src/main/java/eu/kanade/presentation/library/anime/AnimeLibrarySettingsDialog.kt index f0644f2c8..d8aa4754d 100644 --- a/app/src/main/java/eu/kanade/presentation/library/anime/AnimeLibrarySettingsDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/anime/AnimeLibrarySettingsDialog.kt @@ -9,7 +9,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.presentation.components.TabbedDialog import eu.kanade.presentation.components.TabbedDialogPaddings import eu.kanade.presentation.components.TriStateItem @@ -22,6 +21,7 @@ import tachiyomi.domain.library.anime.model.AnimeLibrarySort import tachiyomi.domain.library.anime.model.sort import tachiyomi.domain.library.model.LibraryDisplayMode import tachiyomi.domain.library.model.display +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.presentation.core.components.CheckboxItem import tachiyomi.presentation.core.components.HeadingItem import tachiyomi.presentation.core.components.RadioItem diff --git a/app/src/main/java/eu/kanade/presentation/library/manga/MangaLibrarySettingsDialog.kt b/app/src/main/java/eu/kanade/presentation/library/manga/MangaLibrarySettingsDialog.kt index 7f3fb26df..e5ed3896f 100644 --- a/app/src/main/java/eu/kanade/presentation/library/manga/MangaLibrarySettingsDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/manga/MangaLibrarySettingsDialog.kt @@ -9,7 +9,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.presentation.components.TabbedDialog import eu.kanade.presentation.components.TabbedDialogPaddings import eu.kanade.presentation.components.TriStateItem @@ -22,6 +21,7 @@ import tachiyomi.domain.library.manga.model.MangaLibrarySort import tachiyomi.domain.library.manga.model.sort import tachiyomi.domain.library.model.LibraryDisplayMode import tachiyomi.domain.library.model.display +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.presentation.core.components.CheckboxItem import tachiyomi.presentation.core.components.HeadingItem import tachiyomi.presentation.core.components.RadioItem diff --git a/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt b/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt index 4b2786935..e075ead89 100644 --- a/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt @@ -26,13 +26,13 @@ import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.presentation.components.WarningBanner import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.core.Constants import eu.kanade.tachiyomi.ui.more.DownloadQueueState +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.Divider import tachiyomi.presentation.core.components.material.Scaffold diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearAnimeDatabaseScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearAnimeDatabaseScreen.kt index 198f9aac6..bdaa85ffa 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearAnimeDatabaseScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearAnimeDatabaseScreen.kt @@ -32,7 +32,6 @@ import cafe.adriel.voyager.core.model.coroutineScope import cafe.adriel.voyager.core.model.rememberScreenModel import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.domain.source.anime.interactor.GetAnimeSourcesWithNonLibraryAnime import eu.kanade.presentation.browse.anime.components.AnimeSourceIcon import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions @@ -44,6 +43,7 @@ import kotlinx.coroutines.flow.update import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.launchUI import tachiyomi.core.util.lang.withNonCancellableContext +import tachiyomi.domain.source.anime.interactor.GetAnimeSourcesWithNonLibraryAnime import tachiyomi.domain.source.anime.model.AnimeSource import tachiyomi.domain.source.anime.model.AnimeSourceWithCount import tachiyomi.mi.data.AnimeDatabase diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt index 84843550f..5ca86e8c1 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt @@ -32,7 +32,6 @@ import cafe.adriel.voyager.core.model.coroutineScope import cafe.adriel.voyager.core.model.rememberScreenModel import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.domain.source.manga.interactor.GetMangaSourcesWithNonLibraryManga import eu.kanade.presentation.browse.manga.components.MangaSourceIcon import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions @@ -45,6 +44,7 @@ import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.launchUI import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.data.Database +import tachiyomi.domain.source.manga.interactor.GetMangaSourcesWithNonLibraryManga import tachiyomi.domain.source.manga.model.MangaSourceWithCount import tachiyomi.domain.source.manga.model.Source import tachiyomi.presentation.core.components.FastScrollLazyColumn diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt index 75a07d01f..4c4bc44fb 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt @@ -25,7 +25,6 @@ import androidx.core.net.toUri import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.presentation.more.settings.Preference import eu.kanade.presentation.util.collectAsState import eu.kanade.tachiyomi.R @@ -62,6 +61,7 @@ import tachiyomi.core.util.lang.launchNonCancellable import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat import tachiyomi.domain.entries.manga.repository.MangaRepository +import tachiyomi.domain.library.service.LibraryPreferences import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.io.File diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsGeneralScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsGeneralScreen.kt index bcbdf9d87..2f92a9d4e 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsGeneralScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsGeneralScreen.kt @@ -19,7 +19,6 @@ import androidx.compose.ui.res.stringResource import androidx.core.app.ActivityCompat import androidx.core.os.LocaleListCompat import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.presentation.more.settings.Preference import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.home.HomeScreen @@ -27,6 +26,7 @@ import eu.kanade.tachiyomi.util.system.LocaleHelper import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.drop import org.xmlpull.v1.XmlPullParser +import tachiyomi.domain.library.service.LibraryPreferences import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt index 1fa55e975..903214f5a 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt @@ -31,28 +31,28 @@ import androidx.core.content.ContextCompat import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.domain.category.manga.interactor.ResetMangaCategoryFlags -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.presentation.category.visualName import eu.kanade.presentation.more.settings.Preference import eu.kanade.presentation.more.settings.widget.TriStateListDialog import eu.kanade.presentation.util.collectAsState import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.library.manga.MangaLibraryUpdateJob -import eu.kanade.tachiyomi.data.preference.DEVICE_BATTERY_NOT_LOW -import eu.kanade.tachiyomi.data.preference.DEVICE_CHARGING -import eu.kanade.tachiyomi.data.preference.DEVICE_NETWORK_NOT_METERED -import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI -import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD -import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED -import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.ui.category.CategoriesTab import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import tachiyomi.domain.category.anime.interactor.GetAnimeCategories import tachiyomi.domain.category.manga.interactor.GetMangaCategories +import tachiyomi.domain.category.manga.interactor.ResetMangaCategoryFlags import tachiyomi.domain.category.model.Category +import tachiyomi.domain.library.service.LibraryPreferences +import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_BATTERY_NOT_LOW +import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_CHARGING +import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_NETWORK_NOT_METERED +import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_ONLY_ON_WIFI +import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_HAS_UNREAD +import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_NON_COMPLETED +import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_NON_READ import tachiyomi.presentation.core.components.WheelPicker import tachiyomi.presentation.core.components.WheelPickerDefaults import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/presentation/updates/anime/AnimeUpdatesUiItem.kt b/app/src/main/java/eu/kanade/presentation/updates/anime/AnimeUpdatesUiItem.kt index f3fa113b0..dfa3fb8d6 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/anime/AnimeUpdatesUiItem.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/anime/AnimeUpdatesUiItem.kt @@ -16,7 +16,9 @@ import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.items import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Bookmark +import androidx.compose.material.icons.filled.Circle import androidx.compose.material3.Icon +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -196,12 +198,22 @@ fun AnimeUpdatesUiItem( text = update.animeTitle, maxLines = 1, style = MaterialTheme.typography.bodyMedium, + color = LocalContentColor.current.copy(alpha = textAlpha), overflow = TextOverflow.Ellipsis, - modifier = Modifier.alpha(textAlpha), ) Row(verticalAlignment = Alignment.CenterVertically) { var textHeight by remember { mutableStateOf(0) } + if (!update.seen) { + Icon( + imageVector = Icons.Filled.Circle, + contentDescription = stringResource(R.string.unread), + modifier = Modifier + .height(8.dp) + .padding(end = 4.dp), + tint = MaterialTheme.colorScheme.primary, + ) + } if (update.bookmark) { Icon( imageVector = Icons.Filled.Bookmark, @@ -216,19 +228,19 @@ fun AnimeUpdatesUiItem( text = update.episodeName, maxLines = 1, style = MaterialTheme.typography.bodySmall, + color = LocalContentColor.current.copy(alpha = textAlpha), overflow = TextOverflow.Ellipsis, onTextLayout = { textHeight = it.size.height }, modifier = Modifier - .weight(weight = 1f, fill = false) - .alpha(textAlpha), + .weight(weight = 1f, fill = false), ) if (watchProgress != null) { DotSeparatorText() Text( text = watchProgress, maxLines = 1, + color = LocalContentColor.current.copy(alpha = ReadItemAlpha), overflow = TextOverflow.Ellipsis, - modifier = Modifier.alpha(ReadItemAlpha), ) } } diff --git a/app/src/main/java/eu/kanade/presentation/updates/manga/MangaUpdatesUiItem.kt b/app/src/main/java/eu/kanade/presentation/updates/manga/MangaUpdatesUiItem.kt index e65a55c60..bbf38c182 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/manga/MangaUpdatesUiItem.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/manga/MangaUpdatesUiItem.kt @@ -16,7 +16,9 @@ import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.items import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Bookmark +import androidx.compose.material.icons.filled.Circle import androidx.compose.material3.Icon +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -194,11 +196,21 @@ fun MangaUpdatesUiItem( text = update.mangaTitle, maxLines = 1, style = MaterialTheme.typography.bodyMedium, + color = LocalContentColor.current.copy(alpha = textAlpha), overflow = TextOverflow.Ellipsis, - modifier = Modifier.alpha(textAlpha), ) Row(verticalAlignment = Alignment.CenterVertically) { var textHeight by remember { mutableStateOf(0) } + if (!update.read) { + Icon( + imageVector = Icons.Filled.Circle, + contentDescription = stringResource(R.string.unread), + modifier = Modifier + .height(8.dp) + .padding(end = 4.dp), + tint = MaterialTheme.colorScheme.primary, + ) + } if (update.bookmark) { Icon( imageVector = Icons.Filled.Bookmark, @@ -213,19 +225,19 @@ fun MangaUpdatesUiItem( text = update.chapterName, maxLines = 1, style = MaterialTheme.typography.bodySmall, + color = LocalContentColor.current.copy(alpha = textAlpha), overflow = TextOverflow.Ellipsis, onTextLayout = { textHeight = it.size.height }, modifier = Modifier - .weight(weight = 1f, fill = false) - .alpha(textAlpha), + .weight(weight = 1f, fill = false), ) if (readProgress != null) { DotSeparatorText() Text( text = readProgress, maxLines = 1, + color = LocalContentColor.current.copy(alpha = ReadItemAlpha), overflow = TextOverflow.Ellipsis, - modifier = Modifier.alpha(ReadItemAlpha), ) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt index b86c84b52..fcebf23f0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt @@ -11,7 +11,6 @@ import data.Mangas import dataanime.Animehistory import dataanime.Animes import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.track.anime.store.DelayedAnimeTrackingStore import eu.kanade.domain.track.manga.store.DelayedMangaTrackingStore @@ -61,6 +60,7 @@ import tachiyomi.data.listOfStringsAdapter import tachiyomi.data.updateStrategyAdapter import tachiyomi.domain.backup.service.BackupPreferences import tachiyomi.domain.download.service.DownloadPreferences +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.domain.source.anime.service.AnimeSourceManager import tachiyomi.domain.source.manga.service.MangaSourceManager import tachiyomi.mi.data.AnimeDatabase diff --git a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt index 98c1545ab..d3cb36dbf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt @@ -5,14 +5,12 @@ import androidx.core.content.edit import androidx.preference.PreferenceManager import androidx.work.WorkManager import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.ui.UiPreferences import eu.kanade.tachiyomi.core.security.SecurityPreferences import eu.kanade.tachiyomi.data.backup.BackupCreatorJob import eu.kanade.tachiyomi.data.library.anime.AnimeLibraryUpdateJob import eu.kanade.tachiyomi.data.library.manga.MangaLibraryUpdateJob -import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED import eu.kanade.tachiyomi.data.preference.PreferenceValues import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.network.NetworkPreferences @@ -28,6 +26,8 @@ import tachiyomi.core.preference.PreferenceStore import tachiyomi.core.preference.getEnum import tachiyomi.domain.backup.service.BackupPreferences import tachiyomi.domain.entries.TriStateFilter +import tachiyomi.domain.library.service.LibraryPreferences +import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_NON_COMPLETED import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.io.File diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt index fbceac141..eae1444cf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt @@ -11,7 +11,6 @@ import data.Manga_sync import data.Mangas import dataanime.Anime_sync import dataanime.Animes -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CATEGORY import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CATEGORY_MASK @@ -81,6 +80,7 @@ import tachiyomi.domain.entries.anime.interactor.GetAnimeFavorites import tachiyomi.domain.entries.manga.interactor.GetMangaFavorites import tachiyomi.domain.history.anime.model.AnimeHistoryUpdate import tachiyomi.domain.history.manga.model.MangaHistoryUpdate +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.domain.source.anime.service.AnimeSourceManager import tachiyomi.domain.source.manga.service.MangaSourceManager import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/anime/AnimeLibraryUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/anime/AnimeLibraryUpdateJob.kt index 26cc20745..6e65cc81c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/anime/AnimeLibraryUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/anime/AnimeLibraryUpdateJob.kt @@ -20,7 +20,6 @@ import eu.kanade.domain.entries.anime.model.copyFrom import eu.kanade.domain.entries.anime.model.toSAnime import eu.kanade.domain.items.episode.interactor.SyncEpisodesWithSource import eu.kanade.domain.items.episode.interactor.SyncEpisodesWithTrackServiceTwoWay -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.track.anime.model.toDbTrack import eu.kanade.domain.track.anime.model.toDomainTrack import eu.kanade.tachiyomi.R @@ -28,13 +27,6 @@ import eu.kanade.tachiyomi.animesource.model.SAnime import eu.kanade.tachiyomi.data.cache.AnimeCoverCache import eu.kanade.tachiyomi.data.download.anime.AnimeDownloadManager import eu.kanade.tachiyomi.data.notification.Notifications -import eu.kanade.tachiyomi.data.preference.ANIME_HAS_UNSEEN -import eu.kanade.tachiyomi.data.preference.ANIME_NON_COMPLETED -import eu.kanade.tachiyomi.data.preference.ANIME_NON_SEEN -import eu.kanade.tachiyomi.data.preference.DEVICE_BATTERY_NOT_LOW -import eu.kanade.tachiyomi.data.preference.DEVICE_CHARGING -import eu.kanade.tachiyomi.data.preference.DEVICE_NETWORK_NOT_METERED -import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI import eu.kanade.tachiyomi.data.track.EnhancedAnimeTrackService import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.data.track.TrackService @@ -71,6 +63,14 @@ import tachiyomi.domain.items.episode.interactor.GetEpisodeByAnimeId import tachiyomi.domain.items.episode.model.Episode import tachiyomi.domain.items.episode.model.NoEpisodesException import tachiyomi.domain.library.anime.LibraryAnime +import tachiyomi.domain.library.service.LibraryPreferences +import tachiyomi.domain.library.service.LibraryPreferences.Companion.ANIME_HAS_UNSEEN +import tachiyomi.domain.library.service.LibraryPreferences.Companion.ANIME_NON_COMPLETED +import tachiyomi.domain.library.service.LibraryPreferences.Companion.ANIME_NON_SEEN +import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_BATTERY_NOT_LOW +import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_CHARGING +import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_NETWORK_NOT_METERED +import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_ONLY_ON_WIFI import tachiyomi.domain.source.anime.model.AnimeSourceNotInstalledException import tachiyomi.domain.source.anime.service.AnimeSourceManager import tachiyomi.domain.track.anime.interactor.GetAnimeTracks diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/manga/MangaLibraryUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/manga/MangaLibraryUpdateJob.kt index 10550d0a9..f78b549c9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/manga/MangaLibraryUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/manga/MangaLibraryUpdateJob.kt @@ -20,20 +20,12 @@ import eu.kanade.domain.entries.manga.model.copyFrom import eu.kanade.domain.entries.manga.model.toSManga import eu.kanade.domain.items.chapter.interactor.SyncChaptersWithSource import eu.kanade.domain.items.chapter.interactor.SyncChaptersWithTrackServiceTwoWay -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.track.manga.model.toDbTrack import eu.kanade.domain.track.manga.model.toDomainTrack import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.cache.MangaCoverCache import eu.kanade.tachiyomi.data.download.manga.MangaDownloadManager import eu.kanade.tachiyomi.data.notification.Notifications -import eu.kanade.tachiyomi.data.preference.DEVICE_BATTERY_NOT_LOW -import eu.kanade.tachiyomi.data.preference.DEVICE_CHARGING -import eu.kanade.tachiyomi.data.preference.DEVICE_NETWORK_NOT_METERED -import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI -import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD -import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED -import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ import eu.kanade.tachiyomi.data.track.EnhancedMangaTrackService import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.data.track.TrackService @@ -71,6 +63,14 @@ import tachiyomi.domain.items.chapter.interactor.GetChapterByMangaId import tachiyomi.domain.items.chapter.model.Chapter import tachiyomi.domain.items.chapter.model.NoChaptersException import tachiyomi.domain.library.manga.LibraryManga +import tachiyomi.domain.library.service.LibraryPreferences +import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_BATTERY_NOT_LOW +import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_CHARGING +import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_NETWORK_NOT_METERED +import tachiyomi.domain.library.service.LibraryPreferences.Companion.DEVICE_ONLY_ON_WIFI +import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_HAS_UNREAD +import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_NON_COMPLETED +import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_NON_READ import tachiyomi.domain.source.manga.model.SourceNotInstalledException import tachiyomi.domain.source.manga.service.MangaSourceManager import tachiyomi.domain.track.manga.interactor.GetMangaTracks diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt index 621824b8f..667c2061f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt @@ -2,19 +2,6 @@ package eu.kanade.tachiyomi.data.preference import eu.kanade.tachiyomi.R -const val DEVICE_ONLY_ON_WIFI = "wifi" -const val DEVICE_NETWORK_NOT_METERED = "network_not_metered" -const val DEVICE_CHARGING = "ac" -const val DEVICE_BATTERY_NOT_LOW = "battery_not_low" - -const val MANGA_NON_COMPLETED = "manga_ongoing" -const val MANGA_HAS_UNREAD = "manga_fully_read" -const val MANGA_NON_READ = "manga_started" - -const val ANIME_NON_COMPLETED = "anime_ongoing" -const val ANIME_HAS_UNSEEN = "anime_fully_seen" -const val ANIME_NON_SEEN = "anime_started" - const val FLAG_CATEGORIES = "1" const val FLAG_CHAPTERS = "2" const val FLAG_HISTORY = "4" diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/source/browse/BrowseAnimeSourceScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/source/browse/BrowseAnimeSourceScreenModel.kt index 0c312a9bb..c927bc4f4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/source/browse/BrowseAnimeSourceScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/source/browse/BrowseAnimeSourceScreenModel.kt @@ -18,10 +18,7 @@ import eu.kanade.domain.entries.anime.interactor.UpdateAnime import eu.kanade.domain.entries.anime.model.copyFrom import eu.kanade.domain.entries.anime.model.toDomainAnime import eu.kanade.domain.entries.anime.model.toSAnime -import eu.kanade.domain.items.episode.interactor.SetAnimeDefaultEpisodeFlags import eu.kanade.domain.items.episode.interactor.SyncEpisodesWithTrackServiceTwoWay -import eu.kanade.domain.library.service.LibraryPreferences -import eu.kanade.domain.source.anime.interactor.GetRemoteAnime import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.track.anime.model.toDomainTrack import eu.kanade.tachiyomi.animesource.AnimeCatalogueSource @@ -57,6 +54,9 @@ import tachiyomi.domain.entries.anime.interactor.NetworkToLocalAnime import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.entries.anime.model.toAnimeUpdate import tachiyomi.domain.items.episode.interactor.GetEpisodeByAnimeId +import tachiyomi.domain.items.episode.interactor.SetAnimeDefaultEpisodeFlags +import tachiyomi.domain.library.service.LibraryPreferences +import tachiyomi.domain.source.anime.interactor.GetRemoteAnime import tachiyomi.domain.source.anime.service.AnimeSourceManager import tachiyomi.domain.track.anime.interactor.InsertAnimeTrack import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/source/browse/BrowseMangaSourceScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/source/browse/BrowseMangaSourceScreenModel.kt index 931de4a22..191d8429c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/source/browse/BrowseMangaSourceScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/source/browse/BrowseMangaSourceScreenModel.kt @@ -18,10 +18,7 @@ import eu.kanade.domain.entries.manga.interactor.UpdateManga import eu.kanade.domain.entries.manga.model.copyFrom import eu.kanade.domain.entries.manga.model.toDomainManga import eu.kanade.domain.entries.manga.model.toSManga -import eu.kanade.domain.items.chapter.interactor.SetMangaDefaultChapterFlags import eu.kanade.domain.items.chapter.interactor.SyncChaptersWithTrackServiceTwoWay -import eu.kanade.domain.library.service.LibraryPreferences -import eu.kanade.domain.source.manga.interactor.GetRemoteManga import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.track.manga.model.toDomainTrack import eu.kanade.tachiyomi.data.cache.MangaCoverCache @@ -57,6 +54,9 @@ import tachiyomi.domain.entries.manga.interactor.NetworkToLocalManga import tachiyomi.domain.entries.manga.model.Manga import tachiyomi.domain.entries.manga.model.toMangaUpdate import tachiyomi.domain.items.chapter.interactor.GetChapterByMangaId +import tachiyomi.domain.items.chapter.interactor.SetMangaDefaultChapterFlags +import tachiyomi.domain.library.service.LibraryPreferences +import tachiyomi.domain.source.manga.interactor.GetRemoteManga import tachiyomi.domain.source.manga.service.MangaSourceManager import tachiyomi.domain.track.manga.interactor.InsertMangaTrack import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/anime/AnimeCategoryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/anime/AnimeCategoryScreenModel.kt index bd4fbc291..af20ad16d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/anime/AnimeCategoryScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/anime/AnimeCategoryScreenModel.kt @@ -4,13 +4,13 @@ import androidx.annotation.StringRes import androidx.compose.runtime.Immutable import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.domain.category.anime.interactor.CreateAnimeCategoryWithName import eu.kanade.tachiyomi.R import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch +import tachiyomi.domain.category.anime.interactor.CreateAnimeCategoryWithName import tachiyomi.domain.category.anime.interactor.DeleteAnimeCategory import tachiyomi.domain.category.anime.interactor.GetAnimeCategories import tachiyomi.domain.category.anime.interactor.RenameAnimeCategory diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/manga/MangaCategoryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/manga/MangaCategoryScreenModel.kt index 41facdf74..2f6602ee8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/manga/MangaCategoryScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/manga/MangaCategoryScreenModel.kt @@ -4,13 +4,13 @@ import androidx.annotation.StringRes import androidx.compose.runtime.Immutable import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.domain.category.manga.interactor.CreateMangaCategoryWithName import eu.kanade.tachiyomi.R import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch +import tachiyomi.domain.category.manga.interactor.CreateMangaCategoryWithName import tachiyomi.domain.category.manga.interactor.DeleteMangaCategory import tachiyomi.domain.category.manga.interactor.GetMangaCategories import tachiyomi.domain.category.manga.interactor.RenameMangaCategory diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/AnimeScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/AnimeScreenModel.kt index adde1cb3d..a8555f894 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/AnimeScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/AnimeScreenModel.kt @@ -14,10 +14,8 @@ import eu.kanade.domain.entries.anime.interactor.UpdateAnime import eu.kanade.domain.entries.anime.model.downloadedFilter import eu.kanade.domain.entries.anime.model.isLocal import eu.kanade.domain.entries.anime.model.toSAnime -import eu.kanade.domain.items.episode.interactor.SetAnimeDefaultEpisodeFlags import eu.kanade.domain.items.episode.interactor.SetSeenStatus import eu.kanade.domain.items.episode.interactor.SyncEpisodesWithSource -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.track.anime.model.toDbTrack import eu.kanade.domain.track.service.TrackPreferences import eu.kanade.domain.ui.UiPreferences @@ -68,11 +66,13 @@ import tachiyomi.domain.entries.anime.interactor.GetDuplicateLibraryAnime import tachiyomi.domain.entries.anime.interactor.SetAnimeEpisodeFlags import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.entries.applyFilter +import tachiyomi.domain.items.episode.interactor.SetAnimeDefaultEpisodeFlags import tachiyomi.domain.items.episode.interactor.UpdateEpisode import tachiyomi.domain.items.episode.model.Episode import tachiyomi.domain.items.episode.model.EpisodeUpdate import tachiyomi.domain.items.episode.model.NoEpisodesException import tachiyomi.domain.items.episode.service.getEpisodeSort +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.domain.source.anime.service.AnimeSourceManager import tachiyomi.domain.track.anime.interactor.GetAnimeTracks import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/MangaScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/MangaScreenModel.kt index ca7398a6f..c6362dfef 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/MangaScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/MangaScreenModel.kt @@ -14,10 +14,8 @@ import eu.kanade.domain.entries.manga.interactor.UpdateManga import eu.kanade.domain.entries.manga.model.downloadedFilter import eu.kanade.domain.entries.manga.model.isLocal import eu.kanade.domain.entries.manga.model.toSManga -import eu.kanade.domain.items.chapter.interactor.SetMangaDefaultChapterFlags import eu.kanade.domain.items.chapter.interactor.SetReadStatus import eu.kanade.domain.items.chapter.interactor.SyncChaptersWithSource -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.track.manga.model.toDbTrack import eu.kanade.domain.track.service.TrackPreferences import eu.kanade.domain.ui.UiPreferences @@ -66,11 +64,13 @@ import tachiyomi.domain.entries.manga.interactor.GetDuplicateLibraryManga import tachiyomi.domain.entries.manga.interactor.GetMangaWithChapters import tachiyomi.domain.entries.manga.interactor.SetMangaChapterFlags import tachiyomi.domain.entries.manga.model.Manga +import tachiyomi.domain.items.chapter.interactor.SetMangaDefaultChapterFlags import tachiyomi.domain.items.chapter.interactor.UpdateChapter import tachiyomi.domain.items.chapter.model.Chapter import tachiyomi.domain.items.chapter.model.ChapterUpdate import tachiyomi.domain.items.chapter.model.NoChaptersException import tachiyomi.domain.items.chapter.service.getChapterSort +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.domain.source.manga.service.MangaSourceManager import tachiyomi.domain.track.manga.interactor.GetMangaTracks import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/history/anime/AnimeHistoryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/history/anime/AnimeHistoryScreenModel.kt index 40c305e2f..ef8f53ddf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/history/anime/AnimeHistoryScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/history/anime/AnimeHistoryScreenModel.kt @@ -4,7 +4,6 @@ import androidx.compose.runtime.Immutable import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope import eu.kanade.core.util.insertSeparators -import eu.kanade.domain.history.anime.interactor.GetNextEpisodes import eu.kanade.presentation.history.anime.AnimeHistoryUiModel import eu.kanade.tachiyomi.util.lang.toDateKey import kotlinx.coroutines.Dispatchers @@ -26,6 +25,7 @@ import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.system.logcat import tachiyomi.domain.history.anime.interactor.GetAnimeHistory +import tachiyomi.domain.history.anime.interactor.GetNextEpisodes import tachiyomi.domain.history.anime.interactor.RemoveAnimeHistory import tachiyomi.domain.history.anime.model.AnimeHistoryWithRelations import tachiyomi.domain.items.episode.model.Episode diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/history/manga/MangaHistoryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/history/manga/MangaHistoryScreenModel.kt index bc108f4c9..1d87a176b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/history/manga/MangaHistoryScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/history/manga/MangaHistoryScreenModel.kt @@ -4,7 +4,6 @@ import androidx.compose.runtime.Immutable import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope import eu.kanade.core.util.insertSeparators -import eu.kanade.domain.history.manga.interactor.GetNextChapters import eu.kanade.presentation.history.manga.MangaHistoryUiModel import eu.kanade.tachiyomi.util.lang.toDateKey import kotlinx.coroutines.Dispatchers @@ -26,6 +25,7 @@ import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.system.logcat import tachiyomi.domain.history.manga.interactor.GetMangaHistory +import tachiyomi.domain.history.manga.interactor.GetNextChapters import tachiyomi.domain.history.manga.interactor.RemoveMangaHistory import tachiyomi.domain.history.manga.model.MangaHistoryWithRelations import tachiyomi.domain.items.chapter.model.Chapter diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt index c9b0b911f..e59cdacb7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt @@ -33,7 +33,6 @@ import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.tab.LocalTabNavigator import cafe.adriel.voyager.navigator.tab.TabNavigator -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.presentation.util.Screen import eu.kanade.presentation.util.isTabletUi @@ -53,6 +52,7 @@ import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.launch import soup.compose.material.motion.animation.materialFadeThroughIn import soup.compose.material.motion.animation.materialFadeThroughOut +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.presentation.core.components.material.NavigationBar import tachiyomi.presentation.core.components.material.NavigationRail import tachiyomi.presentation.core.components.material.Scaffold diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibraryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibraryScreenModel.kt index 5c150a571..48e56b57a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibraryScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibraryScreenModel.kt @@ -17,9 +17,7 @@ import eu.kanade.core.util.fastPartition import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.entries.anime.interactor.UpdateAnime import eu.kanade.domain.entries.anime.model.isLocal -import eu.kanade.domain.history.anime.interactor.GetNextEpisodes import eu.kanade.domain.items.episode.interactor.SetSeenStatus -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.presentation.components.SEARCH_DEBOUNCE_MILLIS import eu.kanade.presentation.entries.DownloadAction import eu.kanade.presentation.library.LibraryToolbarTitle @@ -55,11 +53,13 @@ import tachiyomi.domain.entries.anime.interactor.GetLibraryAnime import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.entries.anime.model.AnimeUpdate import tachiyomi.domain.entries.applyFilter +import tachiyomi.domain.history.anime.interactor.GetNextEpisodes import tachiyomi.domain.items.episode.interactor.GetEpisodeByAnimeId import tachiyomi.domain.items.episode.model.Episode import tachiyomi.domain.library.anime.LibraryAnime import tachiyomi.domain.library.anime.model.AnimeLibrarySort import tachiyomi.domain.library.anime.model.sort +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.domain.source.anime.service.AnimeSourceManager import tachiyomi.domain.track.anime.interactor.GetTracksPerAnime import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibrarySettingsScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibrarySettingsScreenModel.kt index ffaede1c3..49b934812 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibrarySettingsScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibrarySettingsScreenModel.kt @@ -3,19 +3,19 @@ package eu.kanade.tachiyomi.ui.library.anime import cafe.adriel.voyager.core.model.ScreenModel import cafe.adriel.voyager.core.model.coroutineScope import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.category.anime.interactor.SetDisplayModeForAnimeCategory -import eu.kanade.domain.category.anime.interactor.SetSortModeForAnimeCategory -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.util.preference.toggle import tachiyomi.core.preference.Preference import tachiyomi.core.preference.getAndSet import tachiyomi.core.util.lang.launchIO import tachiyomi.domain.category.anime.interactor.GetAnimeCategories +import tachiyomi.domain.category.anime.interactor.SetDisplayModeForAnimeCategory +import tachiyomi.domain.category.anime.interactor.SetSortModeForAnimeCategory import tachiyomi.domain.category.model.Category import tachiyomi.domain.entries.TriStateFilter import tachiyomi.domain.library.anime.model.AnimeLibrarySort import tachiyomi.domain.library.model.LibraryDisplayMode +import tachiyomi.domain.library.service.LibraryPreferences import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibraryTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibraryTab.kt index e3f6ea68a..fe1dc0194 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibraryTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibraryTab.kt @@ -32,7 +32,6 @@ import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.tab.LocalTabNavigator import cafe.adriel.voyager.navigator.tab.TabOptions import eu.kanade.domain.entries.anime.model.isLocal -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.presentation.category.ChangeCategoryDialog import eu.kanade.presentation.entries.LibraryBottomActionMenu import eu.kanade.presentation.library.DeleteLibraryEntryDialog @@ -60,6 +59,7 @@ import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.items.episode.model.Episode import tachiyomi.domain.library.anime.LibraryAnime import tachiyomi.domain.library.model.display +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.screens.EmptyScreen import tachiyomi.presentation.core.screens.EmptyScreenAction diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibraryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibraryScreenModel.kt index a91fc2af0..8e1d99c75 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibraryScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibraryScreenModel.kt @@ -17,9 +17,7 @@ import eu.kanade.core.util.fastPartition import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.entries.manga.interactor.UpdateManga import eu.kanade.domain.entries.manga.model.isLocal -import eu.kanade.domain.history.manga.interactor.GetNextChapters import eu.kanade.domain.items.chapter.interactor.SetReadStatus -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.presentation.components.SEARCH_DEBOUNCE_MILLIS import eu.kanade.presentation.entries.DownloadAction import eu.kanade.presentation.library.LibraryToolbarTitle @@ -55,11 +53,13 @@ import tachiyomi.domain.entries.applyFilter import tachiyomi.domain.entries.manga.interactor.GetLibraryManga import tachiyomi.domain.entries.manga.model.Manga import tachiyomi.domain.entries.manga.model.MangaUpdate +import tachiyomi.domain.history.manga.interactor.GetNextChapters import tachiyomi.domain.items.chapter.interactor.GetChapterByMangaId import tachiyomi.domain.items.chapter.model.Chapter import tachiyomi.domain.library.manga.LibraryManga import tachiyomi.domain.library.manga.model.MangaLibrarySort import tachiyomi.domain.library.manga.model.sort +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.domain.source.manga.service.MangaSourceManager import tachiyomi.domain.track.manga.interactor.GetTracksPerManga import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibrarySettingsScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibrarySettingsScreenModel.kt index e14fbb022..8990bdc2a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibrarySettingsScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibrarySettingsScreenModel.kt @@ -3,19 +3,19 @@ package eu.kanade.tachiyomi.ui.library.manga import cafe.adriel.voyager.core.model.ScreenModel import cafe.adriel.voyager.core.model.coroutineScope import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.category.manga.interactor.SetDisplayModeForMangaCategory -import eu.kanade.domain.category.manga.interactor.SetSortModeForMangaCategory -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.util.preference.toggle import tachiyomi.core.preference.Preference import tachiyomi.core.preference.getAndSet import tachiyomi.core.util.lang.launchIO import tachiyomi.domain.category.manga.interactor.GetMangaCategories +import tachiyomi.domain.category.manga.interactor.SetDisplayModeForMangaCategory +import tachiyomi.domain.category.manga.interactor.SetSortModeForMangaCategory import tachiyomi.domain.category.model.Category import tachiyomi.domain.entries.TriStateFilter import tachiyomi.domain.library.manga.model.MangaLibrarySort import tachiyomi.domain.library.model.LibraryDisplayMode +import tachiyomi.domain.library.service.LibraryPreferences import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibraryTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibraryTab.kt index 487285678..e2f95759a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibraryTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibraryTab.kt @@ -31,7 +31,6 @@ import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.tab.LocalTabNavigator import cafe.adriel.voyager.navigator.tab.TabOptions import eu.kanade.domain.entries.manga.model.isLocal -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.presentation.category.ChangeCategoryDialog import eu.kanade.presentation.entries.LibraryBottomActionMenu import eu.kanade.presentation.library.DeleteLibraryEntryDialog @@ -56,6 +55,7 @@ import tachiyomi.domain.category.model.Category import tachiyomi.domain.entries.manga.model.Manga import tachiyomi.domain.library.manga.LibraryManga import tachiyomi.domain.library.model.display +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.screens.EmptyScreen import tachiyomi.presentation.core.screens.EmptyScreenAction diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 59408d358..2e1d05e50 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -53,7 +53,6 @@ import cafe.adriel.voyager.navigator.NavigatorDisposeBehavior import cafe.adriel.voyager.navigator.currentOrThrow import com.google.accompanist.systemuicontroller.rememberSystemUiController import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.components.AppStateBanners @@ -93,7 +92,6 @@ import eu.kanade.tachiyomi.util.system.openInBrowser import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.view.setComposeContent import kotlinx.coroutines.DelicateCoroutinesApi -import kotlinx.coroutines.cancel import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.delay import kotlinx.coroutines.flow.callbackFlow @@ -106,6 +104,7 @@ import kotlinx.coroutines.launch import logcat.LogPriority import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.system.logcat +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.presentation.core.components.material.Scaffold import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt index 1f74107e8..07c1293a5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt @@ -19,7 +19,6 @@ import cafe.adriel.voyager.navigator.tab.LocalTabNavigator import cafe.adriel.voyager.navigator.tab.TabOptions import eu.kanade.core.preference.asState import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.presentation.more.MoreScreen import eu.kanade.presentation.util.Tab import eu.kanade.tachiyomi.R @@ -39,6 +38,7 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.combine import tachiyomi.core.util.lang.launchIO +import tachiyomi.domain.library.service.LibraryPreferences import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt index 54e7b227b..20d9c34fa 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt @@ -9,7 +9,6 @@ import eu.kanade.core.util.asFlow import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.entries.anime.interactor.SetAnimeViewerFlags import eu.kanade.domain.entries.anime.model.isLocal -import eu.kanade.domain.history.anime.interactor.GetNextEpisodes import eu.kanade.domain.items.episode.model.toDbEpisode import eu.kanade.domain.track.anime.model.toDbTrack import eu.kanade.domain.track.anime.service.DelayedAnimeTrackingUpdateJob @@ -64,6 +63,7 @@ import tachiyomi.core.util.system.logcat import tachiyomi.domain.download.service.DownloadPreferences import tachiyomi.domain.entries.anime.interactor.GetAnime import tachiyomi.domain.entries.anime.model.Anime +import tachiyomi.domain.history.anime.interactor.GetNextEpisodes import tachiyomi.domain.history.anime.interactor.UpsertAnimeHistory import tachiyomi.domain.history.anime.model.AnimeHistoryUpdate import tachiyomi.domain.items.episode.interactor.GetEpisodeByAnimeId diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt index 3d521fd74..2d851261f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt @@ -11,7 +11,6 @@ import eu.kanade.domain.entries.manga.interactor.SetMangaViewerFlags import eu.kanade.domain.entries.manga.model.isLocal import eu.kanade.domain.entries.manga.model.orientationType import eu.kanade.domain.entries.manga.model.readingModeType -import eu.kanade.domain.history.manga.interactor.GetNextChapters import eu.kanade.domain.items.chapter.model.toDbChapter import eu.kanade.domain.track.manga.model.toDbTrack import eu.kanade.domain.track.manga.service.DelayedMangaTrackingUpdateJob @@ -69,6 +68,7 @@ import tachiyomi.core.util.system.logcat import tachiyomi.domain.download.service.DownloadPreferences import tachiyomi.domain.entries.manga.interactor.GetManga import tachiyomi.domain.entries.manga.model.Manga +import tachiyomi.domain.history.manga.interactor.GetNextChapters import tachiyomi.domain.history.manga.interactor.UpsertMangaHistory import tachiyomi.domain.history.manga.model.MangaHistoryUpdate import tachiyomi.domain.items.chapter.interactor.GetChapterByMangaId diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/stats/anime/AnimeStatsScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/stats/anime/AnimeStatsScreenModel.kt index 27f9b8f54..b3e2c4255 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/stats/anime/AnimeStatsScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/stats/anime/AnimeStatsScreenModel.kt @@ -8,14 +8,10 @@ import eu.kanade.core.util.fastFilter import eu.kanade.core.util.fastFilterNot import eu.kanade.core.util.fastMapNotNull import eu.kanade.domain.entries.anime.model.isLocal -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.presentation.more.stats.StatsScreenState import eu.kanade.presentation.more.stats.data.StatsData import eu.kanade.tachiyomi.animesource.model.SAnime import eu.kanade.tachiyomi.data.download.anime.AnimeDownloadManager -import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD -import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED -import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ import eu.kanade.tachiyomi.data.track.AnimeTrackService import eu.kanade.tachiyomi.data.track.TrackManager import kotlinx.coroutines.flow.update @@ -23,6 +19,10 @@ import tachiyomi.core.util.lang.launchIO import tachiyomi.domain.entries.anime.interactor.GetLibraryAnime import tachiyomi.domain.items.episode.interactor.GetEpisodeByAnimeId import tachiyomi.domain.library.anime.LibraryAnime +import tachiyomi.domain.library.service.LibraryPreferences +import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_HAS_UNREAD +import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_NON_COMPLETED +import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_NON_READ import tachiyomi.domain.track.anime.interactor.GetAnimeTracks import tachiyomi.domain.track.anime.model.AnimeTrack import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/stats/manga/MangaStatsScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/stats/manga/MangaStatsScreenModel.kt index 4c5d037de..89dbfd870 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/stats/manga/MangaStatsScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/stats/manga/MangaStatsScreenModel.kt @@ -8,13 +8,9 @@ import eu.kanade.core.util.fastFilter import eu.kanade.core.util.fastFilterNot import eu.kanade.core.util.fastMapNotNull import eu.kanade.domain.entries.manga.model.isLocal -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.presentation.more.stats.StatsScreenState import eu.kanade.presentation.more.stats.data.StatsData import eu.kanade.tachiyomi.data.download.manga.MangaDownloadManager -import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD -import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED -import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ import eu.kanade.tachiyomi.data.track.MangaTrackService import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.source.model.SManga @@ -23,6 +19,10 @@ import tachiyomi.core.util.lang.launchIO import tachiyomi.domain.entries.manga.interactor.GetLibraryManga import tachiyomi.domain.history.manga.interactor.GetTotalReadDuration import tachiyomi.domain.library.manga.LibraryManga +import tachiyomi.domain.library.service.LibraryPreferences +import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_HAS_UNREAD +import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_NON_COMPLETED +import tachiyomi.domain.library.service.LibraryPreferences.Companion.MANGA_NON_READ import tachiyomi.domain.track.manga.interactor.GetMangaTracks import tachiyomi.domain.track.manga.model.MangaTrack import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/anime/AnimeUpdatesScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/anime/AnimeUpdatesScreenModel.kt index 640fd4003..fa3890ab6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/anime/AnimeUpdatesScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/anime/AnimeUpdatesScreenModel.kt @@ -12,7 +12,6 @@ import eu.kanade.core.preference.asState import eu.kanade.core.util.addOrRemove import eu.kanade.core.util.insertSeparators import eu.kanade.domain.items.episode.interactor.SetSeenStatus -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.entries.anime.components.EpisodeDownloadAction import eu.kanade.presentation.updates.anime.AnimeUpdatesUiModel @@ -41,6 +40,7 @@ import tachiyomi.domain.entries.anime.interactor.GetAnime import tachiyomi.domain.items.episode.interactor.GetEpisode import tachiyomi.domain.items.episode.interactor.UpdateEpisode import tachiyomi.domain.items.episode.model.EpisodeUpdate +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.domain.source.anime.service.AnimeSourceManager import tachiyomi.domain.updates.anime.interactor.GetAnimeUpdates import tachiyomi.domain.updates.anime.model.AnimeUpdatesWithRelations diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/manga/MangaUpdatesScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/manga/MangaUpdatesScreenModel.kt index 89bf266f6..391551dc3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/manga/MangaUpdatesScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/manga/MangaUpdatesScreenModel.kt @@ -12,7 +12,6 @@ import eu.kanade.core.preference.asState import eu.kanade.core.util.addOrRemove import eu.kanade.core.util.insertSeparators import eu.kanade.domain.items.chapter.interactor.SetReadStatus -import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.entries.manga.components.ChapterDownloadAction import eu.kanade.presentation.updates.manga.MangaUpdatesUiModel @@ -40,6 +39,7 @@ import tachiyomi.domain.entries.manga.interactor.GetManga import tachiyomi.domain.items.chapter.interactor.GetChapter import tachiyomi.domain.items.chapter.interactor.UpdateChapter import tachiyomi.domain.items.chapter.model.ChapterUpdate +import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.domain.source.manga.service.MangaSourceManager import tachiyomi.domain.updates.manga.interactor.GetMangaUpdates import tachiyomi.domain.updates.manga.model.MangaUpdatesWithRelations diff --git a/data/src/main/java/tachiyomi/data/source/anime/AnimeSourcePagingSource.kt b/data/src/main/java/tachiyomi/data/source/anime/AnimeSourcePagingSource.kt index 30d21de96..e66851600 100644 --- a/data/src/main/java/tachiyomi/data/source/anime/AnimeSourcePagingSource.kt +++ b/data/src/main/java/tachiyomi/data/source/anime/AnimeSourcePagingSource.kt @@ -1,6 +1,5 @@ package tachiyomi.data.source.anime -import androidx.paging.PagingSource import androidx.paging.PagingState import eu.kanade.tachiyomi.animesource.AnimeCatalogueSource import eu.kanade.tachiyomi.animesource.model.AnimeFilterList @@ -9,8 +8,25 @@ import eu.kanade.tachiyomi.animesource.model.SAnime import tachiyomi.core.util.lang.awaitSingle import tachiyomi.core.util.lang.withIOContext import tachiyomi.domain.items.episode.model.NoEpisodesException +import tachiyomi.domain.source.anime.repository.AnimeSourcePagingSourceType -typealias AnimeSourcePagingSourceType = PagingSource +class AnimeSourceSearchPagingSource(source: AnimeCatalogueSource, val query: String, val filters: AnimeFilterList) : AnimeSourcePagingSource(source) { + override suspend fun requestNextPage(currentPage: Int): AnimesPage { + return source.fetchSearchAnime(currentPage, query, filters).awaitSingle() + } +} + +class AnimeSourcePopularPagingSource(source: AnimeCatalogueSource) : AnimeSourcePagingSource(source) { + override suspend fun requestNextPage(currentPage: Int): AnimesPage { + return source.fetchPopularAnime(currentPage).awaitSingle() + } +} + +class AnimeSourceLatestPagingSource(source: AnimeCatalogueSource) : AnimeSourcePagingSource(source) { + override suspend fun requestNextPage(currentPage: Int): AnimesPage { + return source.fetchLatestUpdates(currentPage).awaitSingle() + } +} abstract class AnimeSourcePagingSource( protected val source: AnimeCatalogueSource, @@ -45,21 +61,3 @@ abstract class AnimeSourcePagingSource( } } } - -class AnimeSourceSearchPagingSource(source: AnimeCatalogueSource, val query: String, val filters: AnimeFilterList) : AnimeSourcePagingSource(source) { - override suspend fun requestNextPage(currentPage: Int): AnimesPage { - return source.fetchSearchAnime(currentPage, query, filters).awaitSingle() - } -} - -class AnimeSourcePopularPagingSource(source: AnimeCatalogueSource) : AnimeSourcePagingSource(source) { - override suspend fun requestNextPage(currentPage: Int): AnimesPage { - return source.fetchPopularAnime(currentPage).awaitSingle() - } -} - -class AnimeSourceLatestPagingSource(source: AnimeCatalogueSource) : AnimeSourcePagingSource(source) { - override suspend fun requestNextPage(currentPage: Int): AnimesPage { - return source.fetchLatestUpdates(currentPage).awaitSingle() - } -} diff --git a/app/src/main/java/eu/kanade/data/source/anime/AnimeSourceRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/source/anime/AnimeSourceRepositoryImpl.kt similarity index 85% rename from app/src/main/java/eu/kanade/data/source/anime/AnimeSourceRepositoryImpl.kt rename to data/src/main/java/tachiyomi/data/source/anime/AnimeSourceRepositoryImpl.kt index c83da068d..841b31dc6 100644 --- a/app/src/main/java/eu/kanade/data/source/anime/AnimeSourceRepositoryImpl.kt +++ b/data/src/main/java/tachiyomi/data/source/anime/AnimeSourceRepositoryImpl.kt @@ -1,22 +1,17 @@ -package eu.kanade.data.source.anime +package tachiyomi.data.source.anime -import eu.kanade.domain.source.anime.repository.AnimeSourceRepository import eu.kanade.tachiyomi.animesource.AnimeCatalogueSource import eu.kanade.tachiyomi.animesource.model.AnimeFilterList import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import tachiyomi.data.handlers.anime.AnimeDatabaseHandler -import tachiyomi.data.source.anime.AnimeSourceLatestPagingSource -import tachiyomi.data.source.anime.AnimeSourcePagingSourceType -import tachiyomi.data.source.anime.AnimeSourcePopularPagingSource -import tachiyomi.data.source.anime.AnimeSourceSearchPagingSource -import tachiyomi.data.source.anime.animeSourceMapper import tachiyomi.domain.source.anime.model.AnimeSource import tachiyomi.domain.source.anime.model.AnimeSourceWithCount import tachiyomi.domain.source.anime.model.StubAnimeSource +import tachiyomi.domain.source.anime.repository.AnimeSourcePagingSourceType +import tachiyomi.domain.source.anime.repository.AnimeSourceRepository import tachiyomi.domain.source.anime.service.AnimeSourceManager -import tachiyomi.source.local.entries.anime.LocalAnimeSource class AnimeSourceRepositoryImpl( private val sourceManager: AnimeSourceManager, @@ -45,7 +40,6 @@ class AnimeSourceRepositoryImpl( val sourceIdWithFavoriteCount = handler.subscribeToList { animesQueries.getAnimeSourceIdWithFavoriteCount() } return sourceIdWithFavoriteCount.map { sourceIdsWithCount -> sourceIdsWithCount - .filterNot { it.source == LocalAnimeSource.ID } .map { (sourceId, count) -> val source = sourceManager.getOrStub(sourceId) val domainSource = animeSourceMapper(source).copy( diff --git a/data/src/main/java/tachiyomi/data/source/manga/MangaSourcePagingSource.kt b/data/src/main/java/tachiyomi/data/source/manga/MangaSourcePagingSource.kt index 92dd72030..d1bedc793 100644 --- a/data/src/main/java/tachiyomi/data/source/manga/MangaSourcePagingSource.kt +++ b/data/src/main/java/tachiyomi/data/source/manga/MangaSourcePagingSource.kt @@ -1,6 +1,5 @@ package tachiyomi.data.source.manga -import androidx.paging.PagingSource import androidx.paging.PagingState import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.model.FilterList @@ -9,8 +8,25 @@ import eu.kanade.tachiyomi.source.model.SManga import tachiyomi.core.util.lang.awaitSingle import tachiyomi.core.util.lang.withIOContext import tachiyomi.domain.items.chapter.model.NoChaptersException +import tachiyomi.domain.source.manga.repository.SourcePagingSourceType -typealias SourcePagingSourceType = PagingSource +class SourceSearchPagingSource(source: CatalogueSource, val query: String, val filters: FilterList) : SourcePagingSource(source) { + override suspend fun requestNextPage(currentPage: Int): MangasPage { + return source.fetchSearchManga(currentPage, query, filters).awaitSingle() + } +} + +class SourcePopularPagingSource(source: CatalogueSource) : SourcePagingSource(source) { + override suspend fun requestNextPage(currentPage: Int): MangasPage { + return source.fetchPopularManga(currentPage).awaitSingle() + } +} + +class SourceLatestPagingSource(source: CatalogueSource) : SourcePagingSource(source) { + override suspend fun requestNextPage(currentPage: Int): MangasPage { + return source.fetchLatestUpdates(currentPage).awaitSingle() + } +} abstract class SourcePagingSource( protected val source: CatalogueSource, @@ -45,21 +61,3 @@ abstract class SourcePagingSource( } } } - -class SourceSearchPagingSource(source: CatalogueSource, val query: String, val filters: FilterList) : SourcePagingSource(source) { - override suspend fun requestNextPage(currentPage: Int): MangasPage { - return source.fetchSearchManga(currentPage, query, filters).awaitSingle() - } -} - -class SourcePopularPagingSource(source: CatalogueSource) : SourcePagingSource(source) { - override suspend fun requestNextPage(currentPage: Int): MangasPage { - return source.fetchPopularManga(currentPage).awaitSingle() - } -} - -class SourceLatestPagingSource(source: CatalogueSource) : SourcePagingSource(source) { - override suspend fun requestNextPage(currentPage: Int): MangasPage { - return source.fetchLatestUpdates(currentPage).awaitSingle() - } -} diff --git a/app/src/main/java/eu/kanade/data/source/manga/MangaSourceRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/source/manga/MangaSourceRepositoryImpl.kt similarity index 85% rename from app/src/main/java/eu/kanade/data/source/manga/MangaSourceRepositoryImpl.kt rename to data/src/main/java/tachiyomi/data/source/manga/MangaSourceRepositoryImpl.kt index 5f3e0e962..b74fbbd44 100644 --- a/app/src/main/java/eu/kanade/data/source/manga/MangaSourceRepositoryImpl.kt +++ b/data/src/main/java/tachiyomi/data/source/manga/MangaSourceRepositoryImpl.kt @@ -1,22 +1,17 @@ -package eu.kanade.data.source.manga +package tachiyomi.data.source.manga -import eu.kanade.domain.source.manga.repository.MangaSourceRepository import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.online.HttpSource import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import tachiyomi.data.handlers.manga.MangaDatabaseHandler -import tachiyomi.data.source.manga.SourceLatestPagingSource -import tachiyomi.data.source.manga.SourcePagingSourceType -import tachiyomi.data.source.manga.SourcePopularPagingSource -import tachiyomi.data.source.manga.SourceSearchPagingSource -import tachiyomi.data.source.manga.mangaSourceMapper import tachiyomi.domain.source.manga.model.MangaSourceWithCount import tachiyomi.domain.source.manga.model.Source import tachiyomi.domain.source.manga.model.StubMangaSource +import tachiyomi.domain.source.manga.repository.MangaSourceRepository +import tachiyomi.domain.source.manga.repository.SourcePagingSourceType import tachiyomi.domain.source.manga.service.MangaSourceManager -import tachiyomi.source.local.entries.manga.LocalMangaSource class MangaSourceRepositoryImpl( private val sourceManager: MangaSourceManager, @@ -45,7 +40,6 @@ class MangaSourceRepositoryImpl( val sourceIdWithFavoriteCount = handler.subscribeToList { mangasQueries.getSourceIdWithFavoriteCount() } return sourceIdWithFavoriteCount.map { sourceIdsWithCount -> sourceIdsWithCount - .filterNot { it.source == LocalMangaSource.ID } .map { (sourceId, count) -> val source = sourceManager.getOrStub(sourceId) val domainSource = mangaSourceMapper(source).copy( diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index 2a75255bc..76832447f 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -20,5 +20,7 @@ dependencies { implementation(platform(kotlinx.coroutines.bom)) implementation(kotlinx.bundles.coroutines) + api(libs.sqldelight.android.paging) + testImplementation(libs.junit) } diff --git a/app/src/main/java/eu/kanade/domain/category/anime/interactor/CreateAnimeCategoryWithName.kt b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/CreateAnimeCategoryWithName.kt similarity index 92% rename from app/src/main/java/eu/kanade/domain/category/anime/interactor/CreateAnimeCategoryWithName.kt rename to domain/src/main/java/tachiyomi/domain/category/anime/interactor/CreateAnimeCategoryWithName.kt index 436bc1856..35f619c6d 100644 --- a/app/src/main/java/eu/kanade/domain/category/anime/interactor/CreateAnimeCategoryWithName.kt +++ b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/CreateAnimeCategoryWithName.kt @@ -1,11 +1,11 @@ -package eu.kanade.domain.category.anime.interactor +package tachiyomi.domain.category.anime.interactor -import eu.kanade.domain.library.service.LibraryPreferences import logcat.LogPriority import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.core.util.system.logcat import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository import tachiyomi.domain.category.model.Category +import tachiyomi.domain.library.service.LibraryPreferences class CreateAnimeCategoryWithName( private val categoryRepository: AnimeCategoryRepository, diff --git a/app/src/main/java/eu/kanade/domain/category/anime/interactor/ResetAnimeCategoryFlags.kt b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/ResetAnimeCategoryFlags.kt similarity index 82% rename from app/src/main/java/eu/kanade/domain/category/anime/interactor/ResetAnimeCategoryFlags.kt rename to domain/src/main/java/tachiyomi/domain/category/anime/interactor/ResetAnimeCategoryFlags.kt index 7c8eedb1d..cbaa34b63 100644 --- a/app/src/main/java/eu/kanade/domain/category/anime/interactor/ResetAnimeCategoryFlags.kt +++ b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/ResetAnimeCategoryFlags.kt @@ -1,8 +1,8 @@ -package eu.kanade.domain.category.anime.interactor +package tachiyomi.domain.category.anime.interactor -import eu.kanade.domain.library.service.LibraryPreferences import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository import tachiyomi.domain.library.model.plus +import tachiyomi.domain.library.service.LibraryPreferences class ResetAnimeCategoryFlags( private val preferences: LibraryPreferences, diff --git a/app/src/main/java/eu/kanade/domain/category/anime/interactor/SetDisplayModeForAnimeCategory.kt b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/SetDisplayModeForAnimeCategory.kt similarity index 91% rename from app/src/main/java/eu/kanade/domain/category/anime/interactor/SetDisplayModeForAnimeCategory.kt rename to domain/src/main/java/tachiyomi/domain/category/anime/interactor/SetDisplayModeForAnimeCategory.kt index 638b565d3..93221de01 100644 --- a/app/src/main/java/eu/kanade/domain/category/anime/interactor/SetDisplayModeForAnimeCategory.kt +++ b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/SetDisplayModeForAnimeCategory.kt @@ -1,11 +1,11 @@ -package eu.kanade.domain.category.anime.interactor +package tachiyomi.domain.category.anime.interactor -import eu.kanade.domain.library.service.LibraryPreferences import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository import tachiyomi.domain.category.model.Category import tachiyomi.domain.category.model.CategoryUpdate import tachiyomi.domain.library.model.LibraryDisplayMode import tachiyomi.domain.library.model.plus +import tachiyomi.domain.library.service.LibraryPreferences class SetDisplayModeForAnimeCategory( private val preferences: LibraryPreferences, diff --git a/app/src/main/java/eu/kanade/domain/category/anime/interactor/SetSortModeForAnimeCategory.kt b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/SetSortModeForAnimeCategory.kt similarity index 92% rename from app/src/main/java/eu/kanade/domain/category/anime/interactor/SetSortModeForAnimeCategory.kt rename to domain/src/main/java/tachiyomi/domain/category/anime/interactor/SetSortModeForAnimeCategory.kt index 43dbabb41..837e13bea 100644 --- a/app/src/main/java/eu/kanade/domain/category/anime/interactor/SetSortModeForAnimeCategory.kt +++ b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/SetSortModeForAnimeCategory.kt @@ -1,11 +1,11 @@ -package eu.kanade.domain.category.anime.interactor +package tachiyomi.domain.category.anime.interactor -import eu.kanade.domain.library.service.LibraryPreferences import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository import tachiyomi.domain.category.model.Category import tachiyomi.domain.category.model.CategoryUpdate import tachiyomi.domain.library.anime.model.AnimeLibrarySort import tachiyomi.domain.library.model.plus +import tachiyomi.domain.library.service.LibraryPreferences class SetSortModeForAnimeCategory( private val preferences: LibraryPreferences, diff --git a/app/src/main/java/eu/kanade/domain/category/manga/interactor/CreateMangaCategoryWithName.kt b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/CreateMangaCategoryWithName.kt similarity index 92% rename from app/src/main/java/eu/kanade/domain/category/manga/interactor/CreateMangaCategoryWithName.kt rename to domain/src/main/java/tachiyomi/domain/category/manga/interactor/CreateMangaCategoryWithName.kt index 6038dfd86..2caaab2a6 100644 --- a/app/src/main/java/eu/kanade/domain/category/manga/interactor/CreateMangaCategoryWithName.kt +++ b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/CreateMangaCategoryWithName.kt @@ -1,11 +1,11 @@ -package eu.kanade.domain.category.manga.interactor +package tachiyomi.domain.category.manga.interactor -import eu.kanade.domain.library.service.LibraryPreferences import logcat.LogPriority import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.core.util.system.logcat import tachiyomi.domain.category.manga.repository.MangaCategoryRepository import tachiyomi.domain.category.model.Category +import tachiyomi.domain.library.service.LibraryPreferences class CreateMangaCategoryWithName( private val categoryRepository: MangaCategoryRepository, diff --git a/app/src/main/java/eu/kanade/domain/category/manga/interactor/ResetMangaCategoryFlags.kt b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/ResetMangaCategoryFlags.kt similarity index 82% rename from app/src/main/java/eu/kanade/domain/category/manga/interactor/ResetMangaCategoryFlags.kt rename to domain/src/main/java/tachiyomi/domain/category/manga/interactor/ResetMangaCategoryFlags.kt index afa3e8853..a464fbad8 100644 --- a/app/src/main/java/eu/kanade/domain/category/manga/interactor/ResetMangaCategoryFlags.kt +++ b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/ResetMangaCategoryFlags.kt @@ -1,8 +1,8 @@ -package eu.kanade.domain.category.manga.interactor +package tachiyomi.domain.category.manga.interactor -import eu.kanade.domain.library.service.LibraryPreferences import tachiyomi.domain.category.manga.repository.MangaCategoryRepository import tachiyomi.domain.library.model.plus +import tachiyomi.domain.library.service.LibraryPreferences class ResetMangaCategoryFlags( private val preferences: LibraryPreferences, diff --git a/app/src/main/java/eu/kanade/domain/category/manga/interactor/SetDisplayModeForMangaCategory.kt b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/SetDisplayModeForMangaCategory.kt similarity index 91% rename from app/src/main/java/eu/kanade/domain/category/manga/interactor/SetDisplayModeForMangaCategory.kt rename to domain/src/main/java/tachiyomi/domain/category/manga/interactor/SetDisplayModeForMangaCategory.kt index 5f8c1f6bd..56aab6fba 100644 --- a/app/src/main/java/eu/kanade/domain/category/manga/interactor/SetDisplayModeForMangaCategory.kt +++ b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/SetDisplayModeForMangaCategory.kt @@ -1,11 +1,11 @@ -package eu.kanade.domain.category.manga.interactor +package tachiyomi.domain.category.manga.interactor -import eu.kanade.domain.library.service.LibraryPreferences import tachiyomi.domain.category.manga.repository.MangaCategoryRepository import tachiyomi.domain.category.model.Category import tachiyomi.domain.category.model.CategoryUpdate import tachiyomi.domain.library.model.LibraryDisplayMode import tachiyomi.domain.library.model.plus +import tachiyomi.domain.library.service.LibraryPreferences class SetDisplayModeForMangaCategory( private val preferences: LibraryPreferences, diff --git a/app/src/main/java/eu/kanade/domain/category/manga/interactor/SetSortModeForMangaCategory.kt b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/SetSortModeForMangaCategory.kt similarity index 92% rename from app/src/main/java/eu/kanade/domain/category/manga/interactor/SetSortModeForMangaCategory.kt rename to domain/src/main/java/tachiyomi/domain/category/manga/interactor/SetSortModeForMangaCategory.kt index 2cd38ec02..5c3f384e1 100644 --- a/app/src/main/java/eu/kanade/domain/category/manga/interactor/SetSortModeForMangaCategory.kt +++ b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/SetSortModeForMangaCategory.kt @@ -1,11 +1,11 @@ -package eu.kanade.domain.category.manga.interactor +package tachiyomi.domain.category.manga.interactor -import eu.kanade.domain.library.service.LibraryPreferences import tachiyomi.domain.category.manga.repository.MangaCategoryRepository import tachiyomi.domain.category.model.Category import tachiyomi.domain.category.model.CategoryUpdate import tachiyomi.domain.library.manga.model.MangaLibrarySort import tachiyomi.domain.library.model.plus +import tachiyomi.domain.library.service.LibraryPreferences class SetSortModeForMangaCategory( private val preferences: LibraryPreferences, diff --git a/app/src/main/java/eu/kanade/domain/history/anime/interactor/GetNextEpisodes.kt b/domain/src/main/java/tachiyomi/domain/history/anime/interactor/GetNextEpisodes.kt similarity index 97% rename from app/src/main/java/eu/kanade/domain/history/anime/interactor/GetNextEpisodes.kt rename to domain/src/main/java/tachiyomi/domain/history/anime/interactor/GetNextEpisodes.kt index 82f9f2f23..6b7abd12e 100644 --- a/app/src/main/java/eu/kanade/domain/history/anime/interactor/GetNextEpisodes.kt +++ b/domain/src/main/java/tachiyomi/domain/history/anime/interactor/GetNextEpisodes.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.history.anime.interactor +package tachiyomi.domain.history.anime.interactor import tachiyomi.domain.entries.anime.interactor.GetAnime import tachiyomi.domain.history.anime.repository.AnimeHistoryRepository diff --git a/app/src/main/java/eu/kanade/domain/history/manga/interactor/GetNextChapters.kt b/domain/src/main/java/tachiyomi/domain/history/manga/interactor/GetNextChapters.kt similarity index 97% rename from app/src/main/java/eu/kanade/domain/history/manga/interactor/GetNextChapters.kt rename to domain/src/main/java/tachiyomi/domain/history/manga/interactor/GetNextChapters.kt index 343a63a45..9f474a36d 100644 --- a/app/src/main/java/eu/kanade/domain/history/manga/interactor/GetNextChapters.kt +++ b/domain/src/main/java/tachiyomi/domain/history/manga/interactor/GetNextChapters.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.history.manga.interactor +package tachiyomi.domain.history.manga.interactor import tachiyomi.domain.entries.manga.interactor.GetManga import tachiyomi.domain.history.manga.repository.MangaHistoryRepository diff --git a/app/src/main/java/eu/kanade/domain/items/chapter/interactor/SetDefaultChapterSettings.kt b/domain/src/main/java/tachiyomi/domain/items/chapter/interactor/SetDefaultChapterSettings.kt similarity index 92% rename from app/src/main/java/eu/kanade/domain/items/chapter/interactor/SetDefaultChapterSettings.kt rename to domain/src/main/java/tachiyomi/domain/items/chapter/interactor/SetDefaultChapterSettings.kt index 6be016736..d27ecedba 100644 --- a/app/src/main/java/eu/kanade/domain/items/chapter/interactor/SetDefaultChapterSettings.kt +++ b/domain/src/main/java/tachiyomi/domain/items/chapter/interactor/SetDefaultChapterSettings.kt @@ -1,10 +1,10 @@ -package eu.kanade.domain.items.chapter.interactor +package tachiyomi.domain.items.chapter.interactor -import eu.kanade.domain.library.service.LibraryPreferences import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.domain.entries.manga.interactor.GetMangaFavorites import tachiyomi.domain.entries.manga.interactor.SetMangaChapterFlags import tachiyomi.domain.entries.manga.model.Manga +import tachiyomi.domain.library.service.LibraryPreferences class SetMangaDefaultChapterFlags( private val libraryPreferences: LibraryPreferences, diff --git a/app/src/main/java/eu/kanade/domain/items/episode/interactor/SetDefaultEpisodeSettings.kt b/domain/src/main/java/tachiyomi/domain/items/episode/interactor/SetDefaultEpisodeSettings.kt similarity index 92% rename from app/src/main/java/eu/kanade/domain/items/episode/interactor/SetDefaultEpisodeSettings.kt rename to domain/src/main/java/tachiyomi/domain/items/episode/interactor/SetDefaultEpisodeSettings.kt index cda5baf1e..3ea783d2c 100644 --- a/app/src/main/java/eu/kanade/domain/items/episode/interactor/SetDefaultEpisodeSettings.kt +++ b/domain/src/main/java/tachiyomi/domain/items/episode/interactor/SetDefaultEpisodeSettings.kt @@ -1,10 +1,10 @@ -package eu.kanade.domain.items.episode.interactor +package tachiyomi.domain.items.episode.interactor -import eu.kanade.domain.library.service.LibraryPreferences import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.domain.entries.anime.interactor.GetAnimeFavorites import tachiyomi.domain.entries.anime.interactor.SetAnimeEpisodeFlags import tachiyomi.domain.entries.anime.model.Anime +import tachiyomi.domain.library.service.LibraryPreferences class SetAnimeDefaultEpisodeFlags( private val libraryPreferences: LibraryPreferences, diff --git a/app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt b/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt similarity index 90% rename from app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt rename to domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt index e2fb94c7b..86cd91eb9 100644 --- a/app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt +++ b/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt @@ -1,9 +1,5 @@ -package eu.kanade.domain.library.service +package tachiyomi.domain.library.service -import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI -import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD -import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED -import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ import tachiyomi.core.preference.PreferenceStore import tachiyomi.core.preference.getEnum import tachiyomi.domain.entries.TriStateFilter @@ -33,9 +29,20 @@ class LibraryPreferences( fun libraryUpdateLastTimestamp() = preferenceStore.getLong("library_update_last_timestamp", 0L) - fun libraryUpdateDeviceRestriction() = preferenceStore.getStringSet("library_update_restriction", setOf(DEVICE_ONLY_ON_WIFI)) - - fun libraryUpdateItemRestriction() = preferenceStore.getStringSet("library_update_manga_restriction", setOf(MANGA_HAS_UNREAD, MANGA_NON_COMPLETED, MANGA_NON_READ)) + fun libraryUpdateDeviceRestriction() = preferenceStore.getStringSet( + "library_update_restriction", + setOf( + DEVICE_ONLY_ON_WIFI, + ), + ) + fun libraryUpdateItemRestriction() = preferenceStore.getStringSet( + "library_update_manga_restriction", + setOf( + MANGA_HAS_UNREAD, + MANGA_NON_COMPLETED, + MANGA_NON_READ, + ), + ) fun autoUpdateMetadata() = preferenceStore.getBoolean("auto_update_metadata", false) @@ -150,4 +157,19 @@ class LibraryPreferences( displayChapterByNameOrNumber().set(manga.displayMode) sortChapterByAscendingOrDescending().set(if (manga.sortDescending()) Manga.CHAPTER_SORT_DESC else Manga.CHAPTER_SORT_ASC) } + + companion object { + const val DEVICE_ONLY_ON_WIFI = "wifi" + const val DEVICE_NETWORK_NOT_METERED = "network_not_metered" + const val DEVICE_CHARGING = "ac" + const val DEVICE_BATTERY_NOT_LOW = "battery_not_low" + + const val MANGA_NON_COMPLETED = "manga_ongoing" + const val MANGA_HAS_UNREAD = "manga_fully_read" + const val MANGA_NON_READ = "manga_started" + + const val ANIME_NON_COMPLETED = "anime_ongoing" + const val ANIME_HAS_UNSEEN = "anime_fully_seen" + const val ANIME_NON_SEEN = "anime_started" + } } diff --git a/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetAnimeSourcesWithNonLibraryAnime.kt b/domain/src/main/java/tachiyomi/domain/source/anime/interactor/GetAnimeSourcesWithNonLibraryAnime.kt similarity index 74% rename from app/src/main/java/eu/kanade/domain/source/anime/interactor/GetAnimeSourcesWithNonLibraryAnime.kt rename to domain/src/main/java/tachiyomi/domain/source/anime/interactor/GetAnimeSourcesWithNonLibraryAnime.kt index 158ea300d..551b4cd5b 100644 --- a/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetAnimeSourcesWithNonLibraryAnime.kt +++ b/domain/src/main/java/tachiyomi/domain/source/anime/interactor/GetAnimeSourcesWithNonLibraryAnime.kt @@ -1,8 +1,8 @@ -package eu.kanade.domain.source.anime.interactor +package tachiyomi.domain.source.anime.interactor -import eu.kanade.domain.source.anime.repository.AnimeSourceRepository import kotlinx.coroutines.flow.Flow import tachiyomi.domain.source.anime.model.AnimeSourceWithCount +import tachiyomi.domain.source.anime.repository.AnimeSourceRepository class GetAnimeSourcesWithNonLibraryAnime( private val repository: AnimeSourceRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetRemoteAnime.kt b/domain/src/main/java/tachiyomi/domain/source/anime/interactor/GetRemoteAnime.kt similarity index 78% rename from app/src/main/java/eu/kanade/domain/source/anime/interactor/GetRemoteAnime.kt rename to domain/src/main/java/tachiyomi/domain/source/anime/interactor/GetRemoteAnime.kt index 0c9e89646..dd1226752 100644 --- a/app/src/main/java/eu/kanade/domain/source/anime/interactor/GetRemoteAnime.kt +++ b/domain/src/main/java/tachiyomi/domain/source/anime/interactor/GetRemoteAnime.kt @@ -1,8 +1,8 @@ -package eu.kanade.domain.source.anime.interactor +package tachiyomi.domain.source.anime.interactor -import eu.kanade.domain.source.anime.repository.AnimeSourceRepository import eu.kanade.tachiyomi.animesource.model.AnimeFilterList -import tachiyomi.data.source.anime.AnimeSourcePagingSourceType +import tachiyomi.domain.source.anime.repository.AnimeSourcePagingSourceType +import tachiyomi.domain.source.anime.repository.AnimeSourceRepository class GetRemoteAnime( private val repository: AnimeSourceRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/anime/repository/AnimeSourceRepository.kt b/domain/src/main/java/tachiyomi/domain/source/anime/repository/AnimeSourceRepository.kt similarity index 78% rename from app/src/main/java/eu/kanade/domain/source/anime/repository/AnimeSourceRepository.kt rename to domain/src/main/java/tachiyomi/domain/source/anime/repository/AnimeSourceRepository.kt index a9893031b..e8b2d372e 100644 --- a/app/src/main/java/eu/kanade/domain/source/anime/repository/AnimeSourceRepository.kt +++ b/domain/src/main/java/tachiyomi/domain/source/anime/repository/AnimeSourceRepository.kt @@ -1,11 +1,14 @@ -package eu.kanade.domain.source.anime.repository +package tachiyomi.domain.source.anime.repository +import androidx.paging.PagingSource import eu.kanade.tachiyomi.animesource.model.AnimeFilterList +import eu.kanade.tachiyomi.animesource.model.SAnime import kotlinx.coroutines.flow.Flow -import tachiyomi.data.source.anime.AnimeSourcePagingSourceType import tachiyomi.domain.source.anime.model.AnimeSource import tachiyomi.domain.source.anime.model.AnimeSourceWithCount +typealias AnimeSourcePagingSourceType = PagingSource + interface AnimeSourceRepository { fun getAnimeSources(): Flow> diff --git a/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetMangaSourcesWithNonLibraryManga.kt b/domain/src/main/java/tachiyomi/domain/source/manga/interactor/GetMangaSourcesWithNonLibraryManga.kt similarity index 74% rename from app/src/main/java/eu/kanade/domain/source/manga/interactor/GetMangaSourcesWithNonLibraryManga.kt rename to domain/src/main/java/tachiyomi/domain/source/manga/interactor/GetMangaSourcesWithNonLibraryManga.kt index 7cb62b960..9bbba7aa6 100644 --- a/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetMangaSourcesWithNonLibraryManga.kt +++ b/domain/src/main/java/tachiyomi/domain/source/manga/interactor/GetMangaSourcesWithNonLibraryManga.kt @@ -1,8 +1,8 @@ -package eu.kanade.domain.source.manga.interactor +package tachiyomi.domain.source.manga.interactor -import eu.kanade.domain.source.manga.repository.MangaSourceRepository import kotlinx.coroutines.flow.Flow import tachiyomi.domain.source.manga.model.MangaSourceWithCount +import tachiyomi.domain.source.manga.repository.MangaSourceRepository class GetMangaSourcesWithNonLibraryManga( private val repository: MangaSourceRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetRemoteManga.kt b/domain/src/main/java/tachiyomi/domain/source/manga/interactor/GetRemoteManga.kt similarity index 78% rename from app/src/main/java/eu/kanade/domain/source/manga/interactor/GetRemoteManga.kt rename to domain/src/main/java/tachiyomi/domain/source/manga/interactor/GetRemoteManga.kt index 20efcc962..5e7f3eea0 100644 --- a/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetRemoteManga.kt +++ b/domain/src/main/java/tachiyomi/domain/source/manga/interactor/GetRemoteManga.kt @@ -1,8 +1,8 @@ -package eu.kanade.domain.source.manga.interactor +package tachiyomi.domain.source.manga.interactor -import eu.kanade.domain.source.manga.repository.MangaSourceRepository import eu.kanade.tachiyomi.source.model.FilterList -import tachiyomi.data.source.manga.SourcePagingSourceType +import tachiyomi.domain.source.manga.repository.MangaSourceRepository +import tachiyomi.domain.source.manga.repository.SourcePagingSourceType class GetRemoteManga( private val repository: MangaSourceRepository, diff --git a/app/src/main/java/eu/kanade/domain/source/manga/repository/MangaSourceRepository.kt b/domain/src/main/java/tachiyomi/domain/source/manga/repository/MangaSourceRepository.kt similarity index 78% rename from app/src/main/java/eu/kanade/domain/source/manga/repository/MangaSourceRepository.kt rename to domain/src/main/java/tachiyomi/domain/source/manga/repository/MangaSourceRepository.kt index 43715a89a..8d457c85d 100644 --- a/app/src/main/java/eu/kanade/domain/source/manga/repository/MangaSourceRepository.kt +++ b/domain/src/main/java/tachiyomi/domain/source/manga/repository/MangaSourceRepository.kt @@ -1,11 +1,14 @@ -package eu.kanade.domain.source.manga.repository +package tachiyomi.domain.source.manga.repository +import androidx.paging.PagingSource import eu.kanade.tachiyomi.source.model.FilterList +import eu.kanade.tachiyomi.source.model.SManga import kotlinx.coroutines.flow.Flow -import tachiyomi.data.source.manga.SourcePagingSourceType import tachiyomi.domain.source.manga.model.MangaSourceWithCount import tachiyomi.domain.source.manga.model.Source +typealias SourcePagingSourceType = PagingSource + interface MangaSourceRepository { fun getMangaSources(): Flow> diff --git a/i18n/src/main/res/values-ar/strings.xml b/i18n/src/main/res/values-ar/strings.xml index a9d733530..cb43bef71 100644 --- a/i18n/src/main/res/values-ar/strings.xml +++ b/i18n/src/main/res/values-ar/strings.xml @@ -786,4 +786,5 @@ %d فصل تالي إخفاء الإدخالات الموجودة بالفعل في المكتبة + تحديث الفئة \ No newline at end of file diff --git a/i18n/src/main/res/values-ca/strings.xml b/i18n/src/main/res/values-ca/strings.xml index a3390fe27..01f509854 100644 --- a/i18n/src/main/res/values-ca/strings.xml +++ b/i18n/src/main/res/values-ca/strings.xml @@ -761,4 +761,5 @@ %ds Amaga els elements que ja són a la biblioteca Copia al porta-retalls + Actualitza la categoria \ No newline at end of file diff --git a/i18n/src/main/res/values-cs/strings.xml b/i18n/src/main/res/values-cs/strings.xml index 23231f8e8..7028fb677 100644 --- a/i18n/src/main/res/values-cs/strings.xml +++ b/i18n/src/main/res/values-cs/strings.xml @@ -751,4 +751,5 @@ Dalších %d kapitol Zkopírovat do schránky + Aktualizovat kategorii \ No newline at end of file diff --git a/i18n/src/main/res/values-cv/strings.xml b/i18n/src/main/res/values-cv/strings.xml index 19c7d364b..94f650583 100644 --- a/i18n/src/main/res/values-cv/strings.xml +++ b/i18n/src/main/res/values-cv/strings.xml @@ -146,7 +146,7 @@ Хушма ҫинчен Хушмасем Ҫӑл куҫсем - Ҫӗнетӳсем + Ҫӗнӗлӗх Вулавӑш Ӗнерлев Тата diff --git a/i18n/src/main/res/values-de/strings.xml b/i18n/src/main/res/values-de/strings.xml index b0e2eb07e..651b8e249 100644 --- a/i18n/src/main/res/values-de/strings.xml +++ b/i18n/src/main/res/values-de/strings.xml @@ -736,4 +736,5 @@ Nächste %d Kapitel In die Zwischenablage kopieren + Kategorie aktualisieren \ No newline at end of file diff --git a/i18n/src/main/res/values-el/strings.xml b/i18n/src/main/res/values-el/strings.xml index 983b43937..e742bb437 100644 --- a/i18n/src/main/res/values-el/strings.xml +++ b/i18n/src/main/res/values-el/strings.xml @@ -736,4 +736,5 @@ Απόκρυψη καταχωρήσεων που βρίσκονται ήδη στη βιβλιοθήκη Αντιγραφή στο πρόχειρο + Ενημέρωση κατηγορίας \ No newline at end of file diff --git a/i18n/src/main/res/values-es/strings.xml b/i18n/src/main/res/values-es/strings.xml index 6942d21dd..70bc475c2 100644 --- a/i18n/src/main/res/values-es/strings.xml +++ b/i18n/src/main/res/values-es/strings.xml @@ -329,7 +329,7 @@ Según ajustes del sistema Gestionar notificaciones Seguridad y privacidad - Requiere el uso de desbloqueo por biometría + Requiere desbloqueo Bloquear por inactividad Siempre Nunca @@ -498,9 +498,9 @@ 18+ Esto no evita que las extensiones extraoficiales o que estén mal clasificadas muestren contenido para mayores de 18 años en la aplicación. - Se ha omitido un capítulo, esto podría deberse a que la fuente no lo tenga o a que tus ajustes lo estén filtrando - Se han omitido %d capítulos, esto podría deberse a que la fuente no los tenga o a que tus ajustes los estén filtrando - Se han omitido %d capítulos, esto podría deberse a que la fuente no los tenga o a que tus ajustes los estén filtrando + Se salta el capítulo %d, o bien falta en la fuente o se ha filtrado + Saltándose %d capítulos, o las fuentes que faltan o se han filtrado + Saltándose %d capítulos, o las fuentes que faltan o se han filtrado No hay capítulos Se han actualizado los ajustes predeterminados de capítulo @@ -779,4 +779,5 @@ Saltar elementos que ya estén en la biblioteca Copiar al portapapeles + Actualizar categoría \ No newline at end of file diff --git a/i18n/src/main/res/values-fil/strings.xml b/i18n/src/main/res/values-fil/strings.xml index 5c0c208d5..88b4e49e5 100644 --- a/i18n/src/main/res/values-fil/strings.xml +++ b/i18n/src/main/res/values-fil/strings.xml @@ -742,4 +742,5 @@ Susunod na kabanata Susunod na %d (mga) kabanata + I-update ang kategorya \ No newline at end of file diff --git a/i18n/src/main/res/values-fr/strings.xml b/i18n/src/main/res/values-fr/strings.xml index dec18d625..0267b8ee1 100644 --- a/i18n/src/main/res/values-fr/strings.xml +++ b/i18n/src/main/res/values-fr/strings.xml @@ -777,4 +777,6 @@ %d chapitres suivants %d chapitres suivants + Copier dans le presse-papier + Mettre à jour la catégorie \ No newline at end of file diff --git a/i18n/src/main/res/values-hr/strings.xml b/i18n/src/main/res/values-hr/strings.xml index 57f7dd05b..b200e33d0 100644 --- a/i18n/src/main/res/values-hr/strings.xml +++ b/i18n/src/main/res/values-hr/strings.xml @@ -699,4 +699,5 @@ Sljedeća %d poglavlja Sljedećih %d poglavlja + Aktualiziraj katogoriju \ No newline at end of file diff --git a/i18n/src/main/res/values-in/strings.xml b/i18n/src/main/res/values-in/strings.xml index cf606811a..288535c6c 100644 --- a/i18n/src/main/res/values-in/strings.xml +++ b/i18n/src/main/res/values-in/strings.xml @@ -716,4 +716,5 @@ berikutnya %d chapter Salin ke papan klip + Perbarui kategori \ No newline at end of file diff --git a/i18n/src/main/res/values-it/strings.xml b/i18n/src/main/res/values-it/strings.xml index 1f0a3353d..e0225a24f 100644 --- a/i18n/src/main/res/values-it/strings.xml +++ b/i18n/src/main/res/values-it/strings.xml @@ -328,7 +328,7 @@ Tema scuro Disattivo Attivo - Segui l\'impostazione di sistema + Usa il tema di sistema Gestisci le notifiche Sicurezza e privacy Richiede sblocco @@ -537,7 +537,7 @@ Decrescente Crescente Per numero di capitolo - Per data di aggiunta + Per data di caricamento Tracciati Mostra numero elementi Destra e Sinistra @@ -782,4 +782,5 @@ Nascondi le voci già in libreria Copia negli appunti + Aggiorna categoria \ No newline at end of file diff --git a/i18n/src/main/res/values-ja/strings.xml b/i18n/src/main/res/values-ja/strings.xml index 43acc1deb..706bfbcc7 100644 --- a/i18n/src/main/res/values-ja/strings.xml +++ b/i18n/src/main/res/values-ja/strings.xml @@ -722,4 +722,5 @@ 次の%d章 + カテゴリを更新 \ No newline at end of file diff --git a/i18n/src/main/res/values-ko/strings.xml b/i18n/src/main/res/values-ko/strings.xml index fd8b8fc8d..0b9682ca0 100644 --- a/i18n/src/main/res/values-ko/strings.xml +++ b/i18n/src/main/res/values-ko/strings.xml @@ -214,7 +214,7 @@ 다운로드 중에 예기치 않은 오류가 발생하였습니다 다운로드한 챕터 연재가 끝남 - 기본 범주 + 기본 카테고리 현재 서재를 나중에 복구하는 데 사용 가능 네비게이션 페이지 전환 효과 표시 @@ -723,4 +723,5 @@ 다음 %d화 + 카테고리 업데이트 \ No newline at end of file diff --git a/i18n/src/main/res/values-ml/strings-aniyomi.xml b/i18n/src/main/res/values-ml/strings-aniyomi.xml deleted file mode 100644 index f66af5bb2..000000000 --- a/i18n/src/main/res/values-ml/strings-aniyomi.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - വിഭാഗങ്ങൾ - ടാച്ചിയോമി അൺലോക്ക് ചെയ്യുക - ഓർക്കുക, അവസാനം ഉപയോഗിച്ച തെളിച്ചത്തിലേക്ക് മാറുക - %1$s - %2$s - %1$d%% - വായിച്ചത്/കണ്ടത് എന്ന് സ്വമേധയാ അടയാളപ്പെടുത്തിയ ശേഷം - വായിച്ചതിന് ശേഷം/കണ്ടതിന് ശേഷം സ്വയമേവ ഇല്ലാതാക്കുക - അവസാന ഭാഗം ഒഴിവാക്കുക - 5 സെക്കൻഡ് - നെറ്റ്ഫ്ലിക്സ് ശൈലിയിൽ പ്രവർത്തനക്ഷമമാക്കുക - 10 സെക്കൻഡ് - 9 സെക്കൻഡ് - അവസാനം കണ്ടത് - കാണുന്നത് തുടരുക/വായിക്കുക ബട്ടൺ കാണിക്കുക - ഈ വിപുലീകരണം ഔദ്യോഗിക ആനിയോമി വിപുലീകരണ പട്ടികയിൽ നിന്നുള്ളതല്ല. - കളിക്കാരൻ - പുരോഗതി - വീഡിയോ നിലവാരം - 8 സെക്കൻഡ് - 7 സെക്കൻഡ് - ക്രമീകരണങ്ങൾ - %s ഒഴിവാക്കി - കണ്ടിട്ടില്ലെന്ന് അടയാളപ്പെടുത്തുക - 6 സെക്കൻഡ് - സ്വയമേവ ഒഴിവാക്കൽ പ്രവർത്തനക്ഷമമാക്കുക - %d സെക്കൻഡിനുള്ളിൽ ഒഴിവാക്കുക - മുമ്പത്തേത് കണ്ടതായി അടയാളപ്പെടുത്തുക - അവസാനം പരിശോധിച്ചത് - കാണാത്ത കണക്ക് - ഒഴിവാക്കരുത് - കളിക്കുക - ആനിമെ വിഭാഗങ്ങൾ - കാണാത്തത് - കണ്ടതായി അടയാളപ്പെടുത്തുക - വിഭാഗങ്ങൾ - നിങ്ങളുടെ ചരിത്രം താൽക്കാലികമായി നിർത്തുന്നു - മാങ്ക - ആനിമേ - ആനിമേ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/i18n/src/main/res/values-ml/strings.xml b/i18n/src/main/res/values-ml/strings.xml deleted file mode 100644 index 8a632b682..000000000 --- a/i18n/src/main/res/values-ml/strings.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - ഡൗൺലോഡുകളൊന്നുമില്ല - സമീപകാല അപ്‌ഡേറ്റുകളൊന്നുമില്ല - ട്രാക്കിംഗ് - ചരിത്രം - ക്രമീകരണങ്ങൾ - അപ്ഡേറ്റുകൾ - നിങ്ങളുടെ ലൈബ്രറി ശൂന്യമാണ് - നിങ്ങൾക്ക് വിഭാഗങ്ങളൊന്നുമില്ല. നിങ്ങളുടെ ലൈബ്രറി ഓർഗനൈസുചെയ്യുന്നതിന് ഒന്ന് സൃഷ്‌ടിക്കാൻ പ്ലസ് ബട്ടൺ ടാപ്പുചെയ്യുക. - സ്ഥിരസ്ഥിതി - ഫിൽട്ടർ ചെയ്യുക - മുന്നറിയിപ്പ് - പേര് - കൂടുതൽ - പുസ്തകശാല - ചരിത്രം - ഉറവിടങ്ങൾ - ബാക്കപ്പ് ചെയ്ത് പുനഃസ്ഥാപിക്കുക - മൈഗ്രേറ്റ് ചെയ്യുക - വിപുലീകരണങ്ങൾ - വിപുലീകരണ വിവരം - സഹായിക്കൂ - മാംഗ - അധ്യായങ്ങൾ - മാറ്റം സ്ഥിരീകരിക്കാൻ പ്രാമാണീകരിക്കുക - പുറത്തുകടക്കാൻ വീണ്ടും അമർത്തുക - ക്രമീകരണങ്ങൾ - മെനു - അടുത്തിടെ ഒന്നും വായിച്ചില്ല -ഡൗൺലോഡ് ക്യൂ - \ No newline at end of file diff --git a/i18n/src/main/res/values-ms/strings.xml b/i18n/src/main/res/values-ms/strings.xml index 519acdebc..dcddfd68c 100644 --- a/i18n/src/main/res/values-ms/strings.xml +++ b/i18n/src/main/res/values-ms/strings.xml @@ -724,4 +724,5 @@ Sembunyikan entri yang sudah ada di dalam pustaka Salin ke papan keratan + Kemas kini kategori \ No newline at end of file diff --git a/i18n/src/main/res/values-my/strings-aniyomi.xml b/i18n/src/main/res/values-my/strings-aniyomi.xml deleted file mode 100644 index 178b65f65..000000000 --- a/i18n/src/main/res/values-my/strings-aniyomi.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - အမျိုးအစားများ - Aniyomi ကိုဖွင့်ပါ - ပုံသေအမျိုးအစား - \ No newline at end of file diff --git a/i18n/src/main/res/values-my/strings.xml b/i18n/src/main/res/values-my/strings.xml deleted file mode 100644 index bd565f4b6..000000000 --- a/i18n/src/main/res/values-my/strings.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - ပြန်ရယူသည် - Log ဖွင့်သည် - အရင်အတိုင်း - ပြန်စသည် - သိမ်းဆည်းသည် - မျှဝေသည် - Install - အောက်ခြေသို့ရွှေ့သည် - ထိပ်သို့ရွှေ့သည် - ကြီးစဉ်ငယ်လိုက် - ငယ်စဉ်ကြီးလိုက် - အဟောင်းဆုံး - အသစ်ဆုံး - အခန်းနံပါတ်အလိုက် - တင်သည့်နေ့စွဲအလိုက် - ပြန်စဉ်သည် - စဉ်သည် - အားလုံးပယ်ဖျက်သည် - ပယ်ဖျက်သည် - ပင်ဖြုတ်သည် - ပင်ချိတ်သည် - ဖြုတ်သည် - ပစ္စည်းအရေအတွက်ကိုပြသည် - အမျိုးအစားတန်းကိုပြသည် - ဒေါင်းလုဒ်အမှတ်အသားများ - အနေတော်ဇယား - စာရင်းစဉ် - ဇယားအကျဉ်း - ပြသပုံ - ပြသသည့်ပုံစံ - ရွှေ့ပြောင်းသည် - WebView တွင်ဖွင့်သည် - Browser တွင်ဖွင့်သည် - ဆက်လုပ်သည် - စတင်သည် - ဖယ်ရှားသည် - ပြန်လုပ်မည် - နောက်အခန်း - ရှေ့အခန်း - ခေတ္တရပ် - အပြီးရပ် - အခန်းများကိုကြည့်သည် - အဖုံးကိုပြင်ရန် - အမျိုးအစားသတ်မှတ်သည် - အမျိုးအစားအမည်ပြင်သည် - အမျိုးအစားများပြင်ရန် - အမျိုးအစားထည့်ပါ - ထည့်သည် - ပြင်ဆင်သည် - အားလုံးပိတ် - အားလုံးဖွင့် - စာအုပ်စင်ကိုအပ်ဒိပ်လုပ်သည် - ဖျက်သည် - အခန်းကိုစာညှပ်ဖြုတ်သည် - အခန်းကိုစာညှပ်မှတ်သည် - ဒေါင်းလုဒ် - နောက်ရှိအားလုံးကိုဖတ်ပြီးသတ်မှတ်သည် - မဖတ်ရသေးဟုသည်မှတ်သည် - ဖတ်ပြီးဟုသတ်မှတ်သည် - ပြောင်းပြန်ရွေးချယ်ရန် - အားလုံးရွေးချယ်သည် - နေရာအနှံ့ရှာဖွေခြင်း - ရှာဖွေမှုဆက်တင်များ - ရှာဖွေရန် - ထည့်ခဲ့သောရက်စွဲအရ - နောက်ဆုံးထွက်အခန်းအရ - နောက်ဆုံးဖတ်ခဲ့သော - အခန်းစုစုပေါင်း - အက္ခရာစဉ်အလိုက် - စစ်ထုတ်မှုဖယ်ရှားရန် - မဖတ်ရသေးသော - ခြေရာခံထားသော - စာညှပ်ထားသော - စစ်ထုတ်သည် - မီနူး - ဆက်တင်များ - ထွက်ရန်နောက်တစ်ကြိမ်ထပ်နှိပ်ပါ - မှတ်တမ်း - ခြေရာခံမှု - အပိုင်းများ - Manga - အမျိုးအစားများမရှိသေးပါ။သင့်စာအုပ်စင်ကို အမျိုးအစားခွဲခြားမှုပြုလုပ်ရန် အပေါင်းခလုပ်ကိုနှိပ်ပါ။ - စာအုပ်စင်မှာဘာမှမရှိပါ။ရှာဖွေခြင်းသို့သွားကာ စာစဉ်များထည့်လိုက်ပါ။ - လတ်တလောဖတ်ထားသည်များမရှိပါ - လတ်တလောအပ်ဒိတ်များမရှိသေးပါ - ဒေါင်းလုဒ်များမရှိပါ - အကူအညီ - ထပ်တိုးအချက်အလက် - ထပ်တိုးများ - ပြောင်းရွှေ့သည် - အရံ - ပင်မနေရာများ - မှတ်တမ်း - အပ်ဒိတ်များ - စာအုပ်စင် - ဆက်တင်များ - နောက်ထပ် - အမည် - စာဖတ်ကိရိယာ - အကြောင်း - ပိုမိုဆက်လက်၍ - ခြေရာခံခြင်း - Download များ - စာကြည့်တိုက် - အထွေထွေ - App မရနိုင်ပါ - လုပ်ဆောင်နေသည်… - ပြန်ရယူမည် - ရှေ့သို့ - နောက်သို့ - Library ကိုအပ်ဒိတ်လုပ်နေပါတယ် - မည်သည့်အပိုင်းမျှမရှိပါ - အသုံးမပြုချိန်တွင်သော့ခတ်မည် - ထုတ်ဝေမှုပြီးစီး - လိုင်စင်လုပ်ပြီး - မသိရှိပါ - Ongoing - နာမည် -ဒေါင်းလုဒ်အစဉ် - \ No newline at end of file diff --git a/i18n/src/main/res/values-nb-rNO/strings.xml b/i18n/src/main/res/values-nb-rNO/strings.xml index 8ff3cd552..fcdd45e8c 100644 --- a/i18n/src/main/res/values-nb-rNO/strings.xml +++ b/i18n/src/main/res/values-nb-rNO/strings.xml @@ -237,7 +237,7 @@ Laster inn sider… Klarte ikke å laste inn sider: %1$s Velg data å inkludere - Migrer + Flytt Kopier Nye kapitler funnet Klarte ikke å oppdatere omslag @@ -276,7 +276,7 @@ Unngå / lysne Brenn / mørkere Resultatløst - Velg en kilde å migrere fra + Velg en kilde å flytte fra Tilbake Fram Gjenoppfrisk @@ -359,7 +359,7 @@ Vis kategorifaner Komfortabelt rutenett - Migrer + Flytt Start Begge loddrett @@ -473,7 +473,7 @@ Forrige side Feillogg Ingen app for filvelging funnet - Veiledning for kildemigrering + Veiledning for kilde-flytting Er du sikker\? All historikk vil gå tapt. Historikken er slettet Slett historikk @@ -635,7 +635,7 @@ Hoppet over Deaktivert Ingen bibliotekoppføringer å sikkerhetskopiere - En ny versjon er tilgjengelig gjennom offisielle kanaler. Trykk for å lære hvordan du kan migrere fra den uoffisielle F-Droid varianten. + En ny versjon er tilgjengelig gjennom offisielle kanaler. Trykk for å lære hvordan du kan flytte over fra den uoffisielle F-Droid varianten. Feil ved lagring av bilde Åpne på GitHub Lukk @@ -736,4 +736,5 @@ Skjul oppføringer som allerede er i biblioteket Kopier til utklippstavle + Oppdater kategori \ No newline at end of file diff --git a/i18n/src/main/res/values-ne/strings.xml b/i18n/src/main/res/values-ne/strings.xml index 196531fbb..2037c36e1 100644 --- a/i18n/src/main/res/values-ne/strings.xml +++ b/i18n/src/main/res/values-ne/strings.xml @@ -69,8 +69,8 @@ अध्याय अनबुकमार्क गर्नुहोस् अध्याय बुकमार्क गर्नुहोस् डाउनलोड - पढिसकेको भनेर अंकित गर्नुहोस् - नपढिएको चिन्ह लगाउनुहोस् + पढिएको भनी अघिल्लोलाई चिनो लगाउनुहोस् + नपढिएको चिनो लगाउनुहोस् पढिसकेको अंकित गर्नुहोस् सबै चयन गर्नु ग्लोबल खोजी @@ -80,7 +80,7 @@ कुल अध्यायहरू वर्णानुक्रम अनुसार फिल्टर हटाउनुहोस् - अपठित + नपढिएको ट्र्याक गरिएको बुकमार्क गरिएको डाउनलोड गरिएको @@ -122,7 +122,7 @@ \"समाप्त\" स्थिति भएको प्रतिबन्धहरु: %s चार्ज हुँदा - स्वचालित अपडेटहरु उपकरण प्रतिबन्धहरू + स्वचालित अपडेटहरु यन्त्र प्रतिबन्धहरू साप्ताहिक प्रत्येक २ दिन दैनिक @@ -222,7 +222,7 @@ ब्यान्डिङ घटाउँछ, तर प्रदर्शनलाई असर गर्छ अन कस्टम चमक - पढिसकेको चिन्ह लगाइएका अध्यायहरू छोड्नुहोस् + पढिएको चिनो लगाइएका अध्यायहरू छोड्नुहोस् नेभिगेसन भोल्युम कुञ्जीहरू ठाडो @@ -577,7 +577,7 @@ फेरी पढ्दै वर्तमान: - कुनै मेल भेटिएन + कुनै मेल फेला परेन कृपया MAL मा फेरि लगइन गर्नुहोस् स्रोत समर्थित छैन सो नाम गरिएको वर्ग पहिले नै अवस्थित छ! @@ -635,7 +635,7 @@ %1$d अपडेट(हरू) छोडियो अक्षम पुस्तकालय अपडेट त्रुटिहरू कसरी समाधान गर्ने भन्ने बारे मद्दतको लागि, %1$s हेर्नुहोस् - अपठित संख्या + नपढिएको संख्या बन्द वर्गहरु, ग्लोबल अपडेट के तपाई \"%s\" वर्ग हटाउन चाहनु हुन्छ\? @@ -654,7 +654,7 @@ अग्लो छविहरू विभाजित गर्नुहोस् (BETA) थुप्रै डुप्लिकेट अध्यायहरू छोड्नुहोस् - \'पढाइ जारी राख्नुहोस्\' बटन देखाउनुहोस् + \'पढ्न जारी राख्नुहोस्\' बटन देखाउनुहोस् तथ्याङ्क सुरु गरेको लोकल @@ -765,4 +765,5 @@ अवैध युजर एजेन्ट स्ट्रिङ %dदि %dघ + वर्ग अपडेट गर्नुहोस् \ No newline at end of file diff --git a/i18n/src/main/res/values-or/strings-aniyomi.xml b/i18n/src/main/res/values-or/strings-aniyomi.xml deleted file mode 100644 index 1972c7cbe..000000000 --- a/i18n/src/main/res/values-or/strings-aniyomi.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - ମାଙ୍ଗା ଦେଖାଅ - ଡିଫଲ୍ଟ ବର୍ଗ - Tachiyomi ପାଇଁ WebView ଆବଶ୍ୟକ ଅଟେ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/i18n/src/main/res/values-or/strings.xml b/i18n/src/main/res/values-or/strings.xml deleted file mode 100644 index 61bf46dbd..000000000 --- a/i18n/src/main/res/values-or/strings.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - ତ୍ରୁଟି - ତାରିଖ - ଗୋପନୀୟତା ନୀତି - କଳା - ଧଳା - ବାମ - ଡାହାଣ - ବାମରୁ ଡାହାଣ - ଡାହାଣରୁ ବାମ - ବାମ - ଡାହାଣ - ସଂସ୍କରଣ - ଲାଇବ୍ରେରୀରେ - କ୍ଲିପବୋର୍ଡରେ କପି କରିନିଆଗଲା: -\n%1$s - ମଲାଟ - ଅଧିକ ଜାଣିବା ପାଇଁ ଟ୍ୟାପ୍ କରନ୍ତୁ - ପ୍ରଗତି - ଇମେଲ୍ ଠିକଣା - ବର୍ଣ୍ଣମାଳା ଅନୁଯାୟୀ - ସବୁଠୁ ନୂଆ - ଆରୋହଣ - ସବୁଠୁ ପୁରୁଣା - ଲାଇବ୍ରେରୀରେ ଯୋଡ଼ନ୍ତୁ - ଅବରୋହଣ - ଲାଇବ୍ରେରୀ - ପାଠକ - - ଗତକାଲି - %1$d ଦିନ ପୂର୍ବେ - - ଆଖ୍ୟା - ସଜାନ୍ତୁ - ନାମ - ଇତିବୃତ୍ତି - ଡିଫଲ୍ଟ - ମାଙ୍ଗା - ସମ୍ପାଦନା - ଯୋଡ଼ନ୍ତୁ - ମଲାଟ ସମ୍ପାଦନା - ଚାଲୁ - ବନ୍ଦ - ଯୋଡ଼ାଯିବା ତାରିଖ - ସବୁ ଚୟନ କରନ୍ତୁ - ଅପରିଚିତ ମୋଡ୍ - ଭାଷା - ମେନୁ - ଶୋଧନ - ବୁକମାର୍କ ହୋଇଅଛି - ଟ୍ରାକ୍ ହୋଇଅଛି - ପଢ଼ି ନାହାଁନ୍ତି - ଶୋଧକ ହଟାନ୍ତୁ - ସର୍ବମୋଟ ମାଙ୍ଗା - ଶେଷ ପଠନ - ଅଣାଯିବା ତାରିଖ - ବିକଶିତ - ଥିମ୍ - ଗାଢ଼ ମୋଡ୍ - ବନ୍ଦ - ଚାଲୁ - ଆପ୍ ଥିମ୍ - ପାସ୍‍ୱାର୍ଡ଼ - ବନ୍ଦ - ରୂପ - ସିଷ୍ଟମ୍ କୁ ଅନୁସରଣ କରିବା - ଆଜି - ପୋର୍ଟ୍ରେଟ୍ - ଲ୍ୟାଣ୍ଡସ୍କେପ୍ - ପ୍ରତି ୨ ଦିନରେ - ଆପ୍ ସୂଚନା - ସ୍କ୍ରିନ୍ ସଚଳ ରଖନ୍ତୁ - ପ୍ରତି ୬ ଘଣ୍ଟାରେ - ପ୍ରତି ୧୨ ଘଣ୍ଟାରେ - ପ୍ରତି ୩ ଦିନରେ - WebViewରେ ଖୋଲନ୍ତୁ - ଉଭୟ - Kindle ଭଳିଆ - ଇନଷ୍ଟଲ୍ କରିବା - ଲାଇବ୍ରେରୀ - ସହାୟତା - ଇତିବୃତ୍ତି - ଆପ୍ ଉପଲବ୍ଧ ନାହିଁ - ଇନଷ୍ଟଲ୍ କରିବା - ଅନଇନଷ୍ଟଲ୍ କରିବା - କଡ଼ - ୫% - ୧୦% - ୧୫% - ୨୦% - ୨୫% - - %2$sଟିଏ ତ୍ରୁଟି ସହ %1$sରେ କରାଗଲା - %2$sଟି ତ୍ରୁଟି ସହିତ %1$sରେ କରାଗଲା - - ସେବା - %02d ମି, %02d ସେ - ଲାଇବ୍ରେରୀରେ ଯୋଡ଼ାଗଲା - ଡାଉନଲୋଡ୍ ହେଉଛି (%1$d/%2$d) - ପଢ଼ି ନାହାଁନ୍ତି - ପଢ଼ୁଛନ୍ତି - ସାରିଛନ୍ତି - ଆପଣଙ୍କ ଲାଇବ୍ରେରୀ ଖାଲି ଅଛି - ଡାଉନଲୋଡ୍ ହେଉଛି… - ନୂଆ ସଂସ୍କରଣ ଉପଲବ୍ଧ! - ମଲାଟର ପ୍ରତିଛବି ଚୟନ କରନ୍ତୁ - ଆରମ୍ଭ ତାରିଖ - ସ୍ଥିତି - ପୂର୍ବବର୍ତ୍ତୀ: - ଚିତ୍ର ସଞ୍ଚୟ କରିବାରେ ତ୍ରୁଟି - ସ୍ଥିତି - ପ୍ରକାର - ମଲାଟ ଅପଡେଟ୍ କରିବାରେ ବିଫଳ ହେଲା - ମଲାଟ ସଞ୍ଚୟ କରାଗଲା - ମଲାଟ ସଞ୍ଚୟ କରିବାରେ ତ୍ରୁଟି - ସାରିବା ତାରିଖ - ପଢ଼ିବା ପାଇଁ ଇଚ୍ଛୁକ - ବିରତ ହୋଇଅଛି - ଧରି ରଖିଛନ୍ତି - ଚିତ୍ର ସଞ୍ଚୟ କରାଗଲା - ଏଇ ନା‍ଁରେ ଆଗରୁ ଗୋଟିଏ ବର୍ଗ ବିଦ୍ୟମାନ ଅଛି! - ପୁଣି ପଢ଼ୁଛନ୍ତି - ବର୍ଗ ଯୋଡ଼ନ୍ତୁ - ପରବର୍ତ୍ତୀ: - ସାରିଲେ: - ଚଳିତ: - ପଠନ ମୋଡ୍ - %1$s: %2$s, ପୃଷ୍ଠା %3$d - ପୃଷ୍ଠା: %1$d - ଲାଇବ୍ରେରୀ ଅପଡେଟ୍ କଲାବେଳେ ନୂଆ ମଲାଟ ଏବଂ ବିବରଣୀ ପରଖନ୍ତୁ - ଲାଇବ୍ରେରୀରେ ଥିବା ମାଙ୍ଗାଗୁଡ଼ିକର ମଲାଟ ସତେଜ କରନ୍ତୁ - ଛାଡ଼ିଦେଇଛନ୍ତି - ମଲାଟ ଅପଡେଟ୍ କରାଗଲା - ଏଇ ପ୍ରତିଛବିଟିକୁ ମଲାଟ ଚିତ୍ରକଳା ଭାବରେ ବ୍ୟବହାର କରିବେ କି\? - ଲାଇବ୍ରେରୀ ଅଦ୍ୟତନ ହେଉଛି… (%1$d/%2$d) - ବର୍ଗ ଟ୍ୟାବଗୁଡ଼ିକ ଦେଖାଅ - ସାଧାରଣ - ବର୍ଗର ନାମ ବଦଳାନ୍ତୁ - ଅପଲୋଡ୍ ତାରିଖ ଅନୁଯାୟୀ - ପୂର୍ବବତ୍ - ବିବରଣୀ ଦେଖିବା ପାଇଁ ଟ୍ୟାପ୍ କରନ୍ତୁ - \ No newline at end of file diff --git a/i18n/src/main/res/values-pt-rBR/strings.xml b/i18n/src/main/res/values-pt-rBR/strings.xml index 878523eca..5eaa0908f 100644 --- a/i18n/src/main/res/values-pt-rBR/strings.xml +++ b/i18n/src/main/res/values-pt-rBR/strings.xml @@ -750,4 +750,5 @@ Ocultar títulos que já estão na biblioteca Copiar para a área de transferência + Atualizar categoria \ No newline at end of file diff --git a/i18n/src/main/res/values-pt/strings.xml b/i18n/src/main/res/values-pt/strings.xml index a935e46bf..4a377494b 100644 --- a/i18n/src/main/res/values-pt/strings.xml +++ b/i18n/src/main/res/values-pt/strings.xml @@ -800,4 +800,5 @@ Próximos %d capítulos Próximos %d capítulos + Atualizar categoria \ No newline at end of file diff --git a/i18n/src/main/res/values-ru/strings.xml b/i18n/src/main/res/values-ru/strings.xml index a72da32d6..424eb2a71 100644 --- a/i18n/src/main/res/values-ru/strings.xml +++ b/i18n/src/main/res/values-ru/strings.xml @@ -764,4 +764,5 @@ Скрывать серии, уже находящиеся в библиотеке Копировать в буфер обмена + Обновить категорию \ No newline at end of file diff --git a/i18n/src/main/res/values-si/strings-aniyomi.xml b/i18n/src/main/res/values-si/strings-aniyomi.xml deleted file mode 100644 index e8ad2bc8c..000000000 --- a/i18n/src/main/res/values-si/strings-aniyomi.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - විවිධ වර්ග - Tachiyomi විවෘත කරන්න - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/i18n/src/main/res/values-si/strings.xml b/i18n/src/main/res/values-si/strings.xml deleted file mode 100644 index 6acfef090..000000000 --- a/i18n/src/main/res/values-si/strings.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - මංගා (Manga) - සැකසුම් - පුස්තකාලය - යාවත්කාලීන කිරීම් - ඉතිහාසය - ගබඩා කිරීම සහ නැවත ස්ථාපිත කිරීම - කියවීමට බාගත කරන්න - පරිච්ඡේද - ලුහුබැඳීම - ඉතිහාසය - මූලාශ්ර - උදව් - පෙරනිමිය - අවවාදයයි - පිටවීමට එකවර දෙවරක් ඔබන්න - සැකසුම් - මෙනු (Menu) - පෙරනය - මෑත යාවත්කාලීන කරනැත - ඔබට categories නොමැත. පුස්තකාලය සංවිධානය කිරීම සඳහා categories සෑදීමට ප්ලස් බොත්තම ඔබන්න. - නම - තව - ඔබේ පුස්තකාලය හිස්ය - වෙනත් විකල්පයක් සමග ඒකාබද්ධ කරන්න - කියවීමට බාගත කරන වැඩි විස්තර - බාගැනීම් නැත - මෑතකදී කිසිවක් කියවා නැත - වෙනස් කිරීම සඳහ තහවුරු කරන්න - පිටු සලකුණු කර ඇත - ලුහුබැඳ ගියේය(Tracked) - නොකියවූ - අකාරාදී පිළිවෙලට (Alphabetically) - සම්පූර්ණ මංගා - අන්තිමට කියෙව්වා - ලබා ගත් දිනය - Add කළ දිනය - සෙවීම - සම්පූර්ණ පරිච්ඡේද - ෆිල්ටඑක ඉවත් කරන්න - නවතම පරිච්ඡේදය - ප්රතිලෝම තෝරන්න - කියවූ බවට සලකුණු කරන්න - නොකියවූ ලෙස ලකුණු කරන්න - පෙර කියවූ ලෙස සලකුණු කරන්න - බාගත - පිටු සලකුණු පරිච්ඡේදය ඉවත් කරන්න - මකන්න - සියල්ල සබල කරන්න(Enable all) - සංස්කරණය කරන්න - කාණ්ඩ සංස්කරණය කරන්න - ප්‍රවර්ගය නැවත නම් කරන්න(Rename category) - පෙර පරිච්ඡේදය - ආරම්භ කරන්න - ගෝලීය සෙවීම - පුස්තකාලය යාවත්කාලීන කරන්න(Update library) - සියල්ල අක්‍රිය කරන්න - එකතු කරන්න - ප්රවර්ගය එකතු කරන්න(Add category) - කාණ්ඩ සකසන්න - කවරය සංස්කරණය කරන්න - ඉවත් කරන්න - සෙවුම් සැකසුම් - සියල්ල තෝරන්න - පිටු සලකුණු පරිච්ඡේදය - නවත්වන්න - පරිච්ඡේද බලන්න - ඊළඟ පරිච්ඡේදය - දැනට නවත්වන්න - නැවත උත්සාහ කරන්න -බාගත පෝලිම - \ No newline at end of file diff --git a/i18n/src/main/res/values-ta/strings-aniyomi.xml b/i18n/src/main/res/values-ta/strings-aniyomi.xml deleted file mode 100644 index e897d5b0e..000000000 --- a/i18n/src/main/res/values-ta/strings-aniyomi.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - பிரிவுகள் - \"டக்கியோமியை\" திறக்கவும் - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/i18n/src/main/res/values-ta/strings.xml b/i18n/src/main/res/values-ta/strings.xml deleted file mode 100644 index ef5f57161..000000000 --- a/i18n/src/main/res/values-ta/strings.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - அமைப்புகள் - பெயர் - இடம்பெயர்ப்பு - பதிவிறக்கங்கள் இல்லை - மேலும் - நூலகம் - மேம்படுத்தல்கள் - வரலாறு - மூலங்கள் - காப்பு மற்றும் மீட்பு - புதுப்பிப்புகள் இல்லை - சமீபத்தில் எதுவும் படிக்கவில்லை - உங்களிடம் பிரிவுகள் இல்லை. உங்கள் நூலகத்தை ஒழுங்கமைக்க பிளஸ் பட்டனைத் தட்டவும். - இதர மூலங்கள் - இதர மூலங்களின் விவரம் - உதவி - உங்கள் நூலகம் காலியாக உள்ளது - மாங்கா புத்தகங்கள் - அலகுகள் - இயல்புநிலை - எச்சரிக்கை - அமைப்புகள் - கண்காணிப்பு - பட்டியல் - சமீப அலகுகள் - சேர்க்கப்பட்ட தேதி - தேடுதல் - மொத்த தேடுதல் - வரலாறு - நூலகத்தைப் புதுப்பிக்கவும் - பிரிவை சேர்க்கவும் - சேர்த்தல் - பிரிவை கையாளவும் - பிரிவின் பெயரை மாற்றவும் - அலகுகளை பார்க்கவும் - முகப்பு மாற்றவும் - மாற்றத்தை உறுதிப்படுத்த அங்கீகரிக்கவும் - கண்காணிக்கப் பட்டவை - வெளியேற \"எக்ஸிட்\" பட்டனை மீண்டும் அழுத்தவும் - படிக்காதவை - மொத்த மாங்கா புத்தகங்கள் - வடிகட்டுதல் - குறிப்பிடப் பட்டவை - வடிகட்டுதலை நீக்கவும் - எழுத்து வரிசையில் - மொத்த அலகுகள் - சமீபத்தில் படித்தவை - அத்தியாயம் எடுக்கப்பட்ட தேதி - அனைத்தையும் தேர்வு செய் - தேடுதல் அமைப்புகள் - அலகை குறிக்காதே - தேர்வை பின்படுத்து - பிடித்ததாக குறித்து வை - படிக்காததாக குறித்து வை - சம்பத்தை பிடித்ததாக குறித்து வை - பதிவிறக்கம் - அலகை குறித்து வை - அனைத்தையும் இயக்கு - அனைத்தையும் இயக்காதே - அழிக்கவும் - மாற்று - பிரிவுகளாக செய்யவும் - வகையை நீக்கு -பதிவிறக்க வரிசை - \ No newline at end of file diff --git a/i18n/src/main/res/values-ti/strings-aniyomi.xml b/i18n/src/main/res/values-ti/strings-aniyomi.xml deleted file mode 100644 index 6058a5278..000000000 --- a/i18n/src/main/res/values-ti/strings-aniyomi.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - ምድባት - ታቺዮሚ ን ይክፈቱ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/i18n/src/main/res/values-ti/strings.xml b/i18n/src/main/res/values-ti/strings.xml deleted file mode 100644 index 61b8cc30d..000000000 --- a/i18n/src/main/res/values-ti/strings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - ኣብ ቀረባ ግዘ ኣየንበቡን - ዝሕደሱ የለዉን - ዝወርድ የለን - ንምውፃእ ደጊምኻ ተመለስ መልጎም ንኻእ - ዘይተነበበ - ተኸታቲሉ - ተቐሚጡ - ሚሐ - መምረፅ - ስንድኦት - ሓገዝ - ተወሰኽቲ ሓበሬታ - ተወሰኽቲ - ቅብብል - መሐለውታን መመለሲን - ፍልፍላት - መዝገብ - መዝገብ - ምምሕያሽ - ቤተ ንባብ - ስንድኦት - ተወሳኺ - ምክትታል - ምዕራፋት - ማንጋ - ስም - አለሻ ስንድኦት - አለሻ - ዝተመዝገበሉ መዓልቲ - መዓልቲ ተሓዲሱ - እዋናዊ ምዕራፍ - ንመወዳእታ ግዜ ዝተነበበ - ብዝሒ ምዕራፍ - ብፊደል - መጻረዪ ኣወግድ -ምውራድ ሰልፊ - \ No newline at end of file diff --git a/i18n/src/main/res/values-tr/strings.xml b/i18n/src/main/res/values-tr/strings.xml index 2097b4150..8d92ab9e4 100644 --- a/i18n/src/main/res/values-tr/strings.xml +++ b/i18n/src/main/res/values-tr/strings.xml @@ -737,4 +737,5 @@ Sonraki %d bölüm Panoya kopyala + Kategoriyi güncelle \ No newline at end of file diff --git a/i18n/src/main/res/values-uk/strings.xml b/i18n/src/main/res/values-uk/strings.xml index 3a74a3456..9a86f8e4c 100644 --- a/i18n/src/main/res/values-uk/strings.xml +++ b/i18n/src/main/res/values-uk/strings.xml @@ -759,4 +759,5 @@ Наступних %d розділів Наступних %d розділів + Оновити категорію \ No newline at end of file diff --git a/i18n/src/main/res/values-ur-rPK/strings-aniyomi.xml b/i18n/src/main/res/values-ur-rPK/strings-aniyomi.xml deleted file mode 100644 index cdfc2807a..000000000 --- a/i18n/src/main/res/values-ur-rPK/strings-aniyomi.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - زمرہ جات - انلاک تاچییومی - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/i18n/src/main/res/values-ur-rPK/strings.xml b/i18n/src/main/res/values-ur-rPK/strings.xml deleted file mode 100644 index ce5549212..000000000 --- a/i18n/src/main/res/values-ur-rPK/strings.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - نام - مانگا - ابواب - ٹریکنگ - ہسٹری - مزید - ترتیبات - لائبریری - اپڈیٹس - ہسٹری - بیک اپ - ماخذ منتقلی - ایکسٹینشنز - توسیع کی معلومات - مدد - ترتیبات - فلٹر - بُک مارک شدہ - پڑھا نہیں گیا - فلٹر ہٹائیں - حروف تہجی کے لحاظ سے - کل ابواب - آخری بار پڑھا گیا - تازہ ترین باب - تلاش - عالمی تلاش - تمام منتخب کریں - بطور پڑھ چکا نشان زد کریں - بطور پڑھ نہیں چکا نشان زد کریں - پچھلا بطور پڑھ چکا نشان زد کریں - ڈاؤنلوڈ کریں - بُک مارک کریں - بُک مارک ہٹائیں - حذف کریں - لائبریری اپ ڈیٹ کریں - شامل کریں - ذرائع - کم معلومات دکھائیں - مزید معلومات دکھائیں - لائبریری میں شامل - لائبریری سے ہٹائیں - لائبریری میں - پچھلا: - اگلا: -قطارِ ڈاؤنلوڈ - \ No newline at end of file diff --git a/i18n/src/main/res/values-ur/strings-aniyomi.xml b/i18n/src/main/res/values-ur/strings-aniyomi.xml deleted file mode 100644 index dd0192d73..000000000 --- a/i18n/src/main/res/values-ur/strings-aniyomi.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - مانگا دکھائیں - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/i18n/src/main/res/values-ur/strings.xml b/i18n/src/main/res/values-ur/strings.xml deleted file mode 100644 index c67c290cf..000000000 --- a/i18n/src/main/res/values-ur/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - سفید - شروعات - سیاہ - نام - کل مانگا - بائیں سے دائیں - دائیں سے بائیں - دائیں - بائیں - کل ابواب - ڈاؤن لوڈ - از سر نو شروع کریں - WebView میں کھولیں - انتقال - فہرست - براؤزر میں کھولیں - ڈاؤن لوڈ شدہ ابواب - \ No newline at end of file diff --git a/i18n/src/main/res/values-zh-rCN/strings.xml b/i18n/src/main/res/values-zh-rCN/strings.xml index 9cfef0351..d16e6f0e5 100644 --- a/i18n/src/main/res/values-zh-rCN/strings.xml +++ b/i18n/src/main/res/values-zh-rCN/strings.xml @@ -720,4 +720,5 @@ 隐藏已添加到书架的作品 复制到剪贴板 + 更新分类 \ No newline at end of file diff --git a/i18n/src/main/res/values-zh-rTW/strings.xml b/i18n/src/main/res/values-zh-rTW/strings.xml index 7cea73b70..15e9bc084 100644 --- a/i18n/src/main/res/values-zh-rTW/strings.xml +++ b/i18n/src/main/res/values-zh-rTW/strings.xml @@ -722,4 +722,5 @@ 後續 %d 章 + 更新類別 \ No newline at end of file