Merge pull request #6 from Dark25/dev2

Dev2

LICENSE

@@ -173,4 +173,4 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
+   END OF TERMS AND CONDITIONS

app/src/main/AndroidManifest.xml

@@ -177,22 +177,24 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:host="anilist-auth"/>
-                <data android:host="bangumi-auth"/>
-                <data android:host="myanimelist-auth"/>
-                <data android:host="shikimori-auth"/>
-
-                <data android:scheme="tachiyomi"/>
+                <data
+                    android:host="anilist-auth"
+                    android:scheme="tachiyomi" />
             </intent-filter>
+        </activity>
+        <activity
+            android:name=".ui.setting.track.MyAnimeListLoginActivity"
+            android:label="MyAnimeList"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:host="simkl-auth"/>
-
-                <data android:scheme="animetail"/>
+                <data
+                    android:host="myanimelist-auth"
+                    android:scheme="tachiyomi" />
             </intent-filter>
         </activity>
 

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

@@ -58,7 +58,7 @@ fun GlobalMangaSearchToolbar(
             )
             if (progress in 1..<total) {
                 LinearProgressIndicator(
-                    progress = { progress / total.toFloat() },
+                    progress = progress / total.toFloat(),
                     modifier = Modifier
                         .align(Alignment.BottomStart)
                         .fillMaxWidth(),

app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt

@@ -179,12 +179,12 @@ object AboutScreen : Screen() {
                         LinkIcon(
                             label = stringResource(R.string.website),
                             icon = Icons.Outlined.Public,
-                            url = "https://aniyomi.org",
+                            url = "https://akiled.org",
                         )
                         LinkIcon(
                             label = "Discord",
                             icon = CustomIcons.Discord,
-                            url = "https://discord.gg/s82Vu589Ya",
+                            url = "https://discord.gg",
                         )
                         LinkIcon(
                             label = "Reddit",
@@ -194,7 +194,7 @@ object AboutScreen : Screen() {
                         LinkIcon(
                             label = "GitHub",
                             icon = CustomIcons.Github,
-                            url = "https://github.com/dark25/animetailv2",
+                            url = "https://github.com/Dark25/animetailv2",
                         )
                     }
                 }

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

@@ -38,7 +38,8 @@ import eu.kanade.tachiyomi.util.system.createFileInCacheDir
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.isActive
 import tachiyomi.core.util.system.logcat
-import tachiyomi.data.UpdateStrategyColumnAdapter
+import tachiyomi.data.AnimeUpdateStrategyColumnAdapter
+import tachiyomi.data.MangaUpdateStrategyColumnAdapter
 import tachiyomi.data.handlers.anime.AnimeDatabaseHandler
 import tachiyomi.data.handlers.manga.MangaDatabaseHandler
 import tachiyomi.domain.category.anime.interactor.GetAnimeCategories
@@ -417,7 +418,7 @@ class BackupRestorer(
                 coverLastModified = manga.coverLastModified,
                 dateAdded = manga.dateAdded,
                 mangaId = manga.id!!,
-                updateStrategy = manga.updateStrategy.let(UpdateStrategyColumnAdapter::encode),
+                updateStrategy = manga.updateStrategy.let(MangaUpdateStrategyColumnAdapter::encode),
             )
         }
         return manga.id
@@ -901,7 +902,7 @@ class BackupRestorer(
                 coverLastModified = anime.coverLastModified,
                 dateAdded = anime.dateAdded,
                 animeId = anime.id!!,
-                updateStrategy = anime.updateStrategy.let(UpdateStrategyColumnAdapter::encode),
+                updateStrategy = anime.updateStrategy.let(AnimeUpdateStrategyColumnAdapter::encode),
             )
         }
         return anime.id

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

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.backup.models
 
-import eu.kanade.tachiyomi.model.UpdateStrategy
+import eu.kanade.tachiyomi.animesource.model.AnimeUpdateStrategy
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber
 import tachiyomi.domain.entries.anime.model.Anime
@@ -37,7 +37,7 @@ data class BackupAnime(
     @ProtoNumber(102) var brokenHistory: List<BrokenBackupAnimeHistory> = emptyList(),
     @ProtoNumber(103) var viewer_flags: Int = 0,
     @ProtoNumber(104) var history: List<BackupAnimeHistory> = emptyList(),
-    @ProtoNumber(105) var updateStrategy: UpdateStrategy = UpdateStrategy.ALWAYS_UPDATE,
+    @ProtoNumber(105) var updateStrategy: AnimeUpdateStrategy = AnimeUpdateStrategy.ALWAYS_UPDATE,
     @ProtoNumber(106) var lastModifiedAt: Long = 0,
     @ProtoNumber(107) var favoriteModifiedAt: Long? = null,
 

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

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.backup.models
 
-import eu.kanade.tachiyomi.model.UpdateStrategy
+import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber

app/src/main/java/eu/kanade/tachiyomi/data/download/anime/AnimeDownloadProvider.kt

@@ -44,7 +44,7 @@ class AnimeDownloadProvider(
 
     private fun getDownloadsLocation(dir: String): UniFile? {
         return UniFile.fromUri(context, dir.toUri())
-            ?.createDirectory(StoragePreferences.DOWNLOADS_DIR)
+            ?.createDirectory(StoragePreferences.DOWNLOADS_ANIME_DIR)
             ?.also { DiskUtil.createNoMediaFile(it, context) }
     }
 

app/src/main/java/eu/kanade/tachiyomi/data/download/manga/MangaDownloadProvider.kt

@@ -44,7 +44,7 @@ class MangaDownloadProvider(
 
     private fun getDownloadsLocation(dir: String): UniFile? {
         return UniFile.fromUri(context, dir.toUri())
-            ?.createDirectory(StoragePreferences.DOWNLOADS_DIR)
+            ?.createDirectory(StoragePreferences.DOWNLOADS_MANGA_DIR)
             ?.also { DiskUtil.createNoMediaFile(it, context) }
     }
 

app/src/main/java/eu/kanade/tachiyomi/data/library/anime/AnimeLibraryUpdateJob.kt

@@ -21,12 +21,12 @@ import eu.kanade.domain.entries.anime.model.toSAnime
 import eu.kanade.domain.items.episode.interactor.SyncEpisodesWithSource
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.animesource.UnmeteredSource
+import eu.kanade.tachiyomi.animesource.model.AnimeUpdateStrategy
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.data.cache.AnimeCoverCache
 import eu.kanade.tachiyomi.data.download.anime.AnimeDownloadManager
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.track.TrackStatus
-import eu.kanade.tachiyomi.model.UpdateStrategy
 import eu.kanade.tachiyomi.util.prepUpdateCover
 import eu.kanade.tachiyomi.util.shouldDownloadNewEpisodes
 import eu.kanade.tachiyomi.util.storage.getUriCompat
@@ -253,7 +253,7 @@ class AnimeLibraryUpdateJob(private val context: Context, workerParams: WorkerPa
             // SY <--
             .filter {
                 when {
-                    it.anime.updateStrategy != UpdateStrategy.ALWAYS_UPDATE -> {
+                    it.anime.updateStrategy != AnimeUpdateStrategy.ALWAYS_UPDATE -> {
                         skippedUpdates.add(it.anime to context.getString(R.string.skipped_reason_not_always_update))
                         false
                     }

app/src/main/java/eu/kanade/tachiyomi/data/library/manga/MangaLibraryUpdateJob.kt

@@ -24,9 +24,9 @@ import eu.kanade.tachiyomi.data.cache.MangaCoverCache
 import eu.kanade.tachiyomi.data.download.manga.MangaDownloadManager
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.track.TrackStatus
-import eu.kanade.tachiyomi.model.UpdateStrategy
 import eu.kanade.tachiyomi.source.UnmeteredSource
 import eu.kanade.tachiyomi.source.model.SManga
+import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import eu.kanade.tachiyomi.util.prepUpdateCover
 import eu.kanade.tachiyomi.util.shouldDownloadNewChapters
 import eu.kanade.tachiyomi.util.storage.getUriCompat

app/src/main/java/eu/kanade/tachiyomi/di/AppModule.kt

@@ -39,10 +39,11 @@ import nl.adaptivity.xmlutil.XmlDeclMode
 import nl.adaptivity.xmlutil.core.XmlVersion
 import nl.adaptivity.xmlutil.serialization.XML
 import tachiyomi.core.provider.AndroidStorageFolderProvider
+import tachiyomi.data.AnimeUpdateStrategyColumnAdapter
 import tachiyomi.data.Database
 import tachiyomi.data.DateColumnAdapter
+import tachiyomi.data.MangaUpdateStrategyColumnAdapter
 import tachiyomi.data.StringListColumnAdapter
-import tachiyomi.data.UpdateStrategyColumnAdapter
 import tachiyomi.data.handlers.anime.AndroidAnimeDatabaseHandler
 import tachiyomi.data.handlers.anime.AnimeDatabaseHandler
 import tachiyomi.data.handlers.manga.AndroidMangaDatabaseHandler
@@ -123,7 +124,7 @@ class AppModule(val app: Application) : InjektModule {
                 ),
                 mangasAdapter = Mangas.Adapter(
                     genreAdapter = StringListColumnAdapter,
-                    update_strategyAdapter = UpdateStrategyColumnAdapter,
+                    update_strategyAdapter = MangaUpdateStrategyColumnAdapter,
                 ),
             )
         }
@@ -136,7 +137,7 @@ class AppModule(val app: Application) : InjektModule {
                 ),
                 animesAdapter = Animes.Adapter(
                     genreAdapter = StringListColumnAdapter,
-                    update_strategyAdapter = UpdateStrategyColumnAdapter,
+                    update_strategyAdapter = AnimeUpdateStrategyColumnAdapter,
                 ),
             )
         }

app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/StreamsCatalogSheet.kt

@@ -21,6 +21,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import kotlinx.collections.immutable.toPersistentList
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -36,7 +37,6 @@ import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.ui.player.PlayerViewModel
 import eu.kanade.tachiyomi.ui.player.settings.sheetDialogPadding
 import `is`.xyz.mpv.MPVLib
-import kotlinx.collections.immutable.persistentListOf
 import tachiyomi.presentation.core.components.material.padding
 import java.io.File
 
@@ -51,7 +51,7 @@ fun StreamsCatalogSheet(
     onSettingsClicked: () -> Unit,
     onDismissRequest: () -> Unit,
 ) {
-    val tabTitles = persistentListOf(
+    val tabTitles = mutableListOf(
         stringResource(id = R.string.subtitle_dialog_header),
         stringResource(id = R.string.audio_dialog_header),
     )
@@ -61,7 +61,7 @@ fun StreamsCatalogSheet(
 
     TabbedDialog(
         onDismissRequest = onDismissRequest,
-        tabTitles = tabTitles,
+        tabTitles = tabTitles.toPersistentList(),
         onOverflowMenuClicked = onSettingsClicked,
         overflowIcon = Icons.Outlined.Settings,
         hideSystemBars = true,

core/src/main/java/tachiyomi/core/provider/AndroidStorageFolderProvider.kt

@@ -14,7 +14,6 @@ class AndroidStorageFolderProvider(
         return File(
             Environment.getExternalStorageDirectory().absolutePath + File.separator +
                 context.getString(R.string.app_name),
-            "downloads",
         )
     }
 

data/src/main/java/tachiyomi/data/DatabaseAdapter.kt

@@ -1,7 +1,8 @@
 package tachiyomi.data
 
 import app.cash.sqldelight.ColumnAdapter
-import eu.kanade.tachiyomi.model.UpdateStrategy
+import eu.kanade.tachiyomi.animesource.model.AnimeUpdateStrategy
+import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import java.util.Date
 
 object DateColumnAdapter : ColumnAdapter<Date, Long> {
@@ -22,9 +23,16 @@ object StringListColumnAdapter : ColumnAdapter<List<String>, String> {
     )
 }
 
-object UpdateStrategyColumnAdapter : ColumnAdapter<UpdateStrategy, Long> {
+object MangaUpdateStrategyColumnAdapter : ColumnAdapter<UpdateStrategy, Long> {
     override fun decode(databaseValue: Long): UpdateStrategy =
         UpdateStrategy.entries.getOrElse(databaseValue.toInt()) { UpdateStrategy.ALWAYS_UPDATE }
 
     override fun encode(value: UpdateStrategy): Long = value.ordinal.toLong()
 }
+
+object AnimeUpdateStrategyColumnAdapter : ColumnAdapter<AnimeUpdateStrategy, Long> {
+    override fun decode(databaseValue: Long): AnimeUpdateStrategy =
+        AnimeUpdateStrategy.entries.getOrElse(databaseValue.toInt()) { AnimeUpdateStrategy.ALWAYS_UPDATE }
+
+    override fun encode(value: AnimeUpdateStrategy): Long = value.ordinal.toLong()
+}

data/src/main/java/tachiyomi/data/entries/anime/AnimeMapper.kt

@@ -1,6 +1,6 @@
 package tachiyomi.data.entries.anime
 
-import eu.kanade.tachiyomi.model.UpdateStrategy
+import eu.kanade.tachiyomi.animesource.model.AnimeUpdateStrategy
 import tachiyomi.domain.entries.anime.model.Anime
 import tachiyomi.domain.library.anime.LibraryAnime
 object AnimeMapper {
@@ -23,7 +23,7 @@ object AnimeMapper {
         chapterFlags: Long,
         coverLastModified: Long,
         dateAdded: Long,
-        updateStrategy: UpdateStrategy,
+        updateStrategy: AnimeUpdateStrategy,
         calculateInterval: Long,
         lastModifiedAt: Long,
         favoriteModifiedAt: Long?,
@@ -73,7 +73,7 @@ object AnimeMapper {
         chapterFlags: Long,
         coverLastModified: Long,
         dateAdded: Long,
-        updateStrategy: UpdateStrategy,
+        updateStrategy: AnimeUpdateStrategy,
         calculateInterval: Long,
         lastModifiedAt: Long,
         favoriteModifiedAt: Long?,

data/src/main/java/tachiyomi/data/entries/anime/AnimeRepositoryImpl.kt

@@ -2,10 +2,9 @@ package tachiyomi.data.entries.anime
 
 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority
-import tachiyomi.core.util.lang.toLong
 import tachiyomi.core.util.system.logcat
+import tachiyomi.data.AnimeUpdateStrategyColumnAdapter
 import tachiyomi.data.StringListColumnAdapter
-import tachiyomi.data.UpdateStrategyColumnAdapter
 import tachiyomi.data.handlers.anime.AnimeDatabaseHandler
 import tachiyomi.domain.entries.anime.model.Anime
 import tachiyomi.domain.entries.anime.model.AnimeUpdate
@@ -155,7 +154,7 @@ class AnimeRepositoryImpl(
                     coverLastModified = value.coverLastModified,
                     dateAdded = value.dateAdded,
                     animeId = value.id,
-                    updateStrategy = value.updateStrategy?.let(UpdateStrategyColumnAdapter::encode),
+                    updateStrategy = value.updateStrategy?.let(AnimeUpdateStrategyColumnAdapter::encode),
                 )
             }
         }

data/src/main/java/tachiyomi/data/entries/manga/MangaMapper.kt

@@ -1,6 +1,6 @@
 package tachiyomi.data.entries.manga
 
-import eu.kanade.tachiyomi.model.UpdateStrategy
+import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import tachiyomi.domain.entries.manga.model.Manga
 import tachiyomi.domain.library.manga.LibraryManga
 object MangaMapper {

data/src/main/java/tachiyomi/data/entries/manga/MangaRepositoryImpl.kt

@@ -2,10 +2,9 @@ package tachiyomi.data.entries.manga
 
 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority
-import tachiyomi.core.util.lang.toLong
 import tachiyomi.core.util.system.logcat
+import tachiyomi.data.MangaUpdateStrategyColumnAdapter
 import tachiyomi.data.StringListColumnAdapter
-import tachiyomi.data.UpdateStrategyColumnAdapter
 import tachiyomi.data.handlers.manga.MangaDatabaseHandler
 import tachiyomi.domain.entries.manga.model.Manga
 import tachiyomi.domain.entries.manga.model.MangaUpdate
@@ -155,7 +154,7 @@ class MangaRepositoryImpl(
                     coverLastModified = value.coverLastModified,
                     dateAdded = value.dateAdded,
                     mangaId = value.id,
-                    updateStrategy = value.updateStrategy?.let(UpdateStrategyColumnAdapter::encode),
+                    updateStrategy = value.updateStrategy?.let(MangaUpdateStrategyColumnAdapter::encode),
                 )
             }
         }

data/src/main/sqldelight/data/mangas.sq

@@ -1,7 +1,7 @@
-import eu.kanade.tachiyomi.model.UpdateStrategy;
-import kotlin.collections.List;
+import eu.kanade.tachiyomi.source.model.UpdateStrategy;
 import kotlin.Boolean;
 import kotlin.String;
+import kotlin.collections.List;
 
 CREATE TABLE mangas(
     _id INTEGER NOT NULL PRIMARY KEY,
@@ -139,4 +139,4 @@ UPDATE mangas SET
 WHERE _id = :mangaId;
 
 selectLastInsertedRowId:
-SELECT last_insert_rowid();
+SELECT last_insert_rowid();

data/src/main/sqldelightanime/dataanime/animes.sq

@@ -1,7 +1,7 @@
-import eu.kanade.tachiyomi.model.UpdateStrategy;
-import kotlin.collections.List;
+import eu.kanade.tachiyomi.animesource.model.AnimeUpdateStrategy;
 import kotlin.Boolean;
 import kotlin.String;
+import kotlin.collections.List;
 
 CREATE TABLE animes(
     _id INTEGER NOT NULL PRIMARY KEY,
@@ -22,7 +22,7 @@ CREATE TABLE animes(
     episode_flags INTEGER NOT NULL,
     cover_last_modified INTEGER NOT NULL,
     date_added INTEGER NOT NULL,
-    update_strategy INTEGER AS UpdateStrategy NOT NULL DEFAULT 0,
+    update_strategy INTEGER AS AnimeUpdateStrategy NOT NULL DEFAULT 0,
     calculate_interval INTEGER DEFAULT 0 NOT NULL,
     last_modified_at INTEGER NOT NULL DEFAULT 0,
     favorite_modified_at INTEGER
@@ -137,4 +137,4 @@ UPDATE animes SET
 WHERE _id = :animeId;
 
 selectLastInsertedRowId:
-SELECT last_insert_rowid();
+SELECT last_insert_rowid();