From 455481358823617a21ddab4be028403d2bcacb53 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Fri, 27 Aug 2021 12:11:59 -0400 Subject: [PATCH] Build fixes --- .../java/eu/kanade/tachiyomi/data/download/DownloadService.kt | 2 +- .../browse/extension/details/ExtensionDetailsHeaderAdapter.kt | 4 ++-- .../main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt | 1 - .../main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt | 2 +- .../kanade/tachiyomi/ui/setting/SettingsDownloadController.kt | 4 ++-- .../kanade/tachiyomi/ui/setting/SettingsTrackingController.kt | 1 + 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt index 8cbd3da89..0690169c7 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt @@ -167,7 +167,7 @@ class DownloadService : Service() { private fun NetworkCapabilities.connectedToInternet(): Boolean { return this.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) && - this.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) + this.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) } private fun NetworkCapabilities.connectedToWifi(): Boolean { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt index 8857a3f36..00ae1e2f9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt @@ -57,8 +57,8 @@ class ExtensionDetailsHeaderAdapter(private val presenter: ExtensionDetailsPrese // SY --> if (extension.isRedundant) { - binding.extensionWarningBanner.isVisible = true - binding.extensionWarningBanner.setText(R.string.redundant_extension_message) + binding.warningBanner.isVisible = true + binding.warningBanner.setText(R.string.redundant_extension_message) } // SY <-- } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt index cd42615fb..1020be38d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt @@ -60,7 +60,6 @@ import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.ui.base.controller.FabController import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.getMainAppBarHeight -import eu.kanade.tachiyomi.ui.base.controller.ToolbarLiftOnScrollController import eu.kanade.tachiyomi.ui.base.controller.popControllerWithTag import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.browse.migration.advanced.design.PreMigrationController diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt index d5ca32cb7..6b76c017b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt @@ -5,7 +5,7 @@ import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.updater.AppUpdateChecker import eu.kanade.tachiyomi.data.updater.AppUpdateResult -import eu.kanade.tachiyomi.ui.base.controller.NoToolbarElevationController +import eu.kanade.tachiyomi.ui.base.controller.NoAppBarElevationController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.main.WhatsNewDialogController import eu.kanade.tachiyomi.ui.more.licenses.LicensesController diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt index 71a95e585..da2309875 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt @@ -116,7 +116,7 @@ class SettingsDownloadController : SettingsController() { // SY --> preference { val dbCategories = db.getCategories().executeAsBlocking() - val categories = listOf(Category.createDefault()) + dbCategories + val categories = listOf(Category.createDefault(context)) + dbCategories key = Keys.dontDeleteFromCategories titleRes = R.string.pref_dont_delete_from_categories @@ -329,7 +329,7 @@ class SettingsDownloadController : SettingsController() { override fun onCreateDialog(savedViewState: Bundle?): Dialog { val dbCategories = db.getCategories().executeAsBlocking() - val categories = listOf(Category.createDefault()) + dbCategories + val categories = listOf(Category.createDefault(activity!!)) + dbCategories val items = categories.map { it.name }.toTypedArray() val selection = categories diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt index 726d2e02b..894e8b3ca 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt @@ -20,6 +20,7 @@ import eu.kanade.tachiyomi.ui.setting.track.TrackLoginDialog import eu.kanade.tachiyomi.ui.setting.track.TrackLogoutDialog import eu.kanade.tachiyomi.util.preference.add import eu.kanade.tachiyomi.util.preference.defaultValue +import eu.kanade.tachiyomi.util.preference.iconRes import eu.kanade.tachiyomi.util.preference.infoPreference import eu.kanade.tachiyomi.util.preference.onClick import eu.kanade.tachiyomi.util.preference.preferenceCategory