Merge pull request #1023 from LuftVerbot/merge2.0

chore(merge): merge upstream until tachiyomiorg@dfdb688

README.md

@@ -1,6 +1,6 @@
 | Build | Preview Release | Codefactor | Stable | Translate Aniyomi                                                                                                                                 | Discord Server |
 |-------|-----------|-------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------|---------|
-| ![CI](https://github.com/aniyomiorg/aniyomi/workflows/CI/badge.svg?branch=master&event=push) | [![latest preview build](https://img.shields.io/github/v/release/aniyomiorg/aniyomi-preview.svg?maxAge=3600&label=download)](https://github.com/aniyomiorg/aniyomi-preview/releases) | [![CodeFactor](https://www.codefactor.io/repository/github/aniyomiorg/aniyomi/badge)](https://www.codefactor.io/repository/github/aniyomiorg/aniyomi) | [![stable release](https://img.shields.io/github/release/aniyomiorg/aniyomi.svg?maxAge=3600&label=download)](https://github.com/aniyomiorg/aniyomi/releases) | [![Translation status](https://hosted.weblate.org/widgets/aniyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/aniyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/841701076242530374?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/F32UjdJZrR) |
+| [![CI](https://github.com/aniyomiorg/aniyomi/actions/workflows/build_push.yml/badge.svg)] (https://github.com/aniyomiorg/aniyomi/actions/workflows/build_push.yml) | [![latest preview build](https://img.shields.io/github/v/release/aniyomiorg/aniyomi-preview.svg?maxAge=3600&label=download)](https://github.com/aniyomiorg/aniyomi-preview/releases) | [![CodeFactor](https://www.codefactor.io/repository/github/aniyomiorg/aniyomi/badge)](https://www.codefactor.io/repository/github/aniyomiorg/aniyomi) | [![stable release](https://img.shields.io/github/release/aniyomiorg/aniyomi.svg?maxAge=3600&label=download)](https://github.com/aniyomiorg/aniyomi/releases) | [![Translation status](https://hosted.weblate.org/widgets/aniyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/aniyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/841701076242530374?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/F32UjdJZrR) |
 
 
 # ![app icon](.github/readme-images/app-icon.png)Aniyomi

app/build.gradle.kts

@@ -192,16 +192,14 @@ dependencies {
     // Job scheduling
     implementation(androidx.bundles.workmanager)
 
-    // RX
+    // RxJava
     implementation(libs.bundles.reactivex)
     implementation(libs.flowreactivenetwork)
 
-    // Network client
+    // Networking
     implementation(libs.bundles.okhttp)
     implementation(libs.okio)
-
-    // TLS 1.3 support for Android < 10
-    implementation(libs.conscrypt.android)
+    implementation(libs.conscrypt.android) // TLS 1.3 support for Android < 10
 
     // Data serialization (JSON, protobuf, xml)
     implementation(kotlinx.bundles.serialization)
@@ -238,9 +236,10 @@ dependencies {
     implementation(libs.insetter)
     implementation(libs.bundles.richtext)
     implementation(libs.aboutLibraries.compose)
-    implementation(libs.cascade)
     implementation(libs.bundles.voyager)
-    implementation(libs.materialmotion.core)
+    implementation(libs.compose.cascade)
+    implementation(libs.compose.materialmotion)
+    implementation(libs.compose.simpleicons)
 
     // Logging
     implementation(libs.logcat)

app/src/main/java/eu/kanade/domain/DomainModule.kt

@@ -1,15 +1,5 @@
 package eu.kanade.domain
 
-import eu.kanade.data.source.anime.AnimeSourceRepositoryImpl
-import eu.kanade.data.source.manga.MangaSourceRepositoryImpl
-import eu.kanade.domain.category.anime.interactor.CreateAnimeCategoryWithName
-import eu.kanade.domain.category.anime.interactor.ResetAnimeCategoryFlags
-import eu.kanade.domain.category.anime.interactor.SetDisplayModeForAnimeCategory
-import eu.kanade.domain.category.anime.interactor.SetSortModeForAnimeCategory
-import eu.kanade.domain.category.manga.interactor.CreateMangaCategoryWithName
-import eu.kanade.domain.category.manga.interactor.ResetMangaCategoryFlags
-import eu.kanade.domain.category.manga.interactor.SetDisplayModeForMangaCategory
-import eu.kanade.domain.category.manga.interactor.SetSortModeForMangaCategory
 import eu.kanade.domain.download.anime.interactor.DeleteAnimeDownload
 import eu.kanade.domain.download.manga.interactor.DeleteChapterDownload
 import eu.kanade.domain.entries.anime.interactor.SetAnimeViewerFlags
@@ -22,31 +12,22 @@ import eu.kanade.domain.extension.anime.interactor.GetAnimeExtensionsByType
 import eu.kanade.domain.extension.manga.interactor.GetExtensionSources
 import eu.kanade.domain.extension.manga.interactor.GetMangaExtensionLanguages
 import eu.kanade.domain.extension.manga.interactor.GetMangaExtensionsByType
-import eu.kanade.domain.history.anime.interactor.GetNextEpisodes
-import eu.kanade.domain.history.manga.interactor.GetNextChapters
 import eu.kanade.domain.items.chapter.interactor.SetReadStatus
 import eu.kanade.domain.items.chapter.interactor.SyncChaptersWithSource
 import eu.kanade.domain.items.chapter.interactor.SyncChaptersWithTrackServiceTwoWay
-import eu.kanade.domain.items.episode.interactor.SetAnimeDefaultEpisodeFlags
 import eu.kanade.domain.items.episode.interactor.SetSeenStatus
 import eu.kanade.domain.items.episode.interactor.SyncEpisodesWithSource
 import eu.kanade.domain.items.episode.interactor.SyncEpisodesWithTrackServiceTwoWay
 import eu.kanade.domain.source.anime.interactor.GetAnimeSourcesWithFavoriteCount
-import eu.kanade.domain.source.anime.interactor.GetAnimeSourcesWithNonLibraryAnime
 import eu.kanade.domain.source.anime.interactor.GetEnabledAnimeSources
 import eu.kanade.domain.source.anime.interactor.GetLanguagesWithAnimeSources
-import eu.kanade.domain.source.anime.interactor.GetRemoteAnime
 import eu.kanade.domain.source.anime.interactor.ToggleAnimeSource
 import eu.kanade.domain.source.anime.interactor.ToggleAnimeSourcePin
-import eu.kanade.domain.source.anime.repository.AnimeSourceRepository
 import eu.kanade.domain.source.manga.interactor.GetEnabledMangaSources
 import eu.kanade.domain.source.manga.interactor.GetLanguagesWithMangaSources
 import eu.kanade.domain.source.manga.interactor.GetMangaSourcesWithFavoriteCount
-import eu.kanade.domain.source.manga.interactor.GetMangaSourcesWithNonLibraryManga
-import eu.kanade.domain.source.manga.interactor.GetRemoteManga
 import eu.kanade.domain.source.manga.interactor.ToggleMangaSource
 import eu.kanade.domain.source.manga.interactor.ToggleMangaSourcePin
-import eu.kanade.domain.source.manga.repository.MangaSourceRepository
 import eu.kanade.domain.source.service.SetMigrateSorting
 import eu.kanade.domain.source.service.ToggleLanguage
 import tachiyomi.data.category.anime.AnimeCategoryRepositoryImpl
@@ -58,23 +39,33 @@ import tachiyomi.data.history.manga.MangaHistoryRepositoryImpl
 import tachiyomi.data.items.chapter.ChapterRepositoryImpl
 import tachiyomi.data.items.episode.EpisodeRepositoryImpl
 import tachiyomi.data.source.anime.AnimeSourceDataRepositoryImpl
+import tachiyomi.data.source.anime.AnimeSourceRepositoryImpl
 import tachiyomi.data.source.manga.MangaSourceDataRepositoryImpl
+import tachiyomi.data.source.manga.MangaSourceRepositoryImpl
 import tachiyomi.data.track.anime.AnimeTrackRepositoryImpl
 import tachiyomi.data.track.manga.MangaTrackRepositoryImpl
 import tachiyomi.data.updates.anime.AnimeUpdatesRepositoryImpl
 import tachiyomi.data.updates.manga.MangaUpdatesRepositoryImpl
+import tachiyomi.domain.category.anime.interactor.CreateAnimeCategoryWithName
 import tachiyomi.domain.category.anime.interactor.DeleteAnimeCategory
 import tachiyomi.domain.category.anime.interactor.GetAnimeCategories
 import tachiyomi.domain.category.anime.interactor.RenameAnimeCategory
 import tachiyomi.domain.category.anime.interactor.ReorderAnimeCategory
+import tachiyomi.domain.category.anime.interactor.ResetAnimeCategoryFlags
 import tachiyomi.domain.category.anime.interactor.SetAnimeCategories
+import tachiyomi.domain.category.anime.interactor.SetDisplayModeForAnimeCategory
+import tachiyomi.domain.category.anime.interactor.SetSortModeForAnimeCategory
 import tachiyomi.domain.category.anime.interactor.UpdateAnimeCategory
 import tachiyomi.domain.category.anime.repository.AnimeCategoryRepository
+import tachiyomi.domain.category.manga.interactor.CreateMangaCategoryWithName
 import tachiyomi.domain.category.manga.interactor.DeleteMangaCategory
 import tachiyomi.domain.category.manga.interactor.GetMangaCategories
 import tachiyomi.domain.category.manga.interactor.RenameMangaCategory
 import tachiyomi.domain.category.manga.interactor.ReorderMangaCategory
+import tachiyomi.domain.category.manga.interactor.ResetMangaCategoryFlags
+import tachiyomi.domain.category.manga.interactor.SetDisplayModeForMangaCategory
 import tachiyomi.domain.category.manga.interactor.SetMangaCategories
+import tachiyomi.domain.category.manga.interactor.SetSortModeForMangaCategory
 import tachiyomi.domain.category.manga.interactor.UpdateMangaCategory
 import tachiyomi.domain.category.manga.repository.MangaCategoryRepository
 import tachiyomi.domain.entries.anime.interactor.GetAnime
@@ -96,26 +87,36 @@ import tachiyomi.domain.entries.manga.interactor.ResetMangaViewerFlags
 import tachiyomi.domain.entries.manga.interactor.SetMangaChapterFlags
 import tachiyomi.domain.entries.manga.repository.MangaRepository
 import tachiyomi.domain.history.anime.interactor.GetAnimeHistory
+import tachiyomi.domain.history.anime.interactor.GetNextEpisodes
 import tachiyomi.domain.history.anime.interactor.RemoveAnimeHistory
 import tachiyomi.domain.history.anime.interactor.UpsertAnimeHistory
 import tachiyomi.domain.history.anime.repository.AnimeHistoryRepository
 import tachiyomi.domain.history.manga.interactor.GetMangaHistory
+import tachiyomi.domain.history.manga.interactor.GetNextChapters
 import tachiyomi.domain.history.manga.interactor.GetTotalReadDuration
 import tachiyomi.domain.history.manga.interactor.RemoveMangaHistory
 import tachiyomi.domain.history.manga.interactor.UpsertMangaHistory
 import tachiyomi.domain.history.manga.repository.MangaHistoryRepository
 import tachiyomi.domain.items.chapter.interactor.GetChapter
 import tachiyomi.domain.items.chapter.interactor.GetChapterByMangaId
+import tachiyomi.domain.items.chapter.interactor.SetMangaDefaultChapterFlags
 import tachiyomi.domain.items.chapter.interactor.ShouldUpdateDbChapter
 import tachiyomi.domain.items.chapter.interactor.UpdateChapter
 import tachiyomi.domain.items.chapter.repository.ChapterRepository
 import tachiyomi.domain.items.episode.interactor.GetEpisode
 import tachiyomi.domain.items.episode.interactor.GetEpisodeByAnimeId
+import tachiyomi.domain.items.episode.interactor.SetAnimeDefaultEpisodeFlags
 import tachiyomi.domain.items.episode.interactor.ShouldUpdateDbEpisode
 import tachiyomi.domain.items.episode.interactor.UpdateEpisode
 import tachiyomi.domain.items.episode.repository.EpisodeRepository
+import tachiyomi.domain.source.anime.interactor.GetAnimeSourcesWithNonLibraryAnime
+import tachiyomi.domain.source.anime.interactor.GetRemoteAnime
 import tachiyomi.domain.source.anime.repository.AnimeSourceDataRepository
+import tachiyomi.domain.source.anime.repository.AnimeSourceRepository
+import tachiyomi.domain.source.manga.interactor.GetMangaSourcesWithNonLibraryManga
+import tachiyomi.domain.source.manga.interactor.GetRemoteManga
 import tachiyomi.domain.source.manga.repository.MangaSourceDataRepository
+import tachiyomi.domain.source.manga.repository.MangaSourceRepository
 import tachiyomi.domain.track.anime.interactor.DeleteAnimeTrack
 import tachiyomi.domain.track.anime.interactor.GetAnimeTracks
 import tachiyomi.domain.track.anime.interactor.GetTracksPerAnime
@@ -186,7 +187,7 @@ class DomainModule : InjektModule {
         addFactory { ResetMangaViewerFlags(get()) }
         addFactory { SetMangaChapterFlags(get()) }
         addFactory {
-            eu.kanade.domain.items.chapter.interactor.SetMangaDefaultChapterFlags(
+            SetMangaDefaultChapterFlags(
                 get(),
                 get(),
                 get(),

app/src/main/java/eu/kanade/domain/download/anime/interactor/DeleteEpisodeDownload.kt

@@ -1,10 +1,10 @@
 package eu.kanade.domain.download.anime.interactor
 
 import eu.kanade.tachiyomi.data.download.anime.AnimeDownloadManager
-import eu.kanade.tachiyomi.source.anime.AnimeSourceManager
 import tachiyomi.core.util.lang.withNonCancellableContext
 import tachiyomi.domain.entries.anime.model.Anime
 import tachiyomi.domain.items.episode.model.Episode
+import tachiyomi.domain.source.anime.service.AnimeSourceManager
 
 class DeleteAnimeDownload(
     private val sourceManager: AnimeSourceManager,

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

@@ -1,10 +1,10 @@
 package eu.kanade.domain.download.manga.interactor
 
 import eu.kanade.tachiyomi.data.download.manga.MangaDownloadManager
-import eu.kanade.tachiyomi.source.manga.MangaSourceManager
 import tachiyomi.core.util.lang.withNonCancellableContext
 import tachiyomi.domain.entries.manga.model.Manga
 import tachiyomi.domain.items.chapter.model.Chapter
+import tachiyomi.domain.source.manga.service.MangaSourceManager
 
 class DeleteChapterDownload(
     private val sourceManager: MangaSourceManager,

app/src/main/java/eu/kanade/domain/items/chapter/interactor/SetReadStatus.kt

@@ -1,10 +1,10 @@
 package eu.kanade.domain.items.chapter.interactor
 
 import eu.kanade.domain.download.manga.interactor.DeleteChapterDownload
-import eu.kanade.domain.download.service.DownloadPreferences
 import logcat.LogPriority
 import tachiyomi.core.util.lang.withNonCancellableContext
 import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.download.service.DownloadPreferences
 import tachiyomi.domain.entries.manga.model.Manga
 import tachiyomi.domain.entries.manga.repository.MangaRepository
 import tachiyomi.domain.items.chapter.model.Chapter

app/src/main/java/eu/kanade/domain/items/chapter/model/Chapter.kt

@@ -1,5 +1,6 @@
 package eu.kanade.domain.items.chapter.model
 
+import data.Chapters
 import eu.kanade.tachiyomi.data.database.models.manga.ChapterImpl
 import eu.kanade.tachiyomi.source.model.SChapter
 import tachiyomi.domain.items.chapter.model.Chapter
@@ -26,6 +27,16 @@ fun Chapter.copyFromSChapter(sChapter: SChapter): Chapter {
     )
 }
 
+fun Chapter.copyFrom(other: Chapters): Chapter {
+    return copy(
+        name = other.name,
+        url = other.url,
+        dateUpload = other.date_upload,
+        chapterNumber = other.chapter_number,
+        scanlator = other.scanlator?.ifBlank { null },
+    )
+}
+
 fun Chapter.toDbChapter(): DbChapter = ChapterImpl().also {
     it.id = id
     it.manga_id = mangaId

app/src/main/java/eu/kanade/domain/items/episode/interactor/SetSeenStatus.kt

@@ -1,10 +1,10 @@
 package eu.kanade.domain.items.episode.interactor
 
 import eu.kanade.domain.download.anime.interactor.DeleteAnimeDownload
-import eu.kanade.domain.download.service.DownloadPreferences
 import logcat.LogPriority
 import tachiyomi.core.util.lang.withNonCancellableContext
 import tachiyomi.core.util.system.logcat
+import tachiyomi.domain.download.service.DownloadPreferences
 import tachiyomi.domain.entries.anime.model.Anime
 import tachiyomi.domain.entries.anime.repository.AnimeRepository
 import tachiyomi.domain.items.episode.model.Episode

app/src/main/java/eu/kanade/domain/items/episode/model/Episode.kt

@@ -1,5 +1,6 @@
 package eu.kanade.domain.items.episode.model
 
+import dataanime.Episodes
 import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.data.database.models.anime.EpisodeImpl
 import tachiyomi.domain.items.episode.model.Episode
@@ -26,6 +27,16 @@ fun Episode.copyFromSEpisode(sEpisode: SEpisode): Episode {
     )
 }
 
+fun Episode.copyFrom(other: Episodes): Episode {
+    return copy(
+        name = other.name,
+        url = other.url,
+        dateUpload = other.date_upload,
+        episodeNumber = other.episode_number,
+        scanlator = other.scanlator?.ifBlank { null },
+    )
+}
+
 fun Episode.toDbEpisode(): DbEpisode = EpisodeImpl().also {
     it.id = id
     it.anime_id = animeId

app/src/main/java/eu/kanade/domain/source/anime/interactor/GetAnimeSourcesWithFavoriteCount.kt

@@ -1,11 +1,12 @@
 package eu.kanade.domain.source.anime.interactor
 
-import eu.kanade.domain.source.anime.repository.AnimeSourceRepository
 import eu.kanade.domain.source.service.SetMigrateSorting
 import eu.kanade.domain.source.service.SourcePreferences
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import tachiyomi.domain.source.anime.model.AnimeSource
+import tachiyomi.domain.source.anime.repository.AnimeSourceRepository
+import tachiyomi.source.local.entries.anime.LocalAnimeSource
 import java.text.Collator
 import java.util.Collections
 import java.util.Locale
@@ -21,7 +22,9 @@ class GetAnimeSourcesWithFavoriteCount(
             preferences.migrationSortingMode().changes(),
             repository.getAnimeSourcesWithFavoriteCount(),
         ) { direction, mode, list ->
-            list.sortedWith(sortFn(direction, mode))
+            list
+                .filterNot { it.first.id == LocalAnimeSource.ID }
+                .sortedWith(sortFn(direction, mode))
         }
     }
 

app/src/main/java/eu/kanade/domain/source/anime/interactor/GetEnabledAnimeSources.kt

@@ -1,13 +1,13 @@
 package eu.kanade.domain.source.anime.interactor
 
-import eu.kanade.domain.source.anime.repository.AnimeSourceRepository
 import eu.kanade.domain.source.service.SourcePreferences
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import tachiyomi.domain.source.anime.model.AnimeSource
 import tachiyomi.domain.source.anime.model.Pin
 import tachiyomi.domain.source.anime.model.Pins
+import tachiyomi.domain.source.anime.repository.AnimeSourceRepository
 import tachiyomi.source.local.entries.anime.LocalAnimeSource
 
 class GetEnabledAnimeSources(

app/src/main/java/eu/kanade/domain/source/anime/interactor/GetLanguagesWithAnimeSources.kt

@@ -1,11 +1,11 @@
 package eu.kanade.domain.source.anime.interactor
 
-import eu.kanade.domain.source.anime.repository.AnimeSourceRepository
 import eu.kanade.domain.source.service.SourcePreferences
 import eu.kanade.tachiyomi.util.system.LocaleHelper
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import tachiyomi.domain.source.anime.model.AnimeSource
+import tachiyomi.domain.source.anime.repository.AnimeSourceRepository
 
 class GetLanguagesWithAnimeSources(
     private val repository: AnimeSourceRepository,

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

@@ -1,13 +1,13 @@
 package eu.kanade.domain.source.manga.interactor
 
-import eu.kanade.domain.source.manga.repository.MangaSourceRepository
 import eu.kanade.domain.source.service.SourcePreferences
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import tachiyomi.domain.source.manga.model.Pin
 import tachiyomi.domain.source.manga.model.Pins
 import tachiyomi.domain.source.manga.model.Source
+import tachiyomi.domain.source.manga.repository.MangaSourceRepository
 import tachiyomi.source.local.entries.manga.LocalMangaSource
 
 class GetEnabledMangaSources(