From 2c979d2d32c06e6be70a3940aecaafc7ba5e4626 Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Sun, 20 Sep 2026 16:32:33 +0600 Subject: [PATCH] Enable `android.nonTransitiveRClass` --- .../more/settings/screen/appearance/AppLanguageScreen.kt | 2 +- .../main/java/eu/kanade/tachiyomi/data/download/DownloadJob.kt | 2 +- .../ui/browse/extension/details/SourcePreferencesScreen.kt | 2 +- .../java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderButton.kt | 2 +- .../main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt | 2 +- .../eu/kanade/tachiyomi/widget/TachiyomiTextInputEditText.kt | 2 +- gradle.properties | 2 -- 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/appearance/AppLanguageScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/appearance/AppLanguageScreen.kt index e93cdc650..b3e9a6b93 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/appearance/AppLanguageScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/appearance/AppLanguageScreen.kt @@ -23,13 +23,13 @@ import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.util.Screen -import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.LocaleHelper import mihon.icons.materialsymbols.MaterialSymbols import mihon.icons.materialsymbols.rounded.Check import org.xmlpull.v1.XmlPullParser import tachiyomi.core.common.i18n.stringResource import tachiyomi.i18n.MR +import tachiyomi.i18n.R import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.i18n.stringResource diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadJob.kt index 8bebccdb7..880bf5ff4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadJob.kt @@ -12,7 +12,6 @@ import androidx.work.WorkInfo import androidx.work.WorkManager import androidx.work.WorkerParameters import dev.zacsweers.metro.Inject -import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.notification.Notifications import eu.kanade.tachiyomi.util.system.NetworkState import eu.kanade.tachiyomi.util.system.activeNetworkState @@ -28,6 +27,7 @@ import kotlinx.coroutines.flow.onEach import mihon.app.di.AppGraph import mihon.core.metro.metroGraph import tachiyomi.domain.download.service.DownloadPreferences +import tachiyomi.i18n.R /** * This worker is used to manage the downloader. The system can decide to stop the worker, in diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesScreen.kt index 23fd44b94..09d48dbfb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesScreen.kt @@ -27,13 +27,13 @@ import androidx.preference.DialogPreference import androidx.preference.EditTextPreference import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceScreen +import androidx.preference.R import androidx.preference.forEach import androidx.preference.getOnBindEditTextListener import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.util.Screen -import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.SharedPreferencesDataStore import eu.kanade.tachiyomi.source.ConfigurableSource import eu.kanade.tachiyomi.source.Source diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderButton.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderButton.kt index 270d5549b..091c0ca42 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderButton.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderButton.kt @@ -3,8 +3,8 @@ package eu.kanade.tachiyomi.ui.reader.viewer import android.content.Context import android.util.AttributeSet import android.view.MotionEvent +import com.google.android.material.R import com.google.android.material.button.MaterialButton -import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerViewer /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt index 8c7789661..58895acab 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt @@ -11,6 +11,7 @@ import android.view.View import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.annotation.MenuRes +import androidx.appcompat.R import androidx.appcompat.widget.PopupMenu import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalTextStyle @@ -22,7 +23,6 @@ import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import dev.zacsweers.metrox.viewmodel.LocalMetroViewModelFactory import eu.kanade.presentation.theme.TachiyomiTheme -import eu.kanade.tachiyomi.R import mihon.app.di.appGraph inline fun ComponentActivity.setComposeContent( diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiTextInputEditText.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiTextInputEditText.kt index 62071ab0c..1583e26a5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiTextInputEditText.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiTextInputEditText.kt @@ -3,10 +3,10 @@ package eu.kanade.tachiyomi.widget import android.content.Context import android.util.AttributeSet import android.widget.EditText +import androidx.appcompat.R import androidx.core.view.inputmethod.EditorInfoCompat import com.google.android.material.textfield.TextInputEditText import eu.kanade.domain.base.BasePreferences -import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.widget.TachiyomiTextInputEditText.Companion.setIncognito import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/gradle.properties b/gradle.properties index f012e5a7c..840067ced 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,3 @@ -android.nonTransitiveRClass=false - kotlin.code.style=official # Configuration should be synced with [/gradle/build-logic/gradle.properties]