From 51a33a47cdcdd9e1e921bc5d34540124c0fb9bd8 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 3 Jul 2021 12:52:07 -0400 Subject: [PATCH] Revert accidentally committed stuff (oops) --- .../tachiyomi/ui/library/DeleteLibraryMangasDialog.kt | 8 ++------ .../tachiyomi/ui/setting/SettingsTrackingController.kt | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/DeleteLibraryMangasDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/DeleteLibraryMangasDialog.kt index 0ed8a9eb2..4cd2f2bed 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/DeleteLibraryMangasDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/DeleteLibraryMangasDialog.kt @@ -8,7 +8,6 @@ import com.bluelinelabs.conductor.Controller import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.ui.base.controller.DialogController -import eu.kanade.tachiyomi.util.isLocal class DeleteLibraryMangasDialog(bundle: Bundle? = null) : DialogController(bundle) where T : Controller, T : DeleteLibraryMangasDialog.Listener { @@ -21,14 +20,11 @@ class DeleteLibraryMangasDialog(bundle: Bundle? = null) : } override fun onCreateDialog(savedViewState: Bundle?): Dialog { - val canDeleteChapters = mangas.any { !it.isLocal() } - return MaterialDialog(activity!!) .title(R.string.action_remove) .listItemsMultiChoice( - res = R.array.delete_selected_mangas, - disabledIndices = intArrayOf(1).takeUnless { canDeleteChapters }, - initialSelection = intArrayOf(0), + R.array.delete_selected_mangas, + initialSelection = intArrayOf(0) ) { _, selections, _ -> val deleteFromLibrary = 0 in selections val deleteChapters = 1 in selections 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 42fd55881..dbf72ef6e 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 @@ -71,7 +71,8 @@ class SettingsTrackingController : trackManager.komga.loginNoop() updatePreference(trackManager.komga.id) } - + } + preferenceCategory { infoPreference(R.string.tracking_info) } }