diff --git a/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift b/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift index 089c453..3385865 100644 --- a/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift +++ b/Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift @@ -290,8 +290,10 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele self.watchNextButton.alpha = 1.0 self.view.layoutIfNeeded() } - - hiddenVolumeView.showsRouteButton = false + + if #unavailable(iOS 15) { + hiddenVolumeView.showsRouteButton = false + } hiddenVolumeView.isHidden = true view.addSubview(hiddenVolumeView) @@ -968,7 +970,11 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele skipIntroButton.setTitleColor(.white, for: .normal) skipIntroButton.layer.cornerRadius = 15 skipIntroButton.alpha = skipButtonBaseAlpha - skipIntroButton.contentEdgeInsets = UIEdgeInsets(top: 6, left: 10, bottom: 6, right: 10) + + if #unavailable(iOS 15) { + skipIntroButton.contentEdgeInsets = UIEdgeInsets(top: 6, left: 10, bottom: 6, right: 10) + } + skipIntroButton.layer.shadowColor = UIColor.black.cgColor skipIntroButton.layer.shadowOffset = CGSize(width: 0, height: 2) skipIntroButton.layer.shadowOpacity = 0.6 @@ -1001,7 +1007,11 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele skipOutroButton.setTitleColor(.white, for: .normal) skipOutroButton.layer.cornerRadius = skipIntroButton.layer.cornerRadius skipOutroButton.alpha = skipIntroButton.alpha - skipOutroButton.contentEdgeInsets = skipIntroButton.contentEdgeInsets + + if #unavailable(iOS 15) { + skipOutroButton.contentEdgeInsets = skipIntroButton.contentEdgeInsets + } + skipOutroButton.layer.shadowColor = skipIntroButton.layer.shadowColor skipOutroButton.layer.shadowOffset = skipIntroButton.layer.shadowOffset skipOutroButton.layer.shadowOpacity = skipIntroButton.layer.shadowOpacity @@ -1173,9 +1183,11 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele skip85Button.setTitleColor(.white, for: .normal) skip85Button.layer.cornerRadius = 21 skip85Button.alpha = 0.7 - - skip85Button.contentEdgeInsets = UIEdgeInsets(top: 6, left: 10, bottom: 6, right: 10) - + + if #unavailable(iOS 15) { + skip85Button.contentEdgeInsets = UIEdgeInsets(top: 6, left: 10, bottom: 6, right: 10) + } + skip85Button.layer.shadowColor = UIColor.black.cgColor skip85Button.layer.shadowOffset = CGSize(width: 0, height: 2) skip85Button.layer.shadowOpacity = 0.6 @@ -1312,9 +1324,6 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele self.topSubtitleLabel.isHidden = true } - let current = self.currentTimeVal - - DispatchQueue.main.async { if let currentItem = self.player.currentItem, currentItem.duration.seconds > 0 { let progress = min(max(self.currentTimeVal / self.duration, 0), 1.0) diff --git a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewAlternateAppIconPicker.swift b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewAlternateAppIconPicker.swift index 2b329ca..96c1861 100644 --- a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewAlternateAppIconPicker.swift +++ b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewAlternateAppIconPicker.swift @@ -33,6 +33,7 @@ struct SettingsViewAlternateAppIconPicker: View { .scaledToFit() .frame(width: 60, height: 60) .cornerRadius(10) + .shadow(radius: 6) .padding() .background( currentAppIcon == icon.name ? Color.accentColor.opacity(0.3) : Color.clear diff --git a/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/large.png b/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/large.png index 754c8b1..69e5e03 100644 Binary files a/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/large.png and b/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/large.png differ diff --git a/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/small.png b/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/small.png index 368683e..422b586 100644 Binary files a/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/small.png and b/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/small.png differ diff --git a/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/large_2.png b/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/large_2.png index ebcd8fa..4c6de2a 100644 Binary files a/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/large_2.png and b/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/large_2.png differ diff --git a/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/small_2.png b/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/small_2.png index 357a4c9..6cbf6f0 100644 Binary files a/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/small_2.png and b/SulfurTV/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/small_2.png differ