Fix SwiftFormat and SwiftLint issues

- Fix indentation in AppSidebarNavigation, VideoCell
- Replace && with comma in PlayerModel condition
- Add SwiftLint suppression for necessary tvOS 17.0 availability check
- Update SwiftLint config to use renamed rules and disable false positives
This commit is contained in:
Arkadiusz Fal
2025-11-20 17:05:22 +01:00
parent 9a8ccc366c
commit 36738572da
5 changed files with 14 additions and 4 deletions

View File

@@ -8,6 +8,15 @@ disabled_rules:
- multiline_arguments - multiline_arguments
- implicit_return - implicit_return
- closure_end_indentation - closure_end_indentation
- discarded_notification_center_observer # Observer intentionally lives for app lifetime
# Disable deprecated rules in favor of their renamed versions
- operator_whitespace # renamed to function_name_whitespace
- redundant_optional_initialization # renamed to implicit_optional_initialization
opt_in_rules:
- function_name_whitespace
- implicit_optional_initialization
excluded: excluded:
- Vendor - Vendor
- Tests Apple TV - Tests Apple TV

View File

@@ -650,7 +650,7 @@ final class PlayerModel: ObservableObject {
// When switching away from AVPlayer, clear its current item to release Now Playing control // When switching away from AVPlayer, clear its current item to release Now Playing control
#if !os(macOS) #if !os(macOS)
if from == .appleAVPlayer && to == .mpv { if from == .appleAVPlayer, to == .mpv {
avPlayerBackend.avPlayer.replaceCurrentItem(with: nil) avPlayerBackend.avPlayer.replaceCurrentItem(with: nil)
// Clear Now Playing info entirely before MPV takes over // Clear Now Playing info entirely before MPV takes over

View File

@@ -15,7 +15,7 @@ struct AppSidebarNavigation: View {
var body: some View { var body: some View {
#if os(iOS) #if os(iOS)
content.introspect(.viewController, on: .iOS(.v15, .v16, .v17, .v18, .v26)) { viewController in content.introspect(.viewController, on: .iOS(.v15, .v16, .v17, .v18, .v26)) { viewController in
// workaround for an empty supplementary view on launch // workaround for an empty supplementary view on launch
// the supplementary view is determined by the default selection inside the // the supplementary view is determined by the default selection inside the
// primary view, but the primary view is not loaded so its selection is not read // primary view, but the primary view is not loaded so its selection is not read

View File

@@ -223,6 +223,7 @@ struct FeedView: View {
var header: some View { var header: some View {
HStack(spacing: 16) { HStack(spacing: 16) {
#if os(tvOS) #if os(tvOS)
// swiftlint:disable:next deployment_target
if #available(tvOS 17.0, *) { if #available(tvOS 17.0, *) {
Menu { Menu {
accountsPicker accountsPicker

View File

@@ -433,9 +433,9 @@ struct VideoCell: View {
private var thumbnailImage: some View { private var thumbnailImage: some View {
VideoCellThumbnail(video: video) VideoCellThumbnail(video: video)
#if os(tvOS) #if os(tvOS)
.frame(minHeight: 320) .frame(minHeight: 320)
#endif #endif
.mask(RoundedRectangle(cornerRadius: thumbnailRoundingCornerRadius)) .mask(RoundedRectangle(cornerRadius: thumbnailRoundingCornerRadius))
} }