From eb71e8b8d0efc11e165bec5b985556b4501a5401 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Mon, 10 Jan 2022 13:59:10 -0700 Subject: [PATCH] fix for updated swiftformat --- .swiftformat | 5 +++-- Shared/Views/SearchBarView.swift | 2 +- .../Components/LandscapeItemElement.swift | 4 ++-- Swiftfin tvOS/Views/LibraryListView.swift | 18 +++++++++--------- .../VideoPlayer/VLCPlayerOverlayView.swift | 2 +- WidgetExtension/NextUpWidget.swift | 6 +++--- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.swiftformat b/.swiftformat index 7b35d0a4..e6953b07 100644 --- a/.swiftformat +++ b/.swiftformat @@ -40,9 +40,10 @@ blankLinesAtStartOfScope,\ andOperator, \ redundantFileprivate, \ - redundantSelf + redundantSelf, \ + redundantClosure, \ + redundantType --exclude Pods --header "\nSwiftfin is subject to the terms of the Mozilla Public\nLicense, v2.0. If a copy of the MPL was not distributed with this\nfile, you can obtain one at https://mozilla.org/MPL/2.0/.\n\nCopyright (c) {year} Jellyfin & Jellyfin Contributors\n" - diff --git a/Shared/Views/SearchBarView.swift b/Shared/Views/SearchBarView.swift index 137489ac..f33391c9 100644 --- a/Shared/Views/SearchBarView.swift +++ b/Shared/Views/SearchBarView.swift @@ -23,7 +23,7 @@ struct SearchBar: View { #if os(iOS) .background(Color(.systemGray6)) #endif - .cornerRadius(8) + .cornerRadius(8) if !text.isEmpty { Button(action: { self.text = "" diff --git a/Swiftfin tvOS/Components/LandscapeItemElement.swift b/Swiftfin tvOS/Components/LandscapeItemElement.swift index 350e8a93..efae06e9 100644 --- a/Swiftfin tvOS/Components/LandscapeItemElement.swift +++ b/Swiftfin tvOS/Components/LandscapeItemElement.swift @@ -67,8 +67,8 @@ struct LandscapeItemElement: View { .fill(LinearGradient(gradient: Gradient(colors: [.black, .clear]), startPoint: .bottom, endPoint: .top)) - .frame(width: 445, height: 90) - .mask(CutOffShadow()) + .frame(width: 445, height: 90) + .mask(CutOffShadow()) VStack(alignment: .leading) { Text("CONTINUE • \(item.getItemProgressString() ?? "")") .font(.caption) diff --git a/Swiftfin tvOS/Views/LibraryListView.swift b/Swiftfin tvOS/Views/LibraryListView.swift index 1ba40a08..d4e5436d 100644 --- a/Swiftfin tvOS/Views/LibraryListView.swift +++ b/Swiftfin tvOS/Views/LibraryListView.swift @@ -48,9 +48,9 @@ struct LibraryListView: View { .frame(minWidth: 100, maxWidth: .infinity) .frame(height: 100) } - .cornerRadius(10) - .shadow(radius: 5) - .padding(.bottom, 5) + .cornerRadius(10) + .shadow(radius: 5) + .padding(.bottom, 5) } ForEach(viewModel.libraries.filter { $0.collectionType != "boxsets" }, id: \.id) { library in @@ -75,9 +75,9 @@ struct LibraryListView: View { .frame(minWidth: 100, maxWidth: .infinity) .frame(height: 100) } - .cornerRadius(10) - .shadow(radius: 5) - .padding(.bottom, 5) + .cornerRadius(10) + .shadow(radius: 5) + .padding(.bottom, 5) } } else { Button { @@ -99,9 +99,9 @@ struct LibraryListView: View { .frame(minWidth: 100, maxWidth: .infinity) .frame(height: 100) } - .cornerRadius(10) - .shadow(radius: 5) - .padding(.bottom, 5) + .cornerRadius(10) + .shadow(radius: 5) + .padding(.bottom, 5) } } } else { diff --git a/Swiftfin/Views/VideoPlayer/VLCPlayerOverlayView.swift b/Swiftfin/Views/VideoPlayer/VLCPlayerOverlayView.swift index 0928adc7..6b19fe5d 100644 --- a/Swiftfin/Views/VideoPlayer/VLCPlayerOverlayView.swift +++ b/Swiftfin/Views/VideoPlayer/VLCPlayerOverlayView.swift @@ -344,7 +344,7 @@ struct VLCPlayerOverlayView: View { thumbSize: CGSize.Circle(radius: viewModel.sliderIsScrubbing ? 20 : 15), thumbInteractiveSize: CGSize.Circle(radius: 40), options: .defaultOptions)) - .frame(maxHeight: 50) + .frame(maxHeight: 50) Text(viewModel.rightLabelText) .font(.system(size: 18, weight: .semibold, design: .default)) diff --git a/WidgetExtension/NextUpWidget.swift b/WidgetExtension/NextUpWidget.swift index 22d34316..91ef20a2 100644 --- a/WidgetExtension/NextUpWidget.swift +++ b/WidgetExtension/NextUpWidget.swift @@ -458,9 +458,9 @@ private struct InnerShadow: ViewModifier { .overlay(LinearGradient(gradient: Gradient(colors: self.colors), startPoint: .top, endPoint: .bottom) .frame(height: self.radius * self.minSide(geo)), alignment: .top) - .overlay(LinearGradient(gradient: Gradient(colors: self.colors), startPoint: .bottom, endPoint: .top) - .frame(height: self.radius * self.minSide(geo)), - alignment: .bottom) + .overlay(LinearGradient(gradient: Gradient(colors: self.colors), startPoint: .bottom, endPoint: .top) + .frame(height: self.radius * self.minSide(geo)), + alignment: .bottom) } }