mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-10-22 11:56:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

merge7

Browse source 
Last Commit Merged: b53e24e0db
This commit is contained in:
LuftVerbot 2023-05-23 22:37:41 +02:00
parent 24e4158874
commit e2b2a7944b
185 changed files with 367 additions and 319 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle.kts
View file

@ -143,6 +143,7 @@ dependencies {
implementation(project(":core"))
implementation(project(":source-api"))
implementation(project(":data"))
implementation(project(":domain"))
// Compose
implementation(platform(compose.bom))

2
app/src/main/java/eu/kanade/data/entries/anime/AnimeRepositoryImpl.kt
View file

@ -1,7 +1,6 @@
package eu.kanade.data.entries.anime
import eu.kanade.domain.entries.anime.model.Anime
import eu.kanade.domain.entries.anime.model.AnimeUpdate
import eu.kanade.domain.entries.anime.repository.AnimeRepository
import eu.kanade.domain.library.anime.LibraryAnime
import eu.kanade.tachiyomi.util.system.logcat
@ -11,6 +10,7 @@ import logcat.LogPriority
import tachiyomi.data.handlers.anime.AnimeDatabaseHandler
import tachiyomi.data.listOfStringsAdapter
import tachiyomi.data.updateStrategyAdapter
import tachiyomi.domain.entries.anime.model.AnimeUpdate
class AnimeRepositoryImpl(
private val handler: AnimeDatabaseHandler,

2
app/src/main/java/eu/kanade/data/entries/manga/MangaRepositoryImpl.kt
View file

@ -1,7 +1,6 @@
package eu.kanade.data.entries.manga
import eu.kanade.domain.entries.manga.model.Manga
import eu.kanade.domain.entries.manga.model.MangaUpdate
import eu.kanade.domain.entries.manga.repository.MangaRepository
import eu.kanade.domain.library.manga.LibraryManga
import eu.kanade.tachiyomi.util.system.logcat
@ -11,6 +10,7 @@ import logcat.LogPriority
import tachiyomi.data.handlers.manga.MangaDatabaseHandler
import tachiyomi.data.listOfStringsAdapter
import tachiyomi.data.updateStrategyAdapter
import tachiyomi.domain.entries.manga.model.MangaUpdate
class MangaRepositoryImpl(
private val handler: MangaDatabaseHandler,

6
app/src/main/java/eu/kanade/data/history/anime/AnimeHistoryMapper.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.data.history.anime
import eu.kanade.domain.entries.anime.model.AnimeCover
import eu.kanade.domain.history.anime.model.AnimeHistory
import eu.kanade.domain.history.anime.model.AnimeHistoryWithRelations
import tachiyomi.domain.entries.anime.model.AnimeCover
import tachiyomi.domain.history.anime.model.AnimeHistory
import tachiyomi.domain.history.anime.model.AnimeHistoryWithRelations
import java.util.Date
val animeHistoryMapper: (Long, Long, Date?) -> AnimeHistory = { id, episodeId, seenAt ->

4
app/src/main/java/eu/kanade/data/history/anime/AnimeHistoryRepositoryImpl.kt
View file

@ -1,12 +1,12 @@
package eu.kanade.data.history.anime
import eu.kanade.domain.history.anime.model.AnimeHistoryUpdate
import eu.kanade.domain.history.anime.model.AnimeHistoryWithRelations
import eu.kanade.domain.history.anime.repository.AnimeHistoryRepository
import eu.kanade.tachiyomi.util.system.logcat
import kotlinx.coroutines.flow.Flow
import logcat.LogPriority
import tachiyomi.data.handlers.anime.AnimeDatabaseHandler
import tachiyomi.domain.history.anime.model.AnimeHistoryUpdate
import tachiyomi.domain.history.anime.model.AnimeHistoryWithRelations
class AnimeHistoryRepositoryImpl(
private val handler: AnimeDatabaseHandler,

6
app/src/main/java/eu/kanade/data/history/manga/MangaHistoryMapper.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.data.history.manga
import eu.kanade.domain.entries.manga.model.MangaCover
import eu.kanade.domain.history.manga.model.MangaHistory
import eu.kanade.domain.history.manga.model.MangaHistoryWithRelations
import tachiyomi.domain.entries.manga.model.MangaCover
import tachiyomi.domain.history.manga.model.MangaHistory
import tachiyomi.domain.history.manga.model.MangaHistoryWithRelations
import java.util.Date
val mangaHistoryMapper: (Long, Long, Date?, Long) -> MangaHistory = { id, chapterId, readAt, readDuration ->

4
app/src/main/java/eu/kanade/data/history/manga/MangaHistoryRepositoryImpl.kt
View file

@ -1,12 +1,12 @@
package eu.kanade.data.history.manga
import eu.kanade.domain.history.manga.model.MangaHistoryUpdate
import eu.kanade.domain.history.manga.model.MangaHistoryWithRelations
import eu.kanade.domain.history.manga.repository.MangaHistoryRepository
import eu.kanade.tachiyomi.util.system.logcat
import kotlinx.coroutines.flow.Flow
import logcat.LogPriority
import tachiyomi.data.handlers.manga.MangaDatabaseHandler
import tachiyomi.domain.history.manga.model.MangaHistoryUpdate
import tachiyomi.domain.history.manga.model.MangaHistoryWithRelations
class MangaHistoryRepositoryImpl(
private val handler: MangaDatabaseHandler,

2
app/src/main/java/eu/kanade/data/source/anime/AnimeSourceDataRepositoryImpl.kt
View file

@ -1,9 +1,9 @@
package eu.kanade.data.source.anime
import eu.kanade.domain.source.anime.model.AnimeSourceData
import eu.kanade.domain.source.anime.repository.AnimeSourceDataRepository
import kotlinx.coroutines.flow.Flow
import tachiyomi.data.handlers.anime.AnimeDatabaseHandler
import tachiyomi.domain.source.anime.model.AnimeSourceData
class AnimeSourceDataRepositoryImpl(
private val handler: AnimeDatabaseHandler,

2
app/src/main/java/eu/kanade/data/source/anime/AnimeSourceMapper.kt
View file

@ -1,9 +1,9 @@
package eu.kanade.data.source.anime
import eu.kanade.domain.source.anime.model.AnimeSource
import eu.kanade.domain.source.anime.model.AnimeSourceData
import eu.kanade.tachiyomi.animesource.AnimeCatalogueSource
import eu.kanade.tachiyomi.source.anime.AnimeSourceManager
import tachiyomi.domain.source.anime.model.AnimeSourceData
val animeSourceMapper: (eu.kanade.tachiyomi.animesource.AnimeSource) -> AnimeSource = { source ->
AnimeSource(

2
app/src/main/java/eu/kanade/data/source/manga/MangaSourceDataRepositoryImpl.kt
View file

@ -1,9 +1,9 @@
package eu.kanade.data.source.manga
import eu.kanade.domain.source.manga.model.MangaSourceData
import eu.kanade.domain.source.manga.repository.MangaSourceDataRepository
import kotlinx.coroutines.flow.Flow
import tachiyomi.data.handlers.manga.MangaDatabaseHandler
import tachiyomi.domain.source.manga.model.MangaSourceData
class MangaSourceDataRepositoryImpl(
private val handler: MangaDatabaseHandler,

2
app/src/main/java/eu/kanade/data/source/manga/MangaSourceMapper.kt
View file

@ -1,9 +1,9 @@
package eu.kanade.data.source.manga
import eu.kanade.domain.source.manga.model.MangaSourceData
import eu.kanade.domain.source.manga.model.Source
import eu.kanade.tachiyomi.source.CatalogueSource
import eu.kanade.tachiyomi.source.manga.MangaSourceManager
import tachiyomi.domain.source.manga.model.MangaSourceData
val mangaSourceMapper: (eu.kanade.tachiyomi.source.MangaSource) -> Source = { source ->
Source(

4
app/src/main/java/eu/kanade/data/updates/anime/AnimeUpdatesMapper.kt
View file

@ -1,7 +1,7 @@
package eu.kanade.data.updates.anime
import eu.kanade.domain.entries.anime.model.AnimeCover
import eu.kanade.domain.updates.anime.model.AnimeUpdatesWithRelations
import tachiyomi.domain.entries.anime.model.AnimeCover
import tachiyomi.domain.updates.anime.model.AnimeUpdatesWithRelations
val animeUpdateWithRelationMapper: (Long, String, Long, String, String?, Boolean, Boolean, Long, Long, Long, Boolean, String?, Long, Long, Long) -> AnimeUpdatesWithRelations = {
animeId, animeTitle, episodeId, episodeName, scanlator, seen, bookmark, lastSecondSeen, totalSeconds, sourceId, favorite, thumbnailUrl, coverLastModified, _, dateFetch ->

2
app/src/main/java/eu/kanade/data/updates/anime/AnimeUpdatesRepositoryImpl.kt
View file

@ -1,9 +1,9 @@
package eu.kanade.data.updates.anime
import eu.kanade.domain.updates.anime.model.AnimeUpdatesWithRelations
import eu.kanade.domain.updates.anime.repository.AnimeUpdatesRepository
import kotlinx.coroutines.flow.Flow
import tachiyomi.data.handlers.anime.AnimeDatabaseHandler
import tachiyomi.domain.updates.anime.model.AnimeUpdatesWithRelations
class AnimeUpdatesRepositoryImpl(
private val databaseHandler: AnimeDatabaseHandler,

4
app/src/main/java/eu/kanade/data/updates/manga/MangaUpdatesMapper.kt
View file

@ -1,7 +1,7 @@
package eu.kanade.data.updates.manga
import eu.kanade.domain.entries.manga.model.MangaCover
import eu.kanade.domain.updates.manga.model.MangaUpdatesWithRelations
import tachiyomi.domain.entries.manga.model.MangaCover
import tachiyomi.domain.updates.manga.model.MangaUpdatesWithRelations
val mangaUpdateWithRelationMapper: (Long, String, Long, String, String?, Boolean, Boolean, Long, Long, Boolean, String?, Long, Long, Long) -> MangaUpdatesWithRelations = {
mangaId, mangaTitle, chapterId, chapterName, scanlator, read, bookmark, lastPageRead, sourceId, favorite, thumbnailUrl, coverLastModified, _, dateFetch ->

2
app/src/main/java/eu/kanade/data/updates/manga/MangaUpdatesRepositoryImpl.kt
View file

@ -1,9 +1,9 @@
package eu.kanade.data.updates.manga
import eu.kanade.domain.updates.manga.model.MangaUpdatesWithRelations
import eu.kanade.domain.updates.manga.repository.MangaUpdatesRepository
import kotlinx.coroutines.flow.Flow
import tachiyomi.data.handlers.manga.MangaDatabaseHandler
import tachiyomi.domain.updates.manga.model.MangaUpdatesWithRelations
class MangaUpdatesRepositoryImpl(
private val databaseHandler: MangaDatabaseHandler,

8
app/src/main/java/eu/kanade/domain/DomainModule.kt
View file

@ -1,7 +1,5 @@
package eu.kanade.domain
import eu.kanade.data.category.anime.AnimeCategoryRepositoryImpl
import eu.kanade.data.category.manga.MangaCategoryRepositoryImpl
import eu.kanade.data.entries.anime.AnimeRepositoryImpl
import eu.kanade.data.entries.manga.MangaRepositoryImpl
import eu.kanade.data.history.anime.AnimeHistoryRepositoryImpl
@ -26,7 +24,6 @@ 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.anime.repository.AnimeCategoryRepository
import eu.kanade.domain.category.manga.interactor.CreateMangaCategoryWithName
import eu.kanade.domain.category.manga.interactor.DeleteMangaCategory
import eu.kanade.domain.category.manga.interactor.GetMangaCategories
@ -37,7 +34,6 @@ 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.category.manga.repository.MangaCategoryRepository
import eu.kanade.domain.download.anime.interactor.DeleteAnimeDownload
import eu.kanade.domain.download.manga.interactor.DeleteChapterDownload
import eu.kanade.domain.entries.anime.interactor.GetAnime
@ -128,6 +124,10 @@ import eu.kanade.domain.updates.anime.interactor.GetAnimeUpdates
import eu.kanade.domain.updates.anime.repository.AnimeUpdatesRepository
import eu.kanade.domain.updates.manga.interactor.GetMangaUpdates
import eu.kanade.domain.updates.manga.repository.MangaUpdatesRepository
import tachiyomi.data.category.anime.AnimeCategoryRepositoryImpl
import tachiyomi.data.category.manga.MangaCategoryRepositoryImpl
import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository
import tachiyomi.domain.category.manga.repository.MangaCategoryRepository
import uy.kohesive.injekt.api.InjektModule
import uy.kohesive.injekt.api.InjektRegistrar
import uy.kohesive.injekt.api.addFactory

4
app/src/main/java/eu/kanade/domain/category/anime/interactor/CreateAnimeCategoryWithName.kt
View file

@ -1,11 +1,11 @@
package eu.kanade.domain.category.anime.interactor
import eu.kanade.domain.category.anime.repository.AnimeCategoryRepository
import eu.kanade.domain.category.model.Category
import eu.kanade.domain.library.service.LibraryPreferences
import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
import eu.kanade.tachiyomi.util.system.logcat
import logcat.LogPriority
import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository
import tachiyomi.domain.category.model.Category
class CreateAnimeCategoryWithName(
private val categoryRepository: AnimeCategoryRepository,

4
app/src/main/java/eu/kanade/domain/category/anime/interactor/DeleteAnimeCategory.kt
View file

@ -1,10 +1,10 @@
package eu.kanade.domain.category.anime.interactor
import eu.kanade.domain.category.anime.repository.AnimeCategoryRepository
import eu.kanade.domain.category.model.CategoryUpdate
import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
import eu.kanade.tachiyomi.util.system.logcat
import logcat.LogPriority
import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository
import tachiyomi.domain.category.model.CategoryUpdate
class DeleteAnimeCategory(
private val categoryRepository: AnimeCategoryRepository,

4
app/src/main/java/eu/kanade/domain/category/anime/interactor/GetAnimeCategories.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.domain.category.anime.interactor
import eu.kanade.domain.category.anime.repository.AnimeCategoryRepository
import eu.kanade.domain.category.model.Category
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository
import tachiyomi.domain.category.model.Category
class GetAnimeCategories(
private val categoryRepository: AnimeCategoryRepository,

6
app/src/main/java/eu/kanade/domain/category/anime/interactor/RenameAnimeCategory.kt
View file

@ -1,11 +1,11 @@
package eu.kanade.domain.category.anime.interactor
import eu.kanade.domain.category.anime.repository.AnimeCategoryRepository
import eu.kanade.domain.category.model.Category
import eu.kanade.domain.category.model.CategoryUpdate
import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
import eu.kanade.tachiyomi.util.system.logcat
import logcat.LogPriority
import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository
import tachiyomi.domain.category.model.Category
import tachiyomi.domain.category.model.CategoryUpdate
class RenameAnimeCategory(
private val categoryRepository: AnimeCategoryRepository,

6
app/src/main/java/eu/kanade/domain/category/anime/interactor/ReorderAnimeCategory.kt
View file

@ -1,13 +1,13 @@
package eu.kanade.domain.category.anime.interactor
import eu.kanade.domain.category.anime.repository.AnimeCategoryRepository
import eu.kanade.domain.category.model.Category
import eu.kanade.domain.category.model.CategoryUpdate
import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
import eu.kanade.tachiyomi.util.system.logcat
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import logcat.LogPriority
import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository
import tachiyomi.domain.category.model.Category
import tachiyomi.domain.category.model.CategoryUpdate
import java.util.Collections
class ReorderAnimeCategory(

4
app/src/main/java/eu/kanade/domain/category/anime/interactor/ResetAnimeCategoryFlags.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.domain.category.anime.interactor
import eu.kanade.domain.category.anime.repository.AnimeCategoryRepository
import eu.kanade.domain.library.model.plus
import eu.kanade.domain.library.service.LibraryPreferences
import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository
import tachiyomi.domain.library.model.plus
class ResetAnimeCategoryFlags(
private val preferences: LibraryPreferences,

10
app/src/main/java/eu/kanade/domain/category/anime/interactor/SetDisplayModeForAnimeCategory.kt
View file

@ -1,11 +1,11 @@
package eu.kanade.domain.category.anime.interactor
import eu.kanade.domain.category.anime.repository.AnimeCategoryRepository
import eu.kanade.domain.category.model.Category
import eu.kanade.domain.category.model.CategoryUpdate
import eu.kanade.domain.library.model.LibraryDisplayMode
import eu.kanade.domain.library.model.plus
import eu.kanade.domain.library.service.LibraryPreferences
import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository
import tachiyomi.domain.category.model.Category
import tachiyomi.domain.category.model.CategoryUpdate
import tachiyomi.domain.library.model.LibraryDisplayMode
import tachiyomi.domain.library.model.plus
class SetDisplayModeForAnimeCategory(
private val preferences: LibraryPreferences,

10
app/src/main/java/eu/kanade/domain/category/anime/interactor/SetSortModeForAnimeCategory.kt
View file

@ -1,11 +1,11 @@
package eu.kanade.domain.category.anime.interactor
import eu.kanade.domain.category.anime.repository.AnimeCategoryRepository
import eu.kanade.domain.category.model.Category
import eu.kanade.domain.category.model.CategoryUpdate
import eu.kanade.domain.library.model.LibrarySort
import eu.kanade.domain.library.model.plus
import eu.kanade.domain.library.service.LibraryPreferences
import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository
import tachiyomi.domain.category.model.Category
import tachiyomi.domain.category.model.CategoryUpdate
import tachiyomi.domain.library.model.LibrarySort
import tachiyomi.domain.library.model.plus
class SetSortModeForAnimeCategory(
private val preferences: LibraryPreferences,

4
app/src/main/java/eu/kanade/domain/category/anime/interactor/UpdateAnimeCategory.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.domain.category.anime.interactor
import eu.kanade.domain.category.anime.repository.AnimeCategoryRepository
import eu.kanade.domain.category.model.CategoryUpdate
import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository
import tachiyomi.domain.category.model.CategoryUpdate
class UpdateAnimeCategory(
private val categoryRepository: AnimeCategoryRepository,

4
app/src/main/java/eu/kanade/domain/category/manga/interactor/CreateMangaCategoryWithName.kt
View file

@ -1,11 +1,11 @@
package eu.kanade.domain.category.manga.interactor
import eu.kanade.domain.category.manga.repository.MangaCategoryRepository
import eu.kanade.domain.category.model.Category
import eu.kanade.domain.library.service.LibraryPreferences
import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
import eu.kanade.tachiyomi.util.system.logcat
import logcat.LogPriority
import tachiyomi.domain.category.manga.repository.MangaCategoryRepository
import tachiyomi.domain.category.model.Category
class CreateMangaCategoryWithName(
private val categoryRepository: MangaCategoryRepository,

4
app/src/main/java/eu/kanade/domain/category/manga/interactor/DeleteMangaCategory.kt
View file

@ -1,10 +1,10 @@
package eu.kanade.domain.category.manga.interactor
import eu.kanade.domain.category.manga.repository.MangaCategoryRepository
import eu.kanade.domain.category.model.CategoryUpdate
import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
import eu.kanade.tachiyomi.util.system.logcat
import logcat.LogPriority
import tachiyomi.domain.category.manga.repository.MangaCategoryRepository
import tachiyomi.domain.category.model.CategoryUpdate
class DeleteMangaCategory(
private val categoryRepository: MangaCategoryRepository,

4
app/src/main/java/eu/kanade/domain/category/manga/interactor/GetMangaCategories.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.domain.category.manga.interactor
import eu.kanade.domain.category.manga.repository.MangaCategoryRepository
import eu.kanade.domain.category.model.Category
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.category.manga.repository.MangaCategoryRepository
import tachiyomi.domain.category.model.Category
class GetMangaCategories(
private val categoryRepository: MangaCategoryRepository,

6
app/src/main/java/eu/kanade/domain/category/manga/interactor/RenameMangaCategory.kt
View file

@ -1,11 +1,11 @@
package eu.kanade.domain.category.manga.interactor
import eu.kanade.domain.category.manga.repository.MangaCategoryRepository
import eu.kanade.domain.category.model.Category
import eu.kanade.domain.category.model.CategoryUpdate
import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
import eu.kanade.tachiyomi.util.system.logcat
import logcat.LogPriority
import tachiyomi.domain.category.manga.repository.MangaCategoryRepository
import tachiyomi.domain.category.model.Category
import tachiyomi.domain.category.model.CategoryUpdate
class RenameMangaCategory(
private val categoryRepository: MangaCategoryRepository,

6
app/src/main/java/eu/kanade/domain/category/manga/interactor/ReorderMangaCategory.kt
View file

@ -1,13 +1,13 @@
package eu.kanade.domain.category.manga.interactor
import eu.kanade.domain.category.manga.repository.MangaCategoryRepository
import eu.kanade.domain.category.model.Category
import eu.kanade.domain.category.model.CategoryUpdate
import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
import eu.kanade.tachiyomi.util.system.logcat
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import logcat.LogPriority
import tachiyomi.domain.category.manga.repository.MangaCategoryRepository
import tachiyomi.domain.category.model.Category
import tachiyomi.domain.category.model.CategoryUpdate
import java.util.Collections
class ReorderMangaCategory(

4
app/src/main/java/eu/kanade/domain/category/manga/interactor/ResetMangaCategoryFlags.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.domain.category.manga.interactor
import eu.kanade.domain.category.manga.repository.MangaCategoryRepository
import eu.kanade.domain.library.model.plus
import eu.kanade.domain.library.service.LibraryPreferences
import tachiyomi.domain.category.manga.repository.MangaCategoryRepository
import tachiyomi.domain.library.model.plus
class ResetMangaCategoryFlags(
private val preferences: LibraryPreferences,

10
app/src/main/java/eu/kanade/domain/category/manga/interactor/SetDisplayModeForMangaCategory.kt
View file

@ -1,11 +1,11 @@
package eu.kanade.domain.category.manga.interactor
import eu.kanade.domain.category.manga.repository.MangaCategoryRepository
import eu.kanade.domain.category.model.Category
import eu.kanade.domain.category.model.CategoryUpdate
import eu.kanade.domain.library.model.LibraryDisplayMode
import eu.kanade.domain.library.model.plus
import eu.kanade.domain.library.service.LibraryPreferences
import tachiyomi.domain.category.manga.repository.MangaCategoryRepository
import tachiyomi.domain.category.model.Category
import tachiyomi.domain.category.model.CategoryUpdate
import tachiyomi.domain.library.model.LibraryDisplayMode
import tachiyomi.domain.library.model.plus
class SetDisplayModeForMangaCategory(
private val preferences: LibraryPreferences,

10
app/src/main/java/eu/kanade/domain/category/manga/interactor/SetSortModeForMangaCategory.kt
View file

@ -1,11 +1,11 @@
package eu.kanade.domain.category.manga.interactor
import eu.kanade.domain.category.manga.repository.MangaCategoryRepository
import eu.kanade.domain.category.model.Category
import eu.kanade.domain.category.model.CategoryUpdate
import eu.kanade.domain.library.model.LibrarySort
import eu.kanade.domain.library.model.plus
import eu.kanade.domain.library.service.LibraryPreferences
import tachiyomi.domain.category.manga.repository.MangaCategoryRepository
import tachiyomi.domain.category.model.Category
import tachiyomi.domain.category.model.CategoryUpdate
import tachiyomi.domain.library.model.LibrarySort
import tachiyomi.domain.library.model.plus
class SetSortModeForMangaCategory(
private val preferences: LibraryPreferences,

4
app/src/main/java/eu/kanade/domain/category/manga/interactor/UpdateMangaCategory.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.domain.category.manga.interactor
import eu.kanade.domain.category.manga.repository.MangaCategoryRepository
import eu.kanade.domain.category.model.CategoryUpdate
import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
import tachiyomi.domain.category.manga.repository.MangaCategoryRepository
import tachiyomi.domain.category.model.CategoryUpdate
class UpdateMangaCategory(
private val categoryRepository: MangaCategoryRepository,

3
app/src/main/java/eu/kanade/domain/entries/EntryCover.kt
View file

@ -1,3 +0,0 @@
package eu.kanade.domain.entries
interface EntryCover

2
app/src/main/java/eu/kanade/domain/entries/anime/interactor/SetAnimeEpisodeFlags.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.domain.entries.anime.interactor
import eu.kanade.domain.entries.anime.model.Anime
import eu.kanade.domain.entries.anime.model.AnimeUpdate
import eu.kanade.domain.entries.anime.repository.AnimeRepository
import tachiyomi.domain.entries.anime.model.AnimeUpdate
class SetAnimeEpisodeFlags(
private val animeRepository: AnimeRepository,

2
app/src/main/java/eu/kanade/domain/entries/anime/interactor/SetAnimeViewerFlags.kt
View file

@ -1,7 +1,7 @@
package eu.kanade.domain.entries.anime.interactor
import eu.kanade.domain.entries.anime.model.AnimeUpdate
import eu.kanade.domain.entries.anime.repository.AnimeRepository
import tachiyomi.domain.entries.anime.model.AnimeUpdate
class SetAnimeViewerFlags(
private val animeRepository: AnimeRepository,

2
app/src/main/java/eu/kanade/domain/entries/anime/interactor/UpdateAnime.kt
View file

@ -1,12 +1,12 @@
package eu.kanade.domain.entries.anime.interactor
import eu.kanade.domain.entries.anime.model.Anime
import eu.kanade.domain.entries.anime.model.AnimeUpdate
import eu.kanade.domain.entries.anime.model.hasCustomCover
import eu.kanade.domain.entries.anime.model.isLocal
import eu.kanade.domain.entries.anime.repository.AnimeRepository
import eu.kanade.tachiyomi.animesource.model.SAnime
import eu.kanade.tachiyomi.data.cache.AnimeCoverCache
import tachiyomi.domain.entries.anime.model.AnimeUpdate
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.util.Date

1
app/src/main/java/eu/kanade/domain/entries/anime/model/Anime.kt
View file

@ -6,6 +6,7 @@ import eu.kanade.tachiyomi.animesource.model.SAnime
import eu.kanade.tachiyomi.data.cache.AnimeCoverCache
import eu.kanade.tachiyomi.source.anime.LocalAnimeSource
import eu.kanade.tachiyomi.source.model.UpdateStrategy
import tachiyomi.domain.entries.anime.model.AnimeUpdate
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.io.Serializable

13
app/src/main/java/eu/kanade/domain/entries/anime/model/AnimeCover.kt
View file

@ -1,17 +1,6 @@
package eu.kanade.domain.entries.anime.model
import eu.kanade.domain.entries.EntryCover
/**
* Contains the required data for AnimeCoverFetcher
*/
data class AnimeCover(
val animeId: Long,
val sourceId: Long,
val isAnimeFavorite: Boolean,
val url: String?,
val lastModified: Long,
) : EntryCover
import tachiyomi.domain.entries.anime.model.AnimeCover
fun Anime.asAnimeCover(): AnimeCover {
return AnimeCover(

2
app/src/main/java/eu/kanade/domain/entries/anime/repository/AnimeRepository.kt
View file

@ -1,9 +1,9 @@
package eu.kanade.domain.entries.anime.repository
import eu.kanade.domain.entries.anime.model.Anime
import eu.kanade.domain.entries.anime.model.AnimeUpdate
import eu.kanade.domain.library.anime.LibraryAnime
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.entries.anime.model.AnimeUpdate
interface AnimeRepository {

2
app/src/main/java/eu/kanade/domain/entries/manga/interactor/SetMangaChapterFlags.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.domain.entries.manga.interactor
import eu.kanade.domain.entries.manga.model.Manga
import eu.kanade.domain.entries.manga.model.MangaUpdate
import eu.kanade.domain.entries.manga.repository.MangaRepository
import tachiyomi.domain.entries.manga.model.MangaUpdate
class SetMangaChapterFlags(
private val mangaRepository: MangaRepository,

2
app/src/main/java/eu/kanade/domain/entries/manga/interactor/SetMangaViewerFlags.kt
View file

@ -1,9 +1,9 @@
package eu.kanade.domain.entries.manga.interactor
import eu.kanade.domain.entries.manga.model.MangaUpdate
import eu.kanade.domain.entries.manga.repository.MangaRepository
import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
import tachiyomi.domain.entries.manga.model.MangaUpdate
class SetMangaViewerFlags(
private val mangaRepository: MangaRepository,

2
app/src/main/java/eu/kanade/domain/entries/manga/interactor/UpdateManga.kt
View file

@ -1,12 +1,12 @@
package eu.kanade.domain.entries.manga.interactor
import eu.kanade.domain.entries.manga.model.Manga
import eu.kanade.domain.entries.manga.model.MangaUpdate
import eu.kanade.domain.entries.manga.model.hasCustomCover
import eu.kanade.domain.entries.manga.model.isLocal
import eu.kanade.domain.entries.manga.repository.MangaRepository
import eu.kanade.tachiyomi.data.cache.MangaCoverCache
import eu.kanade.tachiyomi.source.model.SManga
import tachiyomi.domain.entries.manga.model.MangaUpdate
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.util.Date

1
app/src/main/java/eu/kanade/domain/entries/manga/model/Manga.kt
View file

@ -8,6 +8,7 @@ import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.model.UpdateStrategy
import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
import tachiyomi.domain.entries.manga.model.MangaUpdate
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.io.Serializable

13
app/src/main/java/eu/kanade/domain/entries/manga/model/MangaCover.kt
View file

@ -1,17 +1,6 @@
package eu.kanade.domain.entries.manga.model
import eu.kanade.domain.entries.EntryCover
/**
* Contains the required data for MangaCoverFetcher
*/
data class MangaCover(
val mangaId: Long,
val sourceId: Long,
val isMangaFavorite: Boolean,
val url: String?,
val lastModified: Long,
) : EntryCover
import tachiyomi.domain.entries.manga.model.MangaCover
fun Manga.asMangaCover(): MangaCover {
return MangaCover(

2
app/src/main/java/eu/kanade/domain/entries/manga/repository/MangaRepository.kt
View file

@ -1,9 +1,9 @@
package eu.kanade.domain.entries.manga.repository
import eu.kanade.domain.entries.manga.model.Manga
import eu.kanade.domain.entries.manga.model.MangaUpdate
import eu.kanade.domain.library.manga.LibraryManga
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.entries.manga.model.MangaUpdate
interface MangaRepository {

2
app/src/main/java/eu/kanade/domain/history/anime/interactor/GetAnimeHistory.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.domain.history.anime.interactor
import eu.kanade.domain.history.anime.model.AnimeHistoryWithRelations
import eu.kanade.domain.history.anime.repository.AnimeHistoryRepository
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.history.anime.model.AnimeHistoryWithRelations
class GetAnimeHistory(
private val repository: AnimeHistoryRepository,

2
app/src/main/java/eu/kanade/domain/history/anime/interactor/RemoveAnimeHistory.kt
View file

@ -1,7 +1,7 @@
package eu.kanade.domain.history.anime.interactor
import eu.kanade.domain.history.anime.model.AnimeHistoryWithRelations
import eu.kanade.domain.history.anime.repository.AnimeHistoryRepository
import tachiyomi.domain.history.anime.model.AnimeHistoryWithRelations
class RemoveAnimeHistory(
private val repository: AnimeHistoryRepository,

2
app/src/main/java/eu/kanade/domain/history/anime/interactor/UpsertAnimeHistory.kt
View file

@ -1,7 +1,7 @@
package eu.kanade.domain.history.anime.interactor
import eu.kanade.domain.history.anime.model.AnimeHistoryUpdate
import eu.kanade.domain.history.anime.repository.AnimeHistoryRepository
import tachiyomi.domain.history.anime.model.AnimeHistoryUpdate
class UpsertAnimeHistory(
private val historyRepository: AnimeHistoryRepository,

4
app/src/main/java/eu/kanade/domain/history/anime/repository/AnimeHistoryRepository.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.domain.history.anime.repository
import eu.kanade.domain.history.anime.model.AnimeHistoryUpdate
import eu.kanade.domain.history.anime.model.AnimeHistoryWithRelations
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.history.anime.model.AnimeHistoryUpdate
import tachiyomi.domain.history.anime.model.AnimeHistoryWithRelations
interface AnimeHistoryRepository {

2
app/src/main/java/eu/kanade/domain/history/manga/interactor/GetMangaHistory.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.domain.history.manga.interactor
import eu.kanade.domain.history.manga.model.MangaHistoryWithRelations
import eu.kanade.domain.history.manga.repository.MangaHistoryRepository
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.history.manga.model.MangaHistoryWithRelations
class GetMangaHistory(
private val repository: MangaHistoryRepository,

2
app/src/main/java/eu/kanade/domain/history/manga/interactor/RemoveMangaHistory.kt
View file

@ -1,7 +1,7 @@
package eu.kanade.domain.history.manga.interactor
import eu.kanade.domain.history.manga.model.MangaHistoryWithRelations
import eu.kanade.domain.history.manga.repository.MangaHistoryRepository
import tachiyomi.domain.history.manga.model.MangaHistoryWithRelations
class RemoveMangaHistory(
private val repository: MangaHistoryRepository,

2
app/src/main/java/eu/kanade/domain/history/manga/interactor/UpsertMangaHistory.kt
View file

@ -1,7 +1,7 @@
package eu.kanade.domain.history.manga.interactor
import eu.kanade.domain.history.manga.model.MangaHistoryUpdate
import eu.kanade.domain.history.manga.repository.MangaHistoryRepository
import tachiyomi.domain.history.manga.model.MangaHistoryUpdate
class UpsertMangaHistory(
private val historyRepository: MangaHistoryRepository,

4
app/src/main/java/eu/kanade/domain/history/manga/repository/MangaHistoryRepository.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.domain.history.manga.repository
import eu.kanade.domain.history.manga.model.MangaHistoryUpdate
import eu.kanade.domain.history.manga.model.MangaHistoryWithRelations
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.history.manga.model.MangaHistoryUpdate
import tachiyomi.domain.history.manga.model.MangaHistoryWithRelations
interface MangaHistoryRepository {

4
app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
View file

@ -2,14 +2,14 @@ package eu.kanade.domain.library.service
import eu.kanade.domain.entries.anime.model.Anime
import eu.kanade.domain.entries.manga.model.Manga
import eu.kanade.domain.library.model.LibraryDisplayMode
import eu.kanade.domain.library.model.LibrarySort
import eu.kanade.tachiyomi.core.preference.PreferenceStore
import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI
import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD
import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED
import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ
import eu.kanade.tachiyomi.widget.ExtendedNavigationView
import tachiyomi.domain.library.model.LibraryDisplayMode
import tachiyomi.domain.library.model.LibrarySort
class LibraryPreferences(
private val preferenceStore: PreferenceStore,

2
app/src/main/java/eu/kanade/domain/source/anime/repository/AnimeSourceDataRepository.kt
View file

@ -1,7 +1,7 @@
package eu.kanade.domain.source.anime.repository
import eu.kanade.domain.source.anime.model.AnimeSourceData
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.source.anime.model.AnimeSourceData
interface AnimeSourceDataRepository {
fun subscribeAllAnime(): Flow<List<AnimeSourceData>>

2
app/src/main/java/eu/kanade/domain/source/manga/repository/MangaSourceDataRepository.kt
View file

@ -1,7 +1,7 @@
package eu.kanade.domain.source.manga.repository
import eu.kanade.domain.source.manga.model.MangaSourceData
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.source.manga.model.MangaSourceData
interface MangaSourceDataRepository {
fun subscribeAllManga(): Flow<List<MangaSourceData>>

2
app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt
View file

@ -1,9 +1,9 @@
package eu.kanade.domain.source.service
import eu.kanade.domain.library.model.LibraryDisplayMode
import eu.kanade.tachiyomi.core.preference.PreferenceStore
import eu.kanade.tachiyomi.core.preference.getEnum
import eu.kanade.tachiyomi.util.system.LocaleHelper
import tachiyomi.domain.library.model.LibraryDisplayMode
class SourcePreferences(
private val preferenceStore: PreferenceStore,

2
app/src/main/java/eu/kanade/domain/updates/anime/interactor/GetAnimeUpdates.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.domain.updates.anime.interactor
import eu.kanade.domain.updates.anime.model.AnimeUpdatesWithRelations
import eu.kanade.domain.updates.anime.repository.AnimeUpdatesRepository
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.updates.anime.model.AnimeUpdatesWithRelations
import java.util.Calendar
class GetAnimeUpdates(

2
app/src/main/java/eu/kanade/domain/updates/anime/repository/AnimeUpdatesRepository.kt
View file

@ -1,7 +1,7 @@
package eu.kanade.domain.updates.anime.repository
import eu.kanade.domain.updates.anime.model.AnimeUpdatesWithRelations
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.updates.anime.model.AnimeUpdatesWithRelations
interface AnimeUpdatesRepository {

2
app/src/main/java/eu/kanade/domain/updates/manga/interactor/GetMangaUpdates.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.domain.updates.manga.interactor
import eu.kanade.domain.updates.manga.model.MangaUpdatesWithRelations
import eu.kanade.domain.updates.manga.repository.MangaUpdatesRepository
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.updates.manga.model.MangaUpdatesWithRelations
import java.util.Calendar
class GetMangaUpdates(

2
app/src/main/java/eu/kanade/domain/updates/manga/repository/MangaUpdatesRepository.kt
View file

@ -1,7 +1,7 @@
package eu.kanade.domain.updates.manga.repository
import eu.kanade.domain.updates.manga.model.MangaUpdatesWithRelations
import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.updates.manga.model.MangaUpdatesWithRelations
interface MangaUpdatesRepository {

2
app/src/main/java/eu/kanade/presentation/browse/GlobalSerachCard.kt
View file

@ -5,9 +5,9 @@ import androidx.compose.foundation.layout.width
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import eu.kanade.domain.entries.EntryCover
import eu.kanade.presentation.components.CommonEntryItemDefaults
import eu.kanade.presentation.components.EntryComfortableGridItem
import tachiyomi.domain.entries.EntryCover
@Composable
fun GlobalSearchCard(

2
app/src/main/java/eu/kanade/presentation/browse/anime/BrowseAnimeSourceScreen.kt
View file

@ -16,7 +16,6 @@ import androidx.paging.LoadState
import androidx.paging.compose.LazyPagingItems
import eu.kanade.data.items.episode.NoEpisodesException
import eu.kanade.domain.entries.anime.model.Anime
import eu.kanade.domain.library.model.LibraryDisplayMode
import eu.kanade.presentation.browse.anime.components.BrowseAnimeSourceComfortableGrid
import eu.kanade.presentation.browse.anime.components.BrowseAnimeSourceCompactGrid
import eu.kanade.presentation.browse.anime.components.BrowseAnimeSourceList
@ -27,6 +26,7 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.animesource.AnimeCatalogueSource
import eu.kanade.tachiyomi.source.anime.LocalAnimeSource
import kotlinx.coroutines.flow.StateFlow
import tachiyomi.domain.library.model.LibraryDisplayMode
@Composable
fun BrowseAnimeSourceContent(

2
app/src/main/java/eu/kanade/presentation/browse/anime/components/BrowseAnimeSourceComfortableGrid.kt
View file

@ -12,13 +12,13 @@ import androidx.compose.ui.unit.dp
import androidx.paging.LoadState
import androidx.paging.compose.LazyPagingItems
import eu.kanade.domain.entries.anime.model.Anime
import eu.kanade.domain.entries.anime.model.AnimeCover
import eu.kanade.presentation.browse.InLibraryBadge
import eu.kanade.presentation.browse.manga.components.BrowseSourceLoadingItem
import eu.kanade.presentation.components.CommonEntryItemDefaults
import eu.kanade.presentation.components.EntryComfortableGridItem
import eu.kanade.presentation.util.plus
import kotlinx.coroutines.flow.StateFlow
import tachiyomi.domain.entries.anime.model.AnimeCover
@Composable
fun BrowseAnimeSourceComfortableGrid(

2
app/src/main/java/eu/kanade/presentation/browse/anime/components/BrowseAnimeSourceCompactGrid.kt
View file

@ -12,13 +12,13 @@ import androidx.compose.ui.unit.dp
import androidx.paging.LoadState
import androidx.paging.compose.LazyPagingItems
import eu.kanade.domain.entries.anime.model.Anime
import eu.kanade.domain.entries.anime.model.AnimeCover
import eu.kanade.presentation.browse.InLibraryBadge
import eu.kanade.presentation.browse.manga.components.BrowseSourceLoadingItem
import eu.kanade.presentation.components.CommonEntryItemDefaults
import eu.kanade.presentation.components.EntryCompactGridItem
import eu.kanade.presentation.util.plus
import kotlinx.coroutines.flow.StateFlow
import tachiyomi.domain.entries.anime.model.AnimeCover
@Composable
fun BrowseAnimeSourceCompactGrid(

2
app/src/main/java/eu/kanade/presentation/browse/anime/components/BrowseAnimeSourceList.kt
View file

@ -9,7 +9,6 @@ import androidx.paging.LoadState
import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.items
import eu.kanade.domain.entries.anime.model.Anime
import eu.kanade.domain.entries.anime.model.AnimeCover
import eu.kanade.presentation.browse.InLibraryBadge
import eu.kanade.presentation.browse.manga.components.BrowseSourceLoadingItem
import eu.kanade.presentation.components.CommonEntryItemDefaults
@ -17,6 +16,7 @@ import eu.kanade.presentation.components.EntryListItem
import eu.kanade.presentation.components.LazyColumn
import eu.kanade.presentation.util.plus
import kotlinx.coroutines.flow.StateFlow
import tachiyomi.domain.entries.anime.model.AnimeCover
@Composable
fun BrowseAnimeSourceList(

2
app/src/main/java/eu/kanade/presentation/browse/anime/components/BrowseAnimeSourceToolbar.kt
View file

@ -13,7 +13,6 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.res.stringResource
import eu.kanade.domain.library.model.LibraryDisplayMode
import eu.kanade.presentation.components.AppBar
import eu.kanade.presentation.components.AppBarActions
import eu.kanade.presentation.components.AppBarTitle
@ -23,6 +22,7 @@ import eu.kanade.presentation.components.SearchToolbar
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.animesource.AnimeCatalogueSource
import eu.kanade.tachiyomi.source.anime.LocalAnimeSource
import tachiyomi.domain.library.model.LibraryDisplayMode
@Composable
fun BrowseAnimeSourceToolbar(

2
app/src/main/java/eu/kanade/presentation/browse/manga/BrowseMangaSourceScreen.kt
View file

@ -16,7 +16,6 @@ import androidx.paging.LoadState
import androidx.paging.compose.LazyPagingItems
import eu.kanade.data.items.chapter.NoChaptersException
import eu.kanade.domain.entries.manga.model.Manga
import eu.kanade.domain.library.model.LibraryDisplayMode
import eu.kanade.presentation.browse.manga.components.BrowseMangaSourceComfortableGrid
import eu.kanade.presentation.browse.manga.components.BrowseMangaSourceCompactGrid
import eu.kanade.presentation.browse.manga.components.BrowseMangaSourceList
@ -27,6 +26,7 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.source.CatalogueSource
import eu.kanade.tachiyomi.source.manga.LocalMangaSource
import kotlinx.coroutines.flow.StateFlow
import tachiyomi.domain.library.model.LibraryDisplayMode
@Composable
fun BrowseSourceContent(

2
app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseMangaSourceComfortableGrid.kt
View file

@ -12,12 +12,12 @@ import androidx.compose.ui.unit.dp
import androidx.paging.LoadState
import androidx.paging.compose.LazyPagingItems
import eu.kanade.domain.entries.manga.model.Manga
import eu.kanade.domain.entries.manga.model.MangaCover
import eu.kanade.presentation.browse.InLibraryBadge
import eu.kanade.presentation.components.CommonEntryItemDefaults
import eu.kanade.presentation.components.EntryComfortableGridItem
import eu.kanade.presentation.util.plus
import kotlinx.coroutines.flow.StateFlow
import tachiyomi.domain.entries.manga.model.MangaCover
@Composable
fun BrowseMangaSourceComfortableGrid(

2
app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseMangaSourceCompactGrid.kt
View file

@ -12,12 +12,12 @@ import androidx.compose.ui.unit.dp
import androidx.paging.LoadState
import androidx.paging.compose.LazyPagingItems
import eu.kanade.domain.entries.manga.model.Manga
import eu.kanade.domain.entries.manga.model.MangaCover
import eu.kanade.presentation.browse.InLibraryBadge
import eu.kanade.presentation.components.CommonEntryItemDefaults
import eu.kanade.presentation.components.EntryCompactGridItem
import eu.kanade.presentation.util.plus
import kotlinx.coroutines.flow.StateFlow
import tachiyomi.domain.entries.manga.model.MangaCover
@Composable
fun BrowseMangaSourceCompactGrid(

2
app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseMangaSourceList.kt
View file

@ -9,13 +9,13 @@ import androidx.paging.LoadState
import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.items
import eu.kanade.domain.entries.manga.model.Manga
import eu.kanade.domain.entries.manga.model.MangaCover
import eu.kanade.presentation.browse.InLibraryBadge
import eu.kanade.presentation.components.CommonEntryItemDefaults
import eu.kanade.presentation.components.EntryListItem
import eu.kanade.presentation.components.LazyColumn
import eu.kanade.presentation.util.plus
import kotlinx.coroutines.flow.StateFlow
import tachiyomi.domain.entries.manga.model.MangaCover
@Composable
fun BrowseMangaSourceList(

2
app/src/main/java/eu/kanade/presentation/browse/manga/components/BrowseMangaSourceToolbar.kt
View file

@ -13,7 +13,6 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.res.stringResource
import eu.kanade.domain.library.model.LibraryDisplayMode
import eu.kanade.presentation.components.AppBar
import eu.kanade.presentation.components.AppBarActions
import eu.kanade.presentation.components.AppBarTitle
@ -23,6 +22,7 @@ import eu.kanade.presentation.components.SearchToolbar
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.source.CatalogueSource
import eu.kanade.tachiyomi.source.manga.LocalMangaSource
import tachiyomi.domain.library.model.LibraryDisplayMode
@Composable
fun BrowseMangaSourceToolbar(

2
app/src/main/java/eu/kanade/presentation/category/AnimeCategoryScreen.kt
View file

@ -6,7 +6,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import eu.kanade.domain.category.model.Category
import eu.kanade.presentation.category.components.CategoryContent
import eu.kanade.presentation.category.components.CategoryFloatingActionButton
import eu.kanade.presentation.components.EmptyScreen
@ -16,6 +15,7 @@ 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
@Composable
fun AnimeCategoryScreen(

2
app/src/main/java/eu/kanade/presentation/category/CategoryExtensions.kt
View file

@ -3,8 +3,8 @@ package eu.kanade.presentation.category
import android.content.Context
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import eu.kanade.domain.category.model.Category
import eu.kanade.tachiyomi.R
import tachiyomi.domain.category.model.Category
val Category.visualName: String
@Composable

2
app/src/main/java/eu/kanade/presentation/category/MangaCategoryScreen.kt
View file

@ -6,7 +6,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import eu.kanade.domain.category.model.Category
import eu.kanade.presentation.category.components.CategoryContent
import eu.kanade.presentation.category.components.CategoryFloatingActionButton
import eu.kanade.presentation.components.EmptyScreen
@ -16,6 +15,7 @@ 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
@Composable
fun MangaCategoryScreen(

2
app/src/main/java/eu/kanade/presentation/category/components/CategoryContent.kt
View file

@ -7,9 +7,9 @@ import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import eu.kanade.domain.category.model.Category
import eu.kanade.presentation.components.LazyColumn
import eu.kanade.presentation.util.padding
import tachiyomi.domain.category.model.Category
@Composable
fun CategoryContent(

7
app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
View file

@ -14,10 +14,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.res.stringResource
import eu.kanade.domain.category.model.Category
import eu.kanade.domain.category.model.anyWithName
import eu.kanade.tachiyomi.R
import kotlinx.coroutines.delay
import tachiyomi.domain.category.model.Category
import kotlin.time.Duration.Companion.seconds
@Composable
@ -164,3 +163,7 @@ fun CategoryDeleteDialog(
},
)
}
internal fun List<Category>.anyWithName(name: String): Boolean {
return any { name == it.name }
}

2
app/src/main/java/eu/kanade/presentation/category/components/CategoryListItem.kt
View file

@ -20,9 +20,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import eu.kanade.domain.category.model.Category
import eu.kanade.presentation.util.padding
import eu.kanade.tachiyomi.R
import tachiyomi.domain.category.model.Category
@Composable
fun CategoryListItem(

2
app/src/main/java/eu/kanade/presentation/components/ChangeCategoryDialog.kt
View file

@ -22,10 +22,10 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import eu.kanade.core.prefs.CheckboxState
import eu.kanade.domain.category.model.Category
import eu.kanade.presentation.category.visualName
import eu.kanade.presentation.util.padding
import eu.kanade.tachiyomi.R
import tachiyomi.domain.category.model.Category
@Composable
fun ChangeCategoryDialog(

2
app/src/main/java/eu/kanade/presentation/components/CommonEntryItem.kt
View file

@ -39,8 +39,8 @@ import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import eu.kanade.domain.entries.EntryCover
import eu.kanade.presentation.util.selectedBackground
import tachiyomi.domain.entries.EntryCover
object CommonEntryItemDefaults {
val GridHorizontalSpacer = 4.dp

2
app/src/main/java/eu/kanade/presentation/history/anime/AnimeHistoryContent.kt
View file

@ -5,12 +5,12 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import eu.kanade.domain.history.anime.model.AnimeHistoryWithRelations
import eu.kanade.domain.ui.UiPreferences
import eu.kanade.presentation.components.FastScrollLazyColumn
import eu.kanade.presentation.components.RelativeDateHeader
import eu.kanade.presentation.history.anime.AnimeHistoryItem
import eu.kanade.presentation.history.anime.AnimeHistoryUiModel
import tachiyomi.domain.history.anime.model.AnimeHistoryWithRelations
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.text.DateFormat

2
app/src/main/java/eu/kanade/presentation/history/anime/AnimeHistoryItem.kt
View file

@ -20,11 +20,11 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import eu.kanade.domain.history.anime.model.AnimeHistoryWithRelations
import eu.kanade.presentation.components.ItemCover
import eu.kanade.presentation.util.padding
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.util.lang.toTimestampString
import tachiyomi.domain.history.anime.model.AnimeHistoryWithRelations
import java.text.DecimalFormat
import java.text.DecimalFormatSymbols

2
app/src/main/java/eu/kanade/presentation/history/anime/AnimeHistoryScreen.kt
View file

@ -6,7 +6,6 @@ import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import eu.kanade.domain.history.anime.model.AnimeHistoryWithRelations
import eu.kanade.presentation.animehistory.components.AnimeHistoryContent
import eu.kanade.presentation.components.EmptyScreen
import eu.kanade.presentation.components.LoadingScreen
@ -14,6 +13,7 @@ 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 java.util.Date
@Composable

2
app/src/main/java/eu/kanade/presentation/history/manga/MangaHistoryContent.kt
View file

@ -5,10 +5,10 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import eu.kanade.domain.history.manga.model.MangaHistoryWithRelations
import eu.kanade.domain.ui.UiPreferences
import eu.kanade.presentation.components.FastScrollLazyColumn
import eu.kanade.presentation.components.RelativeDateHeader
import tachiyomi.domain.history.manga.model.MangaHistoryWithRelations
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.text.DateFormat

2
app/src/main/java/eu/kanade/presentation/history/manga/MangaHistoryItem.kt
View file

@ -20,11 +20,11 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import eu.kanade.domain.history.manga.model.MangaHistoryWithRelations
import eu.kanade.presentation.components.ItemCover
import eu.kanade.presentation.util.padding
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.util.lang.toTimestampString
import tachiyomi.domain.history.manga.model.MangaHistoryWithRelations
import java.text.DecimalFormat
import java.text.DecimalFormatSymbols

2
app/src/main/java/eu/kanade/presentation/history/manga/MangaHistoryScreen.kt
View file

@ -6,13 +6,13 @@ import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import eu.kanade.domain.history.manga.model.MangaHistoryWithRelations
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 java.util.Date
@Composable

2
app/src/main/java/eu/kanade/presentation/library/LibraryTabs.kt
View file

@ -6,11 +6,11 @@ import androidx.compose.material3.ScrollableTabRow
import androidx.compose.material3.Tab
import androidx.compose.runtime.Composable
import androidx.compose.ui.unit.dp
import eu.kanade.domain.category.model.Category
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
@Composable
fun LibraryTabs(

2
app/src/main/java/eu/kanade/presentation/library/anime/AnimeLibraryComfortableGrid.kt
View file

@ -6,7 +6,6 @@ import androidx.compose.foundation.lazy.grid.items
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.util.fastAny
import eu.kanade.domain.entries.anime.model.AnimeCover
import eu.kanade.domain.library.anime.LibraryAnime
import eu.kanade.presentation.animelib.components.DownloadsBadge
import eu.kanade.presentation.animelib.components.LanguageBadge
@ -15,6 +14,7 @@ import eu.kanade.presentation.components.EntryComfortableGridItem
import eu.kanade.presentation.library.LazyLibraryGrid
import eu.kanade.presentation.library.globalSearchItem
import eu.kanade.tachiyomi.ui.library.anime.AnimeLibraryItem
import tachiyomi.domain.entries.anime.model.AnimeCover
@Composable
fun AnimeLibraryComfortableGrid(

2
app/src/main/java/eu/kanade/presentation/library/anime/AnimeLibraryCompactGrid.kt
View file

@ -6,7 +6,6 @@ import androidx.compose.foundation.lazy.grid.items
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.util.fastAny
import eu.kanade.domain.entries.anime.model.AnimeCover
import eu.kanade.domain.library.anime.LibraryAnime
import eu.kanade.presentation.animelib.components.DownloadsBadge
import eu.kanade.presentation.animelib.components.LanguageBadge
@ -15,6 +14,7 @@ import eu.kanade.presentation.components.EntryCompactGridItem
import eu.kanade.presentation.library.LazyLibraryGrid
import eu.kanade.presentation.library.globalSearchItem
import eu.kanade.tachiyomi.ui.library.anime.AnimeLibraryItem
import tachiyomi.domain.entries.anime.model.AnimeCover
@Composable
fun AnimeLibraryCompactGrid(

4
app/src/main/java/eu/kanade/presentation/library/anime/AnimeLibraryContent.kt
View file

@ -15,15 +15,15 @@ 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.domain.category.model.Category
import eu.kanade.domain.library.anime.LibraryAnime
import eu.kanade.domain.library.model.LibraryDisplayMode
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
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import tachiyomi.domain.category.model.Category
import tachiyomi.domain.library.model.LibraryDisplayMode
import kotlin.time.Duration.Companion.seconds
@Composable

2
app/src/main/java/eu/kanade/presentation/library/anime/AnimeLibraryList.kt
View file

@ -8,7 +8,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.fastAny
import eu.kanade.domain.entries.anime.model.AnimeCover
import eu.kanade.domain.library.anime.LibraryAnime
import eu.kanade.presentation.animelib.components.DownloadsBadge
import eu.kanade.presentation.animelib.components.GlobalSearchItem
@ -18,6 +17,7 @@ import eu.kanade.presentation.components.EntryListItem
import eu.kanade.presentation.components.FastScrollLazyColumn
import eu.kanade.presentation.util.plus
import eu.kanade.tachiyomi.ui.library.anime.AnimeLibraryItem
import tachiyomi.domain.entries.anime.model.AnimeCover
@Composable
fun AnimeLibraryList(

2
app/src/main/java/eu/kanade/presentation/library/anime/AnimeLibraryPager.kt
View file

@ -12,11 +12,11 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalConfiguration
import eu.kanade.core.prefs.PreferenceMutableState
import eu.kanade.domain.library.anime.LibraryAnime
import eu.kanade.domain.library.model.LibraryDisplayMode
import eu.kanade.presentation.components.HorizontalPager
import eu.kanade.presentation.components.PagerState
import eu.kanade.presentation.library.manga.LibraryPagerEmptyScreen
import eu.kanade.tachiyomi.ui.library.anime.AnimeLibraryItem
import tachiyomi.domain.library.model.LibraryDisplayMode
@Composable
fun AnimeLibraryPager(

2
app/src/main/java/eu/kanade/presentation/library/manga/MangaLibraryComfortableGrid.kt
View file

@ -6,7 +6,6 @@ import androidx.compose.foundation.lazy.grid.items
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.util.fastAny
import eu.kanade.domain.entries.manga.model.MangaCover
import eu.kanade.domain.library.manga.LibraryManga
import eu.kanade.presentation.animelib.components.DownloadsBadge
import eu.kanade.presentation.animelib.components.LanguageBadge
@ -15,6 +14,7 @@ import eu.kanade.presentation.components.EntryComfortableGridItem
import eu.kanade.presentation.library.LazyLibraryGrid
import eu.kanade.presentation.library.globalSearchItem
import eu.kanade.tachiyomi.ui.library.manga.MangaLibraryItem
import tachiyomi.domain.entries.manga.model.MangaCover
@Composable
fun MangaLibraryComfortableGrid(

2
app/src/main/java/eu/kanade/presentation/library/manga/MangaLibraryCompactGrid.kt
View file

@ -6,7 +6,6 @@ import androidx.compose.foundation.lazy.grid.items
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.util.fastAny
import eu.kanade.domain.entries.manga.model.MangaCover
import eu.kanade.domain.library.manga.LibraryManga
import eu.kanade.presentation.animelib.components.DownloadsBadge
import eu.kanade.presentation.animelib.components.LanguageBadge
@ -15,6 +14,7 @@ import eu.kanade.presentation.components.EntryCompactGridItem
import eu.kanade.presentation.library.LazyLibraryGrid
import eu.kanade.presentation.library.globalSearchItem
import eu.kanade.tachiyomi.ui.library.manga.MangaLibraryItem
import tachiyomi.domain.entries.manga.model.MangaCover
@Composable
fun MangaLibraryCompactGrid(

4
app/src/main/java/eu/kanade/presentation/library/manga/MangaLibraryContent.kt
View file

@ -15,15 +15,15 @@ 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.domain.category.model.Category
import eu.kanade.domain.library.manga.LibraryManga
import eu.kanade.domain.library.model.LibraryDisplayMode
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
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import tachiyomi.domain.category.model.Category
import tachiyomi.domain.library.model.LibraryDisplayMode
import kotlin.time.Duration.Companion.seconds
@Composable

2
app/src/main/java/eu/kanade/presentation/library/manga/MangaLibraryList.kt
View file

@ -8,7 +8,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.fastAny
import eu.kanade.domain.entries.manga.model.MangaCover
import eu.kanade.domain.library.manga.LibraryManga
import eu.kanade.presentation.animelib.components.DownloadsBadge
import eu.kanade.presentation.animelib.components.GlobalSearchItem
@ -18,6 +17,7 @@ import eu.kanade.presentation.components.EntryListItem
import eu.kanade.presentation.components.FastScrollLazyColumn
import eu.kanade.presentation.util.plus
import eu.kanade.tachiyomi.ui.library.manga.MangaLibraryItem
import tachiyomi.domain.entries.manga.model.MangaCover
@Composable
fun MangaLibraryList(

2
app/src/main/java/eu/kanade/presentation/library/manga/MangaLibraryPager.kt
View file

@ -18,7 +18,6 @@ import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.unit.dp
import eu.kanade.core.prefs.PreferenceMutableState
import eu.kanade.domain.library.manga.LibraryManga
import eu.kanade.domain.library.model.LibraryDisplayMode
import eu.kanade.presentation.animelib.components.GlobalSearchItem
import eu.kanade.presentation.components.EmptyScreen
import eu.kanade.presentation.components.HorizontalPager
@ -26,6 +25,7 @@ import eu.kanade.presentation.components.PagerState
import eu.kanade.presentation.util.plus
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.library.manga.MangaLibraryItem
import tachiyomi.domain.library.model.LibraryDisplayMode
@Composable
fun MangaLibraryPager(

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/Commons.kt
View file

@ -4,9 +4,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.ReadOnlyComposable
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import eu.kanade.domain.category.model.Category
import eu.kanade.presentation.category.visualName
import eu.kanade.tachiyomi.R
import tachiyomi.domain.category.model.Category
/**
* Returns a string of categories name for settings subtitle

Some files were not shown because too many files have changed in this diff Show more