From 67d482bad6d7da04f7cdba9698a9322f821bdbc0 Mon Sep 17 00:00:00 2001 From: Finnley Somdahl <87634197+rebelonion@users.noreply.github.com> Date: Tue, 23 Jan 2024 13:35:28 -0600 Subject: [PATCH] Revert "removed sub dub toggle(useless)" This reverts commit 60981ba224b020aefa732c02488c70418f82bac0. --- .../dantotsu/media/MediaDetailsViewModel.kt | 1 + .../ani/dantotsu/settings/SettingsActivity.kt | 5 +++++ .../subcriptions/SubscriptionHelper.kt | 1 + app/src/main/res/layout/activity_settings.xml | 18 ++++++++++++++++++ 4 files changed, 25 insertions(+) diff --git a/app/src/main/java/ani/dantotsu/media/MediaDetailsViewModel.kt b/app/src/main/java/ani/dantotsu/media/MediaDetailsViewModel.kt index 3b377131..cb530472 100644 --- a/app/src/main/java/ani/dantotsu/media/MediaDetailsViewModel.kt +++ b/app/src/main/java/ani/dantotsu/media/MediaDetailsViewModel.kt @@ -53,6 +53,7 @@ class MediaDetailsViewModel : ViewModel() { true -> sharedPreferences.getInt("settings_def_anime_source_s_r", 0) else -> sharedPreferences.getInt(("settings_def_manga_source_s_r"), 0) } + it.preferDub = loadData("settings_prefer_dub") ?: false saveSelected(media.id, it) it } diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt index bb43dada..d140224b 100644 --- a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt +++ b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt @@ -436,6 +436,11 @@ class SettingsActivity : AppCompatActivity(), SimpleDialog.OnDialogResultListene ).edit().putBoolean("shared_user_id", isChecked).apply() } + binding.settingsPreferDub.isChecked = loadData("settings_prefer_dub") ?: false + binding.settingsPreferDub.setOnCheckedChangeListener { _, isChecked -> + saveData("settings_prefer_dub", isChecked) + } + //val mangaSource = loadData("settings_def_manga_source_s")?.let { if (it >= MangaSources.names.size) 0 else it } ?: 0 val mangaSource = getSharedPreferences( "Dantotsu", diff --git a/app/src/main/java/ani/dantotsu/subcriptions/SubscriptionHelper.kt b/app/src/main/java/ani/dantotsu/subcriptions/SubscriptionHelper.kt index 269eb0e5..14ee72b0 100644 --- a/app/src/main/java/ani/dantotsu/subcriptions/SubscriptionHelper.kt +++ b/app/src/main/java/ani/dantotsu/subcriptions/SubscriptionHelper.kt @@ -36,6 +36,7 @@ class SubscriptionHelper { } else { sharedPreferences.getInt("settings_def_manga_source_s_r", 0) } + it.preferDub = loadData("settings_prefer_dub", context) ?: false it } return data diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 0a087d1d..8a8fa7c4 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1208,6 +1208,24 @@ android:layout_marginBottom="8dp" android:background="?android:attr/listDivider" /> + +