Skip to content

feat(player): draw captions in the app font #2053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
A-EDev merged 2 commits into from
Nov 13, 2026
Merged

feat(player): draw captions in the app font #2053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e83e82a
feat(player): draw captions in the app font
A-EDev Nov 13, 2026
0264348
docs(nightly): note captions in the app font
A-EDev Nov 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/nightly-notes/2026-11-13-feat-captions-app-font.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
## Improved
- Captions use your app font, including a custom one (#1427)
29 changes: 26 additions & 3 deletions ...ain/java/io/github/aedev/flow/ui/components/videoplayer/subtitle/Media3SubtitleOverlay.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.getValue
Expand All @@ -15,6 +16,10 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.platform.LocalFontFamilyResolver
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.font.resolveAsTypeface
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.media3.common.Player
Expand Down Expand Up @@ -96,7 +101,8 @@ internal fun StyledSubtitles(
style: SubtitleStyle,
modifier: Modifier = Modifier,
) {
val captionStyle = remember(style) { style.toCaptionStyle() }
val typeface = rememberCaptionTypeface(style.isBold)
val captionStyle = remember(style, typeface) { style.toCaptionStyle(typeface) }
AndroidView(
modifier = modifier,
factory = { context ->
Expand All @@ -114,7 +120,24 @@ internal fun StyledSubtitles(
)
}

private fun SubtitleStyle.toCaptionStyle(): CaptionStyleCompat =
/**
* The app font at the weight the caption Bold switch asks for, so captions follow a custom or
* variable font too (#1427). The system font keeps the platform defaults captions always used.
*/
@Composable
private fun rememberCaptionTypeface(isBold: Boolean): Typeface {
val family = MaterialTheme.typography.bodyLarge.fontFamily
val resolver = LocalFontFamilyResolver.current
val resolved =
remember(family, resolver, isBold) {
family
?.takeIf { it != FontFamily.Default }
?.let { resolver.resolveAsTypeface(it, if (isBold) FontWeight.Bold else FontWeight.Normal) }
}
return resolved?.value ?: if (isBold) Typeface.DEFAULT_BOLD else Typeface.DEFAULT
}

private fun SubtitleStyle.toCaptionStyle(typeface: Typeface): CaptionStyleCompat =
CaptionStyleCompat(
textColor.toArgb(),
backgroundColor.toArgb(),
Expand All @@ -127,7 +150,7 @@ private fun SubtitleStyle.toCaptionStyle(): CaptionStyleCompat =
SubtitleEdgeType.DEPRESSED -> CaptionStyleCompat.EDGE_TYPE_DEPRESSED
},
edgeColor.toArgb(),
if (isBold) Typeface.DEFAULT_BOLD else Typeface.DEFAULT,
typeface,
)

/**
Expand Down
Loading