diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt index ff0e0e82..d06ab90c 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt @@ -44,6 +44,7 @@ import java.io.File const val SUBTITLE_KEY = "subtitle_settings" const val SUBTITLE_AUTO_SELECT_KEY = "subs_auto_select" const val SUBTITLE_DOWNLOAD_KEY = "subs_auto_download" +const val PRIOR_SUB_LANGUAGE = "prior_sub_language" data class SaveCaptionStyle( @JsonProperty("foregroundColor") var foregroundColor: Int, @@ -60,6 +61,7 @@ data class SaveCaptionStyle( @JsonProperty("fixedTextSize") var fixedTextSize: Float?, @JsonProperty("removeCaptions") var removeCaptions: Boolean = false, @JsonProperty("removeBloat") var removeBloat: Boolean = true, + @JsonProperty("removeSubs") var removeSubs: Boolean = false, /** Apply caps lock to the text **/ @JsonProperty("upperCase") var upperCase: Boolean = false, ) @@ -415,6 +417,23 @@ class SubtitlesFragment : Fragment() { } } + subtitles_disable_subs?.isChecked = state.removeSubs + subtitles_disable_subs?.setOnCheckedChangeListener { _, b -> + state.removeSubs = b + if (b) { + setKey( + PRIOR_SUB_LANGUAGE, + getKey(SUBTITLE_AUTO_SELECT_KEY) ?: "en" + ) + setKey(SUBTITLE_AUTO_SELECT_KEY, "") + } else { + setKey( + SUBTITLE_AUTO_SELECT_KEY, + getKey(PRIOR_SUB_LANGUAGE) ?: "en" + ) + } + } + subtitles_remove_bloat?.isChecked = state.removeBloat subtitles_remove_bloat?.setOnCheckedChangeListener { _, b -> state.removeBloat = b diff --git a/app/src/main/res/layout/subtitle_settings.xml b/app/src/main/res/layout/subtitle_settings.xml index 2491b254..c5fa9f6e 100644 --- a/app/src/main/res/layout/subtitle_settings.xml +++ b/app/src/main/res/layout/subtitle_settings.xml @@ -140,9 +140,22 @@ android:nextFocusRight="@id/cancel_btt" android:nextFocusUp="@id/subs_auto_select_language" - android:nextFocusDown="@id/subtitles_remove_bloat" + android:nextFocusDown="@id/subtitles_disable_subs" android:text="@string/subs_download_languages" /> + + @@ -245,4 +258,4 @@ android:text="@string/sort_cancel" /> - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e30abea3..a309057e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -521,6 +521,7 @@ Invalid URL Error Remove closed captions from subtitles + Disable subtitles Remove bloat from subtitles Filter by preferred media language Extras