expo-video-subtitle 0.2.0 → 0.3.0

package/CHANGELOG.md

@@ -1,120 +1,184 @@
-# Changelog
-
-All notable changes to this package are documented here.
-
-This package is a fork of [`expo-video`](https://github.com/expo/expo/tree/main/packages/expo-video).
-Changes inherited from the upstream base version are not repeated here — see the
-[upstream changelog](https://github.com/expo/expo/blob/main/packages/expo-video/CHANGELOG.md)
-for the history of everything that isn't subtitle related.
-
-## 0.2.0
-
-### Added
-
-- **Android:** `subtitleStyle.applyEmbeddedStyles` keeps the inline formatting a subtitle track
-  carries instead of discarding it. Subtitle formats bring styling of their own — SubRip's `<b>`,
-  `<i>`, `<u>` and `<font color>` tags, and the richer per-cue styling of embedded WebVTT/TTML — and
-  until now every bit of it was thrown away so that `subtitleStyle` was the only thing deciding how
-  captions looked. `SubtitleView.setApplyEmbeddedStyles(false)` was hardcoded, and Media3 implements
-  that by removing every span from every cue, so an `.srt` written with `<i>` rendered upright.
-  Defaults to `false`, so nothing changes until you opt in. The rest of `subtitleStyle` still applies
-  underneath and `fontSize` still overrides any size the track asks for; the trade-off is that a cue
-  specifying its own colours overrides `textColor` and `windowColor` for that cue. There is no iOS
-  equivalent: `AVPlayerItem.textStyleRules` always composes with what the WebVTT cue declares.
-
-### Fixed
-
-- **Android:** a subtitle no longer drops down a line when the subtitle *below* it ends. Cues that
-  are on screen together are drawn as one block anchored at its bottom, so the moment the lower cue
-  expired the upper one fell into its place — moving the text at exactly the spot the viewer is
-  reading. Every cue now keeps the same line for its whole time on screen: the line a finished cue
-  leaves behind is held empty, and the next cue to start reclaims the lowest empty line rather than
-  stacking on top, which is what keeps the block from creeping upwards. An empty line can therefore
-  sit below — or between — the cues still on screen, and the stack resets once nothing is left on
-  screen. Cues with explicit `{\anN}` positioning are still passed through untouched.
-- **Android:** merging simultaneous SubRip cues no longer flattens their text. The cues were joined
-  through `toString()`, which erases the spans Media3's SubRip parser produces from inline tags. This
-  changed nothing on screen at the time, because the renderer stripped those spans anyway, but it
-  would have silently defeated the new `applyEmbeddedStyles` option for any overlapping cue.
-
-### Changed
-
-- Repository tooling, with no effect on the published runtime: `npm run lint` runs again. The repo
-  had no `eslint.config.js` — `expo-module configure` treats it as an optional template and never
-  creates one — while the `oxlint.config.mjs` it did have re-exported a module that
-  `expo-module-scripts@56` does not ship, so the lint step in `FORK.md` §5 had never actually
-  executed. A `.gitattributes` now pins the working copy to LF, which stops the Prettier rule from
-  reporting nearly every line of every file on a Windows checkout. The single lint error this
-  uncovered, a non-simple expression in a `useMemo` dependency list in `VideoPlayer.web.tsx`, is
-  fixed by hoisting it into a variable; the value and its identity semantics are unchanged.
-
-## 0.1.3
-
-### Documentation
-
-- Document how subtitles that are on screen at the same time are stacked, which shipped in 0.1.2 but
-  was only described in the changelog.
-- Add a release procedure to `FORK.md`, including the rule that every version bump carries a
-  changelog entry.
-
-## 0.1.2
-
-### Fixed
-
-- **Android:** subtitles that are on screen at the same time are now stacked as one block instead of
-  being drawn on top of each other. `.srt` files legitimately contain overlapping timestamps (two
-  speakers, dialogue over on-screen text), but SubRip carries no positioning, so Media3 pinned every
-  cue to the same spot and rendered them one over the other — Media3 does the stacking in its WebVTT
-  *parser* (`line = -1 - i`) and has no equivalent pass for SubRip. A `SubtitleParser` for SubRip now
-  splits the cue timeline at every boundary and merges the cues active in each slice into a single
-  multi-line cue, ordered like WebVTT: the cue that started earliest sits at the bottom. This also
-  makes Android match the iOS output, which already stacked because sideloaded SRT is converted to
-  WebVTT there. Cues with explicit `{\anN}` positioning are left untouched.
-- **Android:** selecting a `subtitleTrack` whose id is not among the available tracks no longer
-  leaves the previously selected track on screen. The cleared track-selection parameters were only
-  applied when a matching track was found, so an unmatched assignment silently did nothing; the
-  selection is now cleared and a warning is logged.
-- **Android:** `subtitleStyle.bottomOffset` is reset to the default when it is omitted, instead of
-  keeping the value from a previously applied style.
-
-## 0.1.1
-
-### Fixed
-
-- **Android:** `subtitleStyle.fontFamily` now resolves custom fonts bundled with the app, the same way
-  React Native resolves a `<Text>` component's `fontFamily`. It is looked up as an Android font
-  resource (`res/font`, where `expo-font`'s config plugin puts fonts) and then through React Native's
-  font manager, which covers the `assets/fonts/<name>.ttf` convention and fonts registered at runtime.
-  Previously only the built-in system families worked: `Typeface.create` silently fell back to the
-  default typeface for any bundled font, so `fontFamily` appeared to do nothing on Android while
-  working on iOS.
-
-### Documentation
-
-- Document font support and the silent-fallback behaviour for unresolved family names.
-
-## 0.1.0
-
-Initial release. Based on `expo-video` **56.1.4** (Expo SDK 56).
-
-### Added
-
-- **External (sideloaded) subtitles** via `VideoSource.subtitleTracks`. Attach WebVTT or SubRip
-  subtitle files (local or remote) to any source — most importantly progressive **MP4**, which,
-  unlike HLS/DASH manifests, cannot advertise its own subtitle renditions. Sideloaded tracks are
-  merged into the media and surface through `availableSubtitleTracks`, so they are selected with
-  `subtitleTrack` exactly like embedded tracks.
-  - Android: merged with `MediaItem.SubtitleConfiguration` (Media3 wraps them in a `MergingMediaSource`).
-  - iOS: merged into an `AVMutableComposition` as a `.text` track. SRT is converted to WebVTT, remote
-    files are cached locally first, and per-track time ranges are clamped to the video duration.
-    Applies to progressive, non-DRM sources on the asynchronous loading path.
-- **Custom subtitle styling** via the `VideoView` `subtitleStyle` prop: `textColor`, `backgroundColor`,
-  `windowColor`, `fontSize`, `fontFamily`, `bold`, `edgeType`, `edgeColor`, and `bottomOffset`.
-  Applies to embedded and sideloaded tracks alike.
-  - Android: `CaptionStyleCompat` on the `PlayerView` subtitle view.
-  - iOS: `AVPlayerItem.textStyleRules`.
-
-### Changed
-
-- The Android `publication` block and the iOS prebuild artifacts are removed, so the modified
-  Kotlin and Swift are compiled from source instead of resolving a precompiled AAR/XCFramework.
+# Changelog
+
+All notable changes to this package are documented here.
+
+This package is a fork of [`expo-video`](https://github.com/expo/expo/tree/main/packages/expo-video).
+Changes inherited from the upstream base version are not repeated here — see the
+[upstream changelog](https://github.com/expo/expo/blob/main/packages/expo-video/CHANGELOG.md)
+for the history of everything that isn't subtitle related.
+
+## 0.3.0
+
+### Added
+
+- **Android:** `subtitleStyle.backgroundRadius` rounds the corners of the `backgroundColor` box, in dp.
+  One box is drawn per rendered line, so a caption that wraps gets two rounded boxes stacked on each
+  other, the way VLC and most desktop players draw them. It has no effect unless `backgroundColor` is
+  set to something that is not fully transparent, and `windowColor` is deliberately left rectangular —
+  the window is the region the caption occupies, the background is the box that hugs the text.
+
+  Media3 offers nothing for this. `SubtitlePainter` renders `backgroundColor` as an Android
+  `BackgroundColorSpan`, which the framework paints with `canvas.drawRect`, and it paints `windowColor`
+  with a `canvas.drawRect` of its own; neither takes a radius, and `SubtitlePainter` and
+  `CanvasSubtitleOutput` are package-private and final while `SubtitleView` is final, so none of it can
+  be subclassed or replaced. The background is therefore drawn by a second subtitle view inserted
+  behind the one `PlayerView` owns, fed the same cues and configured with the same typeface, text size
+  and bottom padding so the two layouts match; the box itself comes from a `LineBackgroundSpan` calling
+  `drawRoundRect`. That view pins its edge type to `EDGE_TYPE_NONE` on purpose: `SubtitlePainter` copies
+  the cue text for a second edge pass and draws both layouts whenever the edge type is `outline`,
+  `raised` or `depressed`, which would paint the box twice and make a semi-transparent colour composite
+  with itself and come out darker than asked for.
+
+  Leaving `backgroundRadius` unset takes the original code path unchanged, with no extra view and no
+  extra listener.
+
+### Changed
+
+- **Android:** the subtitle view is now reconfigured whenever a player moves between views —
+  attaching a player, entering fullscreen, leaving it. `PlayerView` re-attaches its own subtitle view
+  on `setPlayer`, so nothing needed this before; the rounded background does, because it subscribes to
+  the `Player` rather than riding on `PlayerView`, and a view that no longer drives the player would
+  otherwise keep that subscription and go on drawing cues behind a surface nobody is looking at. For
+  anyone not using `backgroundRadius` this only means the caption style is re-applied at those
+  moments, which is what it already was.
+
+## 0.2.2
+
+### Changed
+
+- The published tarball no longer carries the repo's own development configuration: `.prettierrc`,
+  `.gitattributes`, `eslint.config.js`, `tsconfig.all.json` and the two `*.tsbuildinfo` build caches
+  (260 files → 254). None of it is read from inside a consumer's `node_modules`, and
+  `eslint.config.js` would in fact throw if anything did load it, because it requires
+  `expo-module-scripts` — a devDependency, and therefore absent for consumers. Two conventions
+  combined to publish these: `.npmignore` excludes hidden *directories* but not hidden *files*, and
+  npm ignores `.gitignore` entirely once an `.npmignore` exists, so a build cache that git already
+  ignores still shipped. Nothing a consumer uses changed — the file list is otherwise byte-identical,
+  and installing the tarball into a clean project still resolves `build/`, `plugin/build/`,
+  `app.plugin.js`, `expo-module.config.json` and the Android/iOS sources.
+- Dropped the `.npmignore` entry for `oxlint.config.mjs`, which has not existed since 0.2.0.
+
+## 0.2.1
+
+### Changed
+
+- Repository tooling, with no effect on the published runtime: `npm run lint` is quiet again. Making
+  the lint step runnable in 0.2.0 exposed 377 `prettier/prettier` warnings against code that is in
+  fact correctly formatted. `eslint-config-universe` enables the `prettier/prettier` rule but supplies
+  no options of its own, and `expo-video` inherits them from the Expo monorepo's root `.prettierrc` —
+  a file that does not come along when the package is forked out to stand on its own. Prettier
+  therefore fell back to its own defaults, and every source file disagreed with them about quote style
+  and line width. Adding the upstream options as a `.prettierrc` takes the count to zero without
+  reformatting a single line.
+
+## 0.2.0
+
+### Added
+
+- **Android:** `subtitleStyle.applyEmbeddedStyles` keeps the inline formatting a subtitle track
+  carries instead of discarding it. Subtitle formats bring styling of their own — SubRip's `<b>`,
+  `<i>`, `<u>` and `<font color>` tags, and the richer per-cue styling of embedded WebVTT/TTML — and
+  until now every bit of it was thrown away so that `subtitleStyle` was the only thing deciding how
+  captions looked. `SubtitleView.setApplyEmbeddedStyles(false)` was hardcoded, and Media3 implements
+  that by removing every span from every cue, so an `.srt` written with `<i>` rendered upright.
+  Defaults to `false`, so nothing changes until you opt in. The rest of `subtitleStyle` still applies
+  underneath and `fontSize` still overrides any size the track asks for; the trade-off is that a cue
+  specifying its own colours overrides `textColor` and `windowColor` for that cue. There is no iOS
+  equivalent: `AVPlayerItem.textStyleRules` always composes with what the WebVTT cue declares.
+
+### Fixed
+
+- **Android:** a subtitle no longer drops down a line when the subtitle *below* it ends. Cues that
+  are on screen together are drawn as one block anchored at its bottom, so the moment the lower cue
+  expired the upper one fell into its place — moving the text at exactly the spot the viewer is
+  reading. Every cue now keeps the same line for its whole time on screen: the line a finished cue
+  leaves behind is held empty, and the next cue to start reclaims the lowest empty line rather than
+  stacking on top, which is what keeps the block from creeping upwards. An empty line can therefore
+  sit below — or between — the cues still on screen, and the stack resets once nothing is left on
+  screen. Cues with explicit `{\anN}` positioning are still passed through untouched.
+- **Android:** merging simultaneous SubRip cues no longer flattens their text. The cues were joined
+  through `toString()`, which erases the spans Media3's SubRip parser produces from inline tags. This
+  changed nothing on screen at the time, because the renderer stripped those spans anyway, but it
+  would have silently defeated the new `applyEmbeddedStyles` option for any overlapping cue.
+
+### Changed
+
+- Repository tooling, with no effect on the published runtime: `npm run lint` runs again. The repo
+  had no `eslint.config.js` — `expo-module configure` treats it as an optional template and never
+  creates one — while the `oxlint.config.mjs` it did have re-exported a module that
+  `expo-module-scripts@56` does not ship, so the lint step in `FORK.md` §5 had never actually
+  executed. A `.gitattributes` now pins the working copy to LF, which stops the Prettier rule from
+  reporting nearly every line of every file on a Windows checkout. The single lint error this
+  uncovered, a non-simple expression in a `useMemo` dependency list in `VideoPlayer.web.tsx`, is
+  fixed by hoisting it into a variable; the value and its identity semantics are unchanged.
+
+## 0.1.3
+
+### Documentation
+
+- Document how subtitles that are on screen at the same time are stacked, which shipped in 0.1.2 but
+  was only described in the changelog.
+- Add a release procedure to `FORK.md`, including the rule that every version bump carries a
+  changelog entry.
+
+## 0.1.2
+
+### Fixed
+
+- **Android:** subtitles that are on screen at the same time are now stacked as one block instead of
+  being drawn on top of each other. `.srt` files legitimately contain overlapping timestamps (two
+  speakers, dialogue over on-screen text), but SubRip carries no positioning, so Media3 pinned every
+  cue to the same spot and rendered them one over the other — Media3 does the stacking in its WebVTT
+  *parser* (`line = -1 - i`) and has no equivalent pass for SubRip. A `SubtitleParser` for SubRip now
+  splits the cue timeline at every boundary and merges the cues active in each slice into a single
+  multi-line cue, ordered like WebVTT: the cue that started earliest sits at the bottom. This also
+  makes Android match the iOS output, which already stacked because sideloaded SRT is converted to
+  WebVTT there. Cues with explicit `{\anN}` positioning are left untouched.
+- **Android:** selecting a `subtitleTrack` whose id is not among the available tracks no longer
+  leaves the previously selected track on screen. The cleared track-selection parameters were only
+  applied when a matching track was found, so an unmatched assignment silently did nothing; the
+  selection is now cleared and a warning is logged.
+- **Android:** `subtitleStyle.bottomOffset` is reset to the default when it is omitted, instead of
+  keeping the value from a previously applied style.
+
+## 0.1.1
+
+### Fixed
+
+- **Android:** `subtitleStyle.fontFamily` now resolves custom fonts bundled with the app, the same way
+  React Native resolves a `<Text>` component's `fontFamily`. It is looked up as an Android font
+  resource (`res/font`, where `expo-font`'s config plugin puts fonts) and then through React Native's
+  font manager, which covers the `assets/fonts/<name>.ttf` convention and fonts registered at runtime.
+  Previously only the built-in system families worked: `Typeface.create` silently fell back to the
+  default typeface for any bundled font, so `fontFamily` appeared to do nothing on Android while
+  working on iOS.
+
+### Documentation
+
+- Document font support and the silent-fallback behaviour for unresolved family names.
+
+## 0.1.0
+
+Initial release. Based on `expo-video` **56.1.4** (Expo SDK 56).
+
+### Added
+
+- **External (sideloaded) subtitles** via `VideoSource.subtitleTracks`. Attach WebVTT or SubRip
+  subtitle files (local or remote) to any source — most importantly progressive **MP4**, which,
+  unlike HLS/DASH manifests, cannot advertise its own subtitle renditions. Sideloaded tracks are
+  merged into the media and surface through `availableSubtitleTracks`, so they are selected with
+  `subtitleTrack` exactly like embedded tracks.
+  - Android: merged with `MediaItem.SubtitleConfiguration` (Media3 wraps them in a `MergingMediaSource`).
+  - iOS: merged into an `AVMutableComposition` as a `.text` track. SRT is converted to WebVTT, remote
+    files are cached locally first, and per-track time ranges are clamped to the video duration.
+    Applies to progressive, non-DRM sources on the asynchronous loading path.
+- **Custom subtitle styling** via the `VideoView` `subtitleStyle` prop: `textColor`, `backgroundColor`,
+  `windowColor`, `fontSize`, `fontFamily`, `bold`, `edgeType`, `edgeColor`, and `bottomOffset`.
+  Applies to embedded and sideloaded tracks alike.
+  - Android: `CaptionStyleCompat` on the `PlayerView` subtitle view.
+  - iOS: `AVPlayerItem.textStyleRules`.
+
+### Changed
+
+- The Android `publication` block and the iOS prebuild artifacts are removed, so the modified
+  Kotlin and Swift are compiled from source instead of resolving a precompiled AAR/XCFramework.

package/FORK.md

@@ -5,9 +5,10 @@ and (b) pull a newer `expo-video` release into it **without losing the subtitle
 
 - **Baseline:** `expo-video@56.1.4` (Expo SDK 56), as published on npm.
 - **Native module name:** unchanged (`ExpoVideo`) — this is a drop-in replacement, not a coexisting package.
-- **Design principle:** the fork is deliberately **surgical and additive**. 5 new files hold almost all
-  of the logic (505 lines); the 14 touched upstream files receive ~130 added lines and only ~29 removed
-  ones. Nothing upstream is rewritten, so a version bump is a small, mechanical re-apply.
+- **Design principle:** the fork is deliberately **surgical and additive**. 7 new source files hold
+  almost all of the logic (~1,200 lines); the 19 touched upstream files receive ~450 added lines and
+  only ~44 removed ones. Nothing upstream is rewritten — the removals are call-site signatures and a
+  handful of rewritten function bodies — so a version bump is a small, mechanical re-apply.
 
 ---
 
@@ -23,18 +24,20 @@ Measured against the published `expo-video@56.1.4` tarball. `+`/`-` are added/re
 | `ios/Records/SubtitleStyle.swift` | 118 | Record for caption styling; hex→ARGB parsing; builds `[AVTextStyleRule]`. |
 | `ios/VideoPlayerSubtitleSideload.swift` | 203 | Builds the `AVMutableComposition`, downloads remote subs, SRT→WebVTT converter. |
 | `android/…/records/SubtitleSource.kt` | 54 | Record → `MediaItem.SubtitleConfiguration` + MIME resolution. |
-| `android/…/records/SubtitleStyle.kt` | 137 | Record → `CaptionStyleCompat`; hex colour parsing; font-family resolution (`res/font` → `ReactFontManager`); the `applyEmbeddedStyles` flag, which `SubtitleUtils` reads directly rather than `toCaptionStyle`. |
-| `android/…/utils/StackingSubtitleParser.kt` | 297 | `SubtitleParser` for SubRip that segments the cue timeline and merges simultaneous cues into one stacked block, plus the `SubtitleParser.Factory` that routes SubRip to it. Assigns each cue a vertical slot it keeps for its whole time on screen — a finished cue's line is held blank (`\u200B`) so the cues above it do not drop. Merges through a `SpannableStringBuilder` so cue spans survive. |
+| `android/…/records/SubtitleStyle.kt` | 144 | Record → `CaptionStyleCompat`; hex colour parsing; font-family resolution (`res/font` → `ReactFontManager`); the `applyEmbeddedStyles` flag, which `SubtitleUtils` reads directly rather than `toCaptionStyle`. |
+| `android/…/utils/StackingSubtitleParser.kt` | 300 | `SubtitleParser` for SubRip that segments the cue timeline and merges simultaneous cues into one stacked block, plus the `SubtitleParser.Factory` that routes SubRip to it. Assigns each cue a vertical slot it keeps for its whole time on screen — a finished cue's line is held blank (`\u200B`) so the cues above it do not drop. Merges through a `SpannableStringBuilder` so cue spans survive. |
+| `android/…/utils/RoundedSubtitleBackground.kt` | 352 | Draws `subtitleStyle.backgroundRadius` as rounded boxes, which Media3 cannot do at all: it paints `backgroundColor` as a framework `BackgroundColorSpan` and `windowColor` with `canvas.drawRect`, neither takes a radius, and `SubtitlePainter`/`CanvasSubtitleOutput` are package-private final while `SubtitleView` is final. A second `SubtitleView` is inserted behind `PlayerView`'s own, fed from `Player.Listener.onCues`, drawing a `LineBackgroundSpan` per line. **Its `EDGE_TYPE_NONE` is load-bearing** — `SubtitlePainter` copies the cue text for an edge pass and draws both layouts when the edge type is outline/raised/depressed, which would paint the box twice and darken a semi-transparent colour. State hangs off the view's `tag`, never a map in the companion object; see the `find` KDoc for why even a `WeakHashMap` leaks here. |
 | `FORK.md`, `LICENSE` | — | This guide; MIT licence (upstream copyright preserved). |
 | `eslint.config.js` | 4 | Verbatim copy of `expo-module-scripts/templates/eslint.config.js`. **Recreate it if a sync drops it** — `expo-module configure` treats it as an *optional* template and only syncs it when it already exists, so without this file `npm run lint` dies with "ESLint couldn't find an eslint.config.js". |
 | `.gitattributes` | 21 | Pins the working copy to LF. Git stores these files with LF, but a Windows checkout rewrites them to CRLF and the Prettier rule `npm run lint` enforces wants LF, which drowned the output in ~2800 "Delete `␍`" warnings. |
+| `.prettierrc` | 7 | The Expo monorepo's Prettier options, which the sources were formatted with. `eslint-config-universe` turns the `prettier/prettier` rule *on* but supplies no options, and upstream inherits them from the monorepo root — a file that does not come along when the package is forked out on its own. Without this, Prettier falls back to its own defaults and reports 377 warnings against correctly formatted code. Only `printWidth` and `singleQuote` differ from Prettier 2's defaults today; the rest are written out because they are what upstream uses, and `trailingComma` guards against a bump to Prettier 3, whose default is `"all"`. |
 
 ### Modified — upstream files carrying fork edits (re-apply these after a sync)
 
 | File | Δ | What to re-apply |
 | --- | --- | --- |
 | `src/VideoPlayer.types.ts` | +59 | `subtitleTracks?: SubtitleSource[]` on `VideoSourceObject`; the exported `SubtitleSource` type. |
-| `src/VideoView.types.ts` | +114 | `subtitleStyle?: SubtitleStyle` on `VideoViewProps`; `SubtitleStyle` + `SubtitleEdgeType` types. |
+| `src/VideoView.types.ts` | +129 | `subtitleStyle?: SubtitleStyle` on `VideoViewProps`; `SubtitleStyle` + `SubtitleEdgeType` types. |
 | `src/index.ts` | +2 | Export `SubtitleStyle`, `SubtitleEdgeType` (`SubtitleSource` rides on `export type *`). |
 | `src/VideoPlayer.web.tsx` | +5 / −1 | Hoist `JSON.stringify(source)` out of the `useMemo` dependency list into a `sourceKey` const. No behaviour change — it was already recomputed every render — but `react-hooks/use-memo` rejects non-simple expressions in a dependency array, and it was the single lint **error** in the package. |
 | `src/ts-declarations/react-native-assets.d.ts` | +22 / −1 | Replace upstream's `../../../expo-asset/…` reference (monorepo-only) with standalone `declare module` shims. **Always needed outside the Expo monorepo.** |
@@ -44,14 +47,16 @@ Measured against the published `expo-video@56.1.4` tarball. `+`/`-` are added/re
 | `ios/VideoView.swift` | +8 | `subtitleStyle` property; forward it when `player` is (re)assigned. |
 | `ios/VideoModule.swift` | +4 | `Prop("subtitleStyle")`. |
 | `android/…/records/VideoSource.kt` | +9 / −2 | `subtitleTracks` field; `setSubtitleConfigurations(…)` in `toMediaItem()`; subtitle key in `toMediaId()`. |
-| `android/…/utils/SubtitleUtils.kt` | +33 / −17 | `configureSubtitleView(…, customStyle)` overload and a `styleProvider` on the captioning listener. Keeps the original behaviour when no custom style is set. Passes `context` to `toCaptionStyle` for font lookup. Drives `setApplyEmbeddedStyles` from `customStyle.applyEmbeddedStyles` (upstream hardcodes `false`). |
-| `android/…/VideoView.kt` | +12 / −5 | `subtitleStyle` property; pass it at all 4 `configureSubtitleView` call sites + the captioning listener. |
+| `android/…/utils/SubtitleUtils.kt` | +92 / −21 | `configureSubtitleView(…, customStyle)` overload and a `styleProvider` on the captioning listener. Keeps the original behaviour when no custom style is set. Passes `context` to `toCaptionStyle` for font lookup. Drives `setApplyEmbeddedStyles` from `customStyle.applyEmbeddedStyles` (upstream hardcodes `false`). |
+| `android/…/VideoView.kt` | +16 / −5 | `subtitleStyle` property; pass it at all 4 `configureSubtitleView` call sites + the captioning listener. |
 | `android/…/VideoModule.kt` | +4 | `Prop("subtitleStyle")`. |
 | `android/…/utils/DataSourceUtils.kt` | +5 | `setSubtitleParserFactory(ExpoVideoSubtitleParserFactory())` on the `DefaultMediaSourceFactory`. Note this file declares `package expo.modules.video` despite living in `utils/`, so the factory needs an explicit import. |
+| `android/…/player/VideoPlayer.kt` | +13 / −2 | In `changeVideoView`, after `switchTargetView`: release the subtitle view the player is leaving and reconfigure the one it moves to. **Load-bearing for `backgroundRadius`** — that feature subscribes to the `Player` directly rather than riding on `PlayerView.setPlayer`, so a view that no longer drives the player keeps its subscription and goes on drawing stale cues. This is the choke point for every player move except entering fullscreen, which bypasses it (see `FullscreenPlayerActivity`). |
 | `android/…/player/VideoPlayerSubtitles.kt` | +14 / −8 | Apply the cleared track-selection parameters when the requested subtitle id matches nothing, instead of only inside the `format?.let` block. |
-| `android/…/FullscreenPlayerActivity.kt` | +3 / −3 | Pass `videoView.subtitleStyle` at its 2 call sites + the captioning listener. |
+| `android/…/FullscreenPlayerActivity.kt` | +15 / −3 | Pass `videoView.subtitleStyle` at its 2 call sites + the captioning listener. Also release the originating `VideoView`'s subtitle view right after its own `switchTargetView` — this path bypasses `changeVideoView`, so without it the player carries two cue listeners for the whole time it is fullscreen — and release this activity's own in `onDestroy`. |
 | `package.json` | — | Fork identity + build scripts — see §3. |
 | `expo-module.config.json` | — | **Android `publication` block removed** — see §3. |
+| `.npmignore` | +21 / −1 | A "Fork additions" block excluding the repo's own development config from the tarball: `.gitattributes`, `.prettierrc`, `eslint.config.js`, `tsconfig.all.json` and `*.tsbuildinfo`. Needed because the generated file only excludes hidden *directories* (`/.*/`), and because npm ignores `.gitignore` outright once an `.npmignore` exists — so the tsc build caches shipped despite git ignoring them. The `−1` drops the entry for `oxlint.config.mjs`, deleted in 0.2.0. |
 | `README.md`, `CHANGELOG.md` | — | Fork docs; do not take upstream's. |
 
 ### Removed — upstream artifacts deliberately dropped
@@ -110,9 +115,10 @@ Then re-apply the fork:
    (call-site signatures), `VideoPlayerItem.swift` (`isHls` hoist) and the ts-declarations shim.
 7. **Remove the Android `publication` block** from `expo-module.config.json`.
 8. **Restore the fork's `package.json`** (§3) and keep `README.md`, `CHANGELOG.md`, `LICENSE`,
-   `FORK.md`, `eslint.config.js` and `.gitattributes`. Step 3 only replaces `src ios android plugin`,
-   so the root-level files survive on their own — but confirm it, because a missing `eslint.config.js`
-   breaks `npm run lint` in a way that reads like a tooling bug rather than a lost file.
+   `FORK.md`, `eslint.config.js`, `.gitattributes` and `.prettierrc`. Step 3 only replaces
+   `src ios android plugin`, so the root-level files survive on their own — but confirm it, because a
+   missing `eslint.config.js` breaks `npm run lint` in a way that reads like a tooling bug rather than
+   a lost file, and a missing `.prettierrc` buries the output in warnings against correct code.
 9. Update the baseline version in this file, the README, and add a `CHANGELOG.md` entry.
 10. Verify with §5, then commit.
 
@@ -170,14 +176,23 @@ entry, in §1 of this file and in the README's intro line.
 
 ```bash
 npm run typecheck        # must be clean
-npm run lint             # must exit 0; warnings are tolerated, errors are not
+npm run lint             # expect zero output: no errors and no warnings
 npm pack --dry-run       # expect build/, plugin/build/, LICENSE, native sources;
-                         # NO node_modules, prebuilds, local-maven-repo
+                         # NO node_modules, prebuilds, local-maven-repo;
+                         # NO dev config (.prettierrc, eslint.config.js, *.tsbuildinfo) — see §1
 ```
 
-`npm run lint` needs `eslint.config.js` at the repo root — `expo-module configure` will **not**
-create it (it is an optional template that only gets synced when it already exists), so a sync that
-loses the file silently breaks this step. See §1.
+The file count is a blunt but effective regression check: **254 files** as of 0.2.2. If a change moves
+it, diff the list against the previous release and confirm every difference is intended —
+`npm pack --dry-run --json` gives a machine-readable list. Both directions matter: an unexpected
+*addition* means dev clutter leaked in, an unexpected *removal* means a consumer is missing something.
+
+`npm run lint` depends on two root files that upstream does not carry, both described in §1:
+`eslint.config.js` (without it ESLint refuses to run at all) and `.prettierrc` (without it Prettier
+falls back to its own defaults and reports hundreds of warnings against correctly formatted code).
+Neither is created by `expo-module configure`, so a sync that loses one breaks this step in a way
+that reads like a tooling bug. A `prettier/prettier` warning after a sync is far more likely to mean
+the config went missing than that the code is genuinely misformatted — check that first.
 
 ### Android — compiling the parser without a host app
 

package/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2015-present 650 Industries, Inc. (aka Expo)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2015-present 650 Industries, Inc. (aka Expo)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.