Creepso/Sora
1
0
Fork 0
mirror of https://github.com/cranci1/Sora.git synced 2026-03-11 17:45:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kinda fixed the title maybe?
Some checks are pending
Build and Release / Build IPA (push) Waiting to run
Details
Build and Release / Build Mac Catalyst (push) Waiting to run
Details

Browse source
This commit is contained in:
cranci1 2025-07-08 10:51:51 +02:00
parent 94735cd23d
commit 27b4212567
1 changed files with 45 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Sora/MediaUtils/CustomPlayer/CustomPlayer.swift
View file

@ -524,6 +524,8 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
super.viewWillTransition(to: size, with: coordinator) super.viewWillTransition(to: size, with: coordinator)
coordinator.animate(alongsideTransition: { _ in coordinator.animate(alongsideTransition: { _ in
self.updateMarqueeConstraints() self.updateMarqueeConstraints()
}, completion: { _ in
self.view.layoutIfNeeded()
}) })
} }
@ -1281,14 +1283,14 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
let t = currentTimeVal let t = currentTimeVal
let skipIntroAvailable = skipIntervals.op != nil && let skipIntroAvailable = skipIntervals.op != nil &&
t >= skipIntervals.op!.start.seconds && t >= skipIntervals.op!.start.seconds &&
t <= skipIntervals.op!.end.seconds && t <= skipIntervals.op!.end.seconds &&
!skipIntroDismissedInSession !skipIntroDismissedInSession
let skipOutroAvailable = skipIntervals.ed != nil && let skipOutroAvailable = skipIntervals.ed != nil &&
t >= skipIntervals.ed!.start.seconds && t >= skipIntervals.ed!.start.seconds &&
t <= skipIntervals.ed!.end.seconds && t <= skipIntervals.ed!.end.seconds &&
!skipOutroDismissedInSession !skipOutroDismissedInSession
let shouldShowSkip85 = isSkip85Visible && !skipIntroAvailable let shouldShowSkip85 = isSkip85Visible && !skipIntroAvailable
@ -3180,25 +3182,28 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
let skip85Visible = !(skip85Button?.isHidden ?? true) && (skip85Button?.alpha ?? 0) > 0.1 let skip85Visible = !(skip85Button?.isHidden ?? true) && (skip85Button?.alpha ?? 0) > 0.1
let skipOutroVisible = skipOutroButton.superview != nil && !skipOutroButton.isHidden && skipOutroButton.alpha > 0.1 let skipOutroVisible = skipOutroButton.superview != nil && !skipOutroButton.isHidden && skipOutroButton.alpha > 0.1
let isLandscape = view.bounds.width > view.bounds.height
let widthMultiplier: CGFloat = isLandscape ? 0.5 : 0.7
if skipIntroVisible && skipIntroButton?.superview != nil && titleStackView.superview != nil { if skipIntroVisible && skipIntroButton?.superview != nil && titleStackView.superview != nil {
titleStackAboveSkipButtonConstraints = [ titleStackAboveSkipButtonConstraints = [
titleStackView.leadingAnchor.constraint(equalTo: controlsContainerView.leadingAnchor, constant: 18), titleStackView.leadingAnchor.constraint(equalTo: controlsContainerView.leadingAnchor, constant: 18),
titleStackView.bottomAnchor.constraint(equalTo: skipIntroButton.topAnchor, constant: -4), titleStackView.bottomAnchor.constraint(equalTo: skipIntroButton.topAnchor, constant: -4),
titleStackView.widthAnchor.constraint(lessThanOrEqualTo: controlsContainerView.widthAnchor, multiplier: 0.7) titleStackView.widthAnchor.constraint(lessThanOrEqualTo: controlsContainerView.widthAnchor, multiplier: widthMultiplier)
] ]
NSLayoutConstraint.activate(titleStackAboveSkipButtonConstraints) NSLayoutConstraint.activate(titleStackAboveSkipButtonConstraints)
} else if skip85Visible && skip85Button?.superview != nil && titleStackView.superview != nil { } else if skip85Visible && skip85Button?.superview != nil && titleStackView.superview != nil {
titleStackAboveSkipButtonConstraints = [ titleStackAboveSkipButtonConstraints = [
titleStackView.leadingAnchor.constraint(equalTo: controlsContainerView.leadingAnchor, constant: 18), titleStackView.leadingAnchor.constraint(equalTo: controlsContainerView.leadingAnchor, constant: 18),
titleStackView.bottomAnchor.constraint(equalTo: skip85Button.topAnchor, constant: -4), titleStackView.bottomAnchor.constraint(equalTo: skip85Button.topAnchor, constant: -4),
titleStackView.widthAnchor.constraint(lessThanOrEqualTo: controlsContainerView.widthAnchor, multiplier: 0.7) titleStackView.widthAnchor.constraint(lessThanOrEqualTo: controlsContainerView.widthAnchor, multiplier: widthMultiplier)
] ]
NSLayoutConstraint.activate(titleStackAboveSkipButtonConstraints) NSLayoutConstraint.activate(titleStackAboveSkipButtonConstraints)
} else if let sliderView = sliderHostingController?.view, titleStackView.superview != nil { } else if let sliderView = sliderHostingController?.view, titleStackView.superview != nil {
titleStackAboveSliderConstraints = [ titleStackAboveSliderConstraints = [
titleStackView.leadingAnchor.constraint(equalTo: controlsContainerView.leadingAnchor, constant: 18), titleStackView.leadingAnchor.constraint(equalTo: controlsContainerView.leadingAnchor, constant: 18),
titleStackView.bottomAnchor.constraint(equalTo: sliderView.topAnchor, constant: -4), titleStackView.bottomAnchor.constraint(equalTo: sliderView.topAnchor, constant: -4),
titleStackView.widthAnchor.constraint(lessThanOrEqualTo: controlsContainerView.widthAnchor, multiplier: 0.7) titleStackView.widthAnchor.constraint(lessThanOrEqualTo: controlsContainerView.widthAnchor, multiplier: widthMultiplier)
] ]
NSLayoutConstraint.activate(titleStackAboveSliderConstraints) NSLayoutConstraint.activate(titleStackAboveSliderConstraints)
} }
@ -3416,7 +3421,13 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
episodeNumberLabel.centerYAnchor.constraint(equalTo: dismissButton.centerYAnchor) episodeNumberLabel.centerYAnchor.constraint(equalTo: dismissButton.centerYAnchor)
] ]
NSLayoutConstraint.activate(currentMarqueeConstraints) NSLayoutConstraint.activate(currentMarqueeConstraints)
updateMarqueeConstraintsForBottom()
view.layoutIfNeeded() view.layoutIfNeeded()
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
self.titleLabel?.restartLabel()
}
} }
} }
} }