Replace preference getter functions with properties (#3091)
# Conflicts: # app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt # app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt # app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt # app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt # app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt # app/src/main/java/eu/kanade/presentation/reader/settings/ReadingModePage.kt # app/src/main/java/eu/kanade/tachiyomi/App.kt # app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt # app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt # app/src/main/java/eu/kanade/tachiyomi/di/PreferenceModule.kt # app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt # app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/SecureActivityDelegate.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt # app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt # app/src/main/java/mihon/feature/migration/list/MigrationListScreenModel.kt # core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt # domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt
This commit is contained in:
@@ -494,7 +494,7 @@ abstract class HttpSource : CatalogueSource {
|
||||
|
||||
// EXH -->
|
||||
private var delegate: DelegatedHttpSource? = null
|
||||
get() = if (Injekt.get<DelegateSourcePreferences>().delegateSources().get()) {
|
||||
get() = if (Injekt.get<DelegateSourcePreferences>().delegateSources.get()) {
|
||||
field
|
||||
} else {
|
||||
null
|
||||
|
||||
@@ -58,7 +58,7 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() {
|
||||
|
||||
// No title bug?
|
||||
val title = altTitle
|
||||
?.takeIf { Injekt.get<DelegateSourcePreferences>().useJapaneseTitle().get() } // todo
|
||||
?.takeIf { Injekt.get<DelegateSourcePreferences>().useJapaneseTitle.get() } // todo
|
||||
?: title
|
||||
|
||||
// Set artist (if we can find one)
|
||||
|
||||
@@ -288,7 +288,7 @@ class EnhancedHttpSource(
|
||||
override fun getFilterList() = source().getFilterList()
|
||||
|
||||
fun source(): HttpSource {
|
||||
return if (Injekt.get<DelegateSourcePreferences>().delegateSources().get()) {
|
||||
return if (Injekt.get<DelegateSourcePreferences>().delegateSources.get()) {
|
||||
enhancedSource
|
||||
} else {
|
||||
originalSource
|
||||
|
||||
Reference in New Issue
Block a user