From b201e410a360bee44cd4f7c26fd511094ba51886 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Wed, 25 Dec 2024 07:24:22 +0700 Subject: [PATCH] chore: Remove deprecated constants They're moved to Constants object --- .../tachiyomi/appwidget/components/LockedWidget.kt | 6 +++--- .../tachiyomi/appwidget/components/UpdatesWidget.kt | 7 +++---- .../data/notification/NotificationReceiver.kt | 2 +- .../java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 12 ++---------- .../eu/kanade/tachiyomi/ui/main/SearchActivity.kt | 2 +- 5 files changed, 10 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/appwidget/components/LockedWidget.kt b/app/src/main/java/eu/kanade/tachiyomi/appwidget/components/LockedWidget.kt index 7b89f51a37..56a49cd16d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/appwidget/components/LockedWidget.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/appwidget/components/LockedWidget.kt @@ -17,15 +17,15 @@ import androidx.glance.text.TextAlign import androidx.glance.text.TextStyle import androidx.glance.unit.ColorProvider import eu.kanade.tachiyomi.R -import yokai.i18n.MR import eu.kanade.tachiyomi.appwidget.ContainerModifier import eu.kanade.tachiyomi.appwidget.util.stringResource -import eu.kanade.tachiyomi.ui.main.MainActivity +import yokai.i18n.MR +import yokai.presentation.core.Constants @Composable fun LockedWidget() { val context = LocalContext.current - val intent = Intent(LocalContext.current, Class.forName(MainActivity.MAIN_ACTIVITY)).apply { + val intent = Intent(LocalContext.current, Class.forName(Constants.MAIN_ACTIVITY)).apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) } Box( diff --git a/app/src/main/java/eu/kanade/tachiyomi/appwidget/components/UpdatesWidget.kt b/app/src/main/java/eu/kanade/tachiyomi/appwidget/components/UpdatesWidget.kt index d9786f70ad..542b76d3fc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/appwidget/components/UpdatesWidget.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/appwidget/components/UpdatesWidget.kt @@ -17,19 +17,18 @@ import androidx.glance.layout.Row import androidx.glance.layout.fillMaxWidth import androidx.glance.layout.padding import androidx.glance.text.Text -import eu.kanade.tachiyomi.R -import yokai.i18n.MR -import yokai.util.lang.getString import eu.kanade.tachiyomi.appwidget.ContainerModifier import eu.kanade.tachiyomi.appwidget.util.calculateRowAndColumnCount import eu.kanade.tachiyomi.appwidget.util.stringResource import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.main.SearchActivity +import yokai.i18n.MR +import yokai.presentation.core.Constants @Composable fun UpdatesWidget(data: List>?) { val (rowCount, columnCount) = LocalSize.current.calculateRowAndColumnCount() - val mainIntent = Intent(LocalContext.current, MainActivity::class.java).setAction(MainActivity.SHORTCUT_RECENTS) + val mainIntent = Intent(LocalContext.current, MainActivity::class.java).setAction(Constants.SHORTCUT_RECENTS) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) Column( modifier = ContainerModifier.clickable(actionStartActivity(mainIntent)), 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 649ead87a9..57af3da28a 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 @@ -487,7 +487,7 @@ class NotificationReceiver : BroadcastReceiver() { */ internal fun openChapterPendingActivity(context: Context, manga: Manga, groupId: Int): PendingIntent { val newIntent = - Intent(context, MainActivity::class.java).setAction(MainActivity.SHORTCUT_MANGA) + Intent(context, MainActivity::class.java).setAction(Constants.SHORTCUT_MANGA) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) .putExtra(Constants.MANGA_EXTRA, manga.id) .putExtra("notificationId", manga.id.hashCode()) 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 570db5e7ac..67fb31da3e 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 @@ -1053,13 +1053,13 @@ open class MainActivity : BaseActivity() { } when (intent.action) { SHORTCUT_LIBRARY -> nav.selectedItemId = R.id.nav_library - SHORTCUT_RECENTLY_UPDATED, SHORTCUT_RECENTLY_READ, SHORTCUT_RECENTS -> { + SHORTCUT_RECENTLY_UPDATED, SHORTCUT_RECENTLY_READ, Constants.SHORTCUT_RECENTS -> { if (nav.selectedItemId != R.id.nav_recents) { nav.selectedItemId = R.id.nav_recents } else { router.popToRoot() } - if (intent.action == SHORTCUT_RECENTS) return true + if (intent.action == Constants.SHORTCUT_RECENTS) return true nav.post { val controller = router.backstack.firstOrNull()?.controller as? RecentsController @@ -1609,20 +1609,12 @@ open class MainActivity : BaseActivity() { private const val SWIPE_THRESHOLD = 100 private const val SWIPE_VELOCITY_THRESHOLD = 100 - const val MAIN_ACTIVITY = Constants.MAIN_ACTIVITY - // Shortcut actions const val SHORTCUT_LIBRARY = "eu.kanade.tachiyomi.SHOW_LIBRARY" - @Deprecated("Use the one from Constants object instead") - const val SHORTCUT_RECENTS = Constants.SHORTCUT_RECENTS const val SHORTCUT_RECENTLY_UPDATED = "eu.kanade.tachiyomi.SHOW_RECENTLY_UPDATED" const val SHORTCUT_RECENTLY_READ = "eu.kanade.tachiyomi.SHOW_RECENTLY_READ" const val SHORTCUT_BROWSE = "eu.kanade.tachiyomi.SHOW_BROWSE" const val SHORTCUT_DOWNLOADS = "eu.kanade.tachiyomi.SHOW_DOWNLOADS" - @Deprecated("Use the one from Constants object instead") - const val SHORTCUT_MANGA = Constants.SHORTCUT_MANGA - @Deprecated("Use the one from Constants object instead") - const val SHORTCUT_MANGA_BACK = Constants.SHORTCUT_MANGA_BACK const val SHORTCUT_UPDATE_NOTES = "eu.kanade.tachiyomi.SHOW_UPDATE_NOTES" const val SHORTCUT_SOURCE = "eu.kanade.tachiyomi.SHOW_SOURCE" const val SHORTCUT_READER_SETTINGS = "eu.kanade.tachiyomi.READER_SETTINGS" diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt index 894a5468e7..9a01c3873c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt @@ -97,7 +97,7 @@ class SearchActivity : MainActivity() { } private fun intentShouldGoBack() = - intent.action in listOf(SHORTCUT_MANGA, SHORTCUT_READER_SETTINGS, SHORTCUT_BROWSE) + intent.action in listOf(Constants.SHORTCUT_MANGA, SHORTCUT_READER_SETTINGS, SHORTCUT_BROWSE) override fun syncActivityViewWithController( to: Controller?,