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

fix for updated swiftformat

This commit is contained in:
Ethan Pippin 2022-01-10 13:59:10 -07:00
parent b2a39d934d
commit eb71e8b8d0
6 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.swiftformat
View File

@ -40,9 +40,10 @@
blankLinesAtStartOfScope,\ blankLinesAtStartOfScope,\
andOperator, \ andOperator, \
redundantFileprivate, \ redundantFileprivate, \
redundantSelf redundantSelf, \
redundantClosure, \
redundantType
--exclude Pods --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" --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"

2
Shared/Views/SearchBarView.swift
View File

@ -23,7 +23,7 @@ struct SearchBar: View {
#if os(iOS) #if os(iOS)
.background(Color(.systemGray6)) .background(Color(.systemGray6))
#endif #endif
.cornerRadius(8) .cornerRadius(8)
if !text.isEmpty { if !text.isEmpty {
Button(action: { Button(action: {
self.text = "" self.text = ""

4
Swiftfin tvOS/Components/LandscapeItemElement.swift
View File

@ -67,8 +67,8 @@ struct LandscapeItemElement: View {
.fill(LinearGradient(gradient: Gradient(colors: [.black, .clear]), .fill(LinearGradient(gradient: Gradient(colors: [.black, .clear]),
startPoint: .bottom, startPoint: .bottom,
endPoint: .top)) endPoint: .top))
.frame(width: 445, height: 90) .frame(width: 445, height: 90)
.mask(CutOffShadow()) .mask(CutOffShadow())
VStack(alignment: .leading) { VStack(alignment: .leading) {
Text("CONTINUE • \(item.getItemProgressString() ?? "")") Text("CONTINUE • \(item.getItemProgressString() ?? "")")
.font(.caption) .font(.caption)

18
Swiftfin tvOS/Views/LibraryListView.swift
View File

@ -48,9 +48,9 @@ struct LibraryListView: View {
.frame(minWidth: 100, maxWidth: .infinity) .frame(minWidth: 100, maxWidth: .infinity)
.frame(height: 100) .frame(height: 100)
} }
.cornerRadius(10) .cornerRadius(10)
.shadow(radius: 5) .shadow(radius: 5)
.padding(.bottom, 5) .padding(.bottom, 5)
} }
ForEach(viewModel.libraries.filter { $0.collectionType != "boxsets" }, id: \.id) { library in ForEach(viewModel.libraries.filter { $0.collectionType != "boxsets" }, id: \.id) { library in
@ -75,9 +75,9 @@ struct LibraryListView: View {
.frame(minWidth: 100, maxWidth: .infinity) .frame(minWidth: 100, maxWidth: .infinity)
.frame(height: 100) .frame(height: 100)
} }
.cornerRadius(10) .cornerRadius(10)
.shadow(radius: 5) .shadow(radius: 5)
.padding(.bottom, 5) .padding(.bottom, 5)
} }
} else { } else {
Button { Button {
@ -99,9 +99,9 @@ struct LibraryListView: View {
.frame(minWidth: 100, maxWidth: .infinity) .frame(minWidth: 100, maxWidth: .infinity)
.frame(height: 100) .frame(height: 100)
} }
.cornerRadius(10) .cornerRadius(10)
.shadow(radius: 5) .shadow(radius: 5)
.padding(.bottom, 5) .padding(.bottom, 5)
} }
} }
} else { } else {

2
Swiftfin/Views/VideoPlayer/VLCPlayerOverlayView.swift
View File

@ -344,7 +344,7 @@ struct VLCPlayerOverlayView: View {
thumbSize: CGSize.Circle(radius: viewModel.sliderIsScrubbing ? 20 : 15), thumbSize: CGSize.Circle(radius: viewModel.sliderIsScrubbing ? 20 : 15),
thumbInteractiveSize: CGSize.Circle(radius: 40), thumbInteractiveSize: CGSize.Circle(radius: 40),
options: .defaultOptions)) options: .defaultOptions))
.frame(maxHeight: 50) .frame(maxHeight: 50)
Text(viewModel.rightLabelText) Text(viewModel.rightLabelText)
.font(.system(size: 18, weight: .semibold, design: .default)) .font(.system(size: 18, weight: .semibold, design: .default))

6
WidgetExtension/NextUpWidget.swift
View File

@ -458,9 +458,9 @@ private struct InnerShadow: ViewModifier {
.overlay(LinearGradient(gradient: Gradient(colors: self.colors), startPoint: .top, endPoint: .bottom) .overlay(LinearGradient(gradient: Gradient(colors: self.colors), startPoint: .top, endPoint: .bottom)
.frame(height: self.radius * self.minSide(geo)), .frame(height: self.radius * self.minSide(geo)),
alignment: .top) alignment: .top)
.overlay(LinearGradient(gradient: Gradient(colors: self.colors), startPoint: .bottom, endPoint: .top) .overlay(LinearGradient(gradient: Gradient(colors: self.colors), startPoint: .bottom, endPoint: .top)
.frame(height: self.radius * self.minSide(geo)), .frame(height: self.radius * self.minSide(geo)),
alignment: .bottom) alignment: .bottom)
} }
} }