Creepso/Sora
1
0
Fork 0
mirror of https://github.com/cranci1/Sora.git synced 2026-01-11 20:10:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

buttons fixes

Browse source
This commit is contained in:
cranci1 2025-07-08 10:25:41 +02:00
parent 982fe468c8
commit 94735cd23d
1 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -177,6 +177,8 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
private var dimButtonToRight: NSLayoutConstraint! private var dimButtonToRight: NSLayoutConstraint!
private var dimButtonTimer: Timer? private var dimButtonTimer: Timer?
let cfg = UIImage.SymbolConfiguration(pointSize: 15, weight: .medium)
private var controlsToHide: [UIView] { private var controlsToHide: [UIView] {
var views = [ var views = [
dismissButton, dismissButton,
@ -1105,8 +1107,7 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
} }
func setupDismissButton() { func setupDismissButton() {
let config = UIImage.SymbolConfiguration(pointSize: 15, weight: .bold) let image = UIImage(systemName: "xmark", withConfiguration: cfg)
let image = UIImage(systemName: "xmark", withConfiguration: config)
let dismissCircle = createCircularBlurBackground(size: 42) let dismissCircle = createCircularBlurBackground(size: 42)
view.addSubview(dismissCircle) view.addSubview(dismissCircle)
@ -1534,15 +1535,13 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
skip85Button.leadingAnchor.constraint(equalTo: controlsContainerView.leadingAnchor, constant: 18), skip85Button.leadingAnchor.constraint(equalTo: controlsContainerView.leadingAnchor, constant: 18),
skip85Button.bottomAnchor.constraint(equalTo: sliderHostingController!.view.topAnchor, constant: -12), skip85Button.bottomAnchor.constraint(equalTo: sliderHostingController!.view.topAnchor, constant: -12),
skip85Button.heightAnchor.constraint(equalToConstant: 40), skip85Button.heightAnchor.constraint(equalToConstant: 40),
skip85Button.widthAnchor.constraint(greaterThanOrEqualToConstant: 97) skip85Button.widthAnchor.constraint(greaterThanOrEqualToConstant: 104)
] ]
NSLayoutConstraint.activate(skip85Constraints) NSLayoutConstraint.activate(skip85Constraints)
} }
private func setupQualityButton() { private func setupQualityButton() {
let config = UIImage.SymbolConfiguration(pointSize: 15, weight: .bold) let image = UIImage(systemName: "tv", withConfiguration: cfg)
let image = UIImage(systemName: "tv", withConfiguration: config)
qualityButton = UIButton(type: .system) qualityButton = UIButton(type: .system)
qualityButton.setImage(image, for: .normal) qualityButton.setImage(image, for: .normal)
@ -1815,8 +1814,6 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
} }
} }
@objc func toggleControls() { @objc func toggleControls() {
if controlsLocked { if controlsLocked {
unlockButton.alpha = 1.0 unlockButton.alpha = 1.0
@ -2112,6 +2109,8 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
dimButtonTimer?.invalidate() dimButtonTimer?.invalidate()
UIView.animate(withDuration: 0.25) { UIView.animate(withDuration: 0.25) {
self.blackCoverView.alpha = self.isDimmed ? 1.0 : 0.0 self.blackCoverView.alpha = self.isDimmed ? 1.0 : 0.0
let iconName = self.isDimmed ? "moon.fill" : "moon"
self.dimButton.setImage(UIImage(systemName: iconName, withConfiguration: self.cfg), for: .normal)
} }
} }
@ -3208,8 +3207,7 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
} }
func setupWatchNextButton() { func setupWatchNextButton() {
let config = UIImage.SymbolConfiguration(pointSize: 15, weight: .bold) let image = UIImage(systemName: "forward.end", withConfiguration: cfg)
let image = UIImage(systemName: "forward.end", withConfiguration: config)
watchNextButton = UIButton(type: .system) watchNextButton = UIButton(type: .system)
watchNextButton.setImage(image, for: .normal) watchNextButton.setImage(image, for: .normal)
@ -3221,7 +3219,6 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
} }
private func setupDimButton() { private func setupDimButton() {
let cfg = UIImage.SymbolConfiguration(pointSize: 15, weight: .medium)
dimButton = UIButton(type: .system) dimButton = UIButton(type: .system)
dimButton.setImage(UIImage(systemName: "moon", withConfiguration: cfg), for: .normal) dimButton.setImage(UIImage(systemName: "moon", withConfiguration: cfg), for: .normal)
dimButton.tintColor = .white dimButton.tintColor = .white
@ -3240,8 +3237,7 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
} }
func setupSpeedButton() { func setupSpeedButton() {
let config = UIImage.SymbolConfiguration(pointSize: 15, weight: .bold) let image = UIImage(systemName: "speedometer", withConfiguration: cfg)
let image = UIImage(systemName: "speedometer", withConfiguration: config)
speedButton = UIButton(type: .system) speedButton = UIButton(type: .system)
speedButton.setImage(image, for: .normal) speedButton.setImage(image, for: .normal)
@ -3255,8 +3251,7 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
} }
func setupMenuButton() { func setupMenuButton() {
let config = UIImage.SymbolConfiguration(pointSize: 15, weight: .bold) let image = UIImage(systemName: "captions.bubble", withConfiguration: cfg)
let image = UIImage(systemName: "captions.bubble", withConfiguration: config)
menuButton = UIButton(type: .system) menuButton = UIButton(type: .system)
menuButton.setImage(image, for: .normal) menuButton.setImage(image, for: .normal)
@ -3275,7 +3270,6 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
} }
private func setupLockButton() { private func setupLockButton() {
let cfg = UIImage.SymbolConfiguration(pointSize: 15, weight: .medium)
lockButton = UIButton(type: .system) lockButton = UIButton(type: .system)
lockButton.setImage( lockButton.setImage(
UIImage(systemName: "lock.open", withConfiguration: cfg), UIImage(systemName: "lock.open", withConfiguration: cfg),
@ -3295,10 +3289,10 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
} }
private func setupUnlockButton() { private func setupUnlockButton() {
let cfg = UIImage.SymbolConfiguration(pointSize: 40, weight: .medium) let config = UIImage.SymbolConfiguration(pointSize: 30, weight: .medium)
unlockButton = UIButton(type: .system) unlockButton = UIButton(type: .system)
unlockButton.setImage( unlockButton.setImage(
UIImage(systemName: "lock", withConfiguration: cfg), UIImage(systemName: "lock", withConfiguration: config),
for: .normal for: .normal
) )
unlockButton.tintColor = .white unlockButton.tintColor = .white
@ -3315,9 +3309,9 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
unlockButton.translatesAutoresizingMaskIntoConstraints = false unlockButton.translatesAutoresizingMaskIntoConstraints = false
NSLayoutConstraint.activate([ NSLayoutConstraint.activate([
unlockButton.centerXAnchor.constraint(equalTo: view.centerXAnchor), unlockButton.centerXAnchor.constraint(equalTo: view.centerXAnchor),
unlockButton.centerYAnchor.constraint(equalTo: view.centerYAnchor), unlockButton.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor),
unlockButton.widthAnchor.constraint(equalToConstant: 80), unlockButton.widthAnchor.constraint(equalToConstant: 60),
unlockButton.heightAnchor.constraint(equalToConstant: 80) unlockButton.heightAnchor.constraint(equalToConstant: 60)
]) ])
} }
@ -3379,8 +3373,7 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
pipController = AVPictureInPictureController(playerLayer: playerLayer) pipController = AVPictureInPictureController(playerLayer: playerLayer)
pipController?.delegate = self pipController?.delegate = self
let config = UIImage.SymbolConfiguration(pointSize: 15, weight: .medium) let Image = UIImage(systemName: "pip", withConfiguration: cfg)
let Image = UIImage(systemName: "pip", withConfiguration: config)
pipButton = UIButton(type: .system) pipButton = UIButton(type: .system)
pipButton.setImage(Image, for: .normal) pipButton.setImage(Image, for: .normal)
pipButton.tintColor = .white pipButton.tintColor = .white