Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-05 18:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Aspect ratio improvements

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-07-10 03:15:15 +02:00
parent 5f858bc6d4
commit 1e21c50b5d
7 changed files with 56 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Shared/Player/AppleAVPlayerViewController.swift
View File

@@ -12,7 +12,7 @@ final class AppleAVPlayerViewController: UIViewController {
let persistenceController = PersistenceController.shared
#if !os(tvOS)
#if os(iOS)
var aspectRatio: Double? {
let ratio = Double(playerView.videoBounds.width) / Double(playerView.videoBounds.height)

11
Shared/Player/VideoDetailsPaddingModifier.swift
View File

@@ -5,33 +5,22 @@ struct VideoDetailsPaddingModifier: ViewModifier {
static var defaultAdditionalDetailsPadding = 0.0
let playerSize: CGSize
let aspectRatio: Double?
let minimumHeightLeft: Double
let additionalPadding: Double
let fullScreen: Bool
init(
playerSize: CGSize,
aspectRatio: Double? = nil,
minimumHeightLeft: Double? = nil,
additionalPadding: Double? = nil,
fullScreen: Bool = false
) {
self.playerSize = playerSize
self.aspectRatio = aspectRatio ?? VideoPlayerView.defaultAspectRatio
self.minimumHeightLeft = minimumHeightLeft ?? VideoPlayerView.defaultMinimumHeightLeft
self.additionalPadding = additionalPadding ?? Self.defaultAdditionalDetailsPadding
self.fullScreen = fullScreen
}
var usedAspectRatio: Double {
guard aspectRatio != nil else {
return VideoPlayerView.defaultAspectRatio
}
return [aspectRatio!, VideoPlayerView.defaultAspectRatio].min()!
}
var playerHeight: Double {
playerSize.height
}

11
Shared/Player/VideoPlayerSizeModifier.swift
View File

@@ -33,18 +33,11 @@ struct VideoPlayerSizeModifier: ViewModifier {
}
var usedAspectRatio: Double {
guard aspectRatio != nil, aspectRatio != 0 else {
guard let aspectRatio = aspectRatio, aspectRatio != 0 else {
return VideoPlayerView.defaultAspectRatio
}
let ratio = [aspectRatio!, VideoPlayerView.defaultAspectRatio].min()!
let viewRatio = geometry.size.width / geometry.size.height
#if os(iOS)
return verticalSizeClass == .regular ? ratio : viewRatio
#else
return ratio
#endif
return [aspectRatio, VideoPlayerView.defaultAspectRatio].min()!
}
var usedAspectRatioContentMode: ContentMode {

37
Shared/Player/VideoPlayerView.swift
View File

@@ -188,7 +188,7 @@ struct VideoPlayerView: View {
.modifier(
VideoPlayerSizeModifier(
geometry: geometry,
aspectRatio: player.backend.aspectRatio,
aspectRatio: player.aspectRatio,
fullScreen: fullScreenLayout
)
)
@@ -212,17 +212,17 @@ struct VideoPlayerView: View {
guard drag > 0 else { return }
guard drag < 100 else {
player.hide()
return
}
viewVerticalOffset = drag
}
.onEnded { _ in
if viewVerticalOffset > 100 {
player.backend.setNeedsDrawing(false)
player.hide()
if player.playingFullScreen {
viewVerticalOffset = 0
player.exitFullScreen()
} else {
player.backend.setNeedsDrawing(false)
player.hide()
}
} else {
viewVerticalOffset = 0
player.backend.setNeedsDrawing(true)
@@ -260,7 +260,6 @@ struct VideoPlayerView: View {
.background(colorScheme == .dark ? Color.black : Color.white)
.modifier(VideoDetailsPaddingModifier(
playerSize: player.playerSize,
aspectRatio: player.backend.aspectRatio,
fullScreen: fullScreenDetails
))
}
@@ -299,15 +298,6 @@ struct VideoPlayerView: View {
switch player.activeBackend {
case .mpv:
player.mpvPlayerView
.overlay(GeometryReader { proxy in
Color.clear
.onAppear {
player.playerSize = proxy.size
}
.onChange(of: proxy.size) { _ in
player.playerSize = proxy.size
}
})
case .appleAVPlayer:
player.avPlayerView
#if os(iOS)
@@ -323,6 +313,15 @@ struct VideoPlayerView: View {
#endif
}
}
.overlay(GeometryReader { proxy in
Color.clear
.onAppear {
player.playerSize = proxy.size
}
.onChange(of: proxy.size) { _ in
player.playerSize = proxy.size
}
})
#if os(iOS)
.padding(.top, player.playingFullScreen && verticalSizeClass == .regular ? 20 : 0)
#endif
@@ -346,7 +345,7 @@ struct VideoPlayerView: View {
guard fullScreenLayout else { return 0 }
let idiom = UIDevice.current.userInterfaceIdiom
guard idiom == .pad else { return safeAreaInsets.top }
guard idiom == .pad else { return 0 }
return safeAreaInsets.top.isZero ? safeAreaInsets.bottom : safeAreaInsets.top
}