forked from recloudstream/cloudstream
parent
318ee08366
commit
63d6ea02c0
6 changed files with 241 additions and 211 deletions
|
@ -457,7 +457,6 @@ class HomeFragment : Fragment() {
|
|||
private fun loadHomePage(successful: Boolean = false) {
|
||||
val apiName = context?.getKey<String>(USER_SELECTED_HOMEPAGE_API)
|
||||
|
||||
println("LOAD HOMEPAGE $successful $apiName ${homeViewModel.apiName.value}")
|
||||
if (homeViewModel.apiName.value != apiName || apiName == null) {
|
||||
//println("Caught home: " + homeViewModel.apiName.value + " at " + apiName)
|
||||
homeViewModel.loadAndCancel(apiName)
|
||||
|
|
|
@ -39,6 +39,7 @@ class CustomDecoder : SubtitleDecoder {
|
|||
private var overrideEncoding: String? = null
|
||||
var regexSubtitlesToRemoveCaptions = false
|
||||
var regexSubtitlesToRemoveBloat = false
|
||||
var uppercaseSubtitles = false
|
||||
val bloatRegex =
|
||||
listOf(
|
||||
Regex(
|
||||
|
@ -193,6 +194,9 @@ class CustomDecoder : SubtitleDecoder {
|
|||
bloatRegex.forEach { rgx ->
|
||||
str = str.replace(rgx, "\n")
|
||||
}
|
||||
if (uppercaseSubtitles) {
|
||||
str = str.uppercase()
|
||||
}
|
||||
}
|
||||
inputBuffer.setSubtitleText(str)
|
||||
}
|
||||
|
|
|
@ -9,6 +9,7 @@ import com.google.android.exoplayer2.util.MimeTypes
|
|||
import com.lagradost.cloudstream3.SubtitleFile
|
||||
import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.regexSubtitlesToRemoveBloat
|
||||
import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.regexSubtitlesToRemoveCaptions
|
||||
import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.uppercaseSubtitles
|
||||
import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
|
||||
import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.fromSaveToStyle
|
||||
import com.lagradost.cloudstream3.utils.UIHelper.toPx
|
||||
|
@ -87,6 +88,7 @@ class PlayerSubtitleHelper {
|
|||
|
||||
fun setSubStyle(style: SaveCaptionStyle) {
|
||||
regexSubtitlesToRemoveBloat = style.removeBloat
|
||||
uppercaseSubtitles = style.upperCase
|
||||
regexSubtitlesToRemoveCaptions = style.removeCaptions
|
||||
subtitleView?.context?.let { ctx ->
|
||||
subStyle = style
|
||||
|
|
|
@ -38,6 +38,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
|
|||
import com.lagradost.cloudstream3.utils.UIHelper.navigate
|
||||
import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
|
||||
import kotlinx.android.synthetic.main.subtitle_settings.*
|
||||
import kotlinx.android.synthetic.main.toast.view.*
|
||||
import java.io.File
|
||||
|
||||
const val SUBTITLE_KEY = "subtitle_settings"
|
||||
|
@ -60,6 +61,8 @@ data class SaveCaptionStyle(
|
|||
@JsonProperty("fixedTextSize") var fixedTextSize: Float?,
|
||||
@JsonProperty("removeCaptions") var removeCaptions: Boolean = false,
|
||||
@JsonProperty("removeBloat") var removeBloat: Boolean = true,
|
||||
/** Apply caps lock to the text **/
|
||||
@JsonProperty("upperCase") var upperCase: Boolean = false,
|
||||
)
|
||||
|
||||
const val DEF_SUBS_ELEVATION = 20
|
||||
|
@ -182,6 +185,19 @@ class SubtitlesFragment : Fragment() {
|
|||
|
||||
private fun Context.updateState() {
|
||||
subtitle_text?.setStyle(fromSaveToStyle(state))
|
||||
val text = subtitle_text.context.getString(R.string.subtitles_example_text)
|
||||
val fixedText = if (state.upperCase) text.uppercase() else text
|
||||
subtitle_text?.setCues(
|
||||
listOf(
|
||||
Cue.Builder()
|
||||
.setTextSize(
|
||||
getPixels(TypedValue.COMPLEX_UNIT_SP, 25.0f).toFloat(),
|
||||
Cue.TEXT_SIZE_TYPE_ABSOLUTE
|
||||
)
|
||||
.setText(fixedText)
|
||||
.build()
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
private fun getColor(id: Int): Int {
|
||||
|
@ -222,7 +238,6 @@ class SubtitlesFragment : Fragment() {
|
|||
context?.getExternalFilesDir(null)?.absolutePath.toString() + "/Fonts"
|
||||
)
|
||||
|
||||
|
||||
context?.fixPaddingStatusbar(subs_root)
|
||||
|
||||
state = getCurrentSavedStyle()
|
||||
|
@ -404,6 +419,12 @@ class SubtitlesFragment : Fragment() {
|
|||
subtitles_remove_bloat?.setOnCheckedChangeListener { _, b ->
|
||||
state.removeBloat = b
|
||||
}
|
||||
subtitles_uppercase?.isChecked = state.upperCase
|
||||
subtitles_uppercase?.setOnCheckedChangeListener { _, b ->
|
||||
state.upperCase = b
|
||||
context?.updateState()
|
||||
}
|
||||
|
||||
subtitles_remove_captions?.isChecked = state.removeCaptions
|
||||
subtitles_remove_captions?.setOnCheckedChangeListener { _, b ->
|
||||
state.removeCaptions = b
|
||||
|
@ -418,9 +439,11 @@ class SubtitlesFragment : Fragment() {
|
|||
|
||||
//Fetch current value from preference
|
||||
context?.let { ctx ->
|
||||
subtitles_filter_sub_lang?.isChecked = PreferenceManager.getDefaultSharedPreferences(ctx)
|
||||
subtitles_filter_sub_lang?.isChecked =
|
||||
PreferenceManager.getDefaultSharedPreferences(ctx)
|
||||
.getBoolean(getString(R.string.filter_sub_lang_key), false)
|
||||
}
|
||||
|
||||
subtitles_filter_sub_lang?.setOnCheckedChangeListener { _, b ->
|
||||
context?.let { ctx ->
|
||||
PreferenceManager.getDefaultSharedPreferences(ctx)
|
||||
|
@ -553,17 +576,5 @@ class SubtitlesFragment : Fragment() {
|
|||
it.context.fromSaveToStyle(state)
|
||||
activity?.popCurrentPage()
|
||||
}
|
||||
|
||||
subtitle_text.setCues(
|
||||
listOf(
|
||||
Cue.Builder()
|
||||
.setTextSize(
|
||||
getPixels(TypedValue.COMPLEX_UNIT_SP, 25.0f).toFloat(),
|
||||
Cue.TEXT_SIZE_TYPE_ABSOLUTE
|
||||
)
|
||||
.setText(subtitle_text.context.getString(R.string.subtitles_example_text))
|
||||
.build()
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -144,43 +144,56 @@
|
|||
android:text="@string/subs_download_languages" />
|
||||
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||
android:id="@+id/subtitles_remove_bloat"
|
||||
style="@style/SettingsItem"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fontFamily="@font/google_sans"
|
||||
android:nextFocusLeft="@id/apply_btt"
|
||||
android:nextFocusRight="@id/cancel_btt"
|
||||
android:nextFocusUp="@id/subs_download_languages"
|
||||
android:nextFocusDown="@id/subtitles_remove_captions"
|
||||
android:nextFocusLeft="@id/apply_btt"
|
||||
android:nextFocusRight="@id/cancel_btt"
|
||||
android:fontFamily="@font/google_sans"
|
||||
style="@style/SettingsItem"
|
||||
app:drawableEndCompat="@null"
|
||||
android:id="@+id/subtitles_remove_bloat"
|
||||
android:text="@string/subtitles_remove_bloat"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
app:drawableEndCompat="@null" />
|
||||
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||
android:nextFocusUp="@id/subtitles_remove_bloat"
|
||||
android:nextFocusDown="@id/apply_btt"
|
||||
android:nextFocusLeft="@id/apply_btt"
|
||||
android:nextFocusRight="@id/cancel_btt"
|
||||
android:fontFamily="@font/google_sans"
|
||||
style="@style/SettingsItem"
|
||||
app:drawableEndCompat="@null"
|
||||
android:id="@+id/subtitles_remove_captions"
|
||||
android:text="@string/subtitles_remove_captions"
|
||||
style="@style/SettingsItem"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||
android:nextFocusUp="@id/subtitles_remove_captions"
|
||||
android:nextFocusDown="@id/apply_btt"
|
||||
android:layout_height="match_parent"
|
||||
android:fontFamily="@font/google_sans"
|
||||
android:nextFocusLeft="@id/apply_btt"
|
||||
android:nextFocusRight="@id/cancel_btt"
|
||||
android:fontFamily="@font/google_sans"
|
||||
style="@style/SettingsItem"
|
||||
app:drawableEndCompat="@null"
|
||||
android:nextFocusUp="@id/subtitles_remove_bloat"
|
||||
android:nextFocusDown="@id/subtitles_filter_sub_lang"
|
||||
android:text="@string/subtitles_remove_captions"
|
||||
app:drawableEndCompat="@null" />
|
||||
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||
android:id="@+id/subtitles_filter_sub_lang"
|
||||
android:text="@string/subtitles_filter_lang"
|
||||
style="@style/SettingsItem"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
android:layout_height="match_parent"
|
||||
android:fontFamily="@font/google_sans"
|
||||
android:nextFocusLeft="@id/apply_btt"
|
||||
android:nextFocusRight="@id/cancel_btt"
|
||||
android:nextFocusUp="@id/subtitles_remove_captions"
|
||||
android:nextFocusDown="@id/subtitles_uppercase"
|
||||
android:text="@string/subtitles_filter_lang"
|
||||
app:drawableEndCompat="@null" />
|
||||
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||
android:id="@+id/subtitles_uppercase"
|
||||
style="@style/SettingsItem"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fontFamily="@font/google_sans"
|
||||
android:nextFocusLeft="@id/apply_btt"
|
||||
android:nextFocusRight="@id/cancel_btt"
|
||||
android:nextFocusUp="@id/subtitles_filter_sub_lang"
|
||||
android:nextFocusDown="@id/apply_btt"
|
||||
android:text="@string/uppercase_all_subtitles"
|
||||
app:drawableEndCompat="@null" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
@ -601,4 +601,5 @@
|
|||
<string name="blank_repo_message">Add a repository to install site extensions</string>
|
||||
<string name="view_public_repositories_button">View community repositories</string>
|
||||
<string name="view_public_repositories_button_short">Public list</string>
|
||||
<string name="uppercase_all_subtitles">Uppercase all subtitles</string>
|
||||
</resources>
|
||||
|
|
Loading…
Reference in a new issue