From 6ae79d255dbb581c06cd0d637e1e255ac81d54f2 Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Sat, 13 Jun 2026 23:36:28 +0600 Subject: [PATCH] Address various redundant constructs --- .../settings/screen/SettingsTrackingScreen.kt | 1 - .../restore/restorers/CategoriesRestorer.kt | 1 - .../tachiyomi/data/download/DownloadCache.kt | 2 - .../data/download/DownloadPendingDeleter.kt | 1 - .../tachiyomi/data/download/DownloadStore.kt | 1 - .../tachiyomi/data/download/Downloader.kt | 1 - .../data/library/LibraryUpdateNotifier.kt | 1 - .../data/notification/NotificationReceiver.kt | 3 - .../data/track/kitsu/KitsuDateHelper.kt | 2 +- .../tachiyomi/data/track/komga/KomgaApi.kt | 1 - .../data/track/mangaupdates/MangaUpdates.kt | 2 +- .../track/mangaupdates/MangaUpdatesApi.kt | 2 +- .../data/track/suwayomi/SuwayomiApi.kt | 5 +- .../data/track/suwayomi/SuwayomiModels.kt | 84 +++++++++---------- .../tachiyomi/extension/ExtensionManager.kt | 1 - .../util/ExtensionInstallReceiver.kt | 2 +- .../extension/util/ExtensionInstaller.kt | 2 - .../tachiyomi/source/AndroidSourceManager.kt | 3 - .../source/browse/BrowseSourceScreenModel.kt | 2 +- .../kanade/tachiyomi/ui/main/MainActivity.kt | 2 - .../tachiyomi/ui/manga/MangaScreenModel.kt | 2 +- .../ui/reader/loader/HttpPageLoader.kt | 4 - .../reader/viewer/ReaderProgressIndicator.kt | 1 - .../tachiyomi/ui/webview/WebViewActivity.kt | 4 +- .../kanade/tachiyomi/util/MangaExtensions.kt | 2 +- .../network/interceptor/WebViewInterceptor.kt | 1 - .../common/util/lang/CoroutinesExtensions.kt | 3 - .../core/components/material/Scaffold.kt | 2 +- .../presentation/core/icons/Reddit.kt | 2 +- .../tachiyomi/source/local/LocalSource.kt | 8 +- 30 files changed, 56 insertions(+), 92 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsTrackingScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsTrackingScreen.kt index d3ab00118..96384f34e 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsTrackingScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsTrackingScreen.kt @@ -87,7 +87,6 @@ object SettingsTrackingScreen : SearchableSettings { val trackPreferences = remember { Injekt.get() } val trackerManager = remember { Injekt.get() } val sourceManager = remember { Injekt.get() } - val autoTrackStatePref = trackPreferences.autoUpdateTrackOnMarkRead var dialog by remember { mutableStateOf(null) } dialog?.run { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt index 0a53f18b9..a0e07c102 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.data.backup.restore.restorers -import app.cash.sqldelight.async.coroutines.awaitAsOne import eu.kanade.tachiyomi.data.backup.models.BackupCategory import tachiyomi.data.Database import tachiyomi.domain.category.interactor.GetCategories diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt index 4b9795828..9b08a310a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt @@ -26,7 +26,6 @@ import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.shareIn import kotlinx.coroutines.flow.stateIn -import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withTimeoutOrNull @@ -54,7 +53,6 @@ import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.io.File import kotlin.time.Duration.Companion.hours -import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt index 1bee154b9..26e09a7d5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.data.download import android.content.Context import androidx.core.content.edit import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.manga.model.Manga diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadStore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadStore.kt index 3d95909bf..cd4d81a88 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadStore.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadStore.kt @@ -6,7 +6,6 @@ import eu.kanade.tachiyomi.data.download.model.Download import eu.kanade.tachiyomi.source.online.HttpSource import kotlinx.coroutines.runBlocking import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import tachiyomi.domain.chapter.interactor.GetChapter import tachiyomi.domain.manga.interactor.GetManga diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt index bd3251205..4a8b618ec 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt @@ -18,7 +18,6 @@ import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job -import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.async import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt index d7c51e73c..3377040ea 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt @@ -33,7 +33,6 @@ import kotlinx.coroutines.launch import tachiyomi.core.common.Constants import tachiyomi.core.common.i18n.pluralStringResource import tachiyomi.core.common.i18n.stringResource -import tachiyomi.core.common.util.lang.launchUI import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.manga.model.Manga diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt index b1dd5c9b3..1d29e8b6d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt @@ -6,8 +6,6 @@ import android.content.Context import android.content.Intent import android.net.Uri import androidx.core.net.toUri -import androidx.lifecycle.ProcessLifecycleOwner -import androidx.lifecycle.lifecycleScope import eu.kanade.tachiyomi.data.backup.restore.BackupRestoreJob import eu.kanade.tachiyomi.data.download.DownloadManager import eu.kanade.tachiyomi.data.library.LibraryUpdateJob @@ -25,7 +23,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import tachiyomi.core.common.Constants -import tachiyomi.core.common.util.lang.launchIO import tachiyomi.domain.chapter.interactor.GetChapter import tachiyomi.domain.chapter.interactor.UpdateChapter import tachiyomi.domain.chapter.model.Chapter diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuDateHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuDateHelper.kt index e4521438b..aee35d363 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuDateHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/KitsuDateHelper.kt @@ -20,6 +20,6 @@ object KitsuDateHelper { val dateValue = formatter.parse(dateString) - return dateValue?.time ?: return 0 + return dateValue?.time ?: 0 } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaApi.kt index a8661bf18..bf51a97d5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/KomgaApi.kt @@ -6,7 +6,6 @@ import eu.kanade.tachiyomi.data.track.model.TrackSearch import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.awaitSuccess import eu.kanade.tachiyomi.network.parseAs -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import logcat.LogPriority import okhttp3.Headers diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt index 038bde4e9..a77fa5dbb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt @@ -106,7 +106,7 @@ class MangaUpdates(id: Long) : BaseTracker(id, "MangaUpdates"), DeletableTracker } override suspend fun login(username: String, password: String) { - val authenticated = api.authenticate(username, password) ?: throw Throwable("Unable to login") + val authenticated = api.authenticate(username, password) saveCredentials(authenticated.uid.toString(), authenticated.sessionToken) interceptor.newAuth(authenticated.sessionToken) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdatesApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdatesApi.kt index 1c334ed5e..ad4669c30 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdatesApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdatesApi.kt @@ -172,7 +172,7 @@ class MangaUpdatesApi( } } - suspend fun authenticate(username: String, password: String): MUContext? { + suspend fun authenticate(username: String, password: String): MUContext { val body = buildJsonObject { put("username", username) put("password", password) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/suwayomi/SuwayomiApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/suwayomi/SuwayomiApi.kt index 7177fb82e..7c2c96751 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/suwayomi/SuwayomiApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/suwayomi/SuwayomiApi.kt @@ -20,10 +20,7 @@ import okhttp3.OkHttpClient import okhttp3.RequestBody.Companion.toRequestBody import tachiyomi.core.common.util.lang.withIOContext import tachiyomi.domain.source.service.SourceManager -import uy.kohesive.injekt.Injekt -import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy -import java.nio.charset.Charset import java.security.MessageDigest class SuwayomiApi(private val trackId: Long) { @@ -37,7 +34,7 @@ class SuwayomiApi(private val trackId: Long) { private val baseUrl: String by lazy { source.baseUrl.trimEnd('/') } private val apiUrl: String by lazy { "$baseUrl/api/graphql" } - public fun sourcePreferences(): SharedPreferences = configurableSource.sourcePreferences() + fun sourcePreferences(): SharedPreferences = configurableSource.sourcePreferences() suspend fun getTrackSearch(mangaId: Long): TrackSearch = withIOContext { val query = $$""" diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/suwayomi/SuwayomiModels.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/suwayomi/SuwayomiModels.kt index 385b747c0..7fbd33505 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/suwayomi/SuwayomiModels.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/suwayomi/SuwayomiModels.kt @@ -3,8 +3,8 @@ package eu.kanade.tachiyomi.data.track.suwayomi import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -public enum class MangaStatus( - public val rawValue: String, +enum class MangaStatus( + val rawValue: String, ) { UNKNOWN("UNKNOWN"), ONGOING("ONGOING"), @@ -16,75 +16,73 @@ public enum class MangaStatus( } @Serializable -public data class MangaFragment( - public val artist: String?, - public val author: String?, - public val description: String?, - public val id: Int, - public val status: MangaStatus, - public val thumbnailUrl: String?, - public val title: String, - public val url: String, - public val genre: List, - public val inLibraryAt: Long, - public val chapters: Chapters, - public val latestUploadedChapter: LatestUploadedChapter?, - public val latestFetchedChapter: LatestFetchedChapter?, - public val latestReadChapter: LatestReadChapter?, - public val unreadCount: Int, - public val downloadCount: Int, +data class MangaFragment( + val artist: String?, + val author: String?, + val description: String?, + val id: Int, + val status: MangaStatus, + val thumbnailUrl: String?, + val title: String, + val url: String, + val genre: List, + val inLibraryAt: Long, + val chapters: Chapters, + val latestUploadedChapter: LatestUploadedChapter?, + val latestFetchedChapter: LatestFetchedChapter?, + val latestReadChapter: LatestReadChapter?, + val unreadCount: Int, + val downloadCount: Int, ) { @Serializable - public data class Chapters( - public val totalCount: Int, + data class Chapters( + val totalCount: Int, ) @Serializable - public data class LatestUploadedChapter( - public val uploadDate: Long, + data class LatestUploadedChapter( + val uploadDate: Long, ) @Serializable - public data class LatestFetchedChapter( - public val fetchedAt: Long, + data class LatestFetchedChapter( + val fetchedAt: Long, ) @Serializable - public data class LatestReadChapter( - public val lastReadAt: Long, - public val chapterNumber: Double, + data class LatestReadChapter( + val lastReadAt: Long, + val chapterNumber: Double, ) } @Serializable -public data class GetMangaResult( - public val data: GetMangaData, +data class GetMangaResult( + val data: GetMangaData, ) @Serializable -public data class GetMangaData( - @SerialName("manga") - public val entry: MangaFragment, +data class GetMangaData( + @SerialName("manga") val entry: MangaFragment, ) @Serializable -public data class GetMangaUnreadChaptersEntry( - public val nodes: List, +data class GetMangaUnreadChaptersEntry( + val nodes: List, ) @Serializable -public data class GetMangaUnreadChaptersNode( - public val id: Int, - public val chapterNumber: Double, +data class GetMangaUnreadChaptersNode( + val id: Int, + val chapterNumber: Double, ) @Serializable -public data class GetMangaUnreadChaptersResult( - public val data: GetMangaUnreadChaptersData, +data class GetMangaUnreadChaptersResult( + val data: GetMangaUnreadChaptersData, ) @Serializable -public data class GetMangaUnreadChaptersData( - @SerialName("chapters") - public val entry: GetMangaUnreadChaptersEntry, +data class GetMangaUnreadChaptersData( + @SerialName("chapters") val entry: GetMangaUnreadChaptersEntry, ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt index 43314465d..042a08d3c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt @@ -14,7 +14,6 @@ import eu.kanade.tachiyomi.extension.util.ExtensionInstaller import eu.kanade.tachiyomi.extension.util.ExtensionLoader import eu.kanade.tachiyomi.util.system.toast import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallReceiver.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallReceiver.kt index 48465528f..ff8acf43c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallReceiver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallReceiver.kt @@ -106,7 +106,7 @@ internal class ExtensionInstallReceiver(private val listener: Listener) : Broadc * Returns the package name of the installed, updated or removed application. */ private fun getPackageNameFromIntent(intent: Intent?): String? { - return intent?.data?.encodedSchemeSpecificPart ?: return null + return intent?.data?.encodedSchemeSpecificPart } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt index 3b6590a28..0b3e06fed 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt @@ -12,13 +12,11 @@ import eu.kanade.tachiyomi.network.NetworkHelper import eu.kanade.tachiyomi.util.storage.getUriCompat import eu.kanade.tachiyomi.util.system.isPackageInstalled import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.onCompletion -import kotlinx.coroutines.launch import logcat.LogPriority import okhttp3.OkHttpClient import okhttp3.Request diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt index 928653401..7730e152b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt @@ -5,15 +5,12 @@ import eu.kanade.tachiyomi.data.download.DownloadManager import eu.kanade.tachiyomi.extension.ExtensionManager import eu.kanade.tachiyomi.source.online.HttpSource import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.map -import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import tachiyomi.core.common.util.lang.launchIO import tachiyomi.domain.source.model.StubSource diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt index ef0d324d4..114df78f2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt @@ -66,7 +66,7 @@ class BrowseSourceScreenModel( private val getManga: GetManga = Injekt.get(), private val updateManga: UpdateManga = Injekt.get(), private val addTracks: AddTracks = Injekt.get(), - private val getIncognitoState: GetIncognitoState = Injekt.get(), + getIncognitoState: GetIncognitoState = Injekt.get(), ) : StateScreenModel(State(Listing.valueOf(listingQuery))) { var displayMode by sourcePreferences.sourceDisplayMode.asState(screenModelScope) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 9355a4035..389a6cbcc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -353,7 +353,6 @@ class MainActivity : BaseActivity() { val uriHandler = LocalUriHandler.current val dismissSupportMessage = { preferences.donationCampaignShown.set(true) - @Suppress("AssignedValueIsNeverRead") showCampaign = false } AdaptiveSheet( @@ -459,7 +458,6 @@ class MainActivity : BaseActivity() { try { val firstInstallTime = packageManager.getPackageInfo(packageName, 0).firstInstallTime val eligibleTime = Instant.fromEpochMilliseconds(firstInstallTime).plus(6 * 30.days) - @Suppress("AssignedValueIsNeverRead") showCampaign = (Clock.System.now() >= eligibleTime && !preferences.donationCampaignShown.get()) } catch (_: PackageManager.NameNotFoundException) { } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt index f2ad61174..899474b0c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt @@ -95,7 +95,7 @@ class MangaScreenModel( private val mangaId: Long, private val isFromSource: Boolean, private val libraryPreferences: LibraryPreferences = Injekt.get(), - private val trackPreferences: TrackPreferences = Injekt.get(), + trackPreferences: TrackPreferences = Injekt.get(), readerPreferences: ReaderPreferences = Injekt.get(), private val trackerManager: TrackerManager = Injekt.get(), private val trackChapter: TrackChapter = Injekt.get(), diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt index 322340479..f89eddd55 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.ui.reader.loader -import android.provider.Settings import eu.kanade.tachiyomi.data.cache.ChapterCache import eu.kanade.tachiyomi.data.database.models.toDomainChapter import eu.kanade.tachiyomi.source.model.Page @@ -10,10 +9,7 @@ import eu.kanade.tachiyomi.ui.reader.model.ReaderPage import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.DelicateCoroutinesApi -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.SupervisorJob -import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.flow import kotlinx.coroutines.runInterruptible diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt index e91b375ab..f95cddcf1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderProgressIndicator.kt @@ -6,7 +6,6 @@ import android.view.Gravity import android.view.ViewGroup.LayoutParams.WRAP_CONTENT import android.widget.FrameLayout import androidx.annotation.IntRange -import androidx.compose.material3.CircularProgressIndicator import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableFloatStateOf diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt index e21fc0b76..c39be3907 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt @@ -39,7 +39,7 @@ class WebViewActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { overrideActivityTransition( - Activity.OVERRIDE_TRANSITION_OPEN, + OVERRIDE_TRANSITION_OPEN, R.anim.shared_axis_x_push_enter, R.anim.shared_axis_x_push_exit, ) @@ -90,7 +90,7 @@ class WebViewActivity : BaseActivity() { super.finish() if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { overrideActivityTransition( - Activity.OVERRIDE_TRANSITION_CLOSE, + OVERRIDE_TRANSITION_CLOSE, R.anim.shared_axis_x_pop_enter, R.anim.shared_axis_x_pop_exit, ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt index 8e05869ec..42773a08f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt @@ -43,7 +43,7 @@ fun Manga.prepUpdateCover(coverCache: CoverCache, remoteManga: SManga, refreshSa fun Manga.removeCovers(coverCache: CoverCache = Injekt.get()): Manga { if (isLocal()) return this return if (coverCache.deleteFromCache(this, true) > 0) { - return copy(coverLastModified = Instant.now().toEpochMilli()) + copy(coverLastModified = Instant.now().toEpochMilli()) } else { this } diff --git a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt index c59e09ad6..ef41a1ea2 100644 --- a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt +++ b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt @@ -15,7 +15,6 @@ import okhttp3.Headers import okhttp3.Interceptor import okhttp3.Request import okhttp3.Response -import tachiyomi.core.common.util.lang.launchUI import tachiyomi.i18n.MR import java.util.Locale import java.util.concurrent.CountDownLatch diff --git a/core/common/src/main/kotlin/tachiyomi/core/common/util/lang/CoroutinesExtensions.kt b/core/common/src/main/kotlin/tachiyomi/core/common/util/lang/CoroutinesExtensions.kt index 89dff3b9b..07421fc25 100644 --- a/core/common/src/main/kotlin/tachiyomi/core/common/util/lang/CoroutinesExtensions.kt +++ b/core/common/src/main/kotlin/tachiyomi/core/common/util/lang/CoroutinesExtensions.kt @@ -1,10 +1,7 @@ package tachiyomi.core.common.util.lang import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.CoroutineStart -import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.Job import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.launch diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Scaffold.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Scaffold.kt index 335ce6c96..a2c158931 100644 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Scaffold.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Scaffold.kt @@ -316,7 +316,7 @@ private fun ScaffoldLayout( */ @ExperimentalMaterial3Api @JvmInline -value class FabPosition internal constructor(@Suppress("unused") private val value: Int) { +value class FabPosition internal constructor(private val value: Int) { companion object { /** * Position FAB at the bottom of the screen in the center, above the [NavigationBar] (if it diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Reddit.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Reddit.kt index 3d1594636..5cfb8bfe8 100644 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Reddit.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Reddit.kt @@ -10,7 +10,7 @@ import androidx.compose.ui.graphics.vector.ImageVector.Builder import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.unit.dp -@Suppress("UnusedReceiverParameter", "BooleanLiteralArgument") +@Suppress("UnusedReceiverParameter") val CustomIcons.Reddit: ImageVector get() { if (_reddit != null) { diff --git a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt index fc1d42112..91acd8595 100644 --- a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt +++ b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt @@ -207,12 +207,10 @@ actual class LocalSource( } private fun getComicInfoForChapter(chapter: UniFile, block: (InputStream) -> T): T? { - if (chapter.isDirectory) { - return chapter.findFile(COMIC_INFO_FILE)?.let { file -> - file.openInputStream().use(block) - } + return if (chapter.isDirectory) { + chapter.findFile(COMIC_INFO_FILE)?.openInputStream()?.use(block) } else { - return chapter.archiveReader(context).use { reader -> + chapter.archiveReader(context).use { reader -> reader.getInputStream(COMIC_INFO_FILE)?.use(block) } }