From 9358f86d4357a4216207518dc83d2bc535db13f7 Mon Sep 17 00:00:00 2001 From: Finnley Somdahl <87634197+rebelonion@users.noreply.github.com> Date: Fri, 2 Feb 2024 09:18:47 -0600 Subject: [PATCH] filter exportable extensions --- .../ani/dantotsu/settings/SettingsActivity.kt | 6 +++-- .../saving/internal/PreferenceInternal.kt | 22 +++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt index 98cf5988..432e2d9c 100644 --- a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt +++ b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt @@ -72,7 +72,7 @@ class SettingsActivity : AppCompatActivity(), SimpleDialog.OnDialogResultListene private var cursedCounter = 0 @OptIn(UnstableApi::class) - @SuppressLint("SetTextI18n") + @SuppressLint("SetTextI18n", "Recycle") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) ThemeManager(this).applyTheme() @@ -267,7 +267,9 @@ class SettingsActivity : AppCompatActivity(), SimpleDialog.OnDialogResultListene selectedImpExp = Location.entries[i].name val dialog = AlertDialog.Builder(this, R.style.MyPopup) .setTitle("Import/Export Settings") - .setSingleChoiceItems(Location.entries.map { it.name }.toTypedArray(), 0) { dialog, which -> + .setSingleChoiceItems(Location.entries + .filter { it.exportable } + .map { it.name }.toTypedArray(), 0) { dialog, which -> selectedImpExp = Location.entries[which].name i = which } diff --git a/app/src/main/java/ani/dantotsu/settings/saving/internal/PreferenceInternal.kt b/app/src/main/java/ani/dantotsu/settings/saving/internal/PreferenceInternal.kt index 084d6c06..6e9fcbb3 100644 --- a/app/src/main/java/ani/dantotsu/settings/saving/internal/PreferenceInternal.kt +++ b/app/src/main/java/ani/dantotsu/settings/saving/internal/PreferenceInternal.kt @@ -8,15 +8,15 @@ data class Pref( val type: KClass<*>, val default: Any ) -enum class Location(val location: String) { - General("ani.dantotsu.general"), - UI("ani.dantotsu.ui"), - Anime("ani.dantotsu.anime"), - Manga("ani.dantotsu.manga"), - Player("ani.dantotsu.player"), - Reader("ani.dantotsu.reader"), - NovelReader("ani.dantotsu.novelReader"), - Irrelevant("ani.dantotsu.irrelevant"), - AnimeDownloads("animeDownloads"), //different for legacy reasons - Protected("ani.dantotsu.protected") +enum class Location(val location: String, val exportable: Boolean) { + General("ani.dantotsu.general", true), + UI("ani.dantotsu.ui", true), + Anime("ani.dantotsu.anime", true), + Manga("ani.dantotsu.manga", true), + Player("ani.dantotsu.player", true), + Reader("ani.dantotsu.reader", true), + NovelReader("ani.dantotsu.novelReader", true), + Irrelevant("ani.dantotsu.irrelevant", false), + AnimeDownloads("animeDownloads", false), //different for legacy reasons + Protected("ani.dantotsu.protected", false), }