ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implement (#777)

This commit is contained in:
Ethan Pippin 2023-05-16 17:31:44 -06:00 committed by GitHub
parent ce7ad236fc
commit 84192c20d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Swiftfin.xcodeproj/project.pbxproj
View File

@ -463,6 +463,7 @@
E18A8E8128D6083700333B9A /* MediaSourceInfo+ItemVideoPlayerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E18A8E7F28D6083700333B9A /* MediaSourceInfo+ItemVideoPlayerViewModel.swift */; };
E18A8E8328D60BC400333B9A /* VideoPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = E18A8E8228D60BC400333B9A /* VideoPlayer.swift */; };
E18A8E8528D60D0000333B9A /* VideoPlayerCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E18A8E8428D60D0000333B9A /* VideoPlayerCoordinator.swift */; };
E18ACA8B2A14301800BB4F35 /* ScalingButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = E18ACA8A2A14301800BB4F35 /* ScalingButtonStyle.swift */; };
E18CE0AF28A222240092E7F1 /* PublicUserSignInView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E18CE0AE28A222240092E7F1 /* PublicUserSignInView.swift */; };
E18CE0B228A229E70092E7F1 /* UserDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = E18CE0B128A229E70092E7F1 /* UserDto.swift */; };
E18CE0B428A22EDA0092E7F1 /* RepeatingTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = E18CE0B328A22EDA0092E7F1 /* RepeatingTimer.swift */; };
@ -1068,6 +1069,7 @@
E18A8E7F28D6083700333B9A /* MediaSourceInfo+ItemVideoPlayerViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MediaSourceInfo+ItemVideoPlayerViewModel.swift"; sourceTree = "<group>"; };
E18A8E8228D60BC400333B9A /* VideoPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoPlayer.swift; sourceTree = "<group>"; };
E18A8E8428D60D0000333B9A /* VideoPlayerCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoPlayerCoordinator.swift; sourceTree = "<group>"; };
E18ACA8A2A14301800BB4F35 /* ScalingButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScalingButtonStyle.swift; sourceTree = "<group>"; };
E18CE0AE28A222240092E7F1 /* PublicUserSignInView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PublicUserSignInView.swift; sourceTree = "<group>"; };
E18CE0B128A229E70092E7F1 /* UserDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDto.swift; sourceTree = "<group>"; };
E18CE0B328A22EDA0092E7F1 /* RepeatingTimer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepeatingTimer.swift; sourceTree = "<group>"; };
@ -2621,6 +2623,7 @@
children = (
E1FBDB6529D0F336003DD5E2 /* KeyCommandAction.swift */,
E1E48CC8271E6D410021A2F9 /* RefreshHelper.swift */,
E18ACA8A2A14301800BB4F35 /* ScalingButtonStyle.swift */,
);
path = Objects;
sourceTree = "<group>";
@ -3263,6 +3266,7 @@
E18E0208288749200022598C /* BlurView.swift in Sources */,
E18E01E7288747230022598C /* CollectionItemContentView.swift in Sources */,
E1E1643F28BB075C00323B0A /* SelectorView.swift in Sources */,
E18ACA8B2A14301800BB4F35 /* ScalingButtonStyle.swift in Sources */,
E17665D928E80F0F00130507 /* PosterButtonType.swift in Sources */,
E18E01DF288747230022598C /* iPadOSMovieItemView.swift in Sources */,
E168BD13289A4162001A6922 /* ContinueWatchingView.swift in Sources */,

26
Swiftfin/Objects/ScalingButtonStyle.swift Normal file
View File

@ -0,0 +1,26 @@
//
// Swiftfin is subject to the terms of the Mozilla Public
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
//
import SwiftUI
struct ScalingButtonStyle: ButtonStyle {
private let animation: Animation
private let scale: CGFloat
init(scale: CGFloat = 0.8, animation: Animation = .linear(duration: 0.1)) {
self.animation = animation
self.scale = scale
}
func makeBody(configuration: Configuration) -> some View {
configuration.label
.scaleEffect(configuration.isPressed ? scale : 1)
.animation(animation, value: configuration.isPressed)
}
}

2
Swiftfin/Views/FontPickerView.swift
View File

@ -30,7 +30,7 @@ struct FontPickerView: View {
)
.label { fontFamily in
Text(fontFamily)
.foregroundColor(.white)
.foregroundColor(.primary)
.font(.custom(fontFamily, size: 18))
}
.onChange(of: updateSelection) { newValue in

3
Swiftfin/Views/SettingsView/ExperimentalSettingsView.swift
View File

@ -26,7 +26,8 @@ struct ExperimentalSettingsView: View {
Toggle("Force Direct Play", isOn: $forceDirectPlay)
// Toggle("Sync Subtitles with Adjacent Episodes", isOn: $syncSubtitleStateWithAdjacent)
} header: {
Text("Video Player")
}
Section {

4
Swiftfin/Views/VideoPlayer/Overlays/Components/PlaybackButtons/LargePlaybackButtons.swift
View File

@ -40,6 +40,7 @@ extension VideoPlayer.Overlay {
.contentShape(Rectangle())
}
.contentShape(Rectangle())
.buttonStyle(ScalingButtonStyle(scale: 0.9))
}
@ViewBuilder
@ -66,9 +67,11 @@ extension VideoPlayer.Overlay {
}
.font(.system(size: 56, weight: .bold, design: .default))
.padding()
.transition(.opacity)
.contentShape(Rectangle())
}
.contentShape(Rectangle())
.buttonStyle(ScalingButtonStyle(scale: 0.9))
}
@ViewBuilder
@ -83,6 +86,7 @@ extension VideoPlayer.Overlay {
.contentShape(Rectangle())
}
.contentShape(Rectangle())
.buttonStyle(ScalingButtonStyle(scale: 0.9))
}
var body: some View {

2
Swiftfin/Views/VideoPlayer/Overlays/Components/TopBarView.swift
View File

@ -36,6 +36,7 @@ extension VideoPlayer.Overlay {
Image(systemName: "xmark")
.padding()
}
.buttonStyle(ScalingButtonStyle(scale: 0.8))
Text(viewModel.item.displayTitle)
.font(.title3)
@ -48,6 +49,7 @@ extension VideoPlayer.Overlay {
Spacer()
VideoPlayer.Overlay.BarActionButtons()
.buttonStyle(ScalingButtonStyle(scale: 0.8))
}
.font(.system(size: 24))
.tint(Color.white)

1
Swiftfin/Views/VideoPlayer/VideoPlayer.swift
View File

@ -201,6 +201,7 @@ struct VideoPlayer: View {
playerView
} else {
LoadingView()
.transition(.opacity)
}
}
.navigationBarHidden(true)