mirror of
https://github.com/dirtydishes/dreamio.git
synced 2026-06-06 13:37:24 +00:00
add native player controls captions and close cleanup
This commit is contained in:
parent
8d4dd0870a
commit
fdeacce389
6 changed files with 265 additions and 3 deletions
|
|
@ -9,3 +9,4 @@
|
||||||
{"id":"int-74805ffd","kind":"field_change","created_at":"2026-05-25T04:21:42.440755Z","actor":"dirtydishes","issue_id":"dreamio-2k5","extra":{"field":"status","new_value":"closed","old_value":"in_progress","reason":"Added native backend availability guard, installed CocoaPods, generated workspace metadata, documented setup, and validated available checks."}}
|
{"id":"int-74805ffd","kind":"field_change","created_at":"2026-05-25T04:21:42.440755Z","actor":"dirtydishes","issue_id":"dreamio-2k5","extra":{"field":"status","new_value":"closed","old_value":"in_progress","reason":"Added native backend availability guard, installed CocoaPods, generated workspace metadata, documented setup, and validated available checks."}}
|
||||||
{"id":"int-27a61615","kind":"field_change","created_at":"2026-05-25T04:44:35.633997Z","actor":"dirtydishes","issue_id":"dreamio-ija","extra":{"field":"status","new_value":"closed","old_value":"in_progress","reason":"Fixed MobileVLCKit linker failures by preparing the XCFramework slice before app linking and preserving the integration through pod install."}}
|
{"id":"int-27a61615","kind":"field_change","created_at":"2026-05-25T04:44:35.633997Z","actor":"dirtydishes","issue_id":"dreamio-ija","extra":{"field":"status","new_value":"closed","old_value":"in_progress","reason":"Fixed MobileVLCKit linker failures by preparing the XCFramework slice before app linking and preserving the integration through pod install."}}
|
||||||
{"id":"int-fad68cb4","kind":"field_change","created_at":"2026-05-25T05:04:55.103302Z","actor":"dirtydishes","issue_id":"dreamio-mj8","extra":{"field":"status","new_value":"closed","old_value":"in_progress","reason":"Implemented native VLC player controls, caption controls, subtitle candidate discovery, and close-flow cleanup."}}
|
{"id":"int-fad68cb4","kind":"field_change","created_at":"2026-05-25T05:04:55.103302Z","actor":"dirtydishes","issue_id":"dreamio-mj8","extra":{"field":"status","new_value":"closed","old_value":"in_progress","reason":"Implemented native VLC player controls, caption controls, subtitle candidate discovery, and close-flow cleanup."}}
|
||||||
|
{"id":"int-6b806f87","kind":"field_change","created_at":"2026-05-25T09:49:39.908604Z","actor":"dirtydishes","issue_id":"dreamio-poo","extra":{"field":"status","new_value":"closed","old_value":"in_progress","reason":"Implemented and validated native player controls, subtitle handling refinements, and close-flow cleanup."}}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
{"_type":"issue","id":"dreamio-poo","title":"Native player controls captions and close flow","description":"Add and validate VLC-backed native playback transport controls, subtitle track controls, external subtitle discovery, and Stremio Web close cleanup after native playback dismisses.","status":"closed","priority":1,"issue_type":"feature","assignee":"dirtydishes","owner":"dishes@dpdrm.com","created_at":"2026-05-25T09:47:56Z","created_by":"dirtydishes","updated_at":"2026-05-25T09:49:40Z","started_at":"2026-05-25T09:48:00Z","closed_at":"2026-05-25T09:49:40Z","close_reason":"Implemented and validated native player controls, subtitle handling refinements, and close-flow cleanup.","dependency_count":0,"dependent_count":0,"comment_count":0}
|
||||||
|
{"_type":"issue","id":"dreamio-wgk","title":"Fix native player controls tap-to-show","description":"Native player controls can be hidden by tapping, but subsequent taps on the player do not bring them back. Investigate the overlay gesture handling and restore reliable tap-to-show/tap-to-hide behavior.","status":"in_progress","priority":1,"issue_type":"bug","assignee":"dirtydishes","owner":"dishes@dpdrm.com","created_at":"2026-05-25T09:27:58Z","created_by":"dirtydishes","updated_at":"2026-05-25T09:28:11Z","started_at":"2026-05-25T09:28:11Z","dependency_count":0,"dependent_count":0,"comment_count":0}
|
||||||
{"_type":"issue","id":"dreamio-ija","title":"Fix MobileVLCKit linker dependency","description":"Dreamio fails to link because the MobileVLCKit framework is not found. Investigate how the dependency is configured and update the repository so the framework is available to Xcode builds.","status":"closed","priority":1,"issue_type":"bug","assignee":"dirtydishes","owner":"dishes@dpdrm.com","created_at":"2026-05-25T04:40:49Z","created_by":"dirtydishes","updated_at":"2026-05-25T04:44:36Z","started_at":"2026-05-25T04:40:57Z","closed_at":"2026-05-25T04:44:36Z","close_reason":"Fixed MobileVLCKit linker failures by preparing the XCFramework slice before app linking and preserving the integration through pod install.","dependency_count":0,"dependent_count":0,"comment_count":0}
|
{"_type":"issue","id":"dreamio-ija","title":"Fix MobileVLCKit linker dependency","description":"Dreamio fails to link because the MobileVLCKit framework is not found. Investigate how the dependency is configured and update the repository so the framework is available to Xcode builds.","status":"closed","priority":1,"issue_type":"bug","assignee":"dirtydishes","owner":"dishes@dpdrm.com","created_at":"2026-05-25T04:40:49Z","created_by":"dirtydishes","updated_at":"2026-05-25T04:44:36Z","started_at":"2026-05-25T04:40:57Z","closed_at":"2026-05-25T04:44:36Z","close_reason":"Fixed MobileVLCKit linker failures by preparing the XCFramework slice before app linking and preserving the integration through pod install.","dependency_count":0,"dependent_count":0,"comment_count":0}
|
||||||
{"_type":"issue","id":"dreamio-2k5","title":"Guard native playback when MobileVLCKit is unavailable","description":"Dreamio can currently present its native player from raw xcodeproj builds where MobileVLCKit is not linked, which leads to the fallback backend message instead of an actionable setup path. Add a runtime/build availability check, document the CocoaPods workspace requirement, and validate the fallback remains buildable.","status":"closed","priority":1,"issue_type":"bug","assignee":"dirtydishes","owner":"dishes@dpdrm.com","created_at":"2026-05-25T04:15:47Z","created_by":"dirtydishes","updated_at":"2026-05-25T04:21:42Z","started_at":"2026-05-25T04:15:56Z","closed_at":"2026-05-25T04:21:42Z","close_reason":"Added native backend availability guard, installed CocoaPods, generated workspace metadata, documented setup, and validated available checks.","dependency_count":0,"dependent_count":0,"comment_count":0}
|
{"_type":"issue","id":"dreamio-2k5","title":"Guard native playback when MobileVLCKit is unavailable","description":"Dreamio can currently present its native player from raw xcodeproj builds where MobileVLCKit is not linked, which leads to the fallback backend message instead of an actionable setup path. Add a runtime/build availability check, document the CocoaPods workspace requirement, and validate the fallback remains buildable.","status":"closed","priority":1,"issue_type":"bug","assignee":"dirtydishes","owner":"dishes@dpdrm.com","created_at":"2026-05-25T04:15:47Z","created_by":"dirtydishes","updated_at":"2026-05-25T04:21:42Z","started_at":"2026-05-25T04:15:56Z","closed_at":"2026-05-25T04:21:42Z","close_reason":"Added native backend availability guard, installed CocoaPods, generated workspace metadata, documented setup, and validated available checks.","dependency_count":0,"dependent_count":0,"comment_count":0}
|
||||||
{"_type":"issue","id":"dreamio-8vi","title":"Fix URL redaction crash on percent-encoded paths","description":"## Why\nDreamio can crash while logging WebKit navigation and playback URLs because URLRedactor writes raw replacement text back into URLComponents.percentEncodedPath.\n\n## What needs to be done\n- Update URL redaction to avoid assigning invalid characters to percentEncodedPath\n- Preserve token/path redaction behavior for diagnostics\n- Add a regression test covering percent-encoded path input similar to the Stremio crash logs\n\n## Acceptance criteria\n- Redacting a URL with percent-encoded path segments does not crash\n- Diagnostics still remove query strings/fragments and redact token-like path segments\n- Tests cover the regression","status":"closed","priority":1,"issue_type":"bug","assignee":"dirtydishes","owner":"dishes@dpdrm.com","created_at":"2026-05-25T03:50:04Z","created_by":"dirtydishes","updated_at":"2026-05-25T03:51:39Z","started_at":"2026-05-25T03:50:08Z","closed_at":"2026-05-25T03:51:39Z","close_reason":"Closed","dependency_count":0,"dependent_count":0,"comment_count":0}
|
{"_type":"issue","id":"dreamio-8vi","title":"Fix URL redaction crash on percent-encoded paths","description":"## Why\nDreamio can crash while logging WebKit navigation and playback URLs because URLRedactor writes raw replacement text back into URLComponents.percentEncodedPath.\n\n## What needs to be done\n- Update URL redaction to avoid assigning invalid characters to percentEncodedPath\n- Preserve token/path redaction behavior for diagnostics\n- Add a regression test covering percent-encoded path input similar to the Stremio crash logs\n\n## Acceptance criteria\n- Redacting a URL with percent-encoded path segments does not crash\n- Diagnostics still remove query strings/fragments and redact token-like path segments\n- Tests cover the regression","status":"closed","priority":1,"issue_type":"bug","assignee":"dirtydishes","owner":"dishes@dpdrm.com","created_at":"2026-05-25T03:50:04Z","created_by":"dirtydishes","updated_at":"2026-05-25T03:51:39Z","started_at":"2026-05-25T03:50:08Z","closed_at":"2026-05-25T03:51:39Z","close_reason":"Closed","dependency_count":0,"dependent_count":0,"comment_count":0}
|
||||||
|
|
|
||||||
|
|
@ -122,6 +122,7 @@ final class DreamioWebViewController: UIViewController {
|
||||||
const addSubtitleCandidate = (entry) => {
|
const addSubtitleCandidate = (entry) => {
|
||||||
const rawURL = typeof entry === "string" ? entry : entry && (entry.url || entry.href || entry.src || entry.file || entry.download);
|
const rawURL = typeof entry === "string" ? entry : entry && (entry.url || entry.href || entry.src || entry.file || entry.download);
|
||||||
const url = absoluteURL(rawURL);
|
const url = absoluteURL(rawURL);
|
||||||
|
subtitleURLPattern.lastIndex = 0;
|
||||||
if (!url || !subtitleURLPattern.test(url)) {
|
if (!url || !subtitleURLPattern.test(url)) {
|
||||||
subtitleURLPattern.lastIndex = 0;
|
subtitleURLPattern.lastIndex = 0;
|
||||||
return;
|
return;
|
||||||
|
|
@ -517,12 +518,18 @@ final class DreamioWebViewController: UIViewController {
|
||||||
const clicked = clickVisible([
|
const clicked = clickVisible([
|
||||||
"[aria-label*='Close' i]",
|
"[aria-label*='Close' i]",
|
||||||
"[aria-label*='Back' i]",
|
"[aria-label*='Back' i]",
|
||||||
|
"[title*='Close' i]",
|
||||||
|
"[title*='Back' i]",
|
||||||
"button[class*='close' i]",
|
"button[class*='close' i]",
|
||||||
"button[class*='back' i]",
|
"button[class*='back' i]",
|
||||||
|
"[class*='close' i]",
|
||||||
|
"[class*='back' i]",
|
||||||
".player button",
|
".player button",
|
||||||
"[role='button']"
|
"[role='button']"
|
||||||
]);
|
]);
|
||||||
const stillPlayer = /player|stream|buffer|prepar/i.test(document.body.innerText || "");
|
const locationLooksPlayer = /\/(player|stream)\b/i.test(window.location.pathname || "") || /player|stream/i.test(window.location.hash || "");
|
||||||
|
const visibleBusyPlayer = Boolean(document.querySelector("video, .player, [class*='player' i], [class*='buffer' i]"));
|
||||||
|
const stillPlayer = locationLooksPlayer || (visibleBusyPlayer && /buffer|prepar|stream/i.test(document.body.innerText || ""));
|
||||||
return { clicked, stillPlayer, href: window.location.href };
|
return { clicked, stillPlayer, href: window.location.href };
|
||||||
})();
|
})();
|
||||||
"""#
|
"""#
|
||||||
|
|
@ -544,7 +551,14 @@ final class DreamioWebViewController: UIViewController {
|
||||||
}
|
}
|
||||||
if self.webView.canGoBack {
|
if self.webView.canGoBack {
|
||||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) {
|
DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) {
|
||||||
self.webView.evaluateJavaScript("(/player|stream|buffer|prepar/i).test(document.body.innerText || '')") { result, _ in
|
let stillPlayerScript = #"""
|
||||||
|
(() => {
|
||||||
|
const locationLooksPlayer = /\/(player|stream)\b/i.test(window.location.pathname || "") || /player|stream/i.test(window.location.hash || "");
|
||||||
|
const visibleBusyPlayer = Boolean(document.querySelector("video, .player, [class*='player' i], [class*='buffer' i]"));
|
||||||
|
return locationLooksPlayer || (visibleBusyPlayer && /buffer|prepar|stream/i.test(document.body.innerText || ""));
|
||||||
|
})()
|
||||||
|
"""#
|
||||||
|
self.webView.evaluateJavaScript(stillPlayerScript) { result, _ in
|
||||||
if (result as? Bool) == true {
|
if (result as? Bool) == true {
|
||||||
self.webView.goBack()
|
self.webView.goBack()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,13 @@ final class NativePlayerViewController: UIViewController {
|
||||||
return view
|
return view
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
private let tapSurfaceView: UIView = {
|
||||||
|
let view = UIView()
|
||||||
|
view.translatesAutoresizingMaskIntoConstraints = false
|
||||||
|
view.backgroundColor = .clear
|
||||||
|
return view
|
||||||
|
}()
|
||||||
|
|
||||||
private let playPauseButton = NativePlayerViewController.iconButton(systemName: "pause.fill", label: "Play or Pause")
|
private let playPauseButton = NativePlayerViewController.iconButton(systemName: "pause.fill", label: "Play or Pause")
|
||||||
private let jumpBackButton = NativePlayerViewController.iconButton(systemName: "gobackward.15", label: "Jump Back 15 Seconds")
|
private let jumpBackButton = NativePlayerViewController.iconButton(systemName: "gobackward.15", label: "Jump Back 15 Seconds")
|
||||||
private let jumpForwardButton = NativePlayerViewController.iconButton(systemName: "goforward.15", label: "Jump Forward 15 Seconds")
|
private let jumpForwardButton = NativePlayerViewController.iconButton(systemName: "goforward.15", label: "Jump Forward 15 Seconds")
|
||||||
|
|
@ -167,6 +174,7 @@ final class NativePlayerViewController: UIViewController {
|
||||||
|
|
||||||
private func configureLayout() {
|
private func configureLayout() {
|
||||||
view.addSubview(backend.view)
|
view.addSubview(backend.view)
|
||||||
|
view.addSubview(tapSurfaceView)
|
||||||
view.addSubview(loadingView)
|
view.addSubview(loadingView)
|
||||||
view.addSubview(failureLabel)
|
view.addSubview(failureLabel)
|
||||||
view.addSubview(controlsContainer)
|
view.addSubview(controlsContainer)
|
||||||
|
|
@ -182,7 +190,7 @@ final class NativePlayerViewController: UIViewController {
|
||||||
|
|
||||||
let tap = UITapGestureRecognizer(target: self, action: #selector(toggleControlsVisibility))
|
let tap = UITapGestureRecognizer(target: self, action: #selector(toggleControlsVisibility))
|
||||||
tap.cancelsTouchesInView = false
|
tap.cancelsTouchesInView = false
|
||||||
view.addGestureRecognizer(tap)
|
tapSurfaceView.addGestureRecognizer(tap)
|
||||||
|
|
||||||
let controlRow = UIStackView(arrangedSubviews: [jumpBackButton, playPauseButton, jumpForwardButton, captionsButton])
|
let controlRow = UIStackView(arrangedSubviews: [jumpBackButton, playPauseButton, jumpForwardButton, captionsButton])
|
||||||
controlRow.translatesAutoresizingMaskIntoConstraints = false
|
controlRow.translatesAutoresizingMaskIntoConstraints = false
|
||||||
|
|
@ -208,6 +216,11 @@ final class NativePlayerViewController: UIViewController {
|
||||||
backend.view.topAnchor.constraint(equalTo: view.topAnchor),
|
backend.view.topAnchor.constraint(equalTo: view.topAnchor),
|
||||||
backend.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
|
backend.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
|
||||||
|
|
||||||
|
tapSurfaceView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
|
||||||
|
tapSurfaceView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
|
||||||
|
tapSurfaceView.topAnchor.constraint(equalTo: view.topAnchor),
|
||||||
|
tapSurfaceView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
|
||||||
|
|
||||||
loadingView.centerXAnchor.constraint(equalTo: view.centerXAnchor),
|
loadingView.centerXAnchor.constraint(equalTo: view.centerXAnchor),
|
||||||
loadingView.centerYAnchor.constraint(equalTo: view.centerYAnchor),
|
loadingView.centerYAnchor.constraint(equalTo: view.centerYAnchor),
|
||||||
|
|
||||||
|
|
@ -338,6 +351,8 @@ final class NativePlayerViewController: UIViewController {
|
||||||
}
|
}
|
||||||
|
|
||||||
private func revealControls() {
|
private func revealControls() {
|
||||||
|
controlsContainer.isUserInteractionEnabled = true
|
||||||
|
closeButton.isUserInteractionEnabled = true
|
||||||
UIView.animate(withDuration: 0.18) {
|
UIView.animate(withDuration: 0.18) {
|
||||||
self.controlsContainer.alpha = 1
|
self.controlsContainer.alpha = 1
|
||||||
self.closeButton.alpha = 1
|
self.closeButton.alpha = 1
|
||||||
|
|
@ -346,6 +361,8 @@ final class NativePlayerViewController: UIViewController {
|
||||||
}
|
}
|
||||||
|
|
||||||
private func hideControls() {
|
private func hideControls() {
|
||||||
|
controlsContainer.isUserInteractionEnabled = false
|
||||||
|
closeButton.isUserInteractionEnabled = false
|
||||||
UIView.animate(withDuration: 0.24) {
|
UIView.animate(withDuration: 0.24) {
|
||||||
self.controlsContainer.alpha = 0
|
self.controlsContainer.alpha = 0
|
||||||
self.closeButton.alpha = 0
|
self.closeButton.alpha = 0
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,7 @@ final class VLCNativePlaybackBackend: NSObject, NativePlaybackBackend {
|
||||||
|
|
||||||
func play(request: NativePlaybackRequest) {
|
func play(request: NativePlaybackRequest) {
|
||||||
#if canImport(MobileVLCKit)
|
#if canImport(MobileVLCKit)
|
||||||
|
attachedSubtitleURLs.removeAll()
|
||||||
let media = VLCMedia(url: request.playbackURL)
|
let media = VLCMedia(url: request.playbackURL)
|
||||||
let headerValue = request.headers
|
let headerValue = request.headers
|
||||||
.map { "\($0.key): \($0.value)" }
|
.map { "\($0.key): \($0.value)" }
|
||||||
|
|
@ -204,6 +205,12 @@ final class VLCNativePlaybackBackend: NSObject, NativePlaybackBackend {
|
||||||
print("[DreamioVLC] attached subtitle=\(URLRedactor.redactedURLString(candidate.url.absoluteString))")
|
print("[DreamioVLC] attached subtitle=\(URLRedactor.redactedURLString(candidate.url.absoluteString))")
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
guard !candidates.isEmpty else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
DispatchQueue.main.asyncAfter(deadline: .now() + 1) { [weak self] in
|
||||||
|
self?.onSubtitleTracksChange?()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue