mirror of
https://github.com/yattee/yattee.git
synced 2025-11-16 06:58:43 +00:00
Fix SwiftLint and SwiftFormat violations
- Run SwiftFormat to fix indentation, spacing, and formatting issues - Replace CGFloat with Double and NSRect with CGRect per style guide - Remove redundant .center alignment specifications - Remove unnecessary @available checks for satisfied deployment targets - Fix closure brace indentation for consistency - Disable closure_end_indentation rule to resolve SwiftFormat conflict All linting checks now pass with zero errors and warnings.
This commit is contained in:
@@ -151,52 +151,52 @@ struct PlayerControlsSettings: View {
|
||||
}
|
||||
|
||||
#if os(tvOS)
|
||||
// Custom implementation for tvOS to avoid focus overlay
|
||||
return VStack(alignment: .leading, spacing: 0) {
|
||||
Text("System controls buttons")
|
||||
.font(.headline)
|
||||
.padding(.vertical, 8)
|
||||
// Custom implementation for tvOS to avoid focus overlay
|
||||
return VStack(alignment: .leading, spacing: 0) {
|
||||
Text("System controls buttons")
|
||||
.font(.headline)
|
||||
.padding(.vertical, 8)
|
||||
|
||||
Button(action: { systemControlsCommands = .seek }) {
|
||||
HStack {
|
||||
Text(labelText("Seek".localized()))
|
||||
Spacer()
|
||||
if systemControlsCommands == .seek {
|
||||
Image(systemName: "checkmark")
|
||||
.foregroundColor(.accentColor)
|
||||
Button(action: { systemControlsCommands = .seek }) {
|
||||
HStack {
|
||||
Text(labelText("Seek".localized()))
|
||||
Spacer()
|
||||
if systemControlsCommands == .seek {
|
||||
Image(systemName: "checkmark")
|
||||
.foregroundColor(.accentColor)
|
||||
}
|
||||
}
|
||||
.contentShape(Rectangle())
|
||||
}
|
||||
.contentShape(Rectangle())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.padding(.vertical, 4)
|
||||
.buttonStyle(.plain)
|
||||
.padding(.vertical, 4)
|
||||
|
||||
Button(action: {
|
||||
systemControlsCommands = .restartAndAdvanceToNext
|
||||
player.updateRemoteCommandCenter()
|
||||
}) {
|
||||
HStack {
|
||||
Text(labelText("Restart/Play next".localized()))
|
||||
Spacer()
|
||||
if systemControlsCommands == .restartAndAdvanceToNext {
|
||||
Image(systemName: "checkmark")
|
||||
.foregroundColor(.accentColor)
|
||||
Button(action: {
|
||||
systemControlsCommands = .restartAndAdvanceToNext
|
||||
player.updateRemoteCommandCenter()
|
||||
}) {
|
||||
HStack {
|
||||
Text(labelText("Restart/Play next".localized()))
|
||||
Spacer()
|
||||
if systemControlsCommands == .restartAndAdvanceToNext {
|
||||
Image(systemName: "checkmark")
|
||||
.foregroundColor(.accentColor)
|
||||
}
|
||||
}
|
||||
.contentShape(Rectangle())
|
||||
}
|
||||
.contentShape(Rectangle())
|
||||
.buttonStyle(.plain)
|
||||
.padding(.vertical, 4)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.padding(.vertical, 4)
|
||||
}
|
||||
#else
|
||||
return Picker("System controls buttons", selection: $systemControlsCommands) {
|
||||
Text(labelText("Seek".localized())).tag(SystemControlsCommands.seek)
|
||||
Text(labelText("Restart/Play next".localized())).tag(SystemControlsCommands.restartAndAdvanceToNext)
|
||||
}
|
||||
.onChange(of: systemControlsCommands) { _ in
|
||||
player.updateRemoteCommandCenter()
|
||||
}
|
||||
.modifier(SettingsPickerModifier())
|
||||
return Picker("System controls buttons", selection: $systemControlsCommands) {
|
||||
Text(labelText("Seek".localized())).tag(SystemControlsCommands.seek)
|
||||
Text(labelText("Restart/Play next".localized())).tag(SystemControlsCommands.restartAndAdvanceToNext)
|
||||
}
|
||||
.onChange(of: systemControlsCommands) { _ in
|
||||
player.updateRemoteCommandCenter()
|
||||
}
|
||||
.modifier(SettingsPickerModifier())
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -242,11 +242,7 @@ struct QualityProfileForm: View {
|
||||
#if os(macOS)
|
||||
let list = filteredFormatList
|
||||
|
||||
if #available(macOS 12.0, *) {
|
||||
list.listStyle(.inset(alternatesRowBackgrounds: true))
|
||||
} else {
|
||||
list.listStyle(.inset)
|
||||
}
|
||||
list.listStyle(.inset(alternatesRowBackgrounds: true))
|
||||
Spacer()
|
||||
#else
|
||||
filteredFormatList
|
||||
|
||||
@@ -183,17 +183,10 @@ struct QualitySettings: View {
|
||||
}
|
||||
|
||||
#if os(macOS)
|
||||
if #available(macOS 12.0, *) {
|
||||
List {
|
||||
list
|
||||
}
|
||||
.listStyle(.inset(alternatesRowBackgrounds: true))
|
||||
} else {
|
||||
List {
|
||||
list
|
||||
}
|
||||
.listStyle(.inset)
|
||||
List {
|
||||
list
|
||||
}
|
||||
.listStyle(.inset(alternatesRowBackgrounds: true))
|
||||
#else
|
||||
list
|
||||
#endif
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
import SwiftUI
|
||||
|
||||
#if os(tvOS)
|
||||
struct TVOSPlainToggleStyle: ToggleStyle {
|
||||
func makeBody(configuration: Configuration) -> some View {
|
||||
Button(action: { configuration.isOn.toggle() }) {
|
||||
HStack {
|
||||
configuration.label
|
||||
Spacer()
|
||||
Image(systemName: configuration.isOn ? "checkmark.circle.fill" : "circle")
|
||||
.foregroundColor(configuration.isOn ? .accentColor : .secondary)
|
||||
struct TVOSPlainToggleStyle: ToggleStyle {
|
||||
func makeBody(configuration: Configuration) -> some View {
|
||||
Button(action: { configuration.isOn.toggle() }) {
|
||||
HStack {
|
||||
configuration.label
|
||||
Spacer()
|
||||
Image(systemName: configuration.isOn ? "checkmark.circle.fill" : "circle")
|
||||
.foregroundColor(configuration.isOn ? .accentColor : .secondary)
|
||||
}
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user