diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 486358cfd..9176b6bca 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -290,7 +290,6 @@ androidComponents { } tasks { - withType().configureEach { exclude { it.file.path.contains("generated[\\\\/]".toRegex()) } } diff --git a/app/src/main/java/eu/kanade/domain/DomainModule.kt b/app/src/main/java/eu/kanade/domain/DomainModule.kt index 1f1750103..f01281ea2 100644 --- a/app/src/main/java/eu/kanade/domain/DomainModule.kt +++ b/app/src/main/java/eu/kanade/domain/DomainModule.kt @@ -3,43 +3,17 @@ 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.DeleteAnimeCategory -import eu.kanade.domain.category.anime.interactor.RenameAnimeCategory -import eu.kanade.domain.category.anime.interactor.ReorderAnimeCategory import eu.kanade.domain.category.anime.interactor.ResetAnimeCategoryFlags -import eu.kanade.domain.category.anime.interactor.SetAnimeCategories import eu.kanade.domain.category.anime.interactor.SetDisplayModeForAnimeCategory import eu.kanade.domain.category.anime.interactor.SetSortModeForAnimeCategory -import eu.kanade.domain.category.anime.interactor.UpdateAnimeCategory import eu.kanade.domain.category.manga.interactor.CreateMangaCategoryWithName -import eu.kanade.domain.category.manga.interactor.DeleteMangaCategory -import eu.kanade.domain.category.manga.interactor.RenameMangaCategory -import eu.kanade.domain.category.manga.interactor.ReorderMangaCategory import eu.kanade.domain.category.manga.interactor.ResetMangaCategoryFlags import eu.kanade.domain.category.manga.interactor.SetDisplayModeForMangaCategory -import eu.kanade.domain.category.manga.interactor.SetMangaCategories import eu.kanade.domain.category.manga.interactor.SetSortModeForMangaCategory -import eu.kanade.domain.category.manga.interactor.UpdateMangaCategory import eu.kanade.domain.download.anime.interactor.DeleteAnimeDownload import eu.kanade.domain.download.manga.interactor.DeleteChapterDownload -import eu.kanade.domain.entries.anime.interactor.GetAnime -import eu.kanade.domain.entries.anime.interactor.GetAnimeFavorites -import eu.kanade.domain.entries.anime.interactor.GetAnimeWithEpisodes -import eu.kanade.domain.entries.anime.interactor.GetDuplicateLibraryAnime -import eu.kanade.domain.entries.anime.interactor.GetLibraryAnime -import eu.kanade.domain.entries.anime.interactor.NetworkToLocalAnime -import eu.kanade.domain.entries.anime.interactor.ResetAnimeViewerFlags -import eu.kanade.domain.entries.anime.interactor.SetAnimeEpisodeFlags import eu.kanade.domain.entries.anime.interactor.SetAnimeViewerFlags import eu.kanade.domain.entries.anime.interactor.UpdateAnime -import eu.kanade.domain.entries.manga.interactor.GetDuplicateLibraryManga -import eu.kanade.domain.entries.manga.interactor.GetLibraryManga -import eu.kanade.domain.entries.manga.interactor.GetManga -import eu.kanade.domain.entries.manga.interactor.GetMangaFavorites -import eu.kanade.domain.entries.manga.interactor.GetMangaWithChapters -import eu.kanade.domain.entries.manga.interactor.NetworkToLocalManga -import eu.kanade.domain.entries.manga.interactor.ResetMangaViewerFlags -import eu.kanade.domain.entries.manga.interactor.SetMangaChapterFlags import eu.kanade.domain.entries.manga.interactor.SetMangaViewerFlags import eu.kanade.domain.entries.manga.interactor.UpdateManga import eu.kanade.domain.extension.anime.interactor.GetAnimeExtensionLanguages @@ -53,14 +27,10 @@ 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.chapter.interactor.UpdateChapter -import eu.kanade.domain.items.episode.interactor.GetEpisode -import eu.kanade.domain.items.episode.interactor.GetEpisodeByAnimeId 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.items.episode.interactor.UpdateEpisode import eu.kanade.domain.source.anime.interactor.GetAnimeSourcesWithFavoriteCount import eu.kanade.domain.source.anime.interactor.GetAnimeSourcesWithNonLibraryAnime import eu.kanade.domain.source.anime.interactor.GetEnabledAnimeSources @@ -79,14 +49,6 @@ 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 eu.kanade.domain.track.anime.interactor.DeleteAnimeTrack -import eu.kanade.domain.track.anime.interactor.GetAnimeTracks -import eu.kanade.domain.track.anime.interactor.GetTracksPerAnime -import eu.kanade.domain.track.anime.interactor.InsertAnimeTrack -import eu.kanade.domain.track.manga.interactor.DeleteMangaTrack -import eu.kanade.domain.track.manga.interactor.GetMangaTracks -import eu.kanade.domain.track.manga.interactor.GetTracksPerManga -import eu.kanade.domain.track.manga.interactor.InsertMangaTrack import tachiyomi.data.category.anime.AnimeCategoryRepositoryImpl import tachiyomi.data.category.manga.MangaCategoryRepositoryImpl import tachiyomi.data.entries.anime.AnimeRepositoryImpl @@ -101,11 +63,37 @@ 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.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.SetAnimeCategories +import tachiyomi.domain.category.anime.interactor.UpdateAnimeCategory import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository +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.SetMangaCategories +import tachiyomi.domain.category.manga.interactor.UpdateMangaCategory import tachiyomi.domain.category.manga.repository.MangaCategoryRepository +import tachiyomi.domain.entries.anime.interactor.GetAnime +import tachiyomi.domain.entries.anime.interactor.GetAnimeFavorites +import tachiyomi.domain.entries.anime.interactor.GetAnimeWithEpisodes +import tachiyomi.domain.entries.anime.interactor.GetDuplicateLibraryAnime +import tachiyomi.domain.entries.anime.interactor.GetLibraryAnime +import tachiyomi.domain.entries.anime.interactor.NetworkToLocalAnime +import tachiyomi.domain.entries.anime.interactor.ResetAnimeViewerFlags +import tachiyomi.domain.entries.anime.interactor.SetAnimeEpisodeFlags import tachiyomi.domain.entries.anime.repository.AnimeRepository +import tachiyomi.domain.entries.manga.interactor.GetDuplicateLibraryManga +import tachiyomi.domain.entries.manga.interactor.GetLibraryManga +import tachiyomi.domain.entries.manga.interactor.GetManga +import tachiyomi.domain.entries.manga.interactor.GetMangaFavorites +import tachiyomi.domain.entries.manga.interactor.GetMangaWithChapters +import tachiyomi.domain.entries.manga.interactor.NetworkToLocalManga +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.RemoveAnimeHistory @@ -116,13 +104,27 @@ 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.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.ShouldUpdateDbEpisode +import tachiyomi.domain.items.episode.interactor.UpdateEpisode import tachiyomi.domain.items.episode.repository.EpisodeRepository import tachiyomi.domain.source.anime.repository.AnimeSourceDataRepository import tachiyomi.domain.source.manga.repository.MangaSourceDataRepository +import tachiyomi.domain.track.anime.interactor.DeleteAnimeTrack +import tachiyomi.domain.track.anime.interactor.GetAnimeTracks +import tachiyomi.domain.track.anime.interactor.GetTracksPerAnime +import tachiyomi.domain.track.anime.interactor.InsertAnimeTrack import tachiyomi.domain.track.anime.repository.AnimeTrackRepository +import tachiyomi.domain.track.manga.interactor.DeleteMangaTrack +import tachiyomi.domain.track.manga.interactor.GetMangaTracks +import tachiyomi.domain.track.manga.interactor.GetTracksPerManga +import tachiyomi.domain.track.manga.interactor.InsertMangaTrack import tachiyomi.domain.track.manga.repository.MangaTrackRepository import tachiyomi.domain.updates.anime.interactor.GetAnimeUpdates import tachiyomi.domain.updates.anime.repository.AnimeUpdatesRepository @@ -217,8 +219,8 @@ class DomainModule : InjektModule { addFactory { SyncEpisodesWithTrackServiceTwoWay(get(), get()) } addSingletonFactory { ChapterRepositoryImpl(get()) } - addFactory { eu.kanade.domain.items.chapter.interactor.GetChapter(get()) } - addFactory { eu.kanade.domain.items.chapter.interactor.GetChapterByMangaId(get()) } + addFactory { GetChapter(get()) } + addFactory { GetChapterByMangaId(get()) } addFactory { UpdateChapter(get()) } addFactory { SetReadStatus(get(), get(), get(), get()) } addFactory { ShouldUpdateDbChapter() } diff --git a/app/src/main/java/eu/kanade/domain/history/anime/interactor/GetNextEpisodes.kt b/app/src/main/java/eu/kanade/domain/history/anime/interactor/GetNextEpisodes.kt index bfcbdacc3..82f9f2f23 100644 --- a/app/src/main/java/eu/kanade/domain/history/anime/interactor/GetNextEpisodes.kt +++ b/app/src/main/java/eu/kanade/domain/history/anime/interactor/GetNextEpisodes.kt @@ -1,10 +1,10 @@ package eu.kanade.domain.history.anime.interactor -import eu.kanade.domain.entries.anime.interactor.GetAnime -import eu.kanade.domain.items.episode.interactor.GetEpisodeByAnimeId -import eu.kanade.tachiyomi.util.episode.getEpisodeSort +import tachiyomi.domain.entries.anime.interactor.GetAnime import tachiyomi.domain.history.anime.repository.AnimeHistoryRepository +import tachiyomi.domain.items.episode.interactor.GetEpisodeByAnimeId import tachiyomi.domain.items.episode.model.Episode +import tachiyomi.domain.items.episode.service.getEpisodeSort import kotlin.math.max class GetNextEpisodes( diff --git a/app/src/main/java/eu/kanade/domain/history/manga/interactor/GetNextChapters.kt b/app/src/main/java/eu/kanade/domain/history/manga/interactor/GetNextChapters.kt index 27fe5506c..343a63a45 100644 --- a/app/src/main/java/eu/kanade/domain/history/manga/interactor/GetNextChapters.kt +++ b/app/src/main/java/eu/kanade/domain/history/manga/interactor/GetNextChapters.kt @@ -1,10 +1,10 @@ package eu.kanade.domain.history.manga.interactor -import eu.kanade.domain.entries.manga.interactor.GetManga -import eu.kanade.domain.items.chapter.interactor.GetChapterByMangaId -import eu.kanade.tachiyomi.util.chapter.getChapterSort +import tachiyomi.domain.entries.manga.interactor.GetManga import tachiyomi.domain.history.manga.repository.MangaHistoryRepository +import tachiyomi.domain.items.chapter.interactor.GetChapterByMangaId import tachiyomi.domain.items.chapter.model.Chapter +import tachiyomi.domain.items.chapter.service.getChapterSort import kotlin.math.max class GetNextChapters( diff --git a/app/src/main/java/eu/kanade/domain/items/chapter/interactor/SetDefaultChapterSettings.kt b/app/src/main/java/eu/kanade/domain/items/chapter/interactor/SetDefaultChapterSettings.kt index a796e69fc..6be016736 100644 --- a/app/src/main/java/eu/kanade/domain/items/chapter/interactor/SetDefaultChapterSettings.kt +++ b/app/src/main/java/eu/kanade/domain/items/chapter/interactor/SetDefaultChapterSettings.kt @@ -1,9 +1,9 @@ package eu.kanade.domain.items.chapter.interactor -import eu.kanade.domain.entries.manga.interactor.GetMangaFavorites -import eu.kanade.domain.entries.manga.interactor.SetMangaChapterFlags 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 class SetMangaDefaultChapterFlags( diff --git a/app/src/main/java/eu/kanade/domain/items/chapter/interactor/SyncChaptersWithSource.kt b/app/src/main/java/eu/kanade/domain/items/chapter/interactor/SyncChaptersWithSource.kt index 2abeb4dec..b7cdef7a7 100644 --- a/app/src/main/java/eu/kanade/domain/items/chapter/interactor/SyncChaptersWithSource.kt +++ b/app/src/main/java/eu/kanade/domain/items/chapter/interactor/SyncChaptersWithSource.kt @@ -10,14 +10,16 @@ import eu.kanade.tachiyomi.source.MangaSource import eu.kanade.tachiyomi.source.manga.isLocal import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.online.HttpSource -import eu.kanade.tachiyomi.util.chapter.ChapterRecognition import tachiyomi.data.items.chapter.ChapterSanitizer import tachiyomi.domain.entries.manga.model.Manga +import tachiyomi.domain.items.chapter.interactor.GetChapterByMangaId import tachiyomi.domain.items.chapter.interactor.ShouldUpdateDbChapter +import tachiyomi.domain.items.chapter.interactor.UpdateChapter import tachiyomi.domain.items.chapter.model.Chapter import tachiyomi.domain.items.chapter.model.NoChaptersException import tachiyomi.domain.items.chapter.model.toChapterUpdate import tachiyomi.domain.items.chapter.repository.ChapterRepository +import tachiyomi.domain.items.chapter.service.ChapterRecognition import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.lang.Long.max diff --git a/app/src/main/java/eu/kanade/domain/items/chapter/interactor/SyncChaptersWithTrackServiceTwoWay.kt b/app/src/main/java/eu/kanade/domain/items/chapter/interactor/SyncChaptersWithTrackServiceTwoWay.kt index 78b3a9e95..b0c6c2b07 100644 --- a/app/src/main/java/eu/kanade/domain/items/chapter/interactor/SyncChaptersWithTrackServiceTwoWay.kt +++ b/app/src/main/java/eu/kanade/domain/items/chapter/interactor/SyncChaptersWithTrackServiceTwoWay.kt @@ -1,12 +1,13 @@ package eu.kanade.domain.items.chapter.interactor -import eu.kanade.domain.track.manga.interactor.InsertMangaTrack import eu.kanade.domain.track.manga.model.toDbTrack import eu.kanade.tachiyomi.data.track.MangaTrackService import logcat.LogPriority import tachiyomi.core.util.system.logcat +import tachiyomi.domain.items.chapter.interactor.UpdateChapter import tachiyomi.domain.items.chapter.model.Chapter import tachiyomi.domain.items.chapter.model.toChapterUpdate +import tachiyomi.domain.track.manga.interactor.InsertMangaTrack import tachiyomi.domain.track.manga.model.MangaTrack import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/domain/items/chapter/model/ChapterFilter.kt b/app/src/main/java/eu/kanade/domain/items/chapter/model/ChapterFilter.kt index 7965874ac..14478295a 100644 --- a/app/src/main/java/eu/kanade/domain/items/chapter/model/ChapterFilter.kt +++ b/app/src/main/java/eu/kanade/domain/items/chapter/model/ChapterFilter.kt @@ -5,10 +5,10 @@ import eu.kanade.domain.entries.manga.model.isLocal import eu.kanade.tachiyomi.data.download.manga.MangaDownloadManager import eu.kanade.tachiyomi.data.download.manga.model.MangaDownload import eu.kanade.tachiyomi.ui.entries.manga.ChapterItem -import eu.kanade.tachiyomi.util.chapter.getChapterSort import tachiyomi.domain.entries.TriStateFilter import tachiyomi.domain.entries.manga.model.Manga import tachiyomi.domain.items.chapter.model.Chapter +import tachiyomi.domain.items.chapter.service.getChapterSort /** * Applies the view filters to the list of chapters obtained from the database. diff --git a/app/src/main/java/eu/kanade/domain/items/episode/interactor/SetDefaultEpisodeSettings.kt b/app/src/main/java/eu/kanade/domain/items/episode/interactor/SetDefaultEpisodeSettings.kt index c2821e880..cda5baf1e 100644 --- a/app/src/main/java/eu/kanade/domain/items/episode/interactor/SetDefaultEpisodeSettings.kt +++ b/app/src/main/java/eu/kanade/domain/items/episode/interactor/SetDefaultEpisodeSettings.kt @@ -1,9 +1,9 @@ package eu.kanade.domain.items.episode.interactor -import eu.kanade.domain.entries.anime.interactor.GetAnimeFavorites -import eu.kanade.domain.entries.anime.interactor.SetAnimeEpisodeFlags 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 class SetAnimeDefaultEpisodeFlags( diff --git a/app/src/main/java/eu/kanade/domain/items/episode/interactor/SyncEpisodesWithSource.kt b/app/src/main/java/eu/kanade/domain/items/episode/interactor/SyncEpisodesWithSource.kt index dd188b276..e415c7937 100644 --- a/app/src/main/java/eu/kanade/domain/items/episode/interactor/SyncEpisodesWithSource.kt +++ b/app/src/main/java/eu/kanade/domain/items/episode/interactor/SyncEpisodesWithSource.kt @@ -10,14 +10,16 @@ import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource import eu.kanade.tachiyomi.data.download.anime.AnimeDownloadManager import eu.kanade.tachiyomi.data.download.anime.AnimeDownloadProvider import eu.kanade.tachiyomi.source.anime.isLocal -import eu.kanade.tachiyomi.util.episode.EpisodeRecognition import tachiyomi.data.items.episode.EpisodeSanitizer import tachiyomi.domain.entries.anime.model.Anime +import tachiyomi.domain.items.episode.interactor.GetEpisodeByAnimeId import tachiyomi.domain.items.episode.interactor.ShouldUpdateDbEpisode +import tachiyomi.domain.items.episode.interactor.UpdateEpisode import tachiyomi.domain.items.episode.model.Episode import tachiyomi.domain.items.episode.model.NoEpisodesException import tachiyomi.domain.items.episode.model.toEpisodeUpdate import tachiyomi.domain.items.episode.repository.EpisodeRepository +import tachiyomi.domain.items.episode.service.EpisodeRecognition import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.lang.Long.max diff --git a/app/src/main/java/eu/kanade/domain/items/episode/interactor/SyncEpisodesWithTrackServiceTwoWay.kt b/app/src/main/java/eu/kanade/domain/items/episode/interactor/SyncEpisodesWithTrackServiceTwoWay.kt index d64fa273e..2b5151dfc 100644 --- a/app/src/main/java/eu/kanade/domain/items/episode/interactor/SyncEpisodesWithTrackServiceTwoWay.kt +++ b/app/src/main/java/eu/kanade/domain/items/episode/interactor/SyncEpisodesWithTrackServiceTwoWay.kt @@ -1,12 +1,13 @@ package eu.kanade.domain.items.episode.interactor -import eu.kanade.domain.track.anime.interactor.InsertAnimeTrack import eu.kanade.domain.track.anime.model.toDbTrack import eu.kanade.tachiyomi.data.track.AnimeTrackService import logcat.LogPriority import tachiyomi.core.util.system.logcat +import tachiyomi.domain.items.episode.interactor.UpdateEpisode import tachiyomi.domain.items.episode.model.Episode import tachiyomi.domain.items.episode.model.toEpisodeUpdate +import tachiyomi.domain.track.anime.interactor.InsertAnimeTrack import tachiyomi.domain.track.anime.model.AnimeTrack import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/domain/items/episode/model/EpisodeFilter.kt b/app/src/main/java/eu/kanade/domain/items/episode/model/EpisodeFilter.kt index 41d4e9007..4795365b8 100644 --- a/app/src/main/java/eu/kanade/domain/items/episode/model/EpisodeFilter.kt +++ b/app/src/main/java/eu/kanade/domain/items/episode/model/EpisodeFilter.kt @@ -5,10 +5,10 @@ import eu.kanade.domain.entries.anime.model.isLocal import eu.kanade.tachiyomi.data.download.anime.AnimeDownloadManager import eu.kanade.tachiyomi.data.download.anime.model.AnimeDownload import eu.kanade.tachiyomi.ui.entries.anime.EpisodeItem -import eu.kanade.tachiyomi.util.episode.getEpisodeSort import tachiyomi.domain.entries.TriStateFilter import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.items.episode.model.Episode +import tachiyomi.domain.items.episode.service.getEpisodeSort /** * Applies the view filters to the list of episodes obtained from the database. diff --git a/app/src/main/java/eu/kanade/domain/track/anime/service/DelayedAnimeTrackingUpdateJob.kt b/app/src/main/java/eu/kanade/domain/track/anime/service/DelayedAnimeTrackingUpdateJob.kt index a4c3465a3..cc5bf7a16 100644 --- a/app/src/main/java/eu/kanade/domain/track/anime/service/DelayedAnimeTrackingUpdateJob.kt +++ b/app/src/main/java/eu/kanade/domain/track/anime/service/DelayedAnimeTrackingUpdateJob.kt @@ -9,14 +9,14 @@ import androidx.work.NetworkType import androidx.work.OneTimeWorkRequestBuilder import androidx.work.WorkManager import androidx.work.WorkerParameters -import eu.kanade.domain.track.anime.interactor.GetAnimeTracks -import eu.kanade.domain.track.anime.interactor.InsertAnimeTrack import eu.kanade.domain.track.anime.model.toDbTrack import eu.kanade.domain.track.anime.store.DelayedAnimeTrackingStore import eu.kanade.tachiyomi.data.track.TrackManager import logcat.LogPriority import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.track.anime.interactor.GetAnimeTracks +import tachiyomi.domain.track.anime.interactor.InsertAnimeTrack import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/eu/kanade/domain/track/manga/service/DelayedMangaTrackingUpdateJob.kt b/app/src/main/java/eu/kanade/domain/track/manga/service/DelayedMangaTrackingUpdateJob.kt index 2007e5d81..fe2c40cd2 100644 --- a/app/src/main/java/eu/kanade/domain/track/manga/service/DelayedMangaTrackingUpdateJob.kt +++ b/app/src/main/java/eu/kanade/domain/track/manga/service/DelayedMangaTrackingUpdateJob.kt @@ -9,14 +9,14 @@ import androidx.work.NetworkType import androidx.work.OneTimeWorkRequestBuilder import androidx.work.WorkManager import androidx.work.WorkerParameters -import eu.kanade.domain.track.manga.interactor.GetMangaTracks -import eu.kanade.domain.track.manga.interactor.InsertMangaTrack import eu.kanade.domain.track.manga.model.toDbTrack import eu.kanade.domain.track.manga.store.DelayedMangaTrackingStore import eu.kanade.tachiyomi.data.track.TrackManager import logcat.LogPriority import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.track.manga.interactor.GetMangaTracks +import tachiyomi.domain.track.manga.interactor.InsertMangaTrack import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/eu/kanade/presentation/browse/BrowseBadges.kt b/app/src/main/java/eu/kanade/presentation/browse/BrowseBadges.kt index b3df79442..00adfba35 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/BrowseBadges.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/BrowseBadges.kt @@ -3,7 +3,7 @@ package eu.kanade.presentation.browse import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.CollectionsBookmark import androidx.compose.runtime.Composable -import eu.kanade.presentation.components.Badge +import tachiyomi.presentation.core.components.Badge @Composable fun InLibraryBadge(enabled: Boolean) { diff --git a/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionDetailsScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionDetailsScreen.kt index d5ea26fd6..7f723aa15 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionDetailsScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionDetailsScreen.kt @@ -46,10 +46,7 @@ import eu.kanade.presentation.browse.anime.components.AnimeExtensionIcon import eu.kanade.presentation.browse.manga.NsfwWarningDialog import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions -import eu.kanade.presentation.components.DIVIDER_ALPHA -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.components.WarningBanner import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget @@ -60,6 +57,9 @@ import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource import eu.kanade.tachiyomi.extension.anime.model.AnimeExtension import eu.kanade.tachiyomi.ui.browse.anime.extension.details.AnimeExtensionDetailsState import eu.kanade.tachiyomi.util.system.LocaleHelper +import tachiyomi.presentation.core.components.material.DIVIDER_ALPHA +import tachiyomi.presentation.core.components.material.Divider +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun AnimeExtensionDetailsScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionFilterScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionFilterScreen.kt index bd00b6195..f378e157d 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionFilterScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionFilterScreen.kt @@ -10,11 +10,11 @@ import androidx.compose.ui.res.stringResource import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.FastScrollLazyColumn -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.anime.extension.AnimeExtensionFilterState import eu.kanade.tachiyomi.util.system.LocaleHelper +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun AnimeExtensionFilterScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionsScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionsScreen.kt index dea2341c4..f8e7a6c8a 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionsScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeExtensionsScreen.kt @@ -40,7 +40,6 @@ import eu.kanade.presentation.browse.manga.ExtensionTrustDialog import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.FastScrollLazyColumn import eu.kanade.presentation.components.LoadingScreen -import eu.kanade.presentation.components.PullRefresh import eu.kanade.presentation.entries.DotSeparatorNoSpaceText import eu.kanade.presentation.util.padding import eu.kanade.presentation.util.plus @@ -52,6 +51,7 @@ import eu.kanade.tachiyomi.extension.anime.model.AnimeExtension import eu.kanade.tachiyomi.ui.browse.anime.extension.AnimeExtensionUiModel import eu.kanade.tachiyomi.ui.browse.anime.extension.AnimeExtensionsState import eu.kanade.tachiyomi.util.system.LocaleHelper +import tachiyomi.presentation.core.components.material.PullRefresh @Composable fun AnimeExtensionScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeSourcesFilterScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeSourcesFilterScreen.kt index 564f0ad6f..f9cc376b4 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeSourcesFilterScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/anime/AnimeSourcesFilterScreen.kt @@ -12,12 +12,12 @@ import eu.kanade.presentation.browse.anime.components.BaseAnimeSourceItem import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.FastScrollLazyColumn -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.anime.source.AnimeSourcesFilterState import eu.kanade.tachiyomi.util.system.LocaleHelper import tachiyomi.domain.source.anime.model.AnimeSource +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun AnimeSourcesFilterScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/anime/BrowseAnimeSourceScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/anime/BrowseAnimeSourceScreen.kt index 076e2326e..75d584a9c 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/anime/BrowseAnimeSourceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/anime/BrowseAnimeSourceScreen.kt @@ -23,7 +23,6 @@ import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.EmptyScreenAction import eu.kanade.presentation.components.LoadingScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.animesource.AnimeSource import eu.kanade.tachiyomi.source.anime.AnimeSourceManager @@ -32,6 +31,7 @@ import kotlinx.coroutines.flow.StateFlow import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.items.episode.model.NoEpisodesException import tachiyomi.domain.library.model.LibraryDisplayMode +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun BrowseAnimeSourceContent( 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 1195ced48..3829e660d 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 @@ -14,7 +14,6 @@ import eu.kanade.presentation.browse.GlobalSearchResultItem import eu.kanade.presentation.browse.GlobalSearchToolbar import eu.kanade.presentation.browse.anime.components.GlobalAnimeSearchCardRow import eu.kanade.presentation.components.LazyColumn -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.util.padding import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.animesource.AnimeCatalogueSource @@ -22,6 +21,7 @@ import eu.kanade.tachiyomi.ui.browse.anime.source.globalsearch.AnimeSearchItemRe import eu.kanade.tachiyomi.ui.browse.anime.source.globalsearch.GlobalAnimeSearchState import eu.kanade.tachiyomi.util.system.LocaleHelper import tachiyomi.domain.entries.anime.model.Anime +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun GlobalAnimeSearchScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/anime/MigrateAnimeScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/anime/MigrateAnimeScreen.kt index 640b38ec8..c34ee62b2 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/anime/MigrateAnimeScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/anime/MigrateAnimeScreen.kt @@ -8,11 +8,11 @@ import androidx.compose.ui.Modifier import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.FastScrollLazyColumn -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.entries.anime.components.BaseAnimeListItem import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.anime.migration.anime.MigrateAnimeState import tachiyomi.domain.entries.anime.model.Anime +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun MigrateAnimeScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/anime/MigrateAnimeSearchScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/anime/MigrateAnimeSearchScreen.kt index 0a1238e72..7c739a77e 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/anime/MigrateAnimeSearchScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/anime/MigrateAnimeSearchScreen.kt @@ -10,12 +10,12 @@ import eu.kanade.presentation.browse.GlobalSearchResultItem import eu.kanade.presentation.browse.GlobalSearchToolbar import eu.kanade.presentation.browse.anime.components.GlobalAnimeSearchCardRow import eu.kanade.presentation.components.LazyColumn -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.animesource.AnimeCatalogueSource import eu.kanade.tachiyomi.ui.browse.anime.migration.search.MigrateAnimeSearchState import eu.kanade.tachiyomi.ui.browse.anime.source.globalsearch.AnimeSearchItemResult import eu.kanade.tachiyomi.util.system.LocaleHelper import tachiyomi.domain.entries.anime.model.Anime +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun MigrateAnimeSearchScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/anime/MigrateAnimeSourceScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/anime/MigrateAnimeSourceScreen.kt index 3923f80e3..89c8d11e6 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/anime/MigrateAnimeSourceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/anime/MigrateAnimeSourceScreen.kt @@ -25,8 +25,6 @@ import androidx.compose.ui.text.style.TextOverflow import eu.kanade.domain.source.service.SetMigrateSorting import eu.kanade.presentation.browse.anime.components.AnimeSourceIcon import eu.kanade.presentation.browse.anime.components.BaseAnimeSourceItem -import eu.kanade.presentation.components.Badge -import eu.kanade.presentation.components.BadgeGroup import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.LoadingScreen import eu.kanade.presentation.components.ScrollbarLazyColumn @@ -40,6 +38,8 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.anime.migration.sources.MigrateAnimeSourceState import eu.kanade.tachiyomi.util.system.copyToClipboard import tachiyomi.domain.source.anime.model.AnimeSource +import tachiyomi.presentation.core.components.Badge +import tachiyomi.presentation.core.components.BadgeGroup @Composable fun MigrateAnimeSourceScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/manga/BrowseMangaSourceScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/manga/BrowseMangaSourceScreen.kt index 58f7df038..18c37846f 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/manga/BrowseMangaSourceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/manga/BrowseMangaSourceScreen.kt @@ -23,7 +23,6 @@ import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.EmptyScreenAction import eu.kanade.presentation.components.LoadingScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.MangaSource import eu.kanade.tachiyomi.source.manga.LocalMangaSource @@ -32,6 +31,7 @@ import kotlinx.coroutines.flow.StateFlow import tachiyomi.domain.entries.manga.model.Manga import tachiyomi.domain.items.chapter.model.NoChaptersException import tachiyomi.domain.library.model.LibraryDisplayMode +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun BrowseSourceContent( 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 ed00873cc..31c8de88e 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 @@ -14,7 +14,6 @@ import eu.kanade.presentation.browse.GlobalSearchResultItem import eu.kanade.presentation.browse.GlobalSearchToolbar import eu.kanade.presentation.browse.manga.components.GlobalMangaSearchCardRow import eu.kanade.presentation.components.LazyColumn -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.util.padding import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.CatalogueSource @@ -22,6 +21,7 @@ import eu.kanade.tachiyomi.ui.browse.manga.source.globalsearch.GlobalMangaSearch import eu.kanade.tachiyomi.ui.browse.manga.source.globalsearch.MangaSearchItemResult import eu.kanade.tachiyomi.util.system.LocaleHelper import tachiyomi.domain.entries.manga.model.Manga +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun GlobalMangaSearchScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/manga/MangaExtensionDetailsScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/manga/MangaExtensionDetailsScreen.kt index 914590ffb..d51c26823 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/manga/MangaExtensionDetailsScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/manga/MangaExtensionDetailsScreen.kt @@ -47,10 +47,7 @@ import eu.kanade.domain.extension.manga.interactor.MangaExtensionSourceItem import eu.kanade.presentation.browse.manga.components.MangaExtensionIcon import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions -import eu.kanade.presentation.components.DIVIDER_ALPHA -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.components.WarningBanner import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget @@ -61,6 +58,9 @@ import eu.kanade.tachiyomi.extension.manga.model.MangaExtension import eu.kanade.tachiyomi.source.ConfigurableSource import eu.kanade.tachiyomi.ui.browse.manga.extension.details.MangaExtensionDetailsState import eu.kanade.tachiyomi.util.system.LocaleHelper +import tachiyomi.presentation.core.components.material.DIVIDER_ALPHA +import tachiyomi.presentation.core.components.material.Divider +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun ExtensionDetailsScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/manga/MangaExtensionFilterScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/manga/MangaExtensionFilterScreen.kt index 4792089e2..812f3ceb0 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/manga/MangaExtensionFilterScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/manga/MangaExtensionFilterScreen.kt @@ -10,11 +10,11 @@ import androidx.compose.ui.res.stringResource import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.FastScrollLazyColumn -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.manga.extension.MangaExtensionFilterState import eu.kanade.tachiyomi.util.system.LocaleHelper +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun MangaExtensionFilterScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/manga/MangaExtensionsScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/manga/MangaExtensionsScreen.kt index 77ed76174..818cff3c6 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/manga/MangaExtensionsScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/manga/MangaExtensionsScreen.kt @@ -40,7 +40,6 @@ import eu.kanade.presentation.browse.manga.components.MangaExtensionIcon import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.FastScrollLazyColumn import eu.kanade.presentation.components.LoadingScreen -import eu.kanade.presentation.components.PullRefresh import eu.kanade.presentation.entries.DotSeparatorNoSpaceText import eu.kanade.presentation.theme.header import eu.kanade.presentation.util.padding @@ -53,6 +52,7 @@ import eu.kanade.tachiyomi.extension.manga.model.MangaExtension import eu.kanade.tachiyomi.ui.browse.manga.extension.MangaExtensionUiModel import eu.kanade.tachiyomi.ui.browse.manga.extension.MangaExtensionsState import eu.kanade.tachiyomi.util.system.LocaleHelper +import tachiyomi.presentation.core.components.material.PullRefresh @Composable fun MangaExtensionScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/manga/MangaSourcesFilterScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/manga/MangaSourcesFilterScreen.kt index 88adf2ab5..4199a7e76 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/manga/MangaSourcesFilterScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/manga/MangaSourcesFilterScreen.kt @@ -12,12 +12,12 @@ import eu.kanade.presentation.browse.manga.components.BaseMangaSourceItem import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.FastScrollLazyColumn -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.manga.source.MangaSourcesFilterState import eu.kanade.tachiyomi.util.system.LocaleHelper import tachiyomi.domain.source.manga.model.Source +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun MangaSourcesFilterScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/manga/MigrateMangaScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/manga/MigrateMangaScreen.kt index 03db030b6..473b36b5a 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/manga/MigrateMangaScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/manga/MigrateMangaScreen.kt @@ -8,11 +8,11 @@ import androidx.compose.ui.Modifier import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.FastScrollLazyColumn -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.entries.manga.components.BaseMangaListItem import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.manga.migration.manga.MigrateMangaState import tachiyomi.domain.entries.manga.model.Manga +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun MigrateMangaScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/manga/MigrateMangaSearchScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/manga/MigrateMangaSearchScreen.kt index b6a02204d..cb3454399 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/manga/MigrateMangaSearchScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/manga/MigrateMangaSearchScreen.kt @@ -10,12 +10,12 @@ import eu.kanade.presentation.browse.GlobalSearchResultItem import eu.kanade.presentation.browse.GlobalSearchToolbar import eu.kanade.presentation.browse.manga.components.GlobalMangaSearchCardRow import eu.kanade.presentation.components.LazyColumn -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.ui.browse.manga.migration.search.MigrateMangaSearchState import eu.kanade.tachiyomi.ui.browse.manga.source.globalsearch.MangaSearchItemResult import eu.kanade.tachiyomi.util.system.LocaleHelper import tachiyomi.domain.entries.manga.model.Manga +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun MigrateMangaSearchScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/manga/MigrateMangaSourceScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/manga/MigrateMangaSourceScreen.kt index b15e660f7..6ef899678 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/manga/MigrateMangaSourceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/manga/MigrateMangaSourceScreen.kt @@ -25,8 +25,6 @@ import androidx.compose.ui.text.style.TextOverflow import eu.kanade.domain.source.service.SetMigrateSorting import eu.kanade.presentation.browse.manga.components.BaseMangaSourceItem import eu.kanade.presentation.browse.manga.components.MangaSourceIcon -import eu.kanade.presentation.components.Badge -import eu.kanade.presentation.components.BadgeGroup import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.LoadingScreen import eu.kanade.presentation.components.ScrollbarLazyColumn @@ -40,6 +38,8 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.manga.migration.sources.MigrateMangaSourceState import eu.kanade.tachiyomi.util.system.copyToClipboard import tachiyomi.domain.source.manga.model.Source +import tachiyomi.presentation.core.components.Badge +import tachiyomi.presentation.core.components.BadgeGroup @Composable fun MigrateMangaSourceScreen( diff --git a/app/src/main/java/eu/kanade/presentation/category/AnimeCategoryScreen.kt b/app/src/main/java/eu/kanade/presentation/category/AnimeCategoryScreen.kt index 186a48d42..6720e01d0 100644 --- a/app/src/main/java/eu/kanade/presentation/category/AnimeCategoryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/AnimeCategoryScreen.kt @@ -9,13 +9,13 @@ import androidx.compose.ui.Modifier import eu.kanade.presentation.category.components.CategoryContent import eu.kanade.presentation.category.components.CategoryFloatingActionButton import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.util.padding import eu.kanade.presentation.util.plus import eu.kanade.presentation.util.topSmallPaddingValues import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.category.anime.AnimeCategoryScreenState import tachiyomi.domain.category.model.Category +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun AnimeCategoryScreen( diff --git a/app/src/main/java/eu/kanade/presentation/category/MangaCategoryScreen.kt b/app/src/main/java/eu/kanade/presentation/category/MangaCategoryScreen.kt index 39b5c9579..7b82fab73 100644 --- a/app/src/main/java/eu/kanade/presentation/category/MangaCategoryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/MangaCategoryScreen.kt @@ -9,13 +9,13 @@ import androidx.compose.ui.Modifier import eu.kanade.presentation.category.components.CategoryContent import eu.kanade.presentation.category.components.CategoryFloatingActionButton import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.util.padding import eu.kanade.presentation.util.plus import eu.kanade.presentation.util.topSmallPaddingValues import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.category.manga.MangaCategoryScreenState import tachiyomi.domain.category.model.Category +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun MangaCategoryScreen( diff --git a/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt b/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt index 72057f3d6..ec0310da4 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt @@ -7,10 +7,10 @@ import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import eu.kanade.presentation.components.ExtendedFloatingActionButton import eu.kanade.presentation.util.isScrolledToEnd import eu.kanade.presentation.util.isScrollingUp import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton @Composable fun CategoryFloatingActionButton( diff --git a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt index 62e529fb8..7a961ff13 100644 --- a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt +++ b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt @@ -51,6 +51,7 @@ import androidx.compose.ui.unit.sp import eu.kanade.presentation.util.runOnEnterKeyPressed import eu.kanade.presentation.util.secondaryItemAlpha import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.Pill const val SEARCH_DEBOUNCE_MILLIS = 250L diff --git a/app/src/main/java/eu/kanade/presentation/components/CommonEntryItem.kt b/app/src/main/java/eu/kanade/presentation/components/CommonEntryItem.kt index eb6b1180a..6ada81718 100644 --- a/app/src/main/java/eu/kanade/presentation/components/CommonEntryItem.kt +++ b/app/src/main/java/eu/kanade/presentation/components/CommonEntryItem.kt @@ -41,6 +41,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import eu.kanade.presentation.util.selectedBackground import tachiyomi.domain.entries.EntryCover +import tachiyomi.presentation.core.components.BadgeGroup object CommonEntryItemDefaults { val GridHorizontalSpacer = 4.dp diff --git a/app/src/main/java/eu/kanade/presentation/components/InfoScaffold.kt b/app/src/main/java/eu/kanade/presentation/components/InfoScaffold.kt index ccdb31e3f..e4d32ee8c 100644 --- a/app/src/main/java/eu/kanade/presentation/components/InfoScaffold.kt +++ b/app/src/main/java/eu/kanade/presentation/components/InfoScaffold.kt @@ -30,6 +30,7 @@ import eu.kanade.presentation.theme.TachiyomiTheme import eu.kanade.presentation.util.ThemePreviews import eu.kanade.presentation.util.padding import eu.kanade.presentation.util.secondaryItemAlpha +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun InfoScaffold( diff --git a/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt b/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt index 760a7aa1d..5b59035fa 100644 --- a/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt @@ -31,6 +31,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastForEachIndexed import eu.kanade.tachiyomi.R import kotlinx.coroutines.launch +import tachiyomi.presentation.core.components.material.Divider object TabbedDialogPaddings { val Horizontal = 24.dp diff --git a/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt b/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt index 2ed02ec86..c1bed9e19 100644 --- a/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt @@ -24,6 +24,7 @@ import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun TabbedScreen( diff --git a/app/src/main/java/eu/kanade/presentation/components/Tabs.kt b/app/src/main/java/eu/kanade/presentation/components/Tabs.kt index ce8c4b53f..c4462d910 100644 --- a/app/src/main/java/eu/kanade/presentation/components/Tabs.kt +++ b/app/src/main/java/eu/kanade/presentation/components/Tabs.kt @@ -15,6 +15,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import tachiyomi.presentation.core.components.Pill @Composable fun TabIndicator(currentTabPosition: TabPosition) { diff --git a/app/src/main/java/eu/kanade/presentation/entries/TrackInfoDialogSelector.kt b/app/src/main/java/eu/kanade/presentation/entries/TrackInfoDialogSelector.kt index 2234e0a92..8087862c7 100644 --- a/app/src/main/java/eu/kanade/presentation/entries/TrackInfoDialogSelector.kt +++ b/app/src/main/java/eu/kanade/presentation/entries/TrackInfoDialogSelector.kt @@ -29,8 +29,6 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.AlertDialogContent -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.components.WheelDatePicker import eu.kanade.presentation.components.WheelTextPicker @@ -39,6 +37,8 @@ import eu.kanade.presentation.util.isScrolledToStart import eu.kanade.presentation.util.minimumTouchTargetSize import eu.kanade.presentation.util.padding import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.material.AlertDialogContent +import tachiyomi.presentation.core.components.material.Divider import java.time.LocalDate import java.time.format.TextStyle import java.util.Locale diff --git a/app/src/main/java/eu/kanade/presentation/entries/anime/AnimeScreen.kt b/app/src/main/java/eu/kanade/presentation/entries/anime/AnimeScreen.kt index d5bd9c843..53f9841bc 100644 --- a/app/src/main/java/eu/kanade/presentation/entries/anime/AnimeScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/entries/anime/AnimeScreen.kt @@ -51,10 +51,7 @@ import androidx.compose.ui.util.fastMap import eu.kanade.domain.entries.anime.model.episodesFiltered import eu.kanade.presentation.components.EntryBottomActionMenu import eu.kanade.presentation.components.EpisodeDownloadAction -import eu.kanade.presentation.components.ExtendedFloatingActionButton import eu.kanade.presentation.components.LazyColumn -import eu.kanade.presentation.components.PullRefresh -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.TwoPanelBox import eu.kanade.presentation.components.VerticalFastScroller import eu.kanade.presentation.entries.DownloadAction @@ -79,6 +76,9 @@ import eu.kanade.tachiyomi.util.lang.toRelativeString import eu.kanade.tachiyomi.util.system.copyToClipboard import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.items.episode.model.Episode +import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton +import tachiyomi.presentation.core.components.material.PullRefresh +import tachiyomi.presentation.core.components.material.Scaffold import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.text.DateFormat diff --git a/app/src/main/java/eu/kanade/presentation/entries/anime/AnimeTrackInfoDialogHome.kt b/app/src/main/java/eu/kanade/presentation/entries/anime/AnimeTrackInfoDialogHome.kt index 2a46728fd..732166239 100644 --- a/app/src/main/java/eu/kanade/presentation/entries/anime/AnimeTrackInfoDialogHome.kt +++ b/app/src/main/java/eu/kanade/presentation/entries/anime/AnimeTrackInfoDialogHome.kt @@ -30,15 +30,15 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.TrackLogoIcon -import eu.kanade.presentation.components.VerticalDivider import eu.kanade.presentation.entries.manga.TrackDetailsItem import eu.kanade.presentation.entries.manga.TrackInfoItemMenu import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.track.TrackService import eu.kanade.tachiyomi.ui.entries.anime.track.AnimeTrackItem import eu.kanade.tachiyomi.util.system.copyToClipboard +import tachiyomi.presentation.core.components.material.Divider +import tachiyomi.presentation.core.components.material.VerticalDivider import java.text.DateFormat private const val UnsetStatusTextAlpha = 0.5F diff --git a/app/src/main/java/eu/kanade/presentation/entries/anime/AnimeTrackServiceSearch.kt b/app/src/main/java/eu/kanade/presentation/entries/anime/AnimeTrackServiceSearch.kt index 066145d50..8e4d68109 100644 --- a/app/src/main/java/eu/kanade/presentation/entries/anime/AnimeTrackServiceSearch.kt +++ b/app/src/main/java/eu/kanade/presentation/entries/anime/AnimeTrackServiceSearch.kt @@ -41,16 +41,16 @@ import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.intl.Locale import androidx.compose.ui.text.toLowerCase import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.LoadingScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.entries.manga.SearchResultItem import eu.kanade.presentation.util.plus import eu.kanade.presentation.util.runOnEnterKeyPressed import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.track.model.AnimeTrackSearch +import tachiyomi.presentation.core.components.material.Divider +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun AnimeTrackServiceSearch( diff --git a/app/src/main/java/eu/kanade/presentation/entries/anime/EpisodeOptionsDialogScreen.kt b/app/src/main/java/eu/kanade/presentation/entries/anime/EpisodeOptionsDialogScreen.kt index 1cf2b900d..38e5ab621 100644 --- a/app/src/main/java/eu/kanade/presentation/entries/anime/EpisodeOptionsDialogScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/entries/anime/EpisodeOptionsDialogScreen.kt @@ -36,8 +36,6 @@ import cafe.adriel.voyager.core.model.coroutineScope import cafe.adriel.voyager.core.model.rememberScreenModel import cafe.adriel.voyager.core.screen.Screen import eu.kanade.core.util.asFlow -import eu.kanade.domain.entries.anime.interactor.GetAnime -import eu.kanade.domain.items.episode.interactor.GetEpisode import eu.kanade.presentation.components.LoadingScreen import eu.kanade.presentation.components.TabbedDialogPaddings import eu.kanade.presentation.util.padding @@ -55,7 +53,9 @@ import logcat.LogPriority import tachiyomi.core.util.lang.launchUI import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.entries.anime.interactor.GetAnime import tachiyomi.domain.entries.anime.model.Anime +import tachiyomi.domain.items.episode.interactor.GetEpisode import tachiyomi.domain.items.episode.model.Episode import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/presentation/entries/anime/components/AnimeCoverDialog.kt b/app/src/main/java/eu/kanade/presentation/entries/anime/components/AnimeCoverDialog.kt index d3b35f8c7..b5bd46c08 100644 --- a/app/src/main/java/eu/kanade/presentation/entries/anime/components/AnimeCoverDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/entries/anime/components/AnimeCoverDialog.kt @@ -44,12 +44,12 @@ import coil.request.CachePolicy import coil.request.ImageRequest import coil.size.Size import eu.kanade.presentation.components.DropdownMenu -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.entries.EditCoverAction import eu.kanade.presentation.util.clickableNoIndication import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.reader.viewer.ReaderPageImageView import tachiyomi.domain.entries.anime.model.Anime +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun AnimeCoverDialog( diff --git a/app/src/main/java/eu/kanade/presentation/entries/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/presentation/entries/manga/MangaScreen.kt index 38b343abc..be29ff84c 100644 --- a/app/src/main/java/eu/kanade/presentation/entries/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/entries/manga/MangaScreen.kt @@ -50,10 +50,7 @@ import androidx.compose.ui.util.fastMap import eu.kanade.domain.entries.manga.model.chaptersFiltered import eu.kanade.presentation.components.ChapterDownloadAction import eu.kanade.presentation.components.EntryBottomActionMenu -import eu.kanade.presentation.components.ExtendedFloatingActionButton import eu.kanade.presentation.components.LazyColumn -import eu.kanade.presentation.components.PullRefresh -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.TwoPanelBox import eu.kanade.presentation.components.VerticalFastScroller import eu.kanade.presentation.entries.DownloadAction @@ -77,6 +74,9 @@ import eu.kanade.tachiyomi.util.lang.toRelativeString import eu.kanade.tachiyomi.util.system.copyToClipboard import tachiyomi.domain.entries.manga.model.Manga import tachiyomi.domain.items.chapter.model.Chapter +import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton +import tachiyomi.presentation.core.components.material.PullRefresh +import tachiyomi.presentation.core.components.material.Scaffold import java.text.DateFormat import java.util.Date diff --git a/app/src/main/java/eu/kanade/presentation/entries/manga/MangaTrackInfoDialogHome.kt b/app/src/main/java/eu/kanade/presentation/entries/manga/MangaTrackInfoDialogHome.kt index 0bb0e4068..f00e16cc2 100644 --- a/app/src/main/java/eu/kanade/presentation/entries/manga/MangaTrackInfoDialogHome.kt +++ b/app/src/main/java/eu/kanade/presentation/entries/manga/MangaTrackInfoDialogHome.kt @@ -42,14 +42,14 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.DropdownMenu import eu.kanade.presentation.components.TrackLogoIcon -import eu.kanade.presentation.components.VerticalDivider import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.track.TrackService import eu.kanade.tachiyomi.ui.entries.manga.track.MangaTrackItem import eu.kanade.tachiyomi.util.system.copyToClipboard +import tachiyomi.presentation.core.components.material.Divider +import tachiyomi.presentation.core.components.material.VerticalDivider import java.text.DateFormat private const val UnsetStatusTextAlpha = 0.5F diff --git a/app/src/main/java/eu/kanade/presentation/entries/manga/MangaTrackServiceSearch.kt b/app/src/main/java/eu/kanade/presentation/entries/manga/MangaTrackServiceSearch.kt index c067df5c4..c1d323eca 100644 --- a/app/src/main/java/eu/kanade/presentation/entries/manga/MangaTrackServiceSearch.kt +++ b/app/src/main/java/eu/kanade/presentation/entries/manga/MangaTrackServiceSearch.kt @@ -56,11 +56,9 @@ import androidx.compose.ui.text.intl.Locale import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.toLowerCase import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.ItemCover import eu.kanade.presentation.components.LoadingScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.util.padding import eu.kanade.presentation.util.plus @@ -68,6 +66,8 @@ import eu.kanade.presentation.util.runOnEnterKeyPressed import eu.kanade.presentation.util.secondaryItemAlpha import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.track.model.MangaTrackSearch +import tachiyomi.presentation.core.components.material.Divider +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun MangaTrackServiceSearch( diff --git a/app/src/main/java/eu/kanade/presentation/entries/manga/components/MangaCoverDialog.kt b/app/src/main/java/eu/kanade/presentation/entries/manga/components/MangaCoverDialog.kt index 2d3237a9e..a9f0a26bd 100644 --- a/app/src/main/java/eu/kanade/presentation/entries/manga/components/MangaCoverDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/entries/manga/components/MangaCoverDialog.kt @@ -44,12 +44,12 @@ import coil.request.CachePolicy import coil.request.ImageRequest import coil.size.Size import eu.kanade.presentation.components.DropdownMenu -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.entries.EditCoverAction import eu.kanade.presentation.util.clickableNoIndication import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.reader.viewer.ReaderPageImageView import tachiyomi.domain.entries.manga.model.Manga +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun MangaCoverDialog( diff --git a/app/src/main/java/eu/kanade/presentation/history/anime/AnimeHistoryScreen.kt b/app/src/main/java/eu/kanade/presentation/history/anime/AnimeHistoryScreen.kt index 30e0927c4..0ffa014b3 100644 --- a/app/src/main/java/eu/kanade/presentation/history/anime/AnimeHistoryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/history/anime/AnimeHistoryScreen.kt @@ -9,11 +9,11 @@ import androidx.compose.ui.Modifier import eu.kanade.presentation.animehistory.components.AnimeHistoryContent import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.LoadingScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.history.anime.AnimeHistoryScreenModel import eu.kanade.tachiyomi.ui.history.anime.AnimeHistoryState import tachiyomi.domain.history.anime.model.AnimeHistoryWithRelations +import tachiyomi.presentation.core.components.material.Scaffold import java.util.Date @Composable diff --git a/app/src/main/java/eu/kanade/presentation/history/manga/MangaHistoryScreen.kt b/app/src/main/java/eu/kanade/presentation/history/manga/MangaHistoryScreen.kt index fc1e7c4bd..c81f747ab 100644 --- a/app/src/main/java/eu/kanade/presentation/history/manga/MangaHistoryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/history/manga/MangaHistoryScreen.kt @@ -8,11 +8,11 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.LoadingScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.history.manga.HistoryState import eu.kanade.tachiyomi.ui.history.manga.MangaHistoryScreenModel import tachiyomi.domain.history.manga.model.MangaHistoryWithRelations +import tachiyomi.presentation.core.components.material.Scaffold import java.util.Date @Composable diff --git a/app/src/main/java/eu/kanade/presentation/library/LibraryBadges.kt b/app/src/main/java/eu/kanade/presentation/library/LibraryBadges.kt index 24e4fa7f5..5c63580ef 100644 --- a/app/src/main/java/eu/kanade/presentation/library/LibraryBadges.kt +++ b/app/src/main/java/eu/kanade/presentation/library/LibraryBadges.kt @@ -5,9 +5,9 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Folder import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable -import eu.kanade.presentation.components.Badge import eu.kanade.presentation.theme.TachiyomiTheme import eu.kanade.presentation.util.ThemePreviews +import tachiyomi.presentation.core.components.Badge @Composable fun DownloadsBadge(count: Long) { diff --git a/app/src/main/java/eu/kanade/presentation/library/LibraryTabs.kt b/app/src/main/java/eu/kanade/presentation/library/LibraryTabs.kt index ac4b510da..196e5266f 100644 --- a/app/src/main/java/eu/kanade/presentation/library/LibraryTabs.kt +++ b/app/src/main/java/eu/kanade/presentation/library/LibraryTabs.kt @@ -7,10 +7,10 @@ import androidx.compose.material3.Tab import androidx.compose.runtime.Composable import androidx.compose.ui.unit.dp import eu.kanade.presentation.category.visualName -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.TabIndicator import eu.kanade.presentation.components.TabText import tachiyomi.domain.category.model.Category +import tachiyomi.presentation.core.components.material.Divider @Composable fun LibraryTabs( diff --git a/app/src/main/java/eu/kanade/presentation/library/LibraryToolbar.kt b/app/src/main/java/eu/kanade/presentation/library/LibraryToolbar.kt index 01d0d017c..5f0f463ed 100644 --- a/app/src/main/java/eu/kanade/presentation/library/LibraryToolbar.kt +++ b/app/src/main/java/eu/kanade/presentation/library/LibraryToolbar.kt @@ -22,10 +22,10 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.sp import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.OverflowMenu -import eu.kanade.presentation.components.Pill import eu.kanade.presentation.components.SearchToolbar import eu.kanade.presentation.theme.active import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.Pill @Composable fun LibraryToolbar( diff --git a/app/src/main/java/eu/kanade/presentation/library/anime/AnimeLibraryContent.kt b/app/src/main/java/eu/kanade/presentation/library/anime/AnimeLibraryContent.kt index 10b053064..71e8a853a 100644 --- a/app/src/main/java/eu/kanade/presentation/library/anime/AnimeLibraryContent.kt +++ b/app/src/main/java/eu/kanade/presentation/library/anime/AnimeLibraryContent.kt @@ -15,7 +15,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalLayoutDirection import eu.kanade.core.prefs.PreferenceMutableState -import eu.kanade.presentation.components.PullRefresh import eu.kanade.presentation.components.rememberPagerState import eu.kanade.presentation.library.LibraryTabs import eu.kanade.tachiyomi.ui.library.anime.AnimeLibraryItem @@ -24,6 +23,7 @@ import kotlinx.coroutines.launch import tachiyomi.domain.category.model.Category import tachiyomi.domain.library.anime.LibraryAnime import tachiyomi.domain.library.model.LibraryDisplayMode +import tachiyomi.presentation.core.components.material.PullRefresh import kotlin.time.Duration.Companion.seconds @Composable diff --git a/app/src/main/java/eu/kanade/presentation/library/manga/MangaLibraryContent.kt b/app/src/main/java/eu/kanade/presentation/library/manga/MangaLibraryContent.kt index 5826836ec..1a1421545 100644 --- a/app/src/main/java/eu/kanade/presentation/library/manga/MangaLibraryContent.kt +++ b/app/src/main/java/eu/kanade/presentation/library/manga/MangaLibraryContent.kt @@ -15,7 +15,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalLayoutDirection import eu.kanade.core.prefs.PreferenceMutableState -import eu.kanade.presentation.components.PullRefresh import eu.kanade.presentation.components.rememberPagerState import eu.kanade.presentation.library.LibraryTabs import eu.kanade.tachiyomi.ui.library.manga.MangaLibraryItem @@ -24,6 +23,7 @@ import kotlinx.coroutines.launch import tachiyomi.domain.category.model.Category import tachiyomi.domain.library.manga.LibraryManga import tachiyomi.domain.library.model.LibraryDisplayMode +import tachiyomi.presentation.core.components.material.PullRefresh import kotlin.time.Duration.Companion.seconds @Composable diff --git a/app/src/main/java/eu/kanade/presentation/more/LogoHeader.kt b/app/src/main/java/eu/kanade/presentation/more/LogoHeader.kt index 3652c1f01..cdcc384c0 100644 --- a/app/src/main/java/eu/kanade/presentation/more/LogoHeader.kt +++ b/app/src/main/java/eu/kanade/presentation/more/LogoHeader.kt @@ -11,8 +11,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.Divider import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.material.Divider @Composable fun LogoHeader() { 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 f93d5f069..29707add2 100644 --- a/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt @@ -27,8 +27,6 @@ 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.Divider -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.components.WarningBanner import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget @@ -36,6 +34,8 @@ 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.presentation.core.components.material.Divider +import tachiyomi.presentation.core.components.material.Scaffold import uy.kohesive.injekt.injectLazy @Composable diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScaffold.kt b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScaffold.kt index a1b9e69ee..012e1f01d 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScaffold.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScaffold.kt @@ -10,8 +10,8 @@ import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun PreferenceScaffold( diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt index 056176596..3ccafdbe2 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt @@ -21,8 +21,6 @@ import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.components.AppBar -import eu.kanade.presentation.components.LinkIcon -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.more.LogoHeader import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget @@ -42,6 +40,8 @@ import logcat.LogPriority import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.presentation.core.components.LinkIcon +import tachiyomi.presentation.core.components.material.Scaffold import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.text.DateFormat 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 2cc1baa1b..b0a24c004 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 @@ -38,11 +38,9 @@ import eu.kanade.domain.source.anime.interactor.GetAnimeSourcesWithNonLibraryAni import eu.kanade.presentation.browse.anime.components.AnimeSourceIcon import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.FastScrollLazyColumn import eu.kanade.presentation.components.LoadingScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.util.selectedBackground import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.toast @@ -54,6 +52,8 @@ import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.domain.source.anime.model.AnimeSource import tachiyomi.domain.source.anime.model.AnimeSourceWithCount import tachiyomi.mi.data.AnimeDatabase +import tachiyomi.presentation.core.components.material.Divider +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/presentation/more/settings/screen/ClearDatabaseScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt index 8a9c80a76..dea5fec19 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 @@ -38,11 +38,9 @@ import eu.kanade.domain.source.manga.interactor.GetMangaSourcesWithNonLibraryMan import eu.kanade.presentation.browse.manga.components.MangaSourceIcon import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.FastScrollLazyColumn import eu.kanade.presentation.components.LoadingScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.util.selectedBackground import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.toast @@ -54,6 +52,8 @@ import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.data.Database import tachiyomi.domain.source.manga.model.MangaSourceWithCount import tachiyomi.domain.source.manga.model.Source +import tachiyomi.presentation.core.components.material.Divider +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/presentation/more/settings/screen/LicensesScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/LicensesScreen.kt index c6b8accc6..3e17fafbc 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/LicensesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/LicensesScreen.kt @@ -11,8 +11,8 @@ import cafe.adriel.voyager.navigator.currentOrThrow import com.mikepenz.aboutlibraries.ui.compose.LibrariesContainer import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults import eu.kanade.presentation.components.AppBar -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.material.Scaffold class LicensesScreen : Screen { @Composable diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt index 410a4841d..402802825 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt @@ -37,7 +37,6 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import com.hippo.unifile.UniFile import eu.kanade.domain.backup.service.BackupPreferences -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.more.settings.Preference import eu.kanade.presentation.util.collectAsState @@ -59,6 +58,7 @@ import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.copyToClipboard import eu.kanade.tachiyomi.util.system.toast import kotlinx.coroutines.launch +import tachiyomi.presentation.core.components.material.Divider import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt index da075313b..12ea229ab 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt @@ -49,10 +49,10 @@ import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions import eu.kanade.presentation.components.LazyColumn -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.presentation.util.LocalBackPress import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.material.Scaffold object SettingsMainScreen : Screen { @Composable diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt index 0ff1c222a..64cc56f17 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt @@ -50,13 +50,13 @@ import androidx.compose.ui.unit.dp import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.more.settings.Preference import eu.kanade.presentation.util.runOnEnterKeyPressed import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.isLTR +import tachiyomi.presentation.core.components.material.Divider +import tachiyomi.presentation.core.components.material.Scaffold class SettingsSearchScreen : Screen { @Composable diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/WorkerInfoScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/WorkerInfoScreen.kt index 48dc95de0..f4c10f244 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/WorkerInfoScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/WorkerInfoScreen.kt @@ -38,13 +38,13 @@ import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.presentation.components.LazyColumn -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch +import tachiyomi.presentation.core.components.material.Scaffold object WorkerInfoScreen : Screen { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt index b1a6d929e..fdfd3e91c 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt @@ -39,7 +39,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import eu.kanade.domain.ui.model.AppTheme -import eu.kanade.presentation.components.DIVIDER_ALPHA import eu.kanade.presentation.components.ItemCover import eu.kanade.presentation.theme.TachiyomiTheme import eu.kanade.presentation.util.ThemePreviews @@ -48,6 +47,7 @@ import eu.kanade.presentation.util.secondaryItemAlpha import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.isDynamicColorAvailable +import tachiyomi.presentation.core.components.material.DIVIDER_ALPHA @Composable internal fun AppThemePreferenceWidget( diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt index 41df13266..2d63969be 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt @@ -22,12 +22,12 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.util.isScrolledToEnd import eu.kanade.presentation.util.isScrolledToStart import eu.kanade.presentation.util.minimumTouchTargetSize import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.material.Divider @Composable fun ListPreferenceWidget( diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt index 7f3a2c8a6..682033b7d 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt @@ -27,11 +27,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.LazyColumn import eu.kanade.presentation.util.isScrolledToEnd import eu.kanade.presentation.util.isScrolledToStart import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.material.Divider private enum class State { CHECKED, INVERSED, UNCHECKED diff --git a/app/src/main/java/eu/kanade/presentation/updates/anime/AnimeUpdatesScreen.kt b/app/src/main/java/eu/kanade/presentation/updates/anime/AnimeUpdatesScreen.kt index 06e4d756c..40e5483d7 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/anime/AnimeUpdatesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/anime/AnimeUpdatesScreen.kt @@ -21,8 +21,6 @@ import eu.kanade.presentation.components.EntryBottomActionMenu import eu.kanade.presentation.components.EpisodeDownloadAction import eu.kanade.presentation.components.FastScrollLazyColumn import eu.kanade.presentation.components.LoadingScreen -import eu.kanade.presentation.components.PullRefresh -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.download.anime.model.AnimeDownload import eu.kanade.tachiyomi.ui.player.settings.PlayerPreferences @@ -30,6 +28,8 @@ import eu.kanade.tachiyomi.ui.updates.anime.AnimeUpdatesItem import eu.kanade.tachiyomi.ui.updates.anime.AnimeUpdatesState import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import tachiyomi.presentation.core.components.material.PullRefresh +import tachiyomi.presentation.core.components.material.Scaffold import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import kotlin.time.Duration.Companion.seconds diff --git a/app/src/main/java/eu/kanade/presentation/updates/manga/MangaUpdatesScreen.kt b/app/src/main/java/eu/kanade/presentation/updates/manga/MangaUpdatesScreen.kt index 03a98abf2..d99285a54 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/manga/MangaUpdatesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/manga/MangaUpdatesScreen.kt @@ -21,14 +21,14 @@ import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.EntryBottomActionMenu import eu.kanade.presentation.components.FastScrollLazyColumn import eu.kanade.presentation.components.LoadingScreen -import eu.kanade.presentation.components.PullRefresh -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.download.manga.model.MangaDownload import eu.kanade.tachiyomi.ui.updates.manga.MangaUpdatesItem import eu.kanade.tachiyomi.ui.updates.manga.UpdatesState import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import tachiyomi.presentation.core.components.material.PullRefresh +import tachiyomi.presentation.core.components.material.Scaffold import kotlin.time.Duration.Companion.seconds @Composable diff --git a/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt b/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt index b496a6a05..8cc56af07 100644 --- a/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt +++ b/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt @@ -25,10 +25,10 @@ import com.google.accompanist.web.rememberWebViewNavigator import com.google.accompanist.web.rememberWebViewState import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.setDefaultSettings +import tachiyomi.presentation.core.components.material.Scaffold @Composable fun WebViewScreenContent( 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 47d3ffbf0..cf85a2936 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,8 +11,6 @@ import data.Mangas import dataanime.Anime_sync import dataanime.Animes import eu.kanade.domain.backup.service.BackupPreferences -import eu.kanade.domain.entries.anime.interactor.GetAnimeFavorites -import eu.kanade.domain.entries.manga.interactor.GetMangaFavorites import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_CATEGORY @@ -70,6 +68,8 @@ import tachiyomi.data.updateStrategyAdapter import tachiyomi.domain.category.anime.interactor.GetAnimeCategories import tachiyomi.domain.category.manga.interactor.GetMangaCategories import tachiyomi.domain.category.model.Category +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 uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadStore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadStore.kt index 117a0f892..5dd32e181 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadStore.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadStore.kt @@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.data.download.anime import android.content.Context import androidx.core.content.edit -import eu.kanade.domain.entries.anime.interactor.GetAnime -import eu.kanade.domain.items.episode.interactor.GetEpisode import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource import eu.kanade.tachiyomi.data.download.anime.model.AnimeDownload import eu.kanade.tachiyomi.source.anime.AnimeSourceManager @@ -12,7 +10,9 @@ import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json +import tachiyomi.domain.entries.anime.interactor.GetAnime import tachiyomi.domain.entries.anime.model.Anime +import tachiyomi.domain.items.episode.interactor.GetEpisode import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/model/AnimeDownload.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/model/AnimeDownload.kt index 2438ac68c..7fa450023 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/model/AnimeDownload.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/anime/model/AnimeDownload.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.data.download.anime.model -import eu.kanade.domain.entries.anime.interactor.GetAnime -import eu.kanade.domain.items.episode.interactor.GetEpisode import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource import eu.kanade.tachiyomi.source.anime.AnimeSourceManager @@ -14,7 +12,9 @@ import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.flow import rx.subjects.PublishSubject +import tachiyomi.domain.entries.anime.interactor.GetAnime import tachiyomi.domain.entries.anime.model.Anime +import tachiyomi.domain.items.episode.interactor.GetEpisode import tachiyomi.domain.items.episode.model.Episode import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/manga/MangaDownloadStore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/manga/MangaDownloadStore.kt index 585a3ace1..d8dc75925 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/manga/MangaDownloadStore.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/manga/MangaDownloadStore.kt @@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.data.download.manga import android.content.Context import androidx.core.content.edit -import eu.kanade.domain.entries.manga.interactor.GetManga -import eu.kanade.domain.items.chapter.interactor.GetChapter import eu.kanade.tachiyomi.data.download.manga.model.MangaDownload import eu.kanade.tachiyomi.source.manga.MangaSourceManager import eu.kanade.tachiyomi.source.online.HttpSource @@ -12,7 +10,9 @@ import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json +import tachiyomi.domain.entries.manga.interactor.GetManga import tachiyomi.domain.entries.manga.model.Manga +import tachiyomi.domain.items.chapter.interactor.GetChapter import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/manga/model/MangaDownload.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/manga/model/MangaDownload.kt index f227bbdeb..78ba588f5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/manga/model/MangaDownload.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/manga/model/MangaDownload.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.data.download.manga.model -import eu.kanade.domain.entries.manga.interactor.GetManga -import eu.kanade.domain.items.chapter.interactor.GetChapter import eu.kanade.tachiyomi.source.manga.MangaSourceManager import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.online.HttpSource @@ -13,7 +11,9 @@ import kotlinx.coroutines.flow.debounce import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.flow +import tachiyomi.domain.entries.manga.interactor.GetManga import tachiyomi.domain.entries.manga.model.Manga +import tachiyomi.domain.items.chapter.interactor.GetChapter import tachiyomi.domain.items.chapter.model.Chapter import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get 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 e84709f2b..c69c4add7 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 @@ -16,17 +16,12 @@ import androidx.work.WorkQuery import androidx.work.WorkerParameters import androidx.work.workDataOf import eu.kanade.domain.download.service.DownloadPreferences -import eu.kanade.domain.entries.anime.interactor.GetAnime -import eu.kanade.domain.entries.anime.interactor.GetLibraryAnime import eu.kanade.domain.entries.anime.interactor.UpdateAnime import eu.kanade.domain.entries.anime.model.copyFrom import eu.kanade.domain.entries.anime.model.toSAnime -import eu.kanade.domain.items.episode.interactor.GetEpisodeByAnimeId 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.interactor.GetAnimeTracks -import eu.kanade.domain.track.anime.interactor.InsertAnimeTrack import eu.kanade.domain.track.anime.model.toDbTrack import eu.kanade.domain.track.anime.model.toDomainTrack import eu.kanade.tachiyomi.R @@ -70,11 +65,16 @@ import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.system.logcat import tachiyomi.domain.category.anime.interactor.GetAnimeCategories import tachiyomi.domain.category.model.Category +import tachiyomi.domain.entries.anime.interactor.GetAnime +import tachiyomi.domain.entries.anime.interactor.GetLibraryAnime 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.model.Episode import tachiyomi.domain.items.episode.model.NoEpisodesException import tachiyomi.domain.library.anime.LibraryAnime +import tachiyomi.domain.track.anime.interactor.GetAnimeTracks +import tachiyomi.domain.track.anime.interactor.InsertAnimeTrack 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/library/manga/MangaLibraryUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/manga/MangaLibraryUpdateJob.kt index 39d707010..d8e777783 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 @@ -16,17 +16,12 @@ import androidx.work.WorkQuery import androidx.work.WorkerParameters import androidx.work.workDataOf import eu.kanade.domain.download.service.DownloadPreferences -import eu.kanade.domain.entries.manga.interactor.GetLibraryManga -import eu.kanade.domain.entries.manga.interactor.GetManga import eu.kanade.domain.entries.manga.interactor.UpdateManga import eu.kanade.domain.entries.manga.model.copyFrom import eu.kanade.domain.entries.manga.model.toSManga -import eu.kanade.domain.items.chapter.interactor.GetChapterByMangaId 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.interactor.GetMangaTracks -import eu.kanade.domain.track.manga.interactor.InsertMangaTrack import eu.kanade.domain.track.manga.model.toDbTrack import eu.kanade.domain.track.manga.model.toDomainTrack import eu.kanade.tachiyomi.R @@ -70,11 +65,16 @@ import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.system.logcat import tachiyomi.domain.category.manga.interactor.GetMangaCategories import tachiyomi.domain.category.model.Category +import tachiyomi.domain.entries.manga.interactor.GetLibraryManga +import tachiyomi.domain.entries.manga.interactor.GetManga 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.model.Chapter import tachiyomi.domain.items.chapter.model.NoChaptersException import tachiyomi.domain.library.manga.LibraryManga +import tachiyomi.domain.track.manga.interactor.GetMangaTracks +import tachiyomi.domain.track.manga.interactor.InsertMangaTrack 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/notification/NotificationReceiver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt index 55177b5a2..1e3b54aad 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt @@ -9,12 +9,6 @@ import android.os.Build import androidx.core.content.ContextCompat import androidx.core.net.toUri import eu.kanade.domain.download.service.DownloadPreferences -import eu.kanade.domain.entries.anime.interactor.GetAnime -import eu.kanade.domain.entries.manga.interactor.GetManga -import eu.kanade.domain.items.chapter.interactor.GetChapter -import eu.kanade.domain.items.chapter.interactor.UpdateChapter -import eu.kanade.domain.items.episode.interactor.GetEpisode -import eu.kanade.domain.items.episode.interactor.UpdateEpisode import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.core.Constants import eu.kanade.tachiyomi.data.backup.BackupRestoreService @@ -38,10 +32,16 @@ import eu.kanade.tachiyomi.util.system.toShareIntent import eu.kanade.tachiyomi.util.system.toast import kotlinx.coroutines.runBlocking import tachiyomi.core.util.lang.launchIO +import tachiyomi.domain.entries.anime.interactor.GetAnime import tachiyomi.domain.entries.anime.model.Anime +import tachiyomi.domain.entries.manga.interactor.GetManga import tachiyomi.domain.entries.manga.model.Manga +import tachiyomi.domain.items.chapter.interactor.GetChapter +import tachiyomi.domain.items.chapter.interactor.UpdateChapter import tachiyomi.domain.items.chapter.model.Chapter import tachiyomi.domain.items.chapter.model.toChapterUpdate +import tachiyomi.domain.items.episode.interactor.GetEpisode +import tachiyomi.domain.items.episode.interactor.UpdateEpisode import tachiyomi.domain.items.episode.model.Episode import tachiyomi.domain.items.episode.model.toEpisodeUpdate import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/AnimeTrackService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/AnimeTrackService.kt index 9609c334a..c85d98b56 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/AnimeTrackService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/AnimeTrackService.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.data.track import android.app.Application -import eu.kanade.domain.items.episode.interactor.GetEpisodeByAnimeId import eu.kanade.domain.items.episode.interactor.SyncEpisodesWithTrackServiceTwoWay -import eu.kanade.domain.track.anime.interactor.InsertAnimeTrack import eu.kanade.domain.track.anime.model.toDbTrack import eu.kanade.domain.track.anime.model.toDomainTrack import eu.kanade.tachiyomi.data.database.models.anime.AnimeTrack @@ -13,6 +11,8 @@ import logcat.LogPriority import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.items.episode.interactor.GetEpisodeByAnimeId +import tachiyomi.domain.track.anime.interactor.InsertAnimeTrack import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import tachiyomi.domain.track.anime.model.AnimeTrack as DomainAnimeTrack diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/MangaTrackService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/MangaTrackService.kt index 016f4024d..6f4148b0f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/MangaTrackService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/MangaTrackService.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.data.track import android.app.Application -import eu.kanade.domain.items.chapter.interactor.GetChapterByMangaId import eu.kanade.domain.items.chapter.interactor.SyncChaptersWithTrackServiceTwoWay -import eu.kanade.domain.track.manga.interactor.InsertMangaTrack import eu.kanade.domain.track.manga.model.toDbTrack import eu.kanade.domain.track.manga.model.toDomainTrack import eu.kanade.tachiyomi.data.database.models.manga.MangaTrack @@ -13,6 +11,8 @@ import logcat.LogPriority import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.items.chapter.interactor.GetChapterByMangaId +import tachiyomi.domain.track.manga.interactor.InsertMangaTrack import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import tachiyomi.domain.track.manga.model.MangaTrack as DomainTrack diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/anime/AnimeSourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/anime/AnimeSourceManager.kt index 7c70a7250..ebca9fe29 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/anime/AnimeSourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/anime/AnimeSourceManager.kt @@ -38,7 +38,7 @@ class AnimeSourceManager( private val stubSourcesMap = ConcurrentHashMap() val catalogueSources: Flow> = sourcesMapFlow.map { it.values.filterIsInstance() } - val onlineSources: Flow> = catalogueSources.map { sources -> sources.filterIsInstance() } + val onlineSources: Flow> = catalogueSources.map { it.filterIsInstance() } init { scope.launch { @@ -108,7 +108,7 @@ class AnimeSourceManager( } @Suppress("OverridingDeprecatedMember") - open inner class StubAnimeSource(private val sourceData: AnimeSourceData) : AnimeSource { + inner class StubAnimeSource(private val sourceData: AnimeSourceData) : AnimeSource { override val id: Long = sourceData.id diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/anime/LocalAnimeSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/anime/LocalAnimeSource.kt index 26cd704ca..be38dd1e1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/anime/LocalAnimeSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/anime/LocalAnimeSource.kt @@ -12,7 +12,6 @@ import eu.kanade.tachiyomi.animesource.model.AnimesPage import eu.kanade.tachiyomi.animesource.model.SAnime import eu.kanade.tachiyomi.animesource.model.SEpisode import eu.kanade.tachiyomi.source.UnmeteredSource -import eu.kanade.tachiyomi.util.episode.EpisodeRecognition import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder import eu.kanade.tachiyomi.util.storage.DiskUtil import eu.kanade.tachiyomi.util.storage.toFFmpegString @@ -25,6 +24,7 @@ import logcat.LogPriority import rx.Observable import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.items.episode.service.EpisodeRecognition import uy.kohesive.injekt.injectLazy import java.io.File import java.io.InputStream diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/manga/LocalMangaSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/manga/LocalMangaSource.kt index 70a246883..d8053f38c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/manga/LocalMangaSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/manga/LocalMangaSource.kt @@ -14,7 +14,6 @@ import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga -import eu.kanade.tachiyomi.util.chapter.ChapterRecognition import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder import eu.kanade.tachiyomi.util.storage.DiskUtil import eu.kanade.tachiyomi.util.storage.EpubFile @@ -29,6 +28,7 @@ import nl.adaptivity.xmlutil.serialization.XML import rx.Observable import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.items.chapter.service.ChapterRecognition import uy.kohesive.injekt.injectLazy import java.io.File import java.io.FileInputStream diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/manga/MangaSourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/manga/MangaSourceManager.kt index 854b0a0b9..88ec4359e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/manga/MangaSourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/manga/MangaSourceManager.kt @@ -39,7 +39,7 @@ class MangaSourceManager( private val stubSourcesMap = ConcurrentHashMap() val catalogueSources: Flow> = sourcesMapFlow.map { it.values.filterIsInstance() } - val onlineSources: Flow> = catalogueSources.map { sources -> sources.filterIsInstance() } + val onlineSources: Flow> = catalogueSources.map { it.filterIsInstance() } init { scope.launch { @@ -110,7 +110,7 @@ class MangaSourceManager( } @Suppress("OverridingDeprecatedMember") - open inner class StubMangaSource(private val sourceData: MangaSourceData) : MangaSource { + inner class StubMangaSource(private val sourceData: MangaSourceData) : MangaSource { override val id: Long = sourceData.id diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/extension/details/SourcePreferencesScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/extension/details/SourcePreferencesScreen.kt index 110531770..0a7531670 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/extension/details/SourcePreferencesScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/extension/details/SourcePreferencesScreen.kt @@ -39,13 +39,13 @@ import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.uniqueScreenKey import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource import eu.kanade.tachiyomi.data.preference.SharedPreferencesDataStore import eu.kanade.tachiyomi.source.anime.AnimeSourceManager import eu.kanade.tachiyomi.source.anime.getPreferenceKey import eu.kanade.tachiyomi.widget.TachiyomiTextInputEditText.Companion.setIncognito +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/browse/anime/migration/AnimeMigrationFlags.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/AnimeMigrationFlags.kt index afa5877f7..8169fb695 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/AnimeMigrationFlags.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/AnimeMigrationFlags.kt @@ -1,11 +1,11 @@ package eu.kanade.tachiyomi.ui.browse.anime.migration import eu.kanade.domain.entries.anime.model.hasCustomCover -import eu.kanade.domain.track.anime.interactor.GetAnimeTracks import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.cache.AnimeCoverCache import kotlinx.coroutines.runBlocking import tachiyomi.domain.entries.anime.model.Anime +import tachiyomi.domain.track.anime.interactor.GetAnimeTracks 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/browse/anime/migration/anime/MigrationAnimeScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/anime/MigrationAnimeScreenModel.kt index 5a1e39702..dd73e9e6a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/anime/MigrationAnimeScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/anime/MigrationAnimeScreenModel.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.browse.anime.migration.anime import androidx.compose.runtime.Immutable import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.domain.entries.anime.interactor.GetAnimeFavorites import eu.kanade.tachiyomi.animesource.AnimeSource import eu.kanade.tachiyomi.source.anime.AnimeSourceManager import kotlinx.coroutines.channels.Channel @@ -16,6 +15,7 @@ import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import logcat.LogPriority import tachiyomi.core.util.system.logcat +import tachiyomi.domain.entries.anime.interactor.GetAnimeFavorites import tachiyomi.domain.entries.anime.model.Anime import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/search/AnimeSourceSearchScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/search/AnimeSourceSearchScreen.kt index 8ed934150..fe990c9da 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/search/AnimeSourceSearchScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/search/AnimeSourceSearchScreen.kt @@ -23,8 +23,6 @@ import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.presentation.browse.anime.BrowseAnimeSourceContent -import eu.kanade.presentation.components.ExtendedFloatingActionButton -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.SearchToolbar import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource @@ -36,6 +34,8 @@ import eu.kanade.tachiyomi.ui.home.HomeScreen import eu.kanade.tachiyomi.ui.webview.WebViewScreen import kotlinx.coroutines.launch import tachiyomi.domain.entries.anime.model.Anime +import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton +import tachiyomi.presentation.core.components.material.Scaffold data class AnimeSourceSearchScreen( private val oldAnime: Anime, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/search/MigrateAnimeDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/search/MigrateAnimeDialog.kt index 176495bae..519371413 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/search/MigrateAnimeDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/search/MigrateAnimeDialog.kt @@ -25,15 +25,10 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.util.fastForEachIndexed import cafe.adriel.voyager.core.model.StateScreenModel -import eu.kanade.domain.category.anime.interactor.SetAnimeCategories import eu.kanade.domain.entries.anime.interactor.UpdateAnime import eu.kanade.domain.entries.anime.model.hasCustomCover import eu.kanade.domain.entries.anime.model.toSAnime -import eu.kanade.domain.items.episode.interactor.GetEpisodeByAnimeId import eu.kanade.domain.items.episode.interactor.SyncEpisodesWithSource -import eu.kanade.domain.items.episode.interactor.UpdateEpisode -import eu.kanade.domain.track.anime.interactor.GetAnimeTracks -import eu.kanade.domain.track.anime.interactor.InsertAnimeTrack import eu.kanade.presentation.components.LoadingScreen import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.animesource.AnimeSource @@ -50,9 +45,14 @@ import tachiyomi.core.preference.PreferenceStore import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.withUIContext import tachiyomi.domain.category.anime.interactor.GetAnimeCategories +import tachiyomi.domain.category.anime.interactor.SetAnimeCategories import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.entries.anime.model.AnimeUpdate +import tachiyomi.domain.items.episode.interactor.GetEpisodeByAnimeId +import tachiyomi.domain.items.episode.interactor.UpdateEpisode import tachiyomi.domain.items.episode.model.toEpisodeUpdate +import tachiyomi.domain.track.anime.interactor.GetAnimeTracks +import tachiyomi.domain.track.anime.interactor.InsertAnimeTrack import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.Date diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/search/MigrateAnimeSearchScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/search/MigrateAnimeSearchScreenModel.kt index bacca7550..784cc4b20 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/search/MigrateAnimeSearchScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/migration/search/MigrateAnimeSearchScreenModel.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.browse.anime.migration.search import androidx.compose.runtime.Immutable import cafe.adriel.voyager.core.model.coroutineScope import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.entries.anime.interactor.GetAnime import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.tachiyomi.animesource.AnimeCatalogueSource import eu.kanade.tachiyomi.source.anime.AnimeSourceManager @@ -11,6 +10,7 @@ import eu.kanade.tachiyomi.ui.browse.anime.source.globalsearch.AnimeSearchItemRe import eu.kanade.tachiyomi.ui.browse.anime.source.globalsearch.AnimeSearchScreenModel import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch +import tachiyomi.domain.entries.anime.interactor.GetAnime import tachiyomi.domain.entries.anime.model.Anime import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/source/browse/BrowseAnimeSourceScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/source/browse/BrowseAnimeSourceScreen.kt index cf6a3c05a..eeef09aef 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/source/browse/BrowseAnimeSourceScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/source/browse/BrowseAnimeSourceScreen.kt @@ -43,9 +43,7 @@ import eu.kanade.presentation.browse.anime.MissingSourceScreen import eu.kanade.presentation.browse.anime.components.BrowseAnimeSourceToolbar import eu.kanade.presentation.browse.anime.components.RemoveEntryDialog import eu.kanade.presentation.components.ChangeCategoryDialog -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.DuplicateAnimeDialog -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.util.AssistContentScreen import eu.kanade.presentation.util.padding import eu.kanade.tachiyomi.R @@ -62,6 +60,8 @@ import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.receiveAsFlow import tachiyomi.core.util.lang.launchIO +import tachiyomi.presentation.core.components.material.Divider +import tachiyomi.presentation.core.components.material.Scaffold data class BrowseAnimeSourceScreen( private val sourceId: Long, 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 795ad7375..a83214180 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,21 +18,15 @@ import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.core.prefs.CheckboxState import eu.kanade.core.prefs.asState import eu.kanade.core.prefs.mapAsCheckboxState -import eu.kanade.domain.category.anime.interactor.SetAnimeCategories -import eu.kanade.domain.entries.anime.interactor.GetAnime -import eu.kanade.domain.entries.anime.interactor.GetDuplicateLibraryAnime -import eu.kanade.domain.entries.anime.interactor.NetworkToLocalAnime 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.GetEpisodeByAnimeId 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.interactor.InsertAnimeTrack import eu.kanade.domain.track.anime.model.toDomainTrack import eu.kanade.tachiyomi.animesource.AnimeCatalogueSource import eu.kanade.tachiyomi.animesource.model.AnimeFilterList @@ -71,9 +65,15 @@ import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.core.util.system.logcat import tachiyomi.domain.category.anime.interactor.GetAnimeCategories +import tachiyomi.domain.category.anime.interactor.SetAnimeCategories import tachiyomi.domain.category.model.Category +import tachiyomi.domain.entries.anime.interactor.GetAnime +import tachiyomi.domain.entries.anime.interactor.GetDuplicateLibraryAnime +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.track.anime.interactor.InsertAnimeTrack import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.Date diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/source/globalsearch/AnimeSearchScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/source/globalsearch/AnimeSearchScreenModel.kt index a39a0c090..5b9d5a37c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/source/globalsearch/AnimeSearchScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/anime/source/globalsearch/AnimeSearchScreenModel.kt @@ -5,8 +5,6 @@ import androidx.compose.runtime.State import androidx.compose.runtime.produceState import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.domain.entries.anime.interactor.GetAnime -import eu.kanade.domain.entries.anime.interactor.NetworkToLocalAnime import eu.kanade.domain.entries.anime.interactor.UpdateAnime import eu.kanade.domain.entries.anime.model.copyFrom import eu.kanade.domain.entries.anime.model.toDomainAnime @@ -25,6 +23,8 @@ import tachiyomi.core.util.lang.awaitSingle import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.entries.anime.interactor.GetAnime +import tachiyomi.domain.entries.anime.interactor.NetworkToLocalAnime import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.entries.anime.model.toAnimeUpdate import uy.kohesive.injekt.Injekt diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/extension/details/MangaSourcePreferencesScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/extension/details/MangaSourcePreferencesScreen.kt index 684ae37f9..ebaf03688 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/extension/details/MangaSourcePreferencesScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/extension/details/MangaSourcePreferencesScreen.kt @@ -39,13 +39,13 @@ import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.uniqueScreenKey import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.SharedPreferencesDataStore import eu.kanade.tachiyomi.source.ConfigurableSource import eu.kanade.tachiyomi.source.manga.MangaSourceManager import eu.kanade.tachiyomi.source.manga.getPreferenceKey import eu.kanade.tachiyomi.widget.TachiyomiTextInputEditText.Companion.setIncognito +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/browse/manga/migration/MangaMigrationFlags.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/MangaMigrationFlags.kt index 4f84a1934..d411a35e5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/MangaMigrationFlags.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/MangaMigrationFlags.kt @@ -1,11 +1,11 @@ package eu.kanade.tachiyomi.ui.browse.manga.migration import eu.kanade.domain.entries.manga.model.hasCustomCover -import eu.kanade.domain.track.manga.interactor.GetMangaTracks import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.cache.MangaCoverCache import kotlinx.coroutines.runBlocking import tachiyomi.domain.entries.manga.model.Manga +import tachiyomi.domain.track.manga.interactor.GetMangaTracks 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/browse/manga/migration/manga/MigrationMangaScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/manga/MigrationMangaScreenModel.kt index c80d84136..dc065aef2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/manga/MigrationMangaScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/manga/MigrationMangaScreenModel.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.browse.manga.migration.manga import androidx.compose.runtime.Immutable import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.domain.entries.manga.interactor.GetMangaFavorites import eu.kanade.tachiyomi.source.MangaSource import eu.kanade.tachiyomi.source.manga.MangaSourceManager import kotlinx.coroutines.channels.Channel @@ -16,6 +15,7 @@ import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import logcat.LogPriority import tachiyomi.core.util.system.logcat +import tachiyomi.domain.entries.manga.interactor.GetMangaFavorites import tachiyomi.domain.entries.manga.model.Manga import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/search/MangaSourceSearchScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/search/MangaSourceSearchScreen.kt index 20a186123..432ff30d9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/search/MangaSourceSearchScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/search/MangaSourceSearchScreen.kt @@ -23,8 +23,6 @@ import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.presentation.browse.manga.BrowseSourceContent -import eu.kanade.presentation.components.ExtendedFloatingActionButton -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.SearchToolbar import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.core.Constants @@ -36,6 +34,8 @@ import eu.kanade.tachiyomi.ui.home.HomeScreen import eu.kanade.tachiyomi.ui.webview.WebViewScreen import kotlinx.coroutines.launch import tachiyomi.domain.entries.manga.model.Manga +import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton +import tachiyomi.presentation.core.components.material.Scaffold data class MangaSourceSearchScreen( private val oldManga: Manga, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/search/MigrateMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/search/MigrateMangaDialog.kt index 0e4ac7d87..e75d13782 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/search/MigrateMangaDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/search/MigrateMangaDialog.kt @@ -25,15 +25,10 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.util.fastForEachIndexed import cafe.adriel.voyager.core.model.StateScreenModel -import eu.kanade.domain.category.manga.interactor.SetMangaCategories import eu.kanade.domain.entries.manga.interactor.UpdateManga import eu.kanade.domain.entries.manga.model.hasCustomCover import eu.kanade.domain.entries.manga.model.toSManga -import eu.kanade.domain.items.chapter.interactor.GetChapterByMangaId import eu.kanade.domain.items.chapter.interactor.SyncChaptersWithSource -import eu.kanade.domain.items.chapter.interactor.UpdateChapter -import eu.kanade.domain.track.manga.interactor.GetMangaTracks -import eu.kanade.domain.track.manga.interactor.InsertMangaTrack import eu.kanade.presentation.components.LoadingScreen import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.cache.MangaCoverCache @@ -49,9 +44,14 @@ import tachiyomi.core.preference.PreferenceStore import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.withUIContext import tachiyomi.domain.category.manga.interactor.GetMangaCategories +import tachiyomi.domain.category.manga.interactor.SetMangaCategories import tachiyomi.domain.entries.manga.model.Manga import tachiyomi.domain.entries.manga.model.MangaUpdate +import tachiyomi.domain.items.chapter.interactor.GetChapterByMangaId +import tachiyomi.domain.items.chapter.interactor.UpdateChapter import tachiyomi.domain.items.chapter.model.toChapterUpdate +import tachiyomi.domain.track.manga.interactor.GetMangaTracks +import tachiyomi.domain.track.manga.interactor.InsertMangaTrack import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.Date diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/search/MigrateMangaSearchScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/search/MigrateMangaSearchScreenModel.kt index 94a77a524..92e1d086f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/search/MigrateMangaSearchScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/migration/search/MigrateMangaSearchScreenModel.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.browse.manga.migration.search import androidx.compose.runtime.Immutable import cafe.adriel.voyager.core.model.coroutineScope import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.entries.manga.interactor.GetManga import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.manga.MangaSourceManager @@ -11,6 +10,7 @@ import eu.kanade.tachiyomi.ui.browse.manga.source.globalsearch.MangaSearchItemRe import eu.kanade.tachiyomi.ui.browse.manga.source.globalsearch.MangaSearchScreenModel import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch +import tachiyomi.domain.entries.manga.interactor.GetManga import tachiyomi.domain.entries.manga.model.Manga import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/source/browse/BrowseMangaSourceScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/source/browse/BrowseMangaSourceScreen.kt index 84205bafc..0369e1b59 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/source/browse/BrowseMangaSourceScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/source/browse/BrowseMangaSourceScreen.kt @@ -43,9 +43,7 @@ import eu.kanade.presentation.browse.manga.BrowseSourceContent import eu.kanade.presentation.browse.manga.MissingSourceScreen import eu.kanade.presentation.browse.manga.components.BrowseMangaSourceToolbar import eu.kanade.presentation.components.ChangeCategoryDialog -import eu.kanade.presentation.components.Divider import eu.kanade.presentation.components.DuplicateMangaDialog -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.util.AssistContentScreen import eu.kanade.presentation.util.padding import eu.kanade.tachiyomi.R @@ -62,6 +60,8 @@ import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.receiveAsFlow import tachiyomi.core.util.lang.launchIO +import tachiyomi.presentation.core.components.material.Divider +import tachiyomi.presentation.core.components.material.Scaffold data class BrowseMangaSourceScreen( private val sourceId: Long, 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 e1365833e..04a2d86d8 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,21 +18,15 @@ import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.core.prefs.CheckboxState import eu.kanade.core.prefs.asState import eu.kanade.core.prefs.mapAsCheckboxState -import eu.kanade.domain.category.manga.interactor.SetMangaCategories -import eu.kanade.domain.entries.manga.interactor.GetDuplicateLibraryManga -import eu.kanade.domain.entries.manga.interactor.GetManga -import eu.kanade.domain.entries.manga.interactor.NetworkToLocalManga 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.GetChapterByMangaId 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.interactor.InsertMangaTrack import eu.kanade.domain.track.manga.model.toDomainTrack import eu.kanade.tachiyomi.data.cache.MangaCoverCache import eu.kanade.tachiyomi.data.track.EnhancedMangaTrackService @@ -71,9 +65,15 @@ import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.core.util.system.logcat import tachiyomi.domain.category.manga.interactor.GetMangaCategories +import tachiyomi.domain.category.manga.interactor.SetMangaCategories import tachiyomi.domain.category.model.Category +import tachiyomi.domain.entries.manga.interactor.GetDuplicateLibraryManga +import tachiyomi.domain.entries.manga.interactor.GetManga +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.track.manga.interactor.InsertMangaTrack import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.Date diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/source/globalsearch/MangaSearchScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/source/globalsearch/MangaSearchScreenModel.kt index 347cdae5e..b5a19805c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/source/globalsearch/MangaSearchScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/source/globalsearch/MangaSearchScreenModel.kt @@ -5,8 +5,6 @@ import androidx.compose.runtime.State import androidx.compose.runtime.produceState import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.coroutineScope -import eu.kanade.domain.entries.manga.interactor.GetManga -import eu.kanade.domain.entries.manga.interactor.NetworkToLocalManga import eu.kanade.domain.entries.manga.interactor.UpdateManga import eu.kanade.domain.entries.manga.model.copyFrom import eu.kanade.domain.entries.manga.model.toDomainManga @@ -25,6 +23,8 @@ import tachiyomi.core.util.lang.awaitSingle import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.entries.manga.interactor.GetManga +import tachiyomi.domain.entries.manga.interactor.NetworkToLocalManga import tachiyomi.domain.entries.manga.model.Manga import tachiyomi.domain.entries.manga.model.toMangaUpdate 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 669752cb5..bd4fbc291 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 @@ -5,16 +5,16 @@ 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.domain.category.anime.interactor.DeleteAnimeCategory -import eu.kanade.domain.category.anime.interactor.RenameAnimeCategory -import eu.kanade.domain.category.anime.interactor.ReorderAnimeCategory 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.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.model.Category import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get 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 8c8d8f623..41facdf74 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 @@ -5,16 +5,16 @@ 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.domain.category.manga.interactor.DeleteMangaCategory -import eu.kanade.domain.category.manga.interactor.RenameMangaCategory -import eu.kanade.domain.category.manga.interactor.ReorderMangaCategory 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.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.model.Category import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/anime/AnimeDownloadQueueScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/anime/AnimeDownloadQueueScreen.kt index c405e1812..c31f0fc3b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/anime/AnimeDownloadQueueScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/anime/AnimeDownloadQueueScreen.kt @@ -37,13 +37,13 @@ import androidx.core.view.updateLayoutParams import androidx.core.view.updatePadding import androidx.recyclerview.widget.LinearLayoutManager import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.ExtendedFloatingActionButton -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.download.anime.AnimeDownloadService import eu.kanade.tachiyomi.databinding.DownloadListBinding import kotlinx.coroutines.CoroutineScope import tachiyomi.core.util.lang.launchUI +import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton +import tachiyomi.presentation.core.components.material.Scaffold import kotlin.math.roundToInt @Composable diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/manga/MangaDownloadQueueScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/manga/MangaDownloadQueueScreen.kt index 96307cc95..5570bb55f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/manga/MangaDownloadQueueScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/manga/MangaDownloadQueueScreen.kt @@ -37,13 +37,13 @@ import androidx.core.view.updateLayoutParams import androidx.core.view.updatePadding import androidx.recyclerview.widget.LinearLayoutManager import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.ExtendedFloatingActionButton -import eu.kanade.presentation.components.Scaffold import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.download.manga.MangaDownloadService import eu.kanade.tachiyomi.databinding.DownloadListBinding import kotlinx.coroutines.CoroutineScope import tachiyomi.core.util.lang.launchUI +import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton +import tachiyomi.presentation.core.components.material.Scaffold import kotlin.math.roundToInt @Composable diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/AnimeCoverScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/AnimeCoverScreenModel.kt index 12deba590..3aa9d945d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/AnimeCoverScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/AnimeCoverScreenModel.kt @@ -9,7 +9,6 @@ import cafe.adriel.voyager.core.model.coroutineScope import coil.imageLoader import coil.request.ImageRequest import coil.size.Size -import eu.kanade.domain.entries.anime.interactor.GetAnime import eu.kanade.domain.entries.anime.interactor.UpdateAnime import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.cache.AnimeCoverCache @@ -25,6 +24,7 @@ import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.entries.anime.interactor.GetAnime import tachiyomi.domain.entries.anime.model.Anime import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get 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 e5f6d7a4c..7ce67ee0c 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 @@ -12,11 +12,7 @@ import eu.kanade.core.prefs.CheckboxState import eu.kanade.core.prefs.asState import eu.kanade.core.prefs.mapAsCheckboxState import eu.kanade.core.util.addOrRemove -import eu.kanade.domain.category.anime.interactor.SetAnimeCategories import eu.kanade.domain.download.service.DownloadPreferences -import eu.kanade.domain.entries.anime.interactor.GetAnimeWithEpisodes -import eu.kanade.domain.entries.anime.interactor.GetDuplicateLibraryAnime -import eu.kanade.domain.entries.anime.interactor.SetAnimeEpisodeFlags import eu.kanade.domain.entries.anime.interactor.UpdateAnime import eu.kanade.domain.entries.anime.model.downloadedFilter import eu.kanade.domain.entries.anime.model.isLocal @@ -24,9 +20,7 @@ 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.items.episode.interactor.UpdateEpisode import eu.kanade.domain.library.service.LibraryPreferences -import eu.kanade.domain.track.anime.interactor.GetAnimeTracks import eu.kanade.domain.track.anime.model.toDbTrack import eu.kanade.domain.track.service.TrackPreferences import eu.kanade.domain.ui.UiPreferences @@ -46,7 +40,6 @@ import eu.kanade.tachiyomi.network.HttpException import eu.kanade.tachiyomi.source.anime.AnimeSourceManager import eu.kanade.tachiyomi.ui.entries.anime.track.AnimeTrackItem import eu.kanade.tachiyomi.ui.player.settings.PlayerPreferences -import eu.kanade.tachiyomi.util.episode.getEpisodeSort import eu.kanade.tachiyomi.util.episode.getNextUnseen import eu.kanade.tachiyomi.util.removeCovers import eu.kanade.tachiyomi.util.shouldDownloadNewEpisodes @@ -68,12 +61,19 @@ import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat import tachiyomi.domain.category.anime.interactor.GetAnimeCategories +import tachiyomi.domain.category.anime.interactor.SetAnimeCategories import tachiyomi.domain.category.model.Category import tachiyomi.domain.entries.TriStateFilter +import tachiyomi.domain.entries.anime.interactor.GetAnimeWithEpisodes +import tachiyomi.domain.entries.anime.interactor.GetDuplicateLibraryAnime +import tachiyomi.domain.entries.anime.interactor.SetAnimeEpisodeFlags import tachiyomi.domain.entries.anime.model.Anime +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.track.anime.interactor.GetAnimeTracks import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/track/AnimeTrackInfoDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/track/AnimeTrackInfoDialog.kt index 893f88a12..2039bcf6f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/track/AnimeTrackInfoDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/anime/track/AnimeTrackInfoDialog.kt @@ -36,16 +36,10 @@ import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.domain.entries.anime.interactor.GetAnime -import eu.kanade.domain.entries.anime.interactor.GetAnimeWithEpisodes import eu.kanade.domain.items.episode.interactor.SyncEpisodesWithTrackServiceTwoWay -import eu.kanade.domain.track.anime.interactor.DeleteAnimeTrack -import eu.kanade.domain.track.anime.interactor.GetAnimeTracks -import eu.kanade.domain.track.anime.interactor.InsertAnimeTrack import eu.kanade.domain.track.anime.model.toDbTrack import eu.kanade.domain.track.anime.model.toDomainTrack import eu.kanade.domain.ui.UiPreferences -import eu.kanade.presentation.components.AlertDialogContent import eu.kanade.presentation.entries.TrackDateSelector import eu.kanade.presentation.entries.TrackItemSelector import eu.kanade.presentation.entries.TrackScoreSelector @@ -72,7 +66,13 @@ import tachiyomi.core.util.lang.launchNonCancellable import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.entries.anime.interactor.GetAnime +import tachiyomi.domain.entries.anime.interactor.GetAnimeWithEpisodes +import tachiyomi.domain.track.anime.interactor.DeleteAnimeTrack +import tachiyomi.domain.track.anime.interactor.GetAnimeTracks +import tachiyomi.domain.track.anime.interactor.InsertAnimeTrack import tachiyomi.domain.track.anime.model.AnimeTrack +import tachiyomi.presentation.core.components.material.AlertDialogContent import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.time.Instant diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/MangaCoverScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/MangaCoverScreenModel.kt index 74a553c80..576674db8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/MangaCoverScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/MangaCoverScreenModel.kt @@ -9,7 +9,6 @@ import cafe.adriel.voyager.core.model.coroutineScope import coil.imageLoader import coil.request.ImageRequest import coil.size.Size -import eu.kanade.domain.entries.manga.interactor.GetManga import eu.kanade.domain.entries.manga.interactor.UpdateManga import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.cache.MangaCoverCache @@ -25,6 +24,7 @@ import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.entries.manga.interactor.GetManga import tachiyomi.domain.entries.manga.model.Manga import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get 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 6ef8473fb..910fb69bc 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 @@ -12,11 +12,7 @@ import eu.kanade.core.prefs.CheckboxState import eu.kanade.core.prefs.asState import eu.kanade.core.prefs.mapAsCheckboxState import eu.kanade.core.util.addOrRemove -import eu.kanade.domain.category.manga.interactor.SetMangaCategories import eu.kanade.domain.download.service.DownloadPreferences -import eu.kanade.domain.entries.manga.interactor.GetDuplicateLibraryManga -import eu.kanade.domain.entries.manga.interactor.GetMangaWithChapters -import eu.kanade.domain.entries.manga.interactor.SetMangaChapterFlags import eu.kanade.domain.entries.manga.interactor.UpdateManga import eu.kanade.domain.entries.manga.model.downloadedFilter import eu.kanade.domain.entries.manga.model.isLocal @@ -24,9 +20,7 @@ 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.items.chapter.interactor.UpdateChapter import eu.kanade.domain.library.service.LibraryPreferences -import eu.kanade.domain.track.manga.interactor.GetMangaTracks import eu.kanade.domain.track.manga.model.toDbTrack import eu.kanade.domain.track.service.TrackPreferences import eu.kanade.domain.ui.UiPreferences @@ -45,7 +39,6 @@ import eu.kanade.tachiyomi.source.MangaSource import eu.kanade.tachiyomi.source.manga.MangaSourceManager import eu.kanade.tachiyomi.ui.entries.manga.track.MangaTrackItem import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences -import eu.kanade.tachiyomi.util.chapter.getChapterSort import eu.kanade.tachiyomi.util.chapter.getNextUnread import eu.kanade.tachiyomi.util.removeCovers import eu.kanade.tachiyomi.util.shouldDownloadNewChapters @@ -67,12 +60,19 @@ import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat import tachiyomi.domain.category.manga.interactor.GetMangaCategories +import tachiyomi.domain.category.manga.interactor.SetMangaCategories import tachiyomi.domain.category.model.Category import tachiyomi.domain.entries.TriStateFilter +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.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.track.manga.interactor.GetMangaTracks import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.text.DecimalFormat diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/track/MangaTrackInfoDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/track/MangaTrackInfoDialog.kt index 8a6199608..825521ee7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/track/MangaTrackInfoDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/entries/manga/track/MangaTrackInfoDialog.kt @@ -36,16 +36,10 @@ import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.domain.entries.manga.interactor.GetManga -import eu.kanade.domain.entries.manga.interactor.GetMangaWithChapters import eu.kanade.domain.items.chapter.interactor.SyncChaptersWithTrackServiceTwoWay -import eu.kanade.domain.track.manga.interactor.DeleteMangaTrack -import eu.kanade.domain.track.manga.interactor.GetMangaTracks -import eu.kanade.domain.track.manga.interactor.InsertMangaTrack import eu.kanade.domain.track.manga.model.toDbTrack import eu.kanade.domain.track.manga.model.toDomainTrack import eu.kanade.domain.ui.UiPreferences -import eu.kanade.presentation.components.AlertDialogContent import eu.kanade.presentation.entries.TrackDateSelector import eu.kanade.presentation.entries.TrackItemSelector import eu.kanade.presentation.entries.TrackScoreSelector @@ -72,7 +66,13 @@ import tachiyomi.core.util.lang.launchNonCancellable import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.entries.manga.interactor.GetManga +import tachiyomi.domain.entries.manga.interactor.GetMangaWithChapters +import tachiyomi.domain.track.manga.interactor.DeleteMangaTrack +import tachiyomi.domain.track.manga.interactor.GetMangaTracks +import tachiyomi.domain.track.manga.interactor.InsertMangaTrack import tachiyomi.domain.track.manga.model.MangaTrack +import tachiyomi.presentation.core.components.material.AlertDialogContent import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.time.Instant 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 98e44f619..c22172c99 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 @@ -39,7 +39,6 @@ import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.presentation.components.NavigationBar import eu.kanade.presentation.components.NavigationRail -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.util.isTabletUi import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.BrowseTab @@ -57,6 +56,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.presentation.core.components.material.Scaffold 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/library/anime/AnimeLibraryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibraryScreenModel.kt index cc76d8e56..c53fb80cf 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 @@ -16,15 +16,11 @@ import eu.kanade.core.util.fastFilterNot import eu.kanade.core.util.fastMapNotNull import eu.kanade.core.util.fastPartition import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.category.anime.interactor.SetAnimeCategories -import eu.kanade.domain.entries.anime.interactor.GetLibraryAnime 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.GetEpisodeByAnimeId import eu.kanade.domain.items.episode.interactor.SetSeenStatus import eu.kanade.domain.library.service.LibraryPreferences -import eu.kanade.domain.track.anime.interactor.GetTracksPerAnime import eu.kanade.presentation.components.SEARCH_DEBOUNCE_MILLIS import eu.kanade.presentation.entries.DownloadAction import eu.kanade.presentation.library.LibraryToolbarTitle @@ -53,15 +49,18 @@ import kotlinx.coroutines.flow.update import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.launchNonCancellable import tachiyomi.core.util.lang.withIOContext -import tachiyomi.data.entries.anime.libraryAnime import tachiyomi.domain.category.anime.interactor.GetAnimeCategories +import tachiyomi.domain.category.anime.interactor.SetAnimeCategories import tachiyomi.domain.category.model.Category +import tachiyomi.domain.entries.anime.interactor.GetLibraryAnime import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.entries.anime.model.AnimeUpdate +import tachiyomi.domain.items.episode.interactor.GetEpisodeByAnimeId import tachiyomi.domain.items.episode.model.Episode import tachiyomi.domain.library.anime.LibraryAnime import tachiyomi.domain.library.model.LibrarySort import tachiyomi.domain.library.model.sort +import tachiyomi.domain.track.anime.interactor.GetTracksPerAnime import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.text.Collator 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 0383d0755..8c63d8473 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 @@ -39,7 +39,6 @@ import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.EmptyScreenAction import eu.kanade.presentation.components.LibraryBottomActionMenu import eu.kanade.presentation.components.LoadingScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.library.LibraryToolbar import eu.kanade.presentation.library.anime.AnimeLibraryContent import eu.kanade.presentation.util.Tab @@ -63,6 +62,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.presentation.core.components.material.Scaffold import uy.kohesive.injekt.injectLazy object AnimeLibraryTab : Tab { 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 e59bfb797..31df349bd 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 @@ -16,15 +16,11 @@ import eu.kanade.core.util.fastFilterNot import eu.kanade.core.util.fastMapNotNull import eu.kanade.core.util.fastPartition import eu.kanade.domain.base.BasePreferences -import eu.kanade.domain.category.manga.interactor.SetMangaCategories -import eu.kanade.domain.entries.manga.interactor.GetLibraryManga 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.GetChapterByMangaId import eu.kanade.domain.items.chapter.interactor.SetReadStatus import eu.kanade.domain.library.service.LibraryPreferences -import eu.kanade.domain.track.manga.interactor.GetTracksPerManga import eu.kanade.presentation.components.SEARCH_DEBOUNCE_MILLIS import eu.kanade.presentation.entries.DownloadAction import eu.kanade.presentation.library.LibraryToolbarTitle @@ -54,13 +50,17 @@ import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.launchNonCancellable import tachiyomi.core.util.lang.withIOContext import tachiyomi.domain.category.manga.interactor.GetMangaCategories +import tachiyomi.domain.category.manga.interactor.SetMangaCategories import tachiyomi.domain.category.model.Category +import tachiyomi.domain.entries.manga.interactor.GetLibraryManga import tachiyomi.domain.entries.manga.model.Manga import tachiyomi.domain.entries.manga.model.MangaUpdate +import tachiyomi.domain.items.chapter.interactor.GetChapterByMangaId import tachiyomi.domain.items.chapter.model.Chapter import tachiyomi.domain.library.manga.LibraryManga import tachiyomi.domain.library.model.LibrarySort import tachiyomi.domain.library.model.sort +import tachiyomi.domain.track.manga.interactor.GetTracksPerManga import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.text.Collator 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 38822fbff..e6354e852 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 @@ -38,7 +38,6 @@ import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.EmptyScreenAction import eu.kanade.presentation.components.LibraryBottomActionMenu import eu.kanade.presentation.components.LoadingScreen -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.library.LibraryToolbar import eu.kanade.presentation.library.manga.MangaLibraryContent import eu.kanade.presentation.util.Tab @@ -59,6 +58,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.presentation.core.components.material.Scaffold import uy.kohesive.injekt.injectLazy object MangaLibraryTab : Tab { 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 3c01503d2..58e7ec46e 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 @@ -61,7 +61,6 @@ import eu.kanade.presentation.components.AppStateBanners import eu.kanade.presentation.components.DownloadedOnlyBannerBackgroundColor import eu.kanade.presentation.components.IncognitoModeBannerBackgroundColor import eu.kanade.presentation.components.IndexingBannerBackgroundColor -import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.util.AssistContentScreen import eu.kanade.presentation.util.DefaultNavigatorScreenTransition import eu.kanade.presentation.util.collectAsState @@ -113,6 +112,7 @@ import logcat.LogPriority import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.system.logcat import tachiyomi.domain.category.model.Category +import tachiyomi.presentation.core.components.material.Scaffold 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/ExternalIntents.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/ExternalIntents.kt index fe7af7339..b22705a51 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/ExternalIntents.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/ExternalIntents.kt @@ -13,12 +13,7 @@ import androidx.core.net.toUri import eu.kanade.core.util.asFlow import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.download.service.DownloadPreferences -import eu.kanade.domain.entries.anime.interactor.GetAnime -import eu.kanade.domain.items.episode.interactor.GetEpisodeByAnimeId -import eu.kanade.domain.items.episode.interactor.UpdateEpisode import eu.kanade.domain.items.episode.model.toDbEpisode -import eu.kanade.domain.track.anime.interactor.GetAnimeTracks -import eu.kanade.domain.track.anime.interactor.InsertAnimeTrack import eu.kanade.domain.track.anime.model.toDbTrack import eu.kanade.domain.track.anime.service.DelayedAnimeTrackingUpdateJob import eu.kanade.domain.track.anime.store.DelayedAnimeTrackingStore @@ -43,11 +38,16 @@ import logcat.LogPriority import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.entries.anime.interactor.GetAnime import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.history.anime.interactor.UpsertAnimeHistory import tachiyomi.domain.history.anime.model.AnimeHistoryUpdate +import tachiyomi.domain.items.episode.interactor.GetEpisodeByAnimeId +import tachiyomi.domain.items.episode.interactor.UpdateEpisode import tachiyomi.domain.items.episode.model.Episode import tachiyomi.domain.items.episode.model.EpisodeUpdate +import tachiyomi.domain.track.anime.interactor.GetAnimeTracks +import tachiyomi.domain.track.anime.interactor.InsertAnimeTrack 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 585987bcf..93dd833e5 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,15 +9,10 @@ import androidx.lifecycle.viewModelScope import eu.kanade.core.util.asFlow import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.download.service.DownloadPreferences -import eu.kanade.domain.entries.anime.interactor.GetAnime 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.interactor.GetEpisodeByAnimeId -import eu.kanade.domain.items.episode.interactor.UpdateEpisode import eu.kanade.domain.items.episode.model.toDbEpisode -import eu.kanade.domain.track.anime.interactor.GetAnimeTracks -import eu.kanade.domain.track.anime.interactor.InsertAnimeTrack import eu.kanade.domain.track.anime.model.toDbTrack import eu.kanade.domain.track.anime.service.DelayedAnimeTrackingUpdateJob import eu.kanade.domain.track.anime.store.DelayedAnimeTrackingStore @@ -42,7 +37,6 @@ import eu.kanade.tachiyomi.ui.reader.SaveImageNotifier import eu.kanade.tachiyomi.util.AniSkipApi import eu.kanade.tachiyomi.util.Stamp import eu.kanade.tachiyomi.util.editCover -import eu.kanade.tachiyomi.util.episode.getEpisodeSort import eu.kanade.tachiyomi.util.lang.byteSize import eu.kanade.tachiyomi.util.lang.takeBytes import eu.kanade.tachiyomi.util.storage.DiskUtil @@ -68,10 +62,16 @@ import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.launchNonCancellable import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.entries.anime.interactor.GetAnime import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.history.anime.interactor.UpsertAnimeHistory import tachiyomi.domain.history.anime.model.AnimeHistoryUpdate +import tachiyomi.domain.items.episode.interactor.GetEpisodeByAnimeId +import tachiyomi.domain.items.episode.interactor.UpdateEpisode import tachiyomi.domain.items.episode.model.EpisodeUpdate +import tachiyomi.domain.items.episode.service.getEpisodeSort +import tachiyomi.domain.track.anime.interactor.GetAnimeTracks +import tachiyomi.domain.track.anime.interactor.InsertAnimeTrack import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.io.InputStream 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 8a038b110..c7bd6d8e0 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 @@ -8,17 +8,12 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import eu.kanade.domain.base.BasePreferences import eu.kanade.domain.download.service.DownloadPreferences -import eu.kanade.domain.entries.manga.interactor.GetManga 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.interactor.GetChapterByMangaId -import eu.kanade.domain.items.chapter.interactor.UpdateChapter import eu.kanade.domain.items.chapter.model.toDbChapter -import eu.kanade.domain.track.manga.interactor.GetMangaTracks -import eu.kanade.domain.track.manga.interactor.InsertMangaTrack import eu.kanade.domain.track.manga.model.toDbTrack import eu.kanade.domain.track.manga.service.DelayedMangaTrackingUpdateJob import eu.kanade.domain.track.manga.store.DelayedMangaTrackingStore @@ -45,7 +40,6 @@ import eu.kanade.tachiyomi.ui.reader.model.ViewerChapters import eu.kanade.tachiyomi.ui.reader.setting.OrientationType import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType -import eu.kanade.tachiyomi.util.chapter.getChapterSort import eu.kanade.tachiyomi.util.editCover import eu.kanade.tachiyomi.util.lang.byteSize import eu.kanade.tachiyomi.util.lang.takeBytes @@ -74,10 +68,16 @@ import tachiyomi.core.util.lang.launchNonCancellable import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat +import tachiyomi.domain.entries.manga.interactor.GetManga import tachiyomi.domain.entries.manga.model.Manga import tachiyomi.domain.history.manga.interactor.UpsertMangaHistory import tachiyomi.domain.history.manga.model.MangaHistoryUpdate +import tachiyomi.domain.items.chapter.interactor.GetChapterByMangaId +import tachiyomi.domain.items.chapter.interactor.UpdateChapter import tachiyomi.domain.items.chapter.model.ChapterUpdate +import tachiyomi.domain.items.chapter.service.getChapterSort +import tachiyomi.domain.track.manga.interactor.GetMangaTracks +import tachiyomi.domain.track.manga.interactor.InsertMangaTrack import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.Date 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 2351a9c82..27f9b8f54 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 @@ -7,11 +7,8 @@ import eu.kanade.core.util.fastDistinctBy import eu.kanade.core.util.fastFilter import eu.kanade.core.util.fastFilterNot import eu.kanade.core.util.fastMapNotNull -import eu.kanade.domain.entries.anime.interactor.GetLibraryAnime import eu.kanade.domain.entries.anime.model.isLocal -import eu.kanade.domain.items.episode.interactor.GetEpisodeByAnimeId import eu.kanade.domain.library.service.LibraryPreferences -import eu.kanade.domain.track.anime.interactor.GetAnimeTracks import eu.kanade.presentation.more.stats.StatsScreenState import eu.kanade.presentation.more.stats.data.StatsData import eu.kanade.tachiyomi.animesource.model.SAnime @@ -23,7 +20,10 @@ import eu.kanade.tachiyomi.data.track.AnimeTrackService import eu.kanade.tachiyomi.data.track.TrackManager import kotlinx.coroutines.flow.update 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.track.anime.interactor.GetAnimeTracks import tachiyomi.domain.track.anime.model.AnimeTrack import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get 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 2d8ee249f..4c5d037de 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 @@ -7,10 +7,8 @@ import eu.kanade.core.util.fastDistinctBy import eu.kanade.core.util.fastFilter import eu.kanade.core.util.fastFilterNot import eu.kanade.core.util.fastMapNotNull -import eu.kanade.domain.entries.manga.interactor.GetLibraryManga import eu.kanade.domain.entries.manga.model.isLocal import eu.kanade.domain.library.service.LibraryPreferences -import eu.kanade.domain.track.manga.interactor.GetMangaTracks import eu.kanade.presentation.more.stats.StatsScreenState import eu.kanade.presentation.more.stats.data.StatsData import eu.kanade.tachiyomi.data.download.manga.MangaDownloadManager @@ -22,8 +20,10 @@ import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.source.model.SManga import kotlinx.coroutines.flow.update 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.track.manga.interactor.GetMangaTracks import tachiyomi.domain.track.manga.model.MangaTrack import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get 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 6a8ee16b9..44f5c42e3 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,10 +12,7 @@ import eu.kanade.core.prefs.asState import eu.kanade.core.util.addOrRemove import eu.kanade.core.util.insertSeparators import eu.kanade.domain.download.service.DownloadPreferences -import eu.kanade.domain.entries.anime.interactor.GetAnime -import eu.kanade.domain.items.episode.interactor.GetEpisode import eu.kanade.domain.items.episode.interactor.SetSeenStatus -import eu.kanade.domain.items.episode.interactor.UpdateEpisode import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.components.EpisodeDownloadAction @@ -42,6 +39,9 @@ import logcat.LogPriority import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.launchNonCancellable import tachiyomi.core.util.system.logcat +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.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 6a46ece15..ca877439b 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 @@ -11,10 +11,7 @@ import cafe.adriel.voyager.core.model.coroutineScope import eu.kanade.core.prefs.asState import eu.kanade.core.util.addOrRemove import eu.kanade.core.util.insertSeparators -import eu.kanade.domain.entries.manga.interactor.GetManga -import eu.kanade.domain.items.chapter.interactor.GetChapter import eu.kanade.domain.items.chapter.interactor.SetReadStatus -import eu.kanade.domain.items.chapter.interactor.UpdateChapter import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.components.ChapterDownloadAction @@ -41,6 +38,9 @@ import logcat.LogPriority import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.launchNonCancellable import tachiyomi.core.util.system.logcat +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.updates.manga.interactor.GetMangaUpdates import tachiyomi.domain.updates.manga.model.MangaUpdatesWithRelations diff --git a/data/src/main/sqldelight/view/updatesView.sq b/data/src/main/sqldelight/view/updatesView.sq index 437b86ea0..fc6953818 100644 --- a/data/src/main/sqldelight/view/updatesView.sq +++ b/data/src/main/sqldelight/view/updatesView.sq @@ -24,3 +24,9 @@ updates: SELECT * FROM updatesView WHERE dateUpload > :after; + +getUpdatesByReadStatus: +SELECT * +FROM updatesView +WHERE read = :read +AND dateUpload > :after; \ No newline at end of file diff --git a/data/src/main/sqldelightanime/view/animeupdatesView.sq b/data/src/main/sqldelightanime/view/animeupdatesView.sq index d8b14e5a6..ff1e8b1e3 100644 --- a/data/src/main/sqldelightanime/view/animeupdatesView.sq +++ b/data/src/main/sqldelightanime/view/animeupdatesView.sq @@ -25,3 +25,9 @@ animeupdates: SELECT * FROM animeupdatesView WHERE dateUpload > :after; + +getUpdatesBySeenStatus: +SELECT * +FROM animeupdatesView +WHERE seen = :seen +AND dateUpload > :after; \ No newline at end of file diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index ff5423883..9572077ae 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -18,6 +18,7 @@ dependencies { implementation(kotlinx.bundles.coroutines) implementation(project(":source-api")) + implementation(project(":core")) testImplementation(libs.junit) } diff --git a/app/src/main/java/eu/kanade/domain/category/anime/interactor/DeleteAnimeCategory.kt b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/DeleteAnimeCategory.kt similarity index 96% rename from app/src/main/java/eu/kanade/domain/category/anime/interactor/DeleteAnimeCategory.kt rename to domain/src/main/java/tachiyomi/domain/category/anime/interactor/DeleteAnimeCategory.kt index 02a8edc7d..0ed1c3071 100644 --- a/app/src/main/java/eu/kanade/domain/category/anime/interactor/DeleteAnimeCategory.kt +++ b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/DeleteAnimeCategory.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.category.anime.interactor +package tachiyomi.domain.category.anime.interactor import logcat.LogPriority import tachiyomi.core.util.lang.withNonCancellableContext diff --git a/app/src/main/java/eu/kanade/domain/category/anime/interactor/RenameAnimeCategory.kt b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/RenameAnimeCategory.kt similarity index 95% rename from app/src/main/java/eu/kanade/domain/category/anime/interactor/RenameAnimeCategory.kt rename to domain/src/main/java/tachiyomi/domain/category/anime/interactor/RenameAnimeCategory.kt index 8ef943653..0dd524e97 100644 --- a/app/src/main/java/eu/kanade/domain/category/anime/interactor/RenameAnimeCategory.kt +++ b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/RenameAnimeCategory.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.category.anime.interactor +package tachiyomi.domain.category.anime.interactor import logcat.LogPriority import tachiyomi.core.util.lang.withNonCancellableContext diff --git a/app/src/main/java/eu/kanade/domain/category/anime/interactor/ReorderAnimeCategory.kt b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/ReorderAnimeCategory.kt similarity index 97% rename from app/src/main/java/eu/kanade/domain/category/anime/interactor/ReorderAnimeCategory.kt rename to domain/src/main/java/tachiyomi/domain/category/anime/interactor/ReorderAnimeCategory.kt index 6931d12d9..75ac769f2 100644 --- a/app/src/main/java/eu/kanade/domain/category/anime/interactor/ReorderAnimeCategory.kt +++ b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/ReorderAnimeCategory.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.category.anime.interactor +package tachiyomi.domain.category.anime.interactor import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock diff --git a/app/src/main/java/eu/kanade/domain/category/anime/interactor/SetAnimeCategories.kt b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/SetAnimeCategories.kt similarity index 89% rename from app/src/main/java/eu/kanade/domain/category/anime/interactor/SetAnimeCategories.kt rename to domain/src/main/java/tachiyomi/domain/category/anime/interactor/SetAnimeCategories.kt index 2852b0310..0f72e907c 100644 --- a/app/src/main/java/eu/kanade/domain/category/anime/interactor/SetAnimeCategories.kt +++ b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/SetAnimeCategories.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.category.anime.interactor +package tachiyomi.domain.category.anime.interactor import logcat.LogPriority import tachiyomi.core.util.system.logcat diff --git a/app/src/main/java/eu/kanade/domain/category/anime/interactor/UpdateAnimeCategory.kt b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/UpdateAnimeCategory.kt similarity index 93% rename from app/src/main/java/eu/kanade/domain/category/anime/interactor/UpdateAnimeCategory.kt rename to domain/src/main/java/tachiyomi/domain/category/anime/interactor/UpdateAnimeCategory.kt index e8a472119..d112f7622 100644 --- a/app/src/main/java/eu/kanade/domain/category/anime/interactor/UpdateAnimeCategory.kt +++ b/domain/src/main/java/tachiyomi/domain/category/anime/interactor/UpdateAnimeCategory.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.category.anime.interactor +package tachiyomi.domain.category.anime.interactor import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository diff --git a/app/src/main/java/eu/kanade/domain/category/manga/interactor/DeleteMangaCategory.kt b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/DeleteMangaCategory.kt similarity index 96% rename from app/src/main/java/eu/kanade/domain/category/manga/interactor/DeleteMangaCategory.kt rename to domain/src/main/java/tachiyomi/domain/category/manga/interactor/DeleteMangaCategory.kt index 84a57b406..df7e7541a 100644 --- a/app/src/main/java/eu/kanade/domain/category/manga/interactor/DeleteMangaCategory.kt +++ b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/DeleteMangaCategory.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.category.manga.interactor +package tachiyomi.domain.category.manga.interactor import logcat.LogPriority import tachiyomi.core.util.lang.withNonCancellableContext diff --git a/app/src/main/java/eu/kanade/domain/category/manga/interactor/RenameMangaCategory.kt b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/RenameMangaCategory.kt similarity index 95% rename from app/src/main/java/eu/kanade/domain/category/manga/interactor/RenameMangaCategory.kt rename to domain/src/main/java/tachiyomi/domain/category/manga/interactor/RenameMangaCategory.kt index 4ffdd976b..ea1813a56 100644 --- a/app/src/main/java/eu/kanade/domain/category/manga/interactor/RenameMangaCategory.kt +++ b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/RenameMangaCategory.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.category.manga.interactor +package tachiyomi.domain.category.manga.interactor import logcat.LogPriority import tachiyomi.core.util.lang.withNonCancellableContext diff --git a/app/src/main/java/eu/kanade/domain/category/manga/interactor/ReorderMangaCategory.kt b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/ReorderMangaCategory.kt similarity index 97% rename from app/src/main/java/eu/kanade/domain/category/manga/interactor/ReorderMangaCategory.kt rename to domain/src/main/java/tachiyomi/domain/category/manga/interactor/ReorderMangaCategory.kt index 2ca37ca00..68e0cf090 100644 --- a/app/src/main/java/eu/kanade/domain/category/manga/interactor/ReorderMangaCategory.kt +++ b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/ReorderMangaCategory.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.category.manga.interactor +package tachiyomi.domain.category.manga.interactor import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock diff --git a/app/src/main/java/eu/kanade/domain/category/manga/interactor/SetMangaCategories.kt b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/SetMangaCategories.kt similarity index 89% rename from app/src/main/java/eu/kanade/domain/category/manga/interactor/SetMangaCategories.kt rename to domain/src/main/java/tachiyomi/domain/category/manga/interactor/SetMangaCategories.kt index 16388b9e7..cd7754f39 100644 --- a/app/src/main/java/eu/kanade/domain/category/manga/interactor/SetMangaCategories.kt +++ b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/SetMangaCategories.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.category.manga.interactor +package tachiyomi.domain.category.manga.interactor import logcat.LogPriority import tachiyomi.core.util.system.logcat diff --git a/app/src/main/java/eu/kanade/domain/category/manga/interactor/UpdateMangaCategory.kt b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/UpdateMangaCategory.kt similarity index 93% rename from app/src/main/java/eu/kanade/domain/category/manga/interactor/UpdateMangaCategory.kt rename to domain/src/main/java/tachiyomi/domain/category/manga/interactor/UpdateMangaCategory.kt index f6612cfa9..ccfa6e468 100644 --- a/app/src/main/java/eu/kanade/domain/category/manga/interactor/UpdateMangaCategory.kt +++ b/domain/src/main/java/tachiyomi/domain/category/manga/interactor/UpdateMangaCategory.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.category.manga.interactor +package tachiyomi.domain.category.manga.interactor import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.domain.category.manga.repository.MangaCategoryRepository diff --git a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetAnime.kt b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetAnime.kt similarity index 93% rename from app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetAnime.kt rename to domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetAnime.kt index 626fc7fcf..995207af5 100644 --- a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetAnime.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetAnime.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.anime.interactor +package tachiyomi.domain.entries.anime.interactor import kotlinx.coroutines.flow.Flow import logcat.LogPriority diff --git a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetAnimeFavorites.kt b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetAnimeFavorites.kt similarity index 90% rename from app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetAnimeFavorites.kt rename to domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetAnimeFavorites.kt index b642aa070..73fa52019 100644 --- a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetAnimeFavorites.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetAnimeFavorites.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.anime.interactor +package tachiyomi.domain.entries.anime.interactor import kotlinx.coroutines.flow.Flow import tachiyomi.domain.entries.anime.model.Anime diff --git a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetAnimeWithEpisodes.kt b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetAnimeWithEpisodes.kt similarity index 95% rename from app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetAnimeWithEpisodes.kt rename to domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetAnimeWithEpisodes.kt index 087551905..94dc2aa94 100644 --- a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetAnimeWithEpisodes.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetAnimeWithEpisodes.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.anime.interactor +package tachiyomi.domain.entries.anime.interactor import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine diff --git a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetDuplicateLibraryAnime.kt b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetDuplicateLibraryAnime.kt similarity index 86% rename from app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetDuplicateLibraryAnime.kt rename to domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetDuplicateLibraryAnime.kt index 42bb31981..8e3c9e2ba 100644 --- a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetDuplicateLibraryAnime.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetDuplicateLibraryAnime.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.anime.interactor +package tachiyomi.domain.entries.anime.interactor import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.entries.anime.repository.AnimeRepository diff --git a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetLibraryAnime.kt b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetLibraryAnime.kt similarity index 89% rename from app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetLibraryAnime.kt rename to domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetLibraryAnime.kt index a0af9c556..056050523 100644 --- a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/GetLibraryAnime.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/GetLibraryAnime.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.anime.interactor +package tachiyomi.domain.entries.anime.interactor import kotlinx.coroutines.flow.Flow import tachiyomi.domain.entries.anime.repository.AnimeRepository diff --git a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/NetworkToLocalAnime.kt b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/NetworkToLocalAnime.kt similarity index 95% rename from app/src/main/java/eu/kanade/domain/entries/anime/interactor/NetworkToLocalAnime.kt rename to domain/src/main/java/tachiyomi/domain/entries/anime/interactor/NetworkToLocalAnime.kt index 151eedd14..3a2df6e24 100644 --- a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/NetworkToLocalAnime.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/NetworkToLocalAnime.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.anime.interactor +package tachiyomi.domain.entries.anime.interactor import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.entries.anime.repository.AnimeRepository diff --git a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/ResetAnimeViewerFlags.kt b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/ResetAnimeViewerFlags.kt similarity index 83% rename from app/src/main/java/eu/kanade/domain/entries/anime/interactor/ResetAnimeViewerFlags.kt rename to domain/src/main/java/tachiyomi/domain/entries/anime/interactor/ResetAnimeViewerFlags.kt index 87486ca27..13b69ecd2 100644 --- a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/ResetAnimeViewerFlags.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/ResetAnimeViewerFlags.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.anime.interactor +package tachiyomi.domain.entries.anime.interactor import tachiyomi.domain.entries.anime.repository.AnimeRepository diff --git a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/SetAnimeEpisodeFlags.kt b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/SetAnimeEpisodeFlags.kt similarity index 98% rename from app/src/main/java/eu/kanade/domain/entries/anime/interactor/SetAnimeEpisodeFlags.kt rename to domain/src/main/java/tachiyomi/domain/entries/anime/interactor/SetAnimeEpisodeFlags.kt index 45b8c662a..b7ba09907 100644 --- a/app/src/main/java/eu/kanade/domain/entries/anime/interactor/SetAnimeEpisodeFlags.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/anime/interactor/SetAnimeEpisodeFlags.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.anime.interactor +package tachiyomi.domain.entries.anime.interactor import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.entries.anime.model.AnimeUpdate diff --git a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetDuplicateLibraryManga.kt b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetDuplicateLibraryManga.kt similarity index 86% rename from app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetDuplicateLibraryManga.kt rename to domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetDuplicateLibraryManga.kt index 18ffd7677..8b1eeb94d 100644 --- a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetDuplicateLibraryManga.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetDuplicateLibraryManga.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.manga.interactor +package tachiyomi.domain.entries.manga.interactor import tachiyomi.domain.entries.manga.model.Manga import tachiyomi.domain.entries.manga.repository.MangaRepository diff --git a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetLibraryManga.kt b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetLibraryManga.kt similarity index 89% rename from app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetLibraryManga.kt rename to domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetLibraryManga.kt index 482de860b..68eb9ec9c 100644 --- a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetLibraryManga.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetLibraryManga.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.manga.interactor +package tachiyomi.domain.entries.manga.interactor import kotlinx.coroutines.flow.Flow import tachiyomi.domain.entries.manga.repository.MangaRepository diff --git a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetManga.kt b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetManga.kt similarity index 93% rename from app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetManga.kt rename to domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetManga.kt index acb13ae9a..e1a7e5e58 100644 --- a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetManga.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetManga.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.manga.interactor +package tachiyomi.domain.entries.manga.interactor import kotlinx.coroutines.flow.Flow import logcat.LogPriority diff --git a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetMangaFavorites.kt b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetMangaFavorites.kt similarity index 90% rename from app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetMangaFavorites.kt rename to domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetMangaFavorites.kt index fe7888eb5..0d2977795 100644 --- a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetMangaFavorites.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetMangaFavorites.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.manga.interactor +package tachiyomi.domain.entries.manga.interactor import kotlinx.coroutines.flow.Flow import tachiyomi.domain.entries.manga.model.Manga diff --git a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetMangaWithChapters.kt b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetMangaWithChapters.kt similarity index 95% rename from app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetMangaWithChapters.kt rename to domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetMangaWithChapters.kt index a12e1bea7..b4add22eb 100644 --- a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/GetMangaWithChapters.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/GetMangaWithChapters.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.manga.interactor +package tachiyomi.domain.entries.manga.interactor import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine diff --git a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/NetworkToLocalManga.kt b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/NetworkToLocalManga.kt similarity index 95% rename from app/src/main/java/eu/kanade/domain/entries/manga/interactor/NetworkToLocalManga.kt rename to domain/src/main/java/tachiyomi/domain/entries/manga/interactor/NetworkToLocalManga.kt index 2764dc0d7..8e59fa013 100644 --- a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/NetworkToLocalManga.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/NetworkToLocalManga.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.manga.interactor +package tachiyomi.domain.entries.manga.interactor import tachiyomi.domain.entries.manga.model.Manga import tachiyomi.domain.entries.manga.repository.MangaRepository diff --git a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/ResetMangaViewerFlags.kt b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/ResetMangaViewerFlags.kt similarity index 83% rename from app/src/main/java/eu/kanade/domain/entries/manga/interactor/ResetMangaViewerFlags.kt rename to domain/src/main/java/tachiyomi/domain/entries/manga/interactor/ResetMangaViewerFlags.kt index 7135b7635..034aca30e 100644 --- a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/ResetMangaViewerFlags.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/ResetMangaViewerFlags.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.manga.interactor +package tachiyomi.domain.entries.manga.interactor import tachiyomi.domain.entries.manga.repository.MangaRepository diff --git a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/SetMangaChapterFlags.kt b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/SetMangaChapterFlags.kt similarity index 98% rename from app/src/main/java/eu/kanade/domain/entries/manga/interactor/SetMangaChapterFlags.kt rename to domain/src/main/java/tachiyomi/domain/entries/manga/interactor/SetMangaChapterFlags.kt index 5d7e754d6..dd76a62ba 100644 --- a/app/src/main/java/eu/kanade/domain/entries/manga/interactor/SetMangaChapterFlags.kt +++ b/domain/src/main/java/tachiyomi/domain/entries/manga/interactor/SetMangaChapterFlags.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.entries.manga.interactor +package tachiyomi.domain.entries.manga.interactor import tachiyomi.domain.entries.manga.model.Manga import tachiyomi.domain.entries.manga.model.MangaUpdate diff --git a/app/src/main/java/eu/kanade/domain/items/chapter/interactor/GetChapter.kt b/domain/src/main/java/tachiyomi/domain/items/chapter/interactor/GetChapter.kt similarity index 93% rename from app/src/main/java/eu/kanade/domain/items/chapter/interactor/GetChapter.kt rename to domain/src/main/java/tachiyomi/domain/items/chapter/interactor/GetChapter.kt index 561f34c45..c3269ac3d 100644 --- a/app/src/main/java/eu/kanade/domain/items/chapter/interactor/GetChapter.kt +++ b/domain/src/main/java/tachiyomi/domain/items/chapter/interactor/GetChapter.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.items.chapter.interactor +package tachiyomi.domain.items.chapter.interactor import logcat.LogPriority import tachiyomi.core.util.system.logcat diff --git a/app/src/main/java/eu/kanade/domain/items/chapter/interactor/GetChapterByMangaId.kt b/domain/src/main/java/tachiyomi/domain/items/chapter/interactor/GetChapterByMangaId.kt similarity index 91% rename from app/src/main/java/eu/kanade/domain/items/chapter/interactor/GetChapterByMangaId.kt rename to domain/src/main/java/tachiyomi/domain/items/chapter/interactor/GetChapterByMangaId.kt index e967eee18..716bc3254 100644 --- a/app/src/main/java/eu/kanade/domain/items/chapter/interactor/GetChapterByMangaId.kt +++ b/domain/src/main/java/tachiyomi/domain/items/chapter/interactor/GetChapterByMangaId.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.items.chapter.interactor +package tachiyomi.domain.items.chapter.interactor import logcat.LogPriority import tachiyomi.core.util.system.logcat diff --git a/app/src/main/java/eu/kanade/domain/items/chapter/interactor/UpdateChapter.kt b/domain/src/main/java/tachiyomi/domain/items/chapter/interactor/UpdateChapter.kt similarity index 93% rename from app/src/main/java/eu/kanade/domain/items/chapter/interactor/UpdateChapter.kt rename to domain/src/main/java/tachiyomi/domain/items/chapter/interactor/UpdateChapter.kt index c00ddcc46..ec4cb6a2f 100644 --- a/app/src/main/java/eu/kanade/domain/items/chapter/interactor/UpdateChapter.kt +++ b/domain/src/main/java/tachiyomi/domain/items/chapter/interactor/UpdateChapter.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.items.chapter.interactor +package tachiyomi.domain.items.chapter.interactor import logcat.LogPriority import tachiyomi.core.util.system.logcat diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognition.kt b/domain/src/main/java/tachiyomi/domain/items/chapter/service/ChapterRecognition.kt similarity index 98% rename from app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognition.kt rename to domain/src/main/java/tachiyomi/domain/items/chapter/service/ChapterRecognition.kt index c1d16eb47..48c8fd39c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognition.kt +++ b/domain/src/main/java/tachiyomi/domain/items/chapter/service/ChapterRecognition.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.util.chapter +package tachiyomi.domain.items.chapter.service /** * -R> = regex conversion. diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSorter.kt b/domain/src/main/java/tachiyomi/domain/items/chapter/service/ChapterSorter.kt similarity index 95% rename from app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSorter.kt rename to domain/src/main/java/tachiyomi/domain/items/chapter/service/ChapterSorter.kt index 0162c5a28..3e6b95bf5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSorter.kt +++ b/domain/src/main/java/tachiyomi/domain/items/chapter/service/ChapterSorter.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.util.chapter +package tachiyomi.domain.items.chapter.service import tachiyomi.domain.entries.manga.model.Manga import tachiyomi.domain.items.chapter.model.Chapter diff --git a/app/src/main/java/eu/kanade/domain/items/episode/interactor/GetEpisode.kt b/domain/src/main/java/tachiyomi/domain/items/episode/interactor/GetEpisode.kt similarity index 93% rename from app/src/main/java/eu/kanade/domain/items/episode/interactor/GetEpisode.kt rename to domain/src/main/java/tachiyomi/domain/items/episode/interactor/GetEpisode.kt index b9084cdf0..911242ead 100644 --- a/app/src/main/java/eu/kanade/domain/items/episode/interactor/GetEpisode.kt +++ b/domain/src/main/java/tachiyomi/domain/items/episode/interactor/GetEpisode.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.items.episode.interactor +package tachiyomi.domain.items.episode.interactor import logcat.LogPriority import tachiyomi.core.util.system.logcat diff --git a/app/src/main/java/eu/kanade/domain/items/episode/interactor/GetEpisodeByAnimeId.kt b/domain/src/main/java/tachiyomi/domain/items/episode/interactor/GetEpisodeByAnimeId.kt similarity index 91% rename from app/src/main/java/eu/kanade/domain/items/episode/interactor/GetEpisodeByAnimeId.kt rename to domain/src/main/java/tachiyomi/domain/items/episode/interactor/GetEpisodeByAnimeId.kt index 9e07e4b3a..09fe0471e 100644 --- a/app/src/main/java/eu/kanade/domain/items/episode/interactor/GetEpisodeByAnimeId.kt +++ b/domain/src/main/java/tachiyomi/domain/items/episode/interactor/GetEpisodeByAnimeId.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.items.episode.interactor +package tachiyomi.domain.items.episode.interactor import logcat.LogPriority import tachiyomi.core.util.system.logcat diff --git a/app/src/main/java/eu/kanade/domain/items/episode/interactor/UpdateEpisode.kt b/domain/src/main/java/tachiyomi/domain/items/episode/interactor/UpdateEpisode.kt similarity index 93% rename from app/src/main/java/eu/kanade/domain/items/episode/interactor/UpdateEpisode.kt rename to domain/src/main/java/tachiyomi/domain/items/episode/interactor/UpdateEpisode.kt index 64fcb27ab..9382798e2 100644 --- a/app/src/main/java/eu/kanade/domain/items/episode/interactor/UpdateEpisode.kt +++ b/domain/src/main/java/tachiyomi/domain/items/episode/interactor/UpdateEpisode.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.items.episode.interactor +package tachiyomi.domain.items.episode.interactor import logcat.LogPriority import tachiyomi.core.util.system.logcat diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/episode/EpisodeRecognition.kt b/domain/src/main/java/tachiyomi/domain/items/episode/service/EpisodeRecognition.kt similarity index 98% rename from app/src/main/java/eu/kanade/tachiyomi/util/episode/EpisodeRecognition.kt rename to domain/src/main/java/tachiyomi/domain/items/episode/service/EpisodeRecognition.kt index a765c4675..c40410a33 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/episode/EpisodeRecognition.kt +++ b/domain/src/main/java/tachiyomi/domain/items/episode/service/EpisodeRecognition.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.util.episode +package tachiyomi.domain.items.episode.service /** * -R> = regex conversion. diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/episode/EpisodeSorter.kt b/domain/src/main/java/tachiyomi/domain/items/episode/service/EpisodeSorter.kt similarity index 95% rename from app/src/main/java/eu/kanade/tachiyomi/util/episode/EpisodeSorter.kt rename to domain/src/main/java/tachiyomi/domain/items/episode/service/EpisodeSorter.kt index 63ee9de6c..e83cb0776 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/episode/EpisodeSorter.kt +++ b/domain/src/main/java/tachiyomi/domain/items/episode/service/EpisodeSorter.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.util.episode +package tachiyomi.domain.items.episode.service import tachiyomi.domain.entries.anime.model.Anime import tachiyomi.domain.items.episode.model.Episode diff --git a/app/src/main/java/eu/kanade/domain/track/anime/interactor/DeleteAnimeTrack.kt b/domain/src/main/java/tachiyomi/domain/track/anime/interactor/DeleteAnimeTrack.kt similarity index 90% rename from app/src/main/java/eu/kanade/domain/track/anime/interactor/DeleteAnimeTrack.kt rename to domain/src/main/java/tachiyomi/domain/track/anime/interactor/DeleteAnimeTrack.kt index ece2994f9..62eb0a7e0 100644 --- a/app/src/main/java/eu/kanade/domain/track/anime/interactor/DeleteAnimeTrack.kt +++ b/domain/src/main/java/tachiyomi/domain/track/anime/interactor/DeleteAnimeTrack.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.track.anime.interactor +package tachiyomi.domain.track.anime.interactor import logcat.LogPriority import tachiyomi.core.util.system.logcat diff --git a/app/src/main/java/eu/kanade/domain/track/anime/interactor/GetAnimeTracks.kt b/domain/src/main/java/tachiyomi/domain/track/anime/interactor/GetAnimeTracks.kt similarity index 95% rename from app/src/main/java/eu/kanade/domain/track/anime/interactor/GetAnimeTracks.kt rename to domain/src/main/java/tachiyomi/domain/track/anime/interactor/GetAnimeTracks.kt index e14733129..38c60e132 100644 --- a/app/src/main/java/eu/kanade/domain/track/anime/interactor/GetAnimeTracks.kt +++ b/domain/src/main/java/tachiyomi/domain/track/anime/interactor/GetAnimeTracks.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.track.anime.interactor +package tachiyomi.domain.track.anime.interactor import kotlinx.coroutines.flow.Flow import logcat.LogPriority diff --git a/app/src/main/java/eu/kanade/domain/track/anime/interactor/GetTracksPerAnime.kt b/domain/src/main/java/tachiyomi/domain/track/anime/interactor/GetTracksPerAnime.kt similarity index 91% rename from app/src/main/java/eu/kanade/domain/track/anime/interactor/GetTracksPerAnime.kt rename to domain/src/main/java/tachiyomi/domain/track/anime/interactor/GetTracksPerAnime.kt index 8e3ac468f..fd5853631 100644 --- a/app/src/main/java/eu/kanade/domain/track/anime/interactor/GetTracksPerAnime.kt +++ b/domain/src/main/java/tachiyomi/domain/track/anime/interactor/GetTracksPerAnime.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.track.anime.interactor +package tachiyomi.domain.track.anime.interactor import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/app/src/main/java/eu/kanade/domain/track/anime/interactor/InsertAnimeTrack.kt b/domain/src/main/java/tachiyomi/domain/track/anime/interactor/InsertAnimeTrack.kt similarity index 93% rename from app/src/main/java/eu/kanade/domain/track/anime/interactor/InsertAnimeTrack.kt rename to domain/src/main/java/tachiyomi/domain/track/anime/interactor/InsertAnimeTrack.kt index 262bfee21..dcb801cd5 100644 --- a/app/src/main/java/eu/kanade/domain/track/anime/interactor/InsertAnimeTrack.kt +++ b/domain/src/main/java/tachiyomi/domain/track/anime/interactor/InsertAnimeTrack.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.track.anime.interactor +package tachiyomi.domain.track.anime.interactor import logcat.LogPriority import tachiyomi.core.util.system.logcat diff --git a/app/src/main/java/eu/kanade/domain/track/manga/interactor/DeleteMangaTrack.kt b/domain/src/main/java/tachiyomi/domain/track/manga/interactor/DeleteMangaTrack.kt similarity index 90% rename from app/src/main/java/eu/kanade/domain/track/manga/interactor/DeleteMangaTrack.kt rename to domain/src/main/java/tachiyomi/domain/track/manga/interactor/DeleteMangaTrack.kt index 6a4c9696c..46cf389b4 100644 --- a/app/src/main/java/eu/kanade/domain/track/manga/interactor/DeleteMangaTrack.kt +++ b/domain/src/main/java/tachiyomi/domain/track/manga/interactor/DeleteMangaTrack.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.track.manga.interactor +package tachiyomi.domain.track.manga.interactor import logcat.LogPriority import tachiyomi.core.util.system.logcat diff --git a/app/src/main/java/eu/kanade/domain/track/manga/interactor/GetMangaTracks.kt b/domain/src/main/java/tachiyomi/domain/track/manga/interactor/GetMangaTracks.kt similarity index 95% rename from app/src/main/java/eu/kanade/domain/track/manga/interactor/GetMangaTracks.kt rename to domain/src/main/java/tachiyomi/domain/track/manga/interactor/GetMangaTracks.kt index 4a278256f..19055dab9 100644 --- a/app/src/main/java/eu/kanade/domain/track/manga/interactor/GetMangaTracks.kt +++ b/domain/src/main/java/tachiyomi/domain/track/manga/interactor/GetMangaTracks.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.track.manga.interactor +package tachiyomi.domain.track.manga.interactor import kotlinx.coroutines.flow.Flow import logcat.LogPriority diff --git a/app/src/main/java/eu/kanade/domain/track/manga/interactor/GetTracksPerManga.kt b/domain/src/main/java/tachiyomi/domain/track/manga/interactor/GetTracksPerManga.kt similarity index 91% rename from app/src/main/java/eu/kanade/domain/track/manga/interactor/GetTracksPerManga.kt rename to domain/src/main/java/tachiyomi/domain/track/manga/interactor/GetTracksPerManga.kt index 73080458f..906936cb0 100644 --- a/app/src/main/java/eu/kanade/domain/track/manga/interactor/GetTracksPerManga.kt +++ b/domain/src/main/java/tachiyomi/domain/track/manga/interactor/GetTracksPerManga.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.track.manga.interactor +package tachiyomi.domain.track.manga.interactor import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/app/src/main/java/eu/kanade/domain/track/manga/interactor/InsertMangaTrack.kt b/domain/src/main/java/tachiyomi/domain/track/manga/interactor/InsertMangaTrack.kt similarity index 93% rename from app/src/main/java/eu/kanade/domain/track/manga/interactor/InsertMangaTrack.kt rename to domain/src/main/java/tachiyomi/domain/track/manga/interactor/InsertMangaTrack.kt index 56d288657..566d8c886 100644 --- a/app/src/main/java/eu/kanade/domain/track/manga/interactor/InsertMangaTrack.kt +++ b/domain/src/main/java/tachiyomi/domain/track/manga/interactor/InsertMangaTrack.kt @@ -1,4 +1,4 @@ -package eu.kanade.domain.track.manga.interactor +package tachiyomi.domain.track.manga.interactor import logcat.LogPriority import tachiyomi.core.util.system.logcat diff --git a/app/src/test/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognitionTest.kt b/domain/src/test/java/tachiyomi/domain/items/chapter/service/ChapterRecognitionTest.kt similarity index 99% rename from app/src/test/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognitionTest.kt rename to domain/src/test/java/tachiyomi/domain/items/chapter/service/ChapterRecognitionTest.kt index 022a5d461..f7be94b51 100644 --- a/app/src/test/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognitionTest.kt +++ b/domain/src/test/java/tachiyomi/domain/items/chapter/service/ChapterRecognitionTest.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.util.chapter +package tachiyomi.domain.items.chapter.service import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7009110d9..57351d50e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,7 +29,7 @@ conscrypt-android = "org.conscrypt:conscrypt-android:2.5.2" quickjs-android = "app.cash.quickjs:quickjs-android:0.9.2" -jsoup = "org.jsoup:jsoup:1.15.3" +jsoup = "org.jsoup:jsoup:1.15.4" disklrucache = "com.jakewharton:disklrucache:2.0.2" unifile = "com.github.tachiyomiorg:unifile:17bec43" @@ -61,7 +61,7 @@ flexible-adapter-ui = "com.github.arkon.FlexibleAdapter:flexible-adapter-ui:c801 photoview = "com.github.chrisbanes:PhotoView:2.3.0" directionalviewpager = "com.github.tachiyomiorg:DirectionalViewPager:1.0.0" insetter = "dev.chrisbanes.insetter:insetter:0.6.1" -cascade = "me.saket.cascade:cascade-compose:2.0.0-rc01" +cascade = "me.saket.cascade:cascade-compose:2.0.0-rc02" materialmotion-core = "io.github.fornewid:material-motion-compose-core:0.10.4" logcat = "com.squareup.logcat:logcat:0.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33c4..42defcc94 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/presentation-core/build.gradle.kts b/presentation-core/build.gradle.kts index c8151eb05..8c2218464 100644 --- a/presentation-core/build.gradle.kts +++ b/presentation-core/build.gradle.kts @@ -10,8 +10,42 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") } + + buildFeatures { + compose = true + } + + composeOptions { + kotlinCompilerExtensionVersion = compose.versions.compiler.get() + } } dependencies { - + // Compose + implementation(platform(compose.bom)) + implementation(compose.foundation) + implementation(compose.material3.core) + implementation(compose.material.core) + implementation(compose.material.icons) + implementation(compose.animation) + implementation(compose.animation.graphics) + implementation(compose.ui.tooling) + implementation(compose.ui.util) +} + +tasks { + // See https://kotlinlang.org/docs/reference/experimental.html#experimental-status-of-experimental-api(-markers) + withType { + kotlinOptions.freeCompilerArgs += listOf( + "-opt-in=coil.annotation.ExperimentalCoilApi", + "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi", + "-opt-in=androidx.compose.material.ExperimentalMaterialApi", + "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api", + "-opt-in=androidx.compose.material.ExperimentalMaterialApi", + "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi", + "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi", + "-opt-in=androidx.compose.animation.ExperimentalAnimationApi", + "-opt-in=androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi", + ) + } } diff --git a/app/src/main/java/eu/kanade/presentation/components/Badges.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/Badges.kt similarity index 98% rename from app/src/main/java/eu/kanade/presentation/components/Badges.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/Badges.kt index 60533b79a..f2a004ba2 100644 --- a/app/src/main/java/eu/kanade/presentation/components/Badges.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/Badges.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Row diff --git a/app/src/main/java/eu/kanade/presentation/components/LinkIcon.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/LinkIcon.kt similarity index 95% rename from app/src/main/java/eu/kanade/presentation/components/LinkIcon.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/LinkIcon.kt index 5dd801ac4..9208c587a 100644 --- a/app/src/main/java/eu/kanade/presentation/components/LinkIcon.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/LinkIcon.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components import androidx.compose.foundation.layout.padding import androidx.compose.material3.Icon diff --git a/app/src/main/java/eu/kanade/presentation/components/Pill.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/Pill.kt similarity index 96% rename from app/src/main/java/eu/kanade/presentation/components/Pill.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/Pill.kt index 9f935d1d9..fe5da2d25 100644 --- a/app/src/main/java/eu/kanade/presentation/components/Pill.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/Pill.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.IntrinsicSize diff --git a/app/src/main/java/eu/kanade/presentation/components/AlertDialog.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/AlertDialog.kt similarity index 98% rename from app/src/main/java/eu/kanade/presentation/components/AlertDialog.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/material/AlertDialog.kt index 1a6751970..74f5ec8f0 100644 --- a/app/src/main/java/eu/kanade/presentation/components/AlertDialog.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/AlertDialog.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components.material import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/eu/kanade/presentation/components/Divider.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Divider.kt similarity index 95% rename from app/src/main/java/eu/kanade/presentation/components/Divider.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Divider.kt index 2082e73cb..a434d6354 100644 --- a/app/src/main/java/eu/kanade/presentation/components/Divider.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Divider.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components.material import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/app/src/main/java/eu/kanade/presentation/components/FloatingActionButton.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/FloatingActionButton.kt similarity index 98% rename from app/src/main/java/eu/kanade/presentation/components/FloatingActionButton.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/material/FloatingActionButton.kt index ebb29032b..645e318f3 100644 --- a/app/src/main/java/eu/kanade/presentation/components/FloatingActionButton.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/FloatingActionButton.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components.material import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.CubicBezierEasing diff --git a/app/src/main/java/eu/kanade/presentation/components/PullRefresh.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/PullRefresh.kt similarity index 97% rename from app/src/main/java/eu/kanade/presentation/components/PullRefresh.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/material/PullRefresh.kt index 25699a6a5..2200b5354 100644 --- a/app/src/main/java/eu/kanade/presentation/components/PullRefresh.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/PullRefresh.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components.material import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.PaddingValues diff --git a/app/src/main/java/eu/kanade/presentation/components/Scaffold.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Scaffold.kt similarity index 99% rename from app/src/main/java/eu/kanade/presentation/components/Scaffold.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Scaffold.kt index aa76cd92e..7ecd5964c 100644 --- a/app/src/main/java/eu/kanade/presentation/components/Scaffold.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Scaffold.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components.material import androidx.compose.foundation.layout.MutableWindowInsets import androidx.compose.foundation.layout.PaddingValues diff --git a/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/anime/AnimeUpdatesGridGlanceWidget.kt b/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/anime/AnimeUpdatesGridGlanceWidget.kt index e9cf839b4..a004a3bed 100644 --- a/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/anime/AnimeUpdatesGridGlanceWidget.kt +++ b/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/anime/AnimeUpdatesGridGlanceWidget.kt @@ -75,7 +75,12 @@ class AnimeUpdatesGridGlanceWidget : GlanceAppWidget() { val processList = list ?: Injekt.get() - .awaitList { animeupdatesViewQueries.animeupdates(after = DateLimit.timeInMillis) } + .awaitList { + animeupdatesViewQueries.getUpdatesBySeenStatus( + seen = false, + after = DateLimit.timeInMillis, + ) + } val (rowCount, columnCount) = ids .flatMap { manager.getAppWidgetSizes(it) } .maxBy { it.height.value * it.width.value } diff --git a/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/anime/TachiyomiAnimeWidgetManager.kt b/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/anime/TachiyomiAnimeWidgetManager.kt index 45c879c1e..170c059cf 100644 --- a/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/anime/TachiyomiAnimeWidgetManager.kt +++ b/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/anime/TachiyomiAnimeWidgetManager.kt @@ -16,7 +16,12 @@ class TachiyomiAnimeWidgetManager( ) { fun Context.init(scope: LifecycleCoroutineScope) { - database.subscribeToList { animeupdatesViewQueries.animeupdates(after = AnimeUpdatesGridGlanceWidget.DateLimit.timeInMillis) } + database.subscribeToList { + animeupdatesViewQueries.getUpdatesBySeenStatus( + seen = false, + after = AnimeUpdatesGridGlanceWidget.DateLimit.timeInMillis, + ) + } .drop(1) .distinctUntilChanged() .onEach { diff --git a/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/manga/MangaUpdatesGridGlanceWidget.kt b/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/manga/MangaUpdatesGridGlanceWidget.kt index ff96c14b4..c203e6e82 100644 --- a/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/manga/MangaUpdatesGridGlanceWidget.kt +++ b/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/manga/MangaUpdatesGridGlanceWidget.kt @@ -75,7 +75,12 @@ class MangaUpdatesGridGlanceWidget : GlanceAppWidget() { val processList = list ?: Injekt.get() - .awaitList { updatesViewQueries.updates(after = DateLimit.timeInMillis) } + .awaitList { + updatesViewQueries.getUpdatesByReadStatus( + read = false, + after = DateLimit.timeInMillis, + ) + } val (rowCount, columnCount) = ids .flatMap { manager.getAppWidgetSizes(it) } .maxBy { it.height.value * it.width.value } diff --git a/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/manga/TachiyomiMangaWidgetManager.kt b/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/manga/TachiyomiMangaWidgetManager.kt index 8323fcafc..45a6fae45 100644 --- a/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/manga/TachiyomiMangaWidgetManager.kt +++ b/presentation-widget/src/main/java/tachiyomi/presentation/widget/entries/manga/TachiyomiMangaWidgetManager.kt @@ -16,7 +16,12 @@ class TachiyomiMangaWidgetManager( ) { fun Context.init(scope: LifecycleCoroutineScope) { - database.subscribeToList { updatesViewQueries.updates(after = MangaUpdatesGridGlanceWidget.DateLimit.timeInMillis) } + database.subscribeToList { + updatesViewQueries.getUpdatesByReadStatus( + read = false, + after = MangaUpdatesGridGlanceWidget.DateLimit.timeInMillis, + ) + } .drop(1) .distinctUntilChanged() .onEach { diff --git a/source-api/src/main/java/eu/kanade/tachiyomi/animesource/online/AnimeHttpSourceFetcher.kt b/source-api/src/main/java/eu/kanade/tachiyomi/animesource/online/AnimeHttpSourceFetcher.kt index fb10ae4a3..5b5f91b8d 100644 --- a/source-api/src/main/java/eu/kanade/tachiyomi/animesource/online/AnimeHttpSourceFetcher.kt +++ b/source-api/src/main/java/eu/kanade/tachiyomi/animesource/online/AnimeHttpSourceFetcher.kt @@ -3,23 +3,23 @@ package eu.kanade.tachiyomi.animesource.online import eu.kanade.tachiyomi.animesource.model.Video import rx.Observable -fun AnimeHttpSource.getVideoUrl(video: Video): Observable