Creepso/Sora
1
0
Fork 0
mirror of https://github.com/cranci1/Sora.git synced 2026-04-21 08:32:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added toggle for subtitles + fixed mark all previous as watched in series organized in seasons (#56)
Some checks are pending
Build and Release IPA / Build IPA (push) Waiting to run
Details

Browse source
This commit is contained in:
cranci 2025-03-20 20:29:14 +01:00 committed by GitHub
commit baece1defd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift
View file

@ -42,13 +42,17 @@ class CustomMediaPlayerViewController: UIViewController {
var isWatchNextVisible: Bool = false var isWatchNextVisible: Bool = false
var lastDuration: Double = 0.0 var lastDuration: Double = 0.0
var watchNextButtonAppearedAt: Double? var watchNextButtonAppearedAt: Double?
var subtitleForegroundColor: String = "white" var subtitleForegroundColor: String = "white"
var subtitleBackgroundEnabled: Bool = true var subtitleBackgroundEnabled: Bool = true
var subtitleFontSize: Double = 20.0 var subtitleFontSize: Double = 20.0
var subtitleShadowRadius: Double = 1.0 var subtitleShadowRadius: Double = 1.0
var subtitlesLoader = VTTSubtitlesLoader() var subtitlesLoader = VTTSubtitlesLoader()
var subtitlesEnabled: Bool = true {
didSet {
subtitleLabel.isHidden = !subtitlesEnabled
}
}
var playerViewController: AVPlayerViewController! var playerViewController: AVPlayerViewController!
var controlsContainerView: UIView! var controlsContainerView: UIView!
@ -405,7 +409,7 @@ class CustomMediaPlayerViewController: UIViewController {
} }
func showSkipFeedback(direction: String) { func showSkipFeedback(direction: String) {
let diameter: CGFloat = 700.0 let diameter: CGFloat = 600
if let existingFeedback = view.viewWithTag(999) { if let existingFeedback = view.viewWithTag(999) {
existingFeedback.layer.removeAllAnimations() existingFeedback.layer.removeAllAnimations()
@ -417,6 +421,7 @@ class CustomMediaPlayerViewController: UIViewController {
circleView.layer.cornerRadius = diameter / 2 circleView.layer.cornerRadius = diameter / 2
circleView.clipsToBounds = true circleView.clipsToBounds = true
circleView.translatesAutoresizingMaskIntoConstraints = false circleView.translatesAutoresizingMaskIntoConstraints = false
circleView.isUserInteractionEnabled = false
circleView.tag = 999 circleView.tag = 999
let iconName = (direction == "forward") ? "goforward" : "gobackward" let iconName = (direction == "forward") ? "goforward" : "gobackward"
@ -688,7 +693,8 @@ class CustomMediaPlayerViewController: UIViewController {
UserDefaults.standard.set(self.currentTimeVal, forKey: "lastPlayedTime_\(self.fullUrl)") UserDefaults.standard.set(self.currentTimeVal, forKey: "lastPlayedTime_\(self.fullUrl)")
UserDefaults.standard.set(self.duration, forKey: "totalTime_\(self.fullUrl)") UserDefaults.standard.set(self.duration, forKey: "totalTime_\(self.fullUrl)")
if let currentCue = self.subtitlesLoader.cues.first(where: { self.currentTimeVal >= $0.startTime && self.currentTimeVal <= $0.endTime }) { if self.subtitlesEnabled,
let currentCue = self.subtitlesLoader.cues.first(where: { self.currentTimeVal >= $0.startTime && self.currentTimeVal <= $0.endTime }) {
self.subtitleLabel.text = currentCue.text.strippedHTML self.subtitleLabel.text = currentCue.text.strippedHTML
} else { } else {
self.subtitleLabel.text = "" self.subtitleLabel.text = ""
@ -1102,6 +1108,11 @@ class CustomMediaPlayerViewController: UIViewController {
var menuElements: [UIMenuElement] = [] var menuElements: [UIMenuElement] = []
if let subURL = subtitlesURL, !subURL.isEmpty { if let subURL = subtitlesURL, !subURL.isEmpty {
let subtitlesToggleAction = UIAction(title: "Toggle Subtitles") { [weak self] _ in
guard let self = self else { return }
self.subtitlesEnabled.toggle()
}
let foregroundActions = [ let foregroundActions = [
UIAction(title: "White") { _ in UIAction(title: "White") { _ in
SubtitleSettingsManager.shared.update { settings in settings.foregroundColor = "white" } SubtitleSettingsManager.shared.update { settings in settings.foregroundColor = "white" }
@ -1216,7 +1227,7 @@ class CustomMediaPlayerViewController: UIViewController {
] ]
let paddingMenu = UIMenu(title: "Bottom Padding", children: paddingActions) let paddingMenu = UIMenu(title: "Bottom Padding", children: paddingActions)
let subtitleOptionsMenu = UIMenu(title: "Subtitle Options", children: [colorMenu, fontSizeMenu, shadowMenu, backgroundMenu, paddingMenu]) let subtitleOptionsMenu = UIMenu(title: "Subtitle Options", children: [subtitlesToggleAction, colorMenu, fontSizeMenu, shadowMenu, backgroundMenu, paddingMenu])
menuElements = [subtitleOptionsMenu] menuElements = [subtitleOptionsMenu]
} }

2
Sora/Views/MediaInfoView/MediaInfoView.swift
View file

@ -250,7 +250,7 @@ struct MediaInfoView: View {
} }
}, },
onMarkAllPrevious: { onMarkAllPrevious: {
for ep2 in seasons[selectedSeason] { for ep2 in seasons[selectedSeason] where ep2.number < ep.number {
let href = ep2.href let href = ep2.href
UserDefaults.standard.set(99999999.0, forKey: "lastPlayedTime_\(href)") UserDefaults.standard.set(99999999.0, forKey: "lastPlayedTime_\(href)")
UserDefaults.standard.set(99999999.0, forKey: "totalTime_\(href)") UserDefaults.standard.set(99999999.0, forKey: "totalTime_\(href)")