Bring back iOS 14 and macOS 11

This commit is contained in:
Arkadiusz Fal 2023-10-15 13:46:30 +02:00
parent 94915b0496
commit 8258d8d5b4
7 changed files with 284 additions and 58 deletions

View File

@ -0,0 +1,97 @@
/*
Copyright © 2020 Apple Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
import SwiftUI
#if os(iOS)
public struct VisualEffectBlur<Content: View>: View {
/// Defaults to .systemMaterial
var blurStyle: UIBlurEffect.Style
/// Defaults to nil
var vibrancyStyle: UIVibrancyEffectStyle?
var content: Content
public init(blurStyle: UIBlurEffect.Style = .systemMaterial, vibrancyStyle: UIVibrancyEffectStyle? = nil, @ViewBuilder content: () -> Content) {
self.blurStyle = blurStyle
self.vibrancyStyle = vibrancyStyle
self.content = content()
}
public var body: some View {
Representable(blurStyle: blurStyle, vibrancyStyle: vibrancyStyle, content: ZStack { content })
.accessibility(hidden: Content.self == EmptyView.self)
}
}
// MARK: - Representable
extension VisualEffectBlur {
struct Representable<Content: View>: UIViewRepresentable {
var blurStyle: UIBlurEffect.Style
var vibrancyStyle: UIVibrancyEffectStyle?
var content: Content
func makeUIView(context: Context) -> UIVisualEffectView {
context.coordinator.blurView
}
func updateUIView(_: UIVisualEffectView, context: Context) {
context.coordinator.update(content: content, blurStyle: blurStyle, vibrancyStyle: vibrancyStyle)
}
func makeCoordinator() -> Coordinator {
Coordinator(content: content)
}
}
}
// MARK: - Coordinator
extension VisualEffectBlur.Representable {
class Coordinator {
let blurView = UIVisualEffectView()
let vibrancyView = UIVisualEffectView()
let hostingController: UIHostingController<Content>
init(content: Content) {
hostingController = UIHostingController(rootView: content)
hostingController.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
hostingController.view.backgroundColor = nil
blurView.contentView.addSubview(vibrancyView)
blurView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
vibrancyView.contentView.addSubview(hostingController.view)
vibrancyView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
}
func update(content: Content, blurStyle: UIBlurEffect.Style, vibrancyStyle: UIVibrancyEffectStyle?) {
hostingController.rootView = content
let blurEffect = UIBlurEffect(style: blurStyle)
blurView.effect = blurEffect
if let vibrancyStyle {
vibrancyView.effect = UIVibrancyEffect(blurEffect: blurEffect, style: vibrancyStyle)
} else {
vibrancyView.effect = nil
}
hostingController.view.setNeedsDisplay()
}
}
}
extension VisualEffectBlur where Content == EmptyView {
init(blurStyle: UIBlurEffect.Style = .systemMaterial) {
self.init(blurStyle: blurStyle, vibrancyStyle: nil) {
EmptyView()
}
}
}
#endif

View File

@ -0,0 +1,83 @@
/*
Copyright © 2020 Apple Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
import SwiftUI
#if os(macOS)
public struct VisualEffectBlur: View {
private var material: NSVisualEffectView.Material
private var blendingMode: NSVisualEffectView.BlendingMode
private var state: NSVisualEffectView.State
public init(
material: NSVisualEffectView.Material = .headerView,
blendingMode: NSVisualEffectView.BlendingMode = .withinWindow,
state: NSVisualEffectView.State = .followsWindowActiveState
) {
self.material = material
self.blendingMode = blendingMode
self.state = state
}
public var body: some View {
Representable(
material: material,
blendingMode: blendingMode,
state: state
).accessibility(hidden: true)
}
}
// MARK: - Representable
extension VisualEffectBlur {
struct Representable: NSViewRepresentable {
var material: NSVisualEffectView.Material
var blendingMode: NSVisualEffectView.BlendingMode
var state: NSVisualEffectView.State
func makeNSView(context: Context) -> NSVisualEffectView {
context.coordinator.visualEffectView
}
func updateNSView(_: NSVisualEffectView, context: Context) {
context.coordinator.update(material: material)
context.coordinator.update(blendingMode: blendingMode)
context.coordinator.update(state: state)
}
func makeCoordinator() -> Coordinator {
Coordinator()
}
}
class Coordinator {
let visualEffectView = NSVisualEffectView()
init() {
visualEffectView.blendingMode = .withinWindow
}
func update(material: NSVisualEffectView.Material) {
visualEffectView.material = material
}
func update(blendingMode: NSVisualEffectView.BlendingMode) {
visualEffectView.blendingMode = blendingMode
}
func update(state: NSVisualEffectView.State) {
visualEffectView.state = state
}
}
}
#endif

View File

@ -96,7 +96,7 @@ struct ChannelsView: View {
}
.backport
.refreshable {
subscriptions.load(force: true)
await subscriptions.load(force: true)
}
#endif
#if !os(tvOS)

View File

@ -29,7 +29,7 @@ struct FeedView: View {
}
.backport
.refreshable {
feed.loadResources(force: true)
await feed.loadResources(force: true)
}
#endif
#if !os(tvOS)

View File

@ -21,7 +21,7 @@ final class RefreshControl: ObservableObject {
let onValueChanged: (_ refreshControl: UIRefreshControl) -> Void
internal init(onValueChanged: @escaping ((UIRefreshControl) -> Void)) {
init(onValueChanged: @escaping ((UIRefreshControl) -> Void)) {
self.onValueChanged = onValueChanged
}

View File

@ -12,7 +12,7 @@ struct RefreshControlModifier: ViewModifier {
@State private var geometryReaderFrame: CGRect = .zero
let refreshControl: RefreshControl
internal init(onValueChanged: @escaping (UIRefreshControl) -> Void) {
init(onValueChanged: @escaping (UIRefreshControl) -> Void) {
refreshControl = RefreshControl(onValueChanged: onValueChanged)
}

View File

@ -432,6 +432,24 @@
37732FF42703D32400F04329 /* Sidebar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37732FF32703D32400F04329 /* Sidebar.swift */; };
37732FF52703D32400F04329 /* Sidebar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37732FF32703D32400F04329 /* Sidebar.swift */; };
37737786276F9858000521C1 /* Windows.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37737785276F9858000521C1 /* Windows.swift */; };
3773B7FE2ADC076800B5FEF3 /* RefreshControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B7F52ADC076800B5FEF3 /* RefreshControl.swift */; };
3773B8012ADC076800B5FEF3 /* README in Resources */ = {isa = PBXBuildFile; fileRef = 3773B7F62ADC076800B5FEF3 /* README */; };
3773B8022ADC076800B5FEF3 /* README in Resources */ = {isa = PBXBuildFile; fileRef = 3773B7F62ADC076800B5FEF3 /* README */; };
3773B8032ADC076800B5FEF3 /* README in Resources */ = {isa = PBXBuildFile; fileRef = 3773B7F62ADC076800B5FEF3 /* README */; };
3773B8042ADC076800B5FEF3 /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B7F82ADC076800B5FEF3 /* UIView+Extensions.swift */; };
3773B8062ADC076800B5FEF3 /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B7F82ADC076800B5FEF3 /* UIView+Extensions.swift */; };
3773B8072ADC076800B5FEF3 /* UIResponder+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B7F92ADC076800B5FEF3 /* UIResponder+Extensions.swift */; };
3773B8092ADC076800B5FEF3 /* UIResponder+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B7F92ADC076800B5FEF3 /* UIResponder+Extensions.swift */; };
3773B80A2ADC076800B5FEF3 /* RefreshControlModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B7FA2ADC076800B5FEF3 /* RefreshControlModifier.swift */; };
3773B80D2ADC076800B5FEF3 /* FramePreferenceKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B7FC2ADC076800B5FEF3 /* FramePreferenceKey.swift */; };
3773B80E2ADC076800B5FEF3 /* FramePreferenceKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B7FC2ADC076800B5FEF3 /* FramePreferenceKey.swift */; };
3773B80F2ADC076800B5FEF3 /* FramePreferenceKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B7FC2ADC076800B5FEF3 /* FramePreferenceKey.swift */; };
3773B8102ADC076800B5FEF3 /* ScrollViewMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B7FD2ADC076800B5FEF3 /* ScrollViewMatcher.swift */; };
3773B8122ADC076800B5FEF3 /* ScrollViewMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B7FD2ADC076800B5FEF3 /* ScrollViewMatcher.swift */; };
3773B8152ADC081300B5FEF3 /* VisualEffectBlur-iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B8132ADC081300B5FEF3 /* VisualEffectBlur-iOS.swift */; };
3773B8162ADC081300B5FEF3 /* VisualEffectBlur-iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B8132ADC081300B5FEF3 /* VisualEffectBlur-iOS.swift */; };
3773B8172ADC081300B5FEF3 /* VisualEffectBlur-macOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B8142ADC081300B5FEF3 /* VisualEffectBlur-macOS.swift */; };
3773B8182ADC081300B5FEF3 /* VisualEffectBlur-macOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3773B8142ADC081300B5FEF3 /* VisualEffectBlur-macOS.swift */; };
3774123327387CB000423605 /* Defaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372915E52687E3B900F5A35B /* Defaults.swift */; };
3774124927387D2300423605 /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AAF28F26740715007FC770 /* Channel.swift */; };
3774124A27387D2300423605 /* ContentItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FB28402721B22200A57617 /* ContentItem.swift */; };
@ -836,14 +854,6 @@
37DD9DA32785BBC900539416 /* NoCommentsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD9DA22785BBC900539416 /* NoCommentsView.swift */; };
37DD9DA42785BBC900539416 /* NoCommentsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD9DA22785BBC900539416 /* NoCommentsView.swift */; };
37DD9DA52785BBC900539416 /* NoCommentsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD9DA22785BBC900539416 /* NoCommentsView.swift */; };
37DD9DB12785D58D00539416 /* RefreshControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD9DAF2785D58D00539416 /* RefreshControl.swift */; };
37DD9DB42785D58D00539416 /* RefreshControlModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD9DB02785D58D00539416 /* RefreshControlModifier.swift */; };
37DD9DBA2785D60300539416 /* FramePreferenceKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD9DB82785D60200539416 /* FramePreferenceKey.swift */; };
37DD9DBB2785D60300539416 /* FramePreferenceKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD9DB82785D60200539416 /* FramePreferenceKey.swift */; };
37DD9DBC2785D60300539416 /* FramePreferenceKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD9DB82785D60200539416 /* FramePreferenceKey.swift */; };
37DD9DBD2785D60300539416 /* ScrollViewMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD9DB92785D60200539416 /* ScrollViewMatcher.swift */; };
37DD9DC62785D63A00539416 /* UIResponder+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD9DC22785D63A00539416 /* UIResponder+Extensions.swift */; };
37DD9DCB2785E28C00539416 /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD9DC12785D63A00539416 /* UIView+Extensions.swift */; };
37E04C0F275940FB00172673 /* VerticalScrollingFix.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E04C0E275940FB00172673 /* VerticalScrollingFix.swift */; };
37E084AC2753D95F00039B7D /* AccountsNavigationLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E084AB2753D95F00039B7D /* AccountsNavigationLink.swift */; };
37E084AD2753D95F00039B7D /* AccountsNavigationLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E084AB2753D95F00039B7D /* AccountsNavigationLink.swift */; };
@ -1196,6 +1206,15 @@
37732FEF2703A26300F04329 /* AccountValidationStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountValidationStatus.swift; sourceTree = "<group>"; };
37732FF32703D32400F04329 /* Sidebar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sidebar.swift; sourceTree = "<group>"; };
37737785276F9858000521C1 /* Windows.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Windows.swift; sourceTree = "<group>"; };
3773B7F52ADC076800B5FEF3 /* RefreshControl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RefreshControl.swift; sourceTree = "<group>"; };
3773B7F62ADC076800B5FEF3 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
3773B7F82ADC076800B5FEF3 /* UIView+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Extensions.swift"; sourceTree = "<group>"; };
3773B7F92ADC076800B5FEF3 /* UIResponder+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIResponder+Extensions.swift"; sourceTree = "<group>"; };
3773B7FA2ADC076800B5FEF3 /* RefreshControlModifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RefreshControlModifier.swift; sourceTree = "<group>"; };
3773B7FC2ADC076800B5FEF3 /* FramePreferenceKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FramePreferenceKey.swift; sourceTree = "<group>"; };
3773B7FD2ADC076800B5FEF3 /* ScrollViewMatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScrollViewMatcher.swift; sourceTree = "<group>"; };
3773B8132ADC081300B5FEF3 /* VisualEffectBlur-iOS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "VisualEffectBlur-iOS.swift"; sourceTree = "<group>"; };
3773B8142ADC081300B5FEF3 /* VisualEffectBlur-macOS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "VisualEffectBlur-macOS.swift"; sourceTree = "<group>"; };
37758C0A2A1D1C8B001FD900 /* HideWatchedButtons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HideWatchedButtons.swift; sourceTree = "<group>"; };
3776924D294630110055EC18 /* ChannelAvatarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelAvatarView.swift; sourceTree = "<group>"; };
3776925129463C310055EC18 /* PlaylistsCacheModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaylistsCacheModel.swift; sourceTree = "<group>"; };
@ -1682,6 +1701,8 @@
3722AEBB274DA396005EA4D6 /* Badge+Backport.swift */,
377E17132928265900894889 /* ListRowSeparator+Backport.swift */,
37136CAB286273060095C0CF /* PersistentSystemOverlays+Backport.swift */,
3773B8132ADC081300B5FEF3 /* VisualEffectBlur-iOS.swift */,
3773B8142ADC081300B5FEF3 /* VisualEffectBlur-macOS.swift */,
3759234528C26C7B00C052EC /* Refreshable+Backport.swift */,
37E80F3F287B472300561799 /* ScrollContentBackground+Backport.swift */,
376E331128AD3B320070E30C /* ScrollDismissesKeyboard+Backport.swift */,
@ -1854,6 +1875,57 @@
path = Modifiers;
sourceTree = "<group>";
};
3773B7D12ADC05FF00B5FEF3 /* Recovered References */ = {
isa = PBXGroup;
children = (
37DD9DC12785D63A00539416 /* UIView+Extensions.swift */,
37DD9DAF2785D58D00539416 /* RefreshControl.swift */,
37DD9DB02785D58D00539416 /* RefreshControlModifier.swift */,
37DD9DB82785D60200539416 /* FramePreferenceKey.swift */,
37DD9DB92785D60200539416 /* ScrollViewMatcher.swift */,
37DD9DC22785D63A00539416 /* UIResponder+Extensions.swift */,
);
name = "Recovered References";
sourceTree = "<group>";
};
3773B7F32ADC076800B5FEF3 /* Vendor */ = {
isa = PBXGroup;
children = (
3773B7F42ADC076800B5FEF3 /* RefreshControl */,
);
path = Vendor;
sourceTree = "<group>";
};
3773B7F42ADC076800B5FEF3 /* RefreshControl */ = {
isa = PBXGroup;
children = (
3773B7F52ADC076800B5FEF3 /* RefreshControl.swift */,
3773B7F62ADC076800B5FEF3 /* README */,
3773B7F72ADC076800B5FEF3 /* Extensions */,
3773B7FA2ADC076800B5FEF3 /* RefreshControlModifier.swift */,
3773B7FB2ADC076800B5FEF3 /* ScrollViewMatcher */,
);
path = RefreshControl;
sourceTree = "<group>";
};
3773B7F72ADC076800B5FEF3 /* Extensions */ = {
isa = PBXGroup;
children = (
3773B7F82ADC076800B5FEF3 /* UIView+Extensions.swift */,
3773B7F92ADC076800B5FEF3 /* UIResponder+Extensions.swift */,
);
path = Extensions;
sourceTree = "<group>";
};
3773B7FB2ADC076800B5FEF3 /* ScrollViewMatcher */ = {
isa = PBXGroup;
children = (
3773B7FC2ADC076800B5FEF3 /* FramePreferenceKey.swift */,
3773B7FD2ADC076800B5FEF3 /* ScrollViewMatcher.swift */,
);
path = ScrollViewMatcher;
sourceTree = "<group>";
};
377F9F79294403DC0043F856 /* Cache */ = {
isa = PBXGroup;
children = (
@ -2007,6 +2079,7 @@
37D4B159267164AE00C925CA /* tvOS */,
37D4B1B72672CFE300C925CA /* Model */,
37D4B0C12671614700C925CA /* Shared */,
3773B7F32ADC076800B5FEF3 /* Vendor */,
3722AEBA274DA312005EA4D6 /* Backports */,
37C7A9022679058300E721B4 /* Extensions */,
3748186426A762300084E870 /* Fixtures */,
@ -2019,6 +2092,7 @@
37D4B0E12671614900C925CA /* Tests macOS */,
3DA101AC287C30F50027D920 /* Xcode-config */,
37D9169A27388A81002B1BAA /* README.md */,
3773B7D12ADC05FF00B5FEF3 /* Recovered References */,
);
sourceTree = "<group>";
};
@ -2167,44 +2241,6 @@
path = Model;
sourceTree = "<group>";
};
37DD9DAE2785D58D00539416 /* RefreshControl */ = {
isa = PBXGroup;
children = (
37DD9DC02785D63A00539416 /* Extensions */,
37DD9DB72785D60200539416 /* ScrollViewMatcher */,
37DD9DAF2785D58D00539416 /* RefreshControl.swift */,
37DD9DB02785D58D00539416 /* RefreshControlModifier.swift */,
);
path = RefreshControl;
sourceTree = "<group>";
};
37DD9DB72785D60200539416 /* ScrollViewMatcher */ = {
isa = PBXGroup;
children = (
37DD9DB82785D60200539416 /* FramePreferenceKey.swift */,
37DD9DB92785D60200539416 /* ScrollViewMatcher.swift */,
);
path = ScrollViewMatcher;
sourceTree = "<group>";
};
37DD9DC02785D63A00539416 /* Extensions */ = {
isa = PBXGroup;
children = (
37DD9DC22785D63A00539416 /* UIResponder+Extensions.swift */,
37DD9DC12785D63A00539416 /* UIView+Extensions.swift */,
);
path = Extensions;
sourceTree = "<group>";
};
37DD9DCC2785EE6F00539416 /* Vendor */ = {
isa = PBXGroup;
children = (
3749BF6C27ADA135000480FF /* mpv */,
37DD9DAE2785D58D00539416 /* RefreshControl */,
);
path = Vendor;
sourceTree = "<group>";
};
37E6D79A2944ADCB00550C3D /* Subscriptions */ = {
isa = PBXGroup;
children = (
@ -2630,6 +2666,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3773B8012ADC076800B5FEF3 /* README in Resources */,
37D4B0E82671614900C925CA /* Assets.xcassets in Resources */,
375B537428DF6CBB004C1D19 /* Localizable.strings in Resources */,
);
@ -2639,6 +2676,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3773B8022ADC076800B5FEF3 /* README in Resources */,
37D4B0E92671614900C925CA /* Assets.xcassets in Resources */,
375B537528DF6CBB004C1D19 /* Localizable.strings in Resources */,
);
@ -2662,6 +2700,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3773B8032ADC076800B5FEF3 /* README in Resources */,
37D4B1862671691600C925CA /* Assets.xcassets in Resources */,
375B537628DF6CBB004C1D19 /* Localizable.strings in Resources */,
37D4B15F267164AF00C925CA /* Assets.xcassets in Resources */,
@ -2825,6 +2864,7 @@
37A362BE29537AAA00BDF328 /* PlaybackSettings.swift in Sources */,
371B7E612759706A00D21217 /* CommentsView.swift in Sources */,
37D9BA0629507F69002586BD /* PlayerControlsSettings.swift in Sources */,
3773B80A2ADC076800B5FEF3 /* RefreshControlModifier.swift in Sources */,
379DC3D128BA4EB400B09677 /* Seek.swift in Sources */,
371B7E6A2759791900D21217 /* CommentsModel.swift in Sources */,
37E8B0F027B326F30024006F /* Comparable+Clamped.swift in Sources */,
@ -2853,7 +2893,6 @@
37130A5B277657090033018A /* Yattee.xcdatamodeld in Sources */,
37152EEA26EFEB95004FB96D /* LazyView.swift in Sources */,
3761ABFD26F0F8DE00AA496F /* EnvironmentValues.swift in Sources */,
37DD9DCB2785E28C00539416 /* UIView+Extensions.swift in Sources */,
377FF88F291A99580028EB0B /* HistoryView.swift in Sources */,
3782B94F27553A6700990149 /* SearchSuggestions.swift in Sources */,
378E50FF26FE8EEE00F49626 /* AccountViewButton.swift in Sources */,
@ -2888,13 +2927,13 @@
37B81AF926D2C9A700675966 /* VideoPlayerSizeModifier.swift in Sources */,
37C0698227260B2100F7F6CB /* ThumbnailsModel.swift in Sources */,
37BC50A82778A84700510953 /* HistorySettings.swift in Sources */,
37DD9DB12785D58D00539416 /* RefreshControl.swift in Sources */,
37BDFF1F29488117000C6404 /* ChannelPlaylistListItem.swift in Sources */,
371CC76C29466F5A00979C1A /* AccountsViewModel.swift in Sources */,
37B4E805277D0AB4004BF56A /* Orientation.swift in Sources */,
37DD87C7271C9CFE0027CBF9 /* PlayerStreams.swift in Sources */,
37F7D82C289EB05F00E2B3D0 /* SettingsPickerModifier.swift in Sources */,
375EC95D289EEEE000751258 /* QualityProfile.swift in Sources */,
3773B8102ADC076800B5FEF3 /* ScrollViewMatcher.swift in Sources */,
371B7E662759786B00D21217 /* Comment+Fixtures.swift in Sources */,
37BE0BD326A1D4780092E2DB /* AppleAVPlayerView.swift in Sources */,
37A9965E26D6F9B9006E3224 /* HomeView.swift in Sources */,
@ -2906,6 +2945,7 @@
3722AEBC274DA396005EA4D6 /* Badge+Backport.swift in Sources */,
3748186626A7627F0084E870 /* Video+Fixtures.swift in Sources */,
37599F34272B44000087F250 /* FavoritesModel.swift in Sources */,
3773B8152ADC081300B5FEF3 /* VisualEffectBlur-iOS.swift in Sources */,
3717407D2949D40800FDDBC7 /* ChannelLinkView.swift in Sources */,
379ACB512A1F8DB000E01914 /* HomeSettingsButton.swift in Sources */,
37030FF727B0347C00ECDDAA /* MPVPlayerView.swift in Sources */,
@ -2916,7 +2956,6 @@
3751B4B227836902000B7DF4 /* SearchPage.swift in Sources */,
37CC3F4C270CFE1700608308 /* PlayerQueueView.swift in Sources */,
37FFC440272734C3009FFD26 /* Throttle.swift in Sources */,
37DD9DB42785D58D00539416 /* RefreshControlModifier.swift in Sources */,
3709528A29283E14001ECA40 /* NoDocumentsView.swift in Sources */,
3705B182267B4E4900704544 /* TrendingCategory.swift in Sources */,
378AE940274EDFB5006A4EE1 /* Tint+Backport.swift in Sources */,
@ -2967,7 +3006,6 @@
37BC50AC2778BCBA00510953 /* HistoryModel.swift in Sources */,
37AAF29026740715007FC770 /* Channel.swift in Sources */,
37F5C7E02A1E2AF300927B73 /* ListView.swift in Sources */,
37DD9DBA2785D60300539416 /* FramePreferenceKey.swift in Sources */,
3748186A26A764FB0084E870 /* Thumbnail+Fixtures.swift in Sources */,
37B81AFF26D2CA3700675966 /* VideoDetails.swift in Sources */,
377FC7E5267A084E00A6BBAF /* SearchView.swift in Sources */,
@ -2988,6 +3026,7 @@
377A20A92693C9A2002842B8 /* TypedContentAccessors.swift in Sources */,
37484C3126FCB8F900287258 /* AccountValidator.swift in Sources */,
377ABC48286E5887009C986F /* Sequence+Unique.swift in Sources */,
3773B8172ADC081300B5FEF3 /* VisualEffectBlur-macOS.swift in Sources */,
37520699285E8DD300CA655F /* Chapter.swift in Sources */,
37C7B21429ABD9F20013C196 /* ChannelPage.swift in Sources */,
37319F0527103F94004ECCD0 /* PlayerQueue.swift in Sources */,
@ -3002,6 +3041,7 @@
3784B23B272894DA00B09468 /* ShareSheet.swift in Sources */,
379775932689365600DD52A8 /* Array+Next.swift in Sources */,
37CFB48528AFE2510070024C /* VideoDescription.swift in Sources */,
3773B8042ADC076800B5FEF3 /* UIView+Extensions.swift in Sources */,
37B81AFC26D2C9C900675966 /* VideoDetailsPaddingModifier.swift in Sources */,
371CC77029468BDC00979C1A /* SettingsButtons.swift in Sources */,
37C7A1D5267BFD9D0010EAD6 /* SponsorBlockSegment.swift in Sources */,
@ -3016,7 +3056,6 @@
37DCD3152A18F7630059A470 /* SafeAreaModel.swift in Sources */,
37D526DE2720AC4400ED2F5E /* VideosAPI.swift in Sources */,
37484C2526FC83E000287258 /* InstanceForm.swift in Sources */,
37DD9DBD2785D60300539416 /* ScrollViewMatcher.swift in Sources */,
37B767DB2677C3CA0098BAA8 /* PlayerModel.swift in Sources */,
371CC7742946963000979C1A /* ListingStyleButtons.swift in Sources */,
3788AC2726F6840700F6BAA9 /* FavoriteItemView.swift in Sources */,
@ -3026,7 +3065,6 @@
373031F528383A89000CFD59 /* PiPDelegate.swift in Sources */,
37F5E8BA291BEF69006C15F5 /* BaseCacheModel.swift in Sources */,
371AC09F294D13AA0085989E /* UnwatchedFeedCountModel.swift in Sources */,
37DD9DC62785D63A00539416 /* UIResponder+Extensions.swift in Sources */,
370015A928BBAE7F000149FD /* ProgressBar.swift in Sources */,
37C3A24927235FAA0087A57A /* ChannelPlaylistCell.swift in Sources */,
377E17142928265900894889 /* ListRowSeparator+Backport.swift in Sources */,
@ -3046,6 +3084,7 @@
37EF5C222739D37B00B03725 /* MenuModel.swift in Sources */,
37599F30272B42810087F250 /* FavoriteItem.swift in Sources */,
374924E729215FB60017D862 /* TapRecognizerViewModifier.swift in Sources */,
3773B8072ADC076800B5FEF3 /* UIResponder+Extensions.swift in Sources */,
373197D92732015300EF734F /* RelatedView.swift in Sources */,
3710A55529488C7D006F8025 /* PlaceholderListItem.swift in Sources */,
37F4AD1B28612B23004D0F66 /* OpeningStream.swift in Sources */,
@ -3054,6 +3093,7 @@
370E990A2A1EA8C500D144E9 /* WatchModel.swift in Sources */,
371AC0B6294D1D6E0085989E /* PlayingIndicatorView.swift in Sources */,
37E084AC2753D95F00039B7D /* AccountsNavigationLink.swift in Sources */,
3773B7FE2ADC076800B5FEF3 /* RefreshControl.swift in Sources */,
378E9C38294552A700B2D696 /* ThumbnailView.swift in Sources */,
37732FF42703D32400F04329 /* Sidebar.swift in Sources */,
37D4B19726717E1500C925CA /* Video.swift in Sources */,
@ -3095,6 +3135,7 @@
3784CDE227772EE40055BBF2 /* Watch.swift in Sources */,
37FB285E272225E800A57617 /* ContentItemView.swift in Sources */,
3797758B2689345500DD52A8 /* Store.swift in Sources */,
3773B80D2ADC076800B5FEF3 /* FramePreferenceKey.swift in Sources */,
377F9F7B294403F20043F856 /* VideosCacheModel.swift in Sources */,
37B795902771DAE0001CF27B /* OpenURLHandler.swift in Sources */,
37732FF02703A26300F04329 /* AccountValidationStatus.swift in Sources */,
@ -3160,8 +3201,8 @@
37192D5828B179D60012EEDD /* ChaptersView.swift in Sources */,
3784CDE327772EE40055BBF2 /* Watch.swift in Sources */,
371AC0B7294D1D6E0085989E /* PlayingIndicatorView.swift in Sources */,
3773B8182ADC081300B5FEF3 /* VisualEffectBlur-macOS.swift in Sources */,
37E80F3D287B107F00561799 /* VideoDetailsOverlay.swift in Sources */,
37DD9DBB2785D60300539416 /* FramePreferenceKey.swift in Sources */,
375DFB5926F9DA010013F468 /* InstancesModel.swift in Sources */,
3705B183267B4E4900704544 /* TrendingCategory.swift in Sources */,
37D2E0D128B67DBC00F64D52 /* AnimationCompletionObserverModifier.swift in Sources */,
@ -3192,6 +3233,7 @@
3788AC2826F6840700F6BAA9 /* FavoriteItemView.swift in Sources */,
377FF88C291A60310028EB0B /* OpenVideosModel.swift in Sources */,
378AE93A274EDFAF006A4EE1 /* Badge+Backport.swift in Sources */,
3773B8162ADC081300B5FEF3 /* VisualEffectBlur-iOS.swift in Sources */,
37599F35272B44000087F250 /* FavoritesModel.swift in Sources */,
376527BC285F60F700102284 /* PlayerTimeModel.swift in Sources */,
37F64FE526FE70A60081B69E /* RedrawOnModifier.swift in Sources */,
@ -3363,6 +3405,7 @@
377ABC41286E4AD5009C986F /* InstancesManifest.swift in Sources */,
373CFAF02697A78B003CB2C6 /* AddToPlaylistView.swift in Sources */,
3763495226DFF59D00B9A393 /* AppSidebarRecents.swift in Sources */,
3773B80E2ADC076800B5FEF3 /* FramePreferenceKey.swift in Sources */,
370015AA28BBAE7F000149FD /* ProgressBar.swift in Sources */,
371B7E672759786B00D21217 /* Comment+Fixtures.swift in Sources */,
3769C02F2779F18600DDB3EA /* PlaceholderProgressView.swift in Sources */,
@ -3441,7 +3484,6 @@
375EC95F289EEEE000751258 /* QualityProfile.swift in Sources */,
37EAD871267B9ED100D9E01B /* Segment.swift in Sources */,
373C8FE6275B955100CB5936 /* CommentsPage.swift in Sources */,
37DD9DBC2785D60300539416 /* FramePreferenceKey.swift in Sources */,
375EC974289F2ABF00751258 /* MultiselectRow.swift in Sources */,
37EBD8C827AF26B300F1C24B /* AVPlayerBackend.swift in Sources */,
378E9C3E2945565500B2D696 /* SubscriptionsView.swift in Sources */,
@ -3524,6 +3566,7 @@
37A362C429537FED00BDF328 /* PlaybackSettingsPresentationDetents+Backport.swift in Sources */,
37BDFF1929487B99000C6404 /* PlaylistVideosView.swift in Sources */,
37B7CFEF2A197A08001B0564 /* SafeAreaModel.swift in Sources */,
3773B8092ADC076800B5FEF3 /* UIResponder+Extensions.swift in Sources */,
37C0698427260B2100F7F6CB /* ThumbnailsModel.swift in Sources */,
374924DC2921050B0017D862 /* LocationsSettings.swift in Sources */,
37D6025B28C17375009E8D98 /* PlaybackStatsView.swift in Sources */,
@ -3538,6 +3581,7 @@
37B044B926F7AB9000E1419D /* SettingsView.swift in Sources */,
3743B86A27216D3600261544 /* ChannelCell.swift in Sources */,
3751BA8527E6914F007B1A60 /* ReturnYouTubeDislikeAPI.swift in Sources */,
3773B8062ADC076800B5FEF3 /* UIView+Extensions.swift in Sources */,
37769250294630110055EC18 /* ChannelAvatarView.swift in Sources */,
37030FFD27B0398000ECDDAA /* MPVClient.swift in Sources */,
378E9C4229455A5800B2D696 /* ChannelsView.swift in Sources */,
@ -3616,6 +3660,7 @@
37C069802725C8D400F7F6CB /* CMTime+DefaultTimescale.swift in Sources */,
37EBD8CC27AF26C200F1C24B /* MPVBackend.swift in Sources */,
3711404126B206A6005B3555 /* SearchModel.swift in Sources */,
3773B80F2ADC076800B5FEF3 /* FramePreferenceKey.swift in Sources */,
37FD77022932C4DA00D91A5F /* URL+ByReplacingYatteeProtocol.swift in Sources */,
37FEF11527EFD8580033912F /* PlaceholderCell.swift in Sources */,
37FD43F02704A9C00073EE42 /* RecentsModel.swift in Sources */,
@ -3679,6 +3724,7 @@
37D2E0D228B67DBC00F64D52 /* AnimationCompletionObserverModifier.swift in Sources */,
37AAF2A226741C97007FC770 /* FeedView.swift in Sources */,
37484C1B26FC837400287258 /* PlayerSettings.swift in Sources */,
3773B8122ADC076800B5FEF3 /* ScrollViewMatcher.swift in Sources */,
372915E82687E3B900F5A35B /* Defaults.swift in Sources */,
37BAB54C269B39FD00E75ED1 /* TVNavigationView.swift in Sources */,
3718B9A62921A9BE0003DB2E /* PreferenceKeys.swift in Sources */,