Fix broken subtitles line wrapping

app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java

@@ -69,7 +69,6 @@
 import org.jellyfin.androidtv.ui.presentation.CardPresenter;
 import org.jellyfin.androidtv.ui.presentation.ChannelCardPresenter;
 import org.jellyfin.androidtv.ui.presentation.PositionableListRowPresenter;
-import org.jellyfin.androidtv.ui.shared.OutlineSpan;
 import org.jellyfin.androidtv.ui.shared.PaddedLineBackgroundSpan;
 import org.jellyfin.androidtv.util.DeviceUtils;
 import org.jellyfin.androidtv.util.ImageUtils;
@@ -1467,11 +1466,11 @@ private void renderSubtitles(@Nullable final String text) {
                     .replaceAll("\\\\h", " ");
 
             final SpannableString span = new SpannableString(TextUtilsKt.toHtmlSpanned(htmlText));
-            span.setSpan(new ForegroundColorSpan(Color.WHITE), 0, span.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             if (subtitlesBackgroundEnabled) {
+                // Disable the text outlining when the background is enabled
+                binding.subtitlesText.setStrokeWidth(0.0f);
                 span.setSpan(new PaddedLineBackgroundSpan(ContextCompat.getColor(requireContext(), R.color.black_opaque), SUBTITLE_PADDING), 0, span.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             }
-            span.setSpan(new OutlineSpan(), 0, span.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 
             binding.subtitlesText.setText(span);
             binding.subtitlesText.setVisibility(View.VISIBLE);

app/src/main/java/org/jellyfin/androidtv/ui/shared/StrokeTextView.kt

@@ -0,0 +1,67 @@
+package org.jellyfin.androidtv.ui.shared
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.content.ContextCompat
+import org.jellyfin.androidtv.R
+
+class StrokeTextView : AppCompatTextView {
+	private var strokeWidth = 0.0f
+	private var isDrawing: Boolean = false
+
+	constructor(
+		context: Context,
+		attrs: AttributeSet?,
+		defStyle: Int
+	) : super(context, attrs, defStyle) {
+		obtainStyledAttrs(context, attrs)
+	}
+
+	constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+		obtainStyledAttrs(context, attrs)
+	}
+
+	constructor(context: Context) : super(context) {
+		obtainStyledAttrs(context, attrs = null)
+	}
+
+	private fun obtainStyledAttrs(context: Context, attrs: AttributeSet?) {
+		val styledAttrs = context.obtainStyledAttributes(attrs, R.styleable.StrokeTextView)
+		strokeWidth = styledAttrs.getFloat(
+			R.styleable.StrokeTextView_stroke_width, 0.0f
+		)
+		styledAttrs.recycle()
+	}
+
+	// To prevent infinite call of onDraw because setTextColor calls invalidate()
+	override fun invalidate() {
+		if (isDrawing) return
+		super.invalidate()
+	}
+
+	fun setStrokeWidth(strokeWidth: Float){
+		this.strokeWidth = strokeWidth
+	}
+
+	override fun onDraw(canvas: Canvas?) {
+		if (strokeWidth > 0) {
+			isDrawing = true
+			val initialColor = textColors
+
+			paint.style = Paint.Style.STROKE
+			paint.strokeWidth = strokeWidth
+			setTextColor(ContextCompat.getColor(context, R.color.black))
+			super.onDraw(canvas)
+
+			paint.style = Paint.Style.FILL
+			setTextColor(initialColor)
+			super.onDraw(canvas)
+			isDrawing = false
+		} else {
+			super.onDraw(canvas)
+		}
+	}
+}

app/src/main/res/layout/vlc_player_interface.xml

@@ -44,7 +44,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="center" />
 
-        <TextView
+        <org.jellyfin.androidtv.ui.shared.StrokeTextView
             android:id="@+id/subtitles_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -53,6 +53,7 @@
             android:layout_marginBottom="48dp"
             android:textColor="@color/white"
             android:textSize="28sp"
+            app:stroke_width="5.0"
             tools:text="Subtitles" />
 
     </FrameLayout>

app/src/main/res/values/attrs.xml

@@ -26,4 +26,7 @@
         <attr name="qrBackground" format="color" />
         <attr name="qrForeground" format="color" />
     </declare-styleable>
+    <declare-styleable name="StrokeTextView">
+        <attr name="stroke_width" format="float" />
+    </declare-styleable>
 </resources>