diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt index 03575ed97..1f3f2f888 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt @@ -2,6 +2,7 @@ package eu.kanade.presentation.browse.components import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ViewList +import androidx.compose.material.icons.automirrored.outlined.Help import androidx.compose.material.icons.filled.ViewModule import androidx.compose.material.icons.outlined.Help import androidx.compose.material.icons.outlined.Public @@ -84,7 +85,7 @@ fun BrowseSourceToolbar( add( AppBar.Action( title = stringResource(MR.strings.label_help), - icon = Icons.Outlined.Help, + icon = Icons.AutoMirrored.Outlined.Help, onClick = onHelpClick, ), ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt index 607548f3a..4320dd66e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt @@ -12,8 +12,6 @@ import exh.md.network.MangaDexAuthInterceptor import exh.md.utils.FollowStatus import exh.md.utils.MdUtil import kotlinx.collections.immutable.toImmutableList -import tachiyomi.core.util.lang.awaitSingle -import tachiyomi.core.util.lang.runAsObservable import tachiyomi.core.util.lang.withIOContext import tachiyomi.domain.manga.model.Manga import tachiyomi.i18n.MR @@ -146,15 +144,12 @@ class MdList(id: Long) : BaseTracker(id, "MDList") { override suspend fun search(query: String): List { return withIOContext { val mdex = mdex ?: throw MangaDexNotFoundException() - mdex.fetchSearchManga(1, query, FilterList()) - .flatMap { page -> - runAsObservable { - page.mangas.map { - toTrackSearch(mdex.getMangaDetails(it)) - }.distinct() - } + mdex.getSearchManga(1, query, FilterList()) + .mangas + .map { + toTrackSearch(mdex.getMangaDetails(it)) } - .awaitSingle() + .distinct() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt index 0298b60c8..de9633b79 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt @@ -474,6 +474,7 @@ class EHentai( this } + @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getLatestUpdates")) override fun fetchLatestUpdates(page: Int): Observable { return super.fetchLatestUpdates(page).checkValid() } @@ -482,6 +483,7 @@ class EHentai( return super.getLatestUpdates(page).checkValid() } + @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getPopularManga")) override fun fetchPopularManga(page: Int): Observable { return super.fetchPopularManga(page).checkValid() } @@ -491,6 +493,7 @@ class EHentai( } // Support direct URL importing + @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getSearchManga")) override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable = urlImportFetchSearchManga(context, query) { super.fetchSearchManga(page, query, filters).checkValid() diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt index 41ee259bb..65c63f8ac 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt @@ -112,10 +112,10 @@ class MangaDex(delegate: HttpSource, val context: Context) : MangaPlusHandler(network.client) } private val comikeyHandler by lazy { - ComikeyHandler(network.cloudflareClient, network.defaultUserAgentProvider()) + ComikeyHandler(network.client, network.defaultUserAgentProvider()) } private val bilibiliHandler by lazy { - BilibiliHandler(network.cloudflareClient) + BilibiliHandler(network.client) } private val azukHandler by lazy { AzukiHandler(network.client, network.defaultUserAgentProvider()) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt index f0f9084cf..213adf1b8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt @@ -51,8 +51,10 @@ class NHentai(delegate: HttpSource, val context: Context) : } // Support direct URL importing + @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getSearchManga")) override fun fetchSearchManga(page: Int, query: String, filters: FilterList) = urlImportFetchSearchManga(context, query) { + @Suppress("DEPRECATION") super.fetchSearchManga(page, query, filters) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt index d3c2c4ff5..efe97690a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt @@ -33,6 +33,7 @@ class EightMuses(delegate: HttpSource, val context: Context) : @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getSearchManga")) override fun fetchSearchManga(page: Int, query: String, filters: FilterList) = urlImportFetchSearchManga(context, query) { + @Suppress("DEPRECATION") super.fetchSearchManga(page, query, filters) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt index ff6afa6ca..3712395ee 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt @@ -32,6 +32,7 @@ class HBrowse(delegate: HttpSource, val context: Context) : @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getSearchManga")) override fun fetchSearchManga(page: Int, query: String, filters: FilterList) = urlImportFetchSearchManga(context, query) { + @Suppress("DEPRECATION") super.fetchSearchManga(page, query, filters) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt index 8bbbdb23e..0ea5d7fac 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt @@ -50,6 +50,7 @@ class Pururin(delegate: HttpSource, val context: Context) : } return urlImportFetchSearchManga(context, newQuery) { + @Suppress("DEPRECATION") super.fetchSearchManga(page, query, filters) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt index 78ddae012..b39aead96 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt @@ -38,6 +38,7 @@ class Tsumino(delegate: HttpSource, val context: Context) : @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getSearchManga")) override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable = urlImportFetchSearchManga(context, query) { + @Suppress("DEPRECATION") super.fetchSearchManga(page, query, filters) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationScreen.kt index 0d1874e20..d497e0edd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/PreMigrationScreen.kt @@ -4,7 +4,7 @@ import android.view.LayoutInflater import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.ArrowForward +import androidx.compose.material.icons.automirrored.outlined.ArrowForward import androidx.compose.material.icons.outlined.Deselect import androidx.compose.material.icons.outlined.SelectAll import androidx.compose.material3.Icon @@ -114,7 +114,7 @@ class PreMigrationScreen(val mangaIds: List) : Screen() { text = { Text(text = stringResource(MR.strings.action_migrate)) }, icon = { Icon( - imageVector = Icons.Outlined.ArrowForward, + imageVector = Icons.AutoMirrored.Outlined.ArrowForward, contentDescription = stringResource(MR.strings.action_migrate), ) }, diff --git a/app/src/main/java/exh/ui/batchadd/BatchAddScreen.kt b/app/src/main/java/exh/ui/batchadd/BatchAddScreen.kt index 8cb0aae1c..0ee8e6be9 100644 --- a/app/src/main/java/exh/ui/batchadd/BatchAddScreen.kt +++ b/app/src/main/java/exh/ui/batchadd/BatchAddScreen.kt @@ -106,8 +106,8 @@ class BatchAddScreen : Screen() { val realProgress = progress / state.progressTotal if (!realProgress.isNaN()) { LinearProgressIndicator( - progress = realProgress, - Modifier + progress = { realProgress }, + modifier = Modifier .padding(top = 2.dp) .weight(1f), ) diff --git a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt index a841b8e99..58a5fb285 100755 --- a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt +++ b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt @@ -23,6 +23,7 @@ import eu.kanade.tachiyomi.source.online.UrlImportableSource import eu.kanade.tachiyomi.ui.base.activity.BaseActivity import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.reader.ReaderActivity +import eu.kanade.tachiyomi.util.system.overridePendingTransitionCompat import eu.kanade.tachiyomi.util.view.setComposeContent import exh.GalleryAddEvent import exh.GalleryAdder @@ -39,7 +40,6 @@ import tachiyomi.domain.manga.model.Manga import tachiyomi.i18n.MR import tachiyomi.i18n.sy.SYMR import tachiyomi.presentation.core.components.material.Scaffold -import tachiyomi.presentation.core.i18n.stringResource class InterceptActivity : BaseActivity() { private var statusJob: Job? = null @@ -47,7 +47,7 @@ class InterceptActivity : BaseActivity() { private val status: MutableStateFlow = MutableStateFlow(InterceptResult.Idle) override fun onCreate(savedInstanceState: Bundle?) { - overridePendingTransition(R.anim.shared_axis_x_push_enter, R.anim.shared_axis_x_push_exit) + overridePendingTransitionCompat(R.anim.shared_axis_x_push_enter, R.anim.shared_axis_x_push_exit) super.onCreate(savedInstanceState) setComposeContent { @@ -63,7 +63,7 @@ class InterceptActivity : BaseActivity() { topBar = { scrollBehavior -> AppBar( title = stringResource(MR.strings.app_name), - navigateUp = ::onBackPressed, + navigateUp = ::finish, scrollBehavior = scrollBehavior, ) }, @@ -109,7 +109,7 @@ class InterceptActivity : BaseActivity() { .onEach { when (it) { is InterceptResult.Success -> { - onBackPressed() + finish() startActivity( if (it.chapter != null) { ReaderActivity.newIntent(this, it.manga.id, it.chapter.id) @@ -126,8 +126,8 @@ class InterceptActivity : BaseActivity() { .setTitle(MR.strings.chapter_error.getString(this)) .setMessage(stringResource(SYMR.strings.could_not_open_entry, it.reason)) .setPositiveButton(MR.strings.action_ok.getString(this), null) - .setOnCancelListener { onBackPressed() } - .setOnDismissListener { onBackPressed() } + .setOnCancelListener { finish() } + .setOnDismissListener { finish() } .show() } else -> Unit @@ -143,7 +143,7 @@ class InterceptActivity : BaseActivity() { override fun finish() { super.finish() - overridePendingTransition(R.anim.shared_axis_x_pop_enter, R.anim.shared_axis_x_pop_exit) + overridePendingTransitionCompat(R.anim.shared_axis_x_pop_enter, R.anim.shared_axis_x_pop_exit) } private val galleryAdder = GalleryAdder()