Move more models to domain module

app/src/main/java/eu/kanade/data/history/HistoryMapper.kt

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

app/src/main/java/eu/kanade/data/history/HistoryRepositoryImpl.kt

@@ -1,12 +1,12 @@
 package eu.kanade.data.history
 
-import eu.kanade.domain.history.model.HistoryUpdate
-import eu.kanade.domain.history.model.HistoryWithRelations
 import eu.kanade.domain.history.repository.HistoryRepository
 import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority
 import tachiyomi.data.DatabaseHandler
+import tachiyomi.domain.history.model.HistoryUpdate
+import tachiyomi.domain.history.model.HistoryWithRelations
 
 class HistoryRepositoryImpl(
     private val handler: DatabaseHandler,

app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt

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

app/src/main/java/eu/kanade/data/source/SourceDataRepositoryImpl.kt

@@ -1,9 +1,9 @@
 package eu.kanade.data.source
 
-import eu.kanade.domain.source.model.SourceData
 import eu.kanade.domain.source.repository.SourceDataRepository
 import kotlinx.coroutines.flow.Flow
 import tachiyomi.data.DatabaseHandler
+import tachiyomi.domain.source.model.SourceData
 
 class SourceDataRepositoryImpl(
     private val handler: DatabaseHandler,

app/src/main/java/eu/kanade/data/source/SourceMapper.kt

@@ -1,9 +1,9 @@
 package eu.kanade.data.source
 
 import eu.kanade.domain.source.model.Source
-import eu.kanade.domain.source.model.SourceData
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.SourceManager
+import tachiyomi.domain.source.model.SourceData
 
 val sourceMapper: (eu.kanade.tachiyomi.source.Source) -> Source = { source ->
     Source(

app/src/main/java/eu/kanade/data/updates/UpdatesMapper.kt

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

app/src/main/java/eu/kanade/data/updates/UpdatesRepositoryImpl.kt

@@ -1,9 +1,9 @@
 package eu.kanade.data.updates
 
-import eu.kanade.domain.updates.model.UpdatesWithRelations
 import eu.kanade.domain.updates.repository.UpdatesRepository
 import kotlinx.coroutines.flow.Flow
 import tachiyomi.data.DatabaseHandler
+import tachiyomi.domain.updates.model.UpdatesWithRelations
 
 class UpdatesRepositoryImpl(
     val databaseHandler: DatabaseHandler,

app/src/main/java/eu/kanade/domain/category/interactor/ResetCategoryFlags.kt

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

app/src/main/java/eu/kanade/domain/category/interactor/SetDisplayModeForCategory.kt

@@ -1,11 +1,11 @@
 package eu.kanade.domain.category.interactor
 
-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.model.Category
 import tachiyomi.domain.category.model.CategoryUpdate
 import tachiyomi.domain.category.repository.CategoryRepository
+import tachiyomi.domain.library.model.LibraryDisplayMode
+import tachiyomi.domain.library.model.plus
 
 class SetDisplayModeForCategory(
     private val preferences: LibraryPreferences,

app/src/main/java/eu/kanade/domain/category/interactor/SetSortModeForCategory.kt

@@ -1,11 +1,11 @@
 package eu.kanade.domain.category.interactor
 
-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.model.Category
 import tachiyomi.domain.category.model.CategoryUpdate
 import tachiyomi.domain.category.repository.CategoryRepository
+import tachiyomi.domain.library.model.LibrarySort
+import tachiyomi.domain.library.model.plus
 
 class SetSortModeForCategory(
     private val preferences: LibraryPreferences,

app/src/main/java/eu/kanade/domain/history/interactor/GetHistory.kt

@@ -1,8 +1,8 @@
 package eu.kanade.domain.history.interactor
 
-import eu.kanade.domain.history.model.HistoryWithRelations
 import eu.kanade.domain.history.repository.HistoryRepository
 import kotlinx.coroutines.flow.Flow
+import tachiyomi.domain.history.model.HistoryWithRelations
 
 class GetHistory(
     private val repository: HistoryRepository,

app/src/main/java/eu/kanade/domain/history/interactor/RemoveHistory.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.history.interactor
 
-import eu.kanade.domain.history.model.HistoryWithRelations
 import eu.kanade.domain.history.repository.HistoryRepository
+import tachiyomi.domain.history.model.HistoryWithRelations
 
 class RemoveHistory(
     private val repository: HistoryRepository,

app/src/main/java/eu/kanade/domain/history/interactor/UpsertHistory.kt

@@ -1,7 +1,7 @@
 package eu.kanade.domain.history.interactor
 
-import eu.kanade.domain.history.model.HistoryUpdate
 import eu.kanade.domain.history.repository.HistoryRepository
+import tachiyomi.domain.history.model.HistoryUpdate
 
 class UpsertHistory(
     private val historyRepository: HistoryRepository,

app/src/main/java/eu/kanade/domain/history/repository/HistoryRepository.kt

@@ -1,8 +1,8 @@
 package eu.kanade.domain.history.repository
 
-import eu.kanade.domain.history.model.HistoryUpdate
-import eu.kanade.domain.history.model.HistoryWithRelations
 import kotlinx.coroutines.flow.Flow
+import tachiyomi.domain.history.model.HistoryUpdate
+import tachiyomi.domain.history.model.HistoryWithRelations
 
 interface HistoryRepository {
 

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

@@ -1,7 +1,5 @@
 package eu.kanade.domain.library.service
 
-import eu.kanade.domain.library.model.LibraryDisplayMode
-import eu.kanade.domain.library.model.LibrarySort
 import eu.kanade.domain.manga.model.Manga
 import eu.kanade.tachiyomi.core.preference.PreferenceStore
 import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI
@@ -9,6 +7,8 @@ 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,

app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaChapterFlags.kt

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

app/src/main/java/eu/kanade/domain/manga/interactor/SetMangaViewerFlags.kt

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

app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt

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

app/src/main/java/eu/kanade/domain/manga/model/Manga.kt

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

app/src/main/java/eu/kanade/domain/manga/model/MangaCover.kt

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

app/src/main/java/eu/kanade/domain/manga/repository/MangaRepository.kt

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

app/src/main/java/eu/kanade/domain/source/repository/SourceDataRepository.kt

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

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

@@ -1,10 +1,10 @@
 package eu.kanade.domain.source.service
 
-import eu.kanade.domain.library.model.LibraryDisplayMode
 import eu.kanade.domain.source.interactor.SetMigrateSorting
 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,
@@ -18,8 +18,6 @@ class SourcePreferences(
 
     fun pinnedSources() = preferenceStore.getStringSet("pinned_catalogues", emptySet())
 
-    fun duplicatePinnedSources() = preferenceStore.getBoolean("duplicate_pinned_sources", false)
-
     fun lastUsedSource() = preferenceStore.getLong("last_catalogue_source", -1)
 
     fun showNsfwSource() = preferenceStore.getBoolean("show_nsfw_source", true)

app/src/main/java/eu/kanade/domain/updates/interactor/GetUpdates.kt

@@ -1,8 +1,8 @@
 package eu.kanade.domain.updates.interactor
 
-import eu.kanade.domain.updates.model.UpdatesWithRelations
 import eu.kanade.domain.updates.repository.UpdatesRepository
 import kotlinx.coroutines.flow.Flow
+import tachiyomi.domain.updates.model.UpdatesWithRelations
 import java.util.Calendar
 
 class GetUpdates(

app/src/main/java/eu/kanade/domain/updates/repository/UpdatesRepository.kt

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

app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt

@@ -15,7 +15,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
 import eu.kanade.data.source.NoResultsException
-import eu.kanade.domain.library.model.LibraryDisplayMode
 import eu.kanade.domain.manga.model.Manga
 import eu.kanade.presentation.browse.components.BrowseSourceComfortableGrid
 import eu.kanade.presentation.browse.components.BrowseSourceCompactGrid
@@ -27,6 +26,7 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.LocalSource
 import kotlinx.coroutines.flow.StateFlow
+import tachiyomi.domain.library.model.LibraryDisplayMode
 
 @Composable
 fun BrowseSourceContent(

app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt

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

app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt

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

app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt

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

app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt

@@ -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.LocalSource
+import tachiyomi.domain.library.model.LibraryDisplayMode
 
 @Composable
 fun BrowseSourceToolbar(

app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchCard.kt

@@ -5,10 +5,10 @@ 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.manga.model.MangaCover
 import eu.kanade.presentation.browse.InLibraryBadge
 import eu.kanade.presentation.components.CommonMangaItemDefaults
 import eu.kanade.presentation.components.MangaComfortableGridItem
+import tachiyomi.domain.manga.model.MangaCover
 
 @Composable
 fun GlobalSearchCard(

app/src/main/java/eu/kanade/presentation/components/CommonMangaItem.kt

@@ -62,7 +62,7 @@ private const val GridSelectedCoverAlpha = 0.76f
 fun MangaCompactGridItem(
     isSelected: Boolean = false,
     title: String? = null,
-    coverData: eu.kanade.domain.manga.model.MangaCover,
+    coverData: tachiyomi.domain.manga.model.MangaCover,
     coverAlpha: Float = 1f,
     coverBadgeStart: @Composable (RowScope.() -> Unit)? = null,
     coverBadgeEnd: @Composable (RowScope.() -> Unit)? = null,
@@ -162,7 +162,7 @@ private fun BoxScope.CoverTextOverlay(
 fun MangaComfortableGridItem(
     isSelected: Boolean = false,
     title: String,
-    coverData: eu.kanade.domain.manga.model.MangaCover,
+    coverData: tachiyomi.domain.manga.model.MangaCover,
     coverAlpha: Float = 1f,
     coverBadgeStart: (@Composable RowScope.() -> Unit)? = null,
     coverBadgeEnd: (@Composable RowScope.() -> Unit)? = null,
@@ -330,7 +330,7 @@ private fun Modifier.selectedOutline(
 fun MangaListItem(
     isSelected: Boolean = false,
     title: String,
-    coverData: eu.kanade.domain.manga.model.MangaCover,
+    coverData: tachiyomi.domain.manga.model.MangaCover,
     coverAlpha: Float = 1f,
     badge: @Composable (RowScope.() -> Unit),
     onLongClick: () -> Unit,

app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt

@@ -10,7 +10,6 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import eu.kanade.domain.history.model.HistoryWithRelations
 import eu.kanade.presentation.components.AppBarTitle
 import eu.kanade.presentation.components.EmptyScreen
 import eu.kanade.presentation.components.LoadingScreen
@@ -20,6 +19,7 @@ import eu.kanade.presentation.history.components.HistoryContent
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.history.HistoryScreenModel
 import eu.kanade.tachiyomi.ui.history.HistoryState
+import tachiyomi.domain.history.model.HistoryWithRelations
 import java.util.Date
 
 @Composable

app/src/main/java/eu/kanade/presentation/history/components/HistoryContent.kt

@@ -5,11 +5,11 @@ 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.model.HistoryWithRelations
 import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.presentation.components.FastScrollLazyColumn
 import eu.kanade.presentation.components.RelativeDateHeader
 import eu.kanade.presentation.history.HistoryUiModel
+import tachiyomi.domain.history.model.HistoryWithRelations
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.text.DateFormat

app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt

@@ -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.model.HistoryWithRelations
 import eu.kanade.presentation.components.MangaCover
 import eu.kanade.presentation.util.padding
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.util.lang.toTimestampString
+import tachiyomi.domain.history.model.HistoryWithRelations
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
 

app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt

@@ -7,9 +7,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.util.fastAny
 import eu.kanade.domain.library.model.LibraryManga
-import eu.kanade.domain.manga.model.MangaCover
 import eu.kanade.presentation.components.MangaComfortableGridItem
 import eu.kanade.tachiyomi.ui.library.LibraryItem
+import tachiyomi.domain.manga.model.MangaCover
 
 @Composable
 fun LibraryComfortableGrid(

app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt

@@ -7,9 +7,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.util.fastAny
 import eu.kanade.domain.library.model.LibraryManga
-import eu.kanade.domain.manga.model.MangaCover
 import eu.kanade.presentation.components.MangaCompactGridItem
 import eu.kanade.tachiyomi.ui.library.LibraryItem
+import tachiyomi.domain.manga.model.MangaCover
 
 @Composable
 fun LibraryCompactGrid(

app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.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.domain.library.model.LibraryDisplayMode
 import eu.kanade.domain.library.model.LibraryManga
 import eu.kanade.presentation.components.PullRefresh
 import eu.kanade.presentation.components.rememberPagerState
@@ -23,6 +22,7 @@ import eu.kanade.tachiyomi.ui.library.LibraryItem
 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

app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt

@@ -9,11 +9,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastAny
 import eu.kanade.domain.library.model.LibraryManga
-import eu.kanade.domain.manga.model.MangaCover
 import eu.kanade.presentation.components.FastScrollLazyColumn
 import eu.kanade.presentation.components.MangaListItem
 import eu.kanade.presentation.util.plus
 import eu.kanade.tachiyomi.ui.library.LibraryItem
+import tachiyomi.domain.manga.model.MangaCover
 
 @Composable
 fun LibraryList(

app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt

@@ -17,7 +17,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.unit.dp
 import eu.kanade.core.prefs.PreferenceMutableState
-import eu.kanade.domain.library.model.LibraryDisplayMode
 import eu.kanade.domain.library.model.LibraryManga
 import eu.kanade.presentation.components.EmptyScreen
 import eu.kanade.presentation.components.HorizontalPager
@@ -25,6 +24,7 @@ import eu.kanade.presentation.components.PagerState
 import eu.kanade.presentation.util.plus
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.library.LibraryItem
+import tachiyomi.domain.library.model.LibraryDisplayMode
 
 @Composable
 fun LibraryPager(

app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt

@@ -33,7 +33,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import eu.kanade.domain.updates.model.UpdatesWithRelations
 import eu.kanade.presentation.components.ChapterDownloadAction
 import eu.kanade.presentation.components.ChapterDownloadIndicator
 import eu.kanade.presentation.components.ListGroupHeader
@@ -45,6 +44,7 @@ import eu.kanade.presentation.util.selectedBackground
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.ui.updates.UpdatesItem
+import tachiyomi.domain.updates.model.UpdatesWithRelations
 import java.util.Date
 import kotlin.time.Duration.Companion.minutes
 

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt

@@ -6,7 +6,6 @@ import android.net.Uri
 import com.hippo.unifile.UniFile
 import eu.kanade.domain.backup.service.BackupPreferences
 import eu.kanade.domain.category.interactor.GetCategories
-import eu.kanade.domain.history.model.HistoryUpdate
 import eu.kanade.domain.library.service.LibraryPreferences
 import eu.kanade.domain.manga.interactor.GetFavorites
 import eu.kanade.tachiyomi.R
@@ -45,6 +44,7 @@ import tachiyomi.data.Manga_sync
 import tachiyomi.data.Mangas
 import tachiyomi.data.updateStrategyAdapter
 import tachiyomi.domain.category.model.Category
+import tachiyomi.domain.history.model.HistoryUpdate
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.FileOutputStream

app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt

@@ -10,7 +10,6 @@ import coil.fetch.SourceResult
 import coil.network.HttpException
 import coil.request.Options
 import coil.request.Parameters
-import eu.kanade.domain.manga.model.MangaCover
 import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.coil.MangaCoverFetcher.Companion.USE_CUSTOM_COVER
 import eu.kanade.tachiyomi.data.database.models.Manga
@@ -28,6 +27,7 @@ import okio.Path.Companion.toOkioPath
 import okio.Source
 import okio.buffer
 import okio.sink
+import tachiyomi.domain.manga.model.MangaCover
 import uy.kohesive.injekt.injectLazy
 import java.io.File
 import eu.kanade.domain.manga.model.Manga as DomainManga

app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverKeyer.kt

@@ -2,11 +2,11 @@ package eu.kanade.tachiyomi.data.coil
 
 import coil.key.Keyer
 import coil.request.Options
-import eu.kanade.domain.manga.model.MangaCover
 import eu.kanade.domain.manga.model.hasCustomCover
 import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.toDomainManga
+import tachiyomi.domain.manga.model.MangaCover
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import eu.kanade.domain.manga.model.Manga as DomainManga

app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt

@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.extension
 
 import android.content.Context
 import android.graphics.drawable.Drawable
-import eu.kanade.domain.source.model.SourceData
 import eu.kanade.domain.source.service.SourcePreferences
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi
@@ -23,6 +22,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import logcat.LogPriority
 import rx.Observable
+import tachiyomi.domain.source.model.SourceData
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.util.Locale

app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt

@@ -1,8 +1,8 @@
 package eu.kanade.tachiyomi.extension.model
 
 import android.graphics.drawable.Drawable
-import eu.kanade.domain.source.model.SourceData
 import eu.kanade.tachiyomi.source.Source
+import tachiyomi.domain.source.model.SourceData
 
 sealed class Extension {
 

app/src/main/java/eu/kanade/tachiyomi/glance/UpdatesGridGlanceWidget.kt

@@ -43,7 +43,6 @@ import coil.request.ImageRequest
 import coil.size.Precision
 import coil.size.Scale
 import coil.transform.RoundedCornersTransformation
-import eu.kanade.domain.manga.model.MangaCover
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.core.security.SecurityPreferences
 import eu.kanade.tachiyomi.ui.main.MainActivity
@@ -52,6 +51,7 @@ import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.system.dpToPx
 import kotlinx.coroutines.MainScope
 import tachiyomi.data.DatabaseHandler
+import tachiyomi.domain.manga.model.MangaCover
 import tachiyomi.view.UpdatesView
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt

@@ -1,9 +1,9 @@
 package eu.kanade.tachiyomi.source
 
 import android.graphics.drawable.Drawable
-import eu.kanade.domain.source.model.SourceData
 import eu.kanade.domain.source.service.SourcePreferences
 import eu.kanade.tachiyomi.extension.ExtensionManager
+import tachiyomi.domain.source.model.SourceData
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 

app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt

@@ -1,7 +1,6 @@
 package eu.kanade.tachiyomi.source
 
 import android.content.Context
-import eu.kanade.domain.source.model.SourceData
 import eu.kanade.domain.source.repository.SourceDataRepository
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.download.DownloadManager
@@ -20,6 +19,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import rx.Observable
+import tachiyomi.domain.source.model.SourceData
 import uy.kohesive.injekt.injectLazy
 import java.util.concurrent.ConcurrentHashMap
 

app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt

@@ -33,7 +33,6 @@ import eu.kanade.domain.chapter.interactor.UpdateChapter
 import eu.kanade.domain.chapter.model.toChapterUpdate
 import eu.kanade.domain.manga.interactor.UpdateManga
 import eu.kanade.domain.manga.model.Manga
-import eu.kanade.domain.manga.model.MangaUpdate
 import eu.kanade.domain.manga.model.hasCustomCover
 import eu.kanade.domain.track.interactor.GetTracks
 import eu.kanade.domain.track.interactor.InsertTrack
@@ -51,6 +50,7 @@ import eu.kanade.tachiyomi.ui.browse.migration.MigrationFlags
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.flow.update
+import tachiyomi.domain.manga.model.MangaUpdate
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.util.Date

app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryScreenModel.kt

@@ -8,7 +8,6 @@ import eu.kanade.domain.chapter.model.Chapter
 import eu.kanade.domain.history.interactor.GetHistory
 import eu.kanade.domain.history.interactor.GetNextChapters
 import eu.kanade.domain.history.interactor.RemoveHistory
-import eu.kanade.domain.history.model.HistoryWithRelations
 import eu.kanade.presentation.history.HistoryUiModel
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.toDateKey
@@ -26,6 +25,7 @@ import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import logcat.LogPriority
+import tachiyomi.domain.history.model.HistoryWithRelations
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.util.Date

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt

@@ -23,13 +23,10 @@ import eu.kanade.domain.chapter.interactor.SetReadStatus
 import eu.kanade.domain.chapter.model.Chapter
 import eu.kanade.domain.history.interactor.GetNextChapters
 import eu.kanade.domain.library.model.LibraryManga
-import eu.kanade.domain.library.model.LibrarySort
-import eu.kanade.domain.library.model.sort
 import eu.kanade.domain.library.service.LibraryPreferences
 import eu.kanade.domain.manga.interactor.GetLibraryManga
 import eu.kanade.domain.manga.interactor.UpdateManga
 import eu.kanade.domain.manga.model.Manga
-import eu.kanade.domain.manga.model.MangaUpdate
 import eu.kanade.domain.manga.model.isLocal
 import eu.kanade.domain.track.interactor.GetTracksPerManga
 import eu.kanade.presentation.library.components.LibraryToolbarTitle
@@ -58,6 +55,9 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 import tachiyomi.domain.category.model.Category
+import tachiyomi.domain.library.model.LibrarySort
+import tachiyomi.domain.library.model.sort
+import tachiyomi.domain.manga.model.MangaUpdate
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.text.Collator

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt

@@ -7,10 +7,6 @@ import android.view.View
 import eu.kanade.domain.base.BasePreferences
 import eu.kanade.domain.category.interactor.SetDisplayModeForCategory
 import eu.kanade.domain.category.interactor.SetSortModeForCategory
-import eu.kanade.domain.library.model.LibraryDisplayMode
-import eu.kanade.domain.library.model.LibrarySort
-import eu.kanade.domain.library.model.display
-import eu.kanade.domain.library.model.sort
 import eu.kanade.domain.library.service.LibraryPreferences
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.track.TrackManager
@@ -23,6 +19,10 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import tachiyomi.domain.category.model.Category
+import tachiyomi.domain.library.model.LibraryDisplayMode
+import tachiyomi.domain.library.model.LibrarySort
+import tachiyomi.domain.library.model.display
+import tachiyomi.domain.library.model.sort
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt

@@ -29,7 +29,6 @@ import cafe.adriel.voyager.navigator.currentOrThrow
 import cafe.adriel.voyager.navigator.tab.LocalTabNavigator
 import cafe.adriel.voyager.navigator.tab.TabOptions
 import eu.kanade.domain.library.model.LibraryManga
-import eu.kanade.domain.library.model.display
 import eu.kanade.domain.manga.model.Manga
 import eu.kanade.domain.manga.model.isLocal
 import eu.kanade.presentation.components.ChangeCategoryDialog
@@ -57,6 +56,7 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import tachiyomi.domain.category.model.Category
+import tachiyomi.domain.library.model.display
 
 object LibraryTab : Tab {
 

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt

@@ -14,7 +14,6 @@ import eu.kanade.domain.chapter.model.toDbChapter
 import eu.kanade.domain.download.service.DownloadPreferences
 import eu.kanade.domain.history.interactor.GetNextChapters
 import eu.kanade.domain.history.interactor.UpsertHistory
-import eu.kanade.domain.history.model.HistoryUpdate
 import eu.kanade.domain.manga.interactor.GetManga
 import eu.kanade.domain.manga.interactor.SetMangaViewerFlags
 import eu.kanade.domain.manga.model.Manga
@@ -76,6 +75,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import logcat.LogPriority
+import tachiyomi.domain.history.model.HistoryUpdate
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.util.Date

app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt

@@ -19,7 +19,6 @@ import eu.kanade.domain.library.service.LibraryPreferences
 import eu.kanade.domain.manga.interactor.GetManga
 import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.domain.updates.interactor.GetUpdates
-import eu.kanade.domain.updates.model.UpdatesWithRelations
 import eu.kanade.presentation.components.ChapterDownloadAction
 import eu.kanade.presentation.updates.UpdatesUiModel
 import eu.kanade.tachiyomi.data.download.DownloadCache
@@ -44,6 +43,7 @@ import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import logcat.LogPriority
+import tachiyomi.domain.updates.model.UpdatesWithRelations
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.util.Calendar

domain/build.gradle.kts

@@ -10,10 +10,13 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
-
 }
 
 dependencies {
     implementation(platform(kotlinx.coroutines.bom))
     implementation(kotlinx.bundles.coroutines)
+
+    implementation(project(":source-api"))
+
+    testImplementation(libs.junit)
 }

domain/src/main/java/tachiyomi/domain/history/model/History.kt

@@ -1,4 +1,4 @@
-package eu.kanade.domain.history.model
+package tachiyomi.domain.history.model
 
 import java.util.Date
 

domain/src/main/java/tachiyomi/domain/history/model/HistoryUpdate.kt

@@ -1,4 +1,4 @@
-package eu.kanade.domain.history.model
+package tachiyomi.domain.history.model
 
 import java.util.Date
 

domain/src/main/java/tachiyomi/domain/history/model/HistoryWithRelations.kt

@@ -1,6 +1,6 @@
-package eu.kanade.domain.history.model
+package tachiyomi.domain.history.model
 
-import eu.kanade.domain.manga.model.MangaCover
+import tachiyomi.domain.manga.model.MangaCover
 import java.util.Date
 
 data class HistoryWithRelations(

domain/src/main/java/tachiyomi/domain/library/model/Flag.kt

@@ -1,4 +1,4 @@
-package eu.kanade.domain.library.model
+package tachiyomi.domain.library.model
 
 interface Flag {
     val flag: Long

domain/src/main/java/tachiyomi/domain/library/model/LibraryDisplayMode.kt

@@ -1,4 +1,4 @@
-package eu.kanade.domain.library.model
+package tachiyomi.domain.library.model
 
 import tachiyomi.domain.category.model.Category
 

domain/src/main/java/tachiyomi/domain/library/model/LibrarySort.kt

@@ -1,4 +1,4 @@
-package eu.kanade.domain.library.model
+package tachiyomi.domain.library.model
 
 import tachiyomi.domain.category.model.Category
 

domain/src/main/java/tachiyomi/domain/manga/model/MangaCover.kt

@@ -0,0 +1,12 @@
+package tachiyomi.domain.manga.model
+
+/**
+ * Contains the required data for MangaCoverFetcher
+ */
+data class MangaCover(
+    val mangaId: Long,
+    val sourceId: Long,
+    val isMangaFavorite: Boolean,
+    val url: String?,
+    val lastModified: Long,
+)

domain/src/main/java/tachiyomi/domain/manga/model/MangaUpdate.kt

@@ -1,4 +1,4 @@
-package eu.kanade.domain.manga.model
+package tachiyomi.domain.manga.model
 
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 

domain/src/main/java/tachiyomi/domain/source/model/SourceData.kt

@@ -1,4 +1,4 @@
-package eu.kanade.domain.source.model
+package tachiyomi.domain.source.model
 
 data class SourceData(
     val id: Long,

domain/src/main/java/tachiyomi/domain/updates/model/UpdatesWithRelations.kt

@@ -1,6 +1,6 @@
-package eu.kanade.domain.updates.model
+package tachiyomi.domain.updates.model
 
-import eu.kanade.domain.manga.model.MangaCover
+import tachiyomi.domain.manga.model.MangaCover
 
 data class UpdatesWithRelations(
     val mangaId: Long,

domain/src/test/java/tachiyomi/domain/library/model/LibraryFlagsTest.kt

@@ -1,8 +1,5 @@
-package eu.kanade.tachiyomi.util.chapter
+package tachiyomi.domain.library.model
 
-import eu.kanade.domain.library.model.LibraryDisplayMode
-import eu.kanade.domain.library.model.LibrarySort
-import eu.kanade.domain.library.model.plus
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotEquals
 import org.junit.jupiter.api.Test

i18n/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    namespace = "eu.kanade.tachiyomi.i18n"
+    namespace = "tachiyomi.i18n"
 
     lint {
         disable.addAll(listOf("MissingTranslation", "ExtraTranslation"))