Preserve Japanese language features when not applying embedded styling #8943
Conversation
Fix bug where rubies and boutens are missing, tate-chu-yoko is rendered incorrectly when SubtitleView.setApplyEmbeddedStyles(false). This method should only affect styling elements and not remove any language features.
| @@ -48,5 +54,27 @@ public static float resolveTextSize( | |||
| } | |||
| } | |||
|
|
|||
| public static void preserveJapaneseLanguageFeatures(Spannable copy, Spanned original) { | |||
There was a problem hiding this comment.
Instead of needing to encode this list of Span types in SubtitleViewUtils, what do you think about using a marker interface like LanguageFeature that would be implemented by spans like RubySpan?
(See Effective Java 3rd edition Item 41: Use marker interfaces to define types)
There was a problem hiding this comment.
Great idea! Will update the PR
| @@ -386,7 +386,12 @@ private Cue removeEmbeddedStyling(Cue cue) { | |||
| cue.buildUpon().setTextSize(Cue.DIMEN_UNSET, Cue.TYPE_UNSET).clearWindowColor(); | |||
| if (cueText != null) { | |||
| // Remove all spans, regardless of type. | |||
| strippedCue.setText(cueText.toString()); | |||
| strippedCue.setText(new SpannableString(cueText.toString())); | |||
There was a problem hiding this comment.
Since we're no longer stripping all Spans, I think it's probably easier just to directly copy the Spanned to a SpannableString (including all the spans) by passing it into the constructor, and then iterate over them calling removeSpan() unless the type is recognised as a 'language feature'.
I suspect it will also reduce the number of instanceof and cast calls needed (especially if you store it in a SpannableString local before calling Cue#setText later).
It seems less complicated than being sure we definitely copied all the flags etc over.
|
Thanks! I'll work on getting this merged. |
Fix bug where rubies and boutens are missing, tate-chu-yoko is rendered incorrectly when
SubtitleView.setApplyEmbeddedStyles(false). This method should only affect styling elements and not remove any language features.@icbaker
Bug is observed when using the
WebViewSubtitleOutputand player setsSubtitleView.setApplyEmbeddedStyles(false).