Swiftformat fixes

2025-08-09 20:24:06 +00:00 · 2024-05-16 18:28:32 +02:00
parent 4b21cd48e3
commit 7741e531f4
28 changed files with 57 additions and 65 deletions
--- a/Shared/Channels/ChannelPlaylistCell.swift
+++ b/Shared/Channels/ChannelPlaylistCell.swift
@@ -53,7 +53,6 @@ struct ChannelPlaylistCell: View {

                Text("\(playlist.videosCount ?? playlist.videos.count) videos")
                    .foregroundColor(.secondary)
-
                    .frame(height: 20)
            }
        }
--- a/Shared/Home/FavoriteItemView.swift
+++ b/Shared/Home/FavoriteItemView.swift
@@ -81,7 +81,6 @@ struct FavoriteItemView: View {
                    }
                }
                .contentShape(Rectangle())
-
                .onAppear {
                    if item.section == .history {
                        reloadVisibleWatches()
@@ -165,7 +164,7 @@ struct FavoriteItemView: View {
                .prefix(favoritesModel.limit(item))
        )
        let last = watches.last
-        watches.forEach { watch in
+        for watch in watches {
            player.loadHistoryVideoDetails(watch) {
                guard let video = player.historyVideo(watch.videoID), itemVisible(.init(video: video)) else { return }
                visibleWatches.append(watch)
--- a/Shared/Player/PlaybackSettings.swift
+++ b/Shared/Player/PlaybackSettings.swift
@@ -142,7 +142,6 @@ struct PlaybackSettings: View {
        }
        .animation(nil, value: player.activeBackend)
        .frame(alignment: .topLeading)
-
        .ignoresSafeArea(.all, edges: .bottom)
        .backport
        .playbackSettingsPresentationDetents()
@@ -235,7 +234,6 @@ struct PlaybackSettings: View {
            #if os(iOS)
                .padding(12)
                .frame(width: 40, height: 40)
-
                .background(RoundedRectangle(cornerRadius: 4).strokeBorder(Color.accentColor, lineWidth: 1))
                .contentShape(Rectangle())
            #endif
@@ -261,7 +259,6 @@ struct PlaybackSettings: View {
            #if os(iOS)
                .padding(12)
                .frame(width: 40, height: 40)
-
                .background(RoundedRectangle(cornerRadius: 4).strokeBorder(Color.accentColor, lineWidth: 1))
                .contentShape(Rectangle())
            #endif
--- a/Details/ChapterView.swift
+++ b/Details/ChapterView.swift
@@ -57,7 +57,6 @@ import SwiftUI
                }
                .indicator(.activity)
                .frame(width: Self.thumbnailWidth, height: Self.thumbnailHeight)
-
                .mask(RoundedRectangle(cornerRadius: 6))
        }

--- a/Details/ChaptersView.swift
+++ b/Details/ChaptersView.swift
@@ -80,7 +80,7 @@ struct ChaptersView: View {
    }

    #if !os(tvOS)
-        private func chapterViews(for chaptersToShow: ArraySlice<Chapter>, opacity: Double = 1.0, clickable: Bool = true, scrollViewProxy: ScrollViewProxy? = nil) -> some View {
+        private func chapterViews(for chaptersToShow: ArraySlice<Chapter>, opacity: Double = 1.0, clickable: Bool = true, scrollViewProxy _: ScrollViewProxy? = nil) -> some View {
            ForEach(Array(chaptersToShow.indices), id: \.self) { index in
                let chapter = chaptersToShow[index]
                ChapterView(chapter: chapter, chapterIndex: index, showThumbnail: showThumbnails)
--- a/Details/VideoDescription.swift
+++ b/Details/VideoDescription.swift
@@ -88,7 +88,7 @@ struct VideoDescription: View {
            var formattedString: AttributedString {
                var attrString = AttributedString(description)
                let words = description.unicodeScalars.split(whereSeparator: separators.contains).map(String.init)
-                words.forEach { word in
+                for word in words {
                    if word.hasPrefix("https://") || word.hasPrefix("http://"), let url = URL(string: String(word)) {
                        if let range = attrString.range(of: word) {
                            attrString[range].link = url
--- a/Shared/Player/VideoPlayerView.swift
+++ b/Shared/Player/VideoPlayerView.swift
@@ -263,7 +263,6 @@ struct VideoPlayerView: View {
                #else
                    GeometryReader { geometry in
                        player.playerBackendView
-
                            .modifier(
                                VideoPlayerSizeModifier(
                                    geometry: geometry,
--- a/Shared/Playlists/PlaylistFormView.swift
+++ b/Shared/Playlists/PlaylistFormView.swift
@@ -198,7 +198,7 @@ struct PlaylistFormView: View {
                }
            }
        #else
-            Button(self.visibility.name) {
+            Button(visibility.name) {
                self.visibility = self.visibility.next()
            }
            .contextMenu {
--- a/Shared/Settings/HistorySettings.swift
+++ b/Shared/Settings/HistorySettings.swift
@@ -61,23 +61,23 @@ struct HistorySettings: View {
                    Toggle("Save history of played videos", isOn: $saveHistory)
                    Toggle("Show recents in sidebar", isOn: $showRecents)
                    #if os(macOS)
-                    HStack {
-                        Toggle("Limit recents shown", isOn: $limitRecents)
-                            .frame(minWidth: 140, alignment: .leading)
-                            .disabled(!showRecents)
-                        Spacer()
-                        counterButtons(for: $limitRecentsAmount)
-                            .disabled(!limitRecents)
-                    }
+                        HStack {
+                            Toggle("Limit recents shown", isOn: $limitRecents)
+                                .frame(minWidth: 140, alignment: .leading)
+                                .disabled(!showRecents)
+                            Spacer()
+                            counterButtons(for: $limitRecentsAmount)
+                                .disabled(!limitRecents)
+                        }
                    #else
-                    Toggle("Limit recents shown", isOn: $limitRecents)
-                        .disabled(!showRecents)
-                    HStack {
-                        Text("Recents shown")
-                        Spacer()
-                        counterButtons(for: $limitRecentsAmount)
-                            .disabled(!limitRecents)
-                    }
+                        Toggle("Limit recents shown", isOn: $limitRecents)
+                            .disabled(!showRecents)
+                        HStack {
+                            Text("Recents shown")
+                            Spacer()
+                            counterButtons(for: $limitRecentsAmount)
+                                .disabled(!limitRecents)
+                        }
                    #endif
                    Toggle("Show progress of watching on thumbnails", isOn: $showWatchingProgress)
                        .disabled(!saveHistory)
@@ -196,7 +196,7 @@ struct HistorySettings: View {
    private func counterButtons(for _value: Binding<Int>) -> some View {
        var value: Binding<Int> {
            Binding(
-                get: { return _value.wrappedValue },
+                get: { _value.wrappedValue },
                set: {
                    if $0 < 1 {
                        _value.wrappedValue = 1
--- a/Shared/Settings/HomeSettings.swift
+++ b/Shared/Settings/HomeSettings.swift
@@ -68,7 +68,7 @@ struct HomeSettings: View {
                            }
                            .help("Add to Favorites")
                            #if !os(tvOS)
-                            .buttonStyle(.borderless)
+                                .buttonStyle(.borderless)
                            #endif
                        }
                    }
--- a/Shared/Settings/PlayerControlsSettings.swift
+++ b/Shared/Settings/PlayerControlsSettings.swift
@@ -261,7 +261,6 @@ struct PlayerControlsSettings: View {
                TextField("Duration", text: value)
                    .frame(width: textFieldWidth, alignment: .trailing)
                    .multilineTextAlignment(.center)
-
                    .labelsHidden()
                #if !os(macOS)
                    .keyboardType(.numberPad)
--- a/Shared/Settings/QualityProfileForm.swift
+++ b/Shared/Settings/QualityProfileForm.swift
@@ -48,7 +48,6 @@ struct QualityProfileForm: View {

        .onAppear(perform: initializeForm)
        .onChange(of: backend, perform: { _ in backendChanged(self.backend); updateActiveFormats(); validate() })
-
        .onChange(of: name, perform: { _ in validate() })
        .onChange(of: resolution, perform: { _ in validate() })
        .onChange(of: orderedFormats, perform: { _ in validate() })
--- a/Shared/Settings/SettingsView.swift
+++ b/Shared/Settings/SettingsView.swift
@@ -1,6 +1,7 @@
 import Defaults
 import Foundation
 import SwiftUI
+
 struct SettingsView: View {
    static let matrixURL = URL(string: "https://tinyurl.com/matrix-yattee")!
    static let discordURL = URL(string: "https://yattee.stream/discord")!
--- a/Shared/URLParser.swift
+++ b/Shared/URLParser.swift
@@ -176,7 +176,7 @@ struct URLParser {
    private func removePrefixes(_ value: String, _ prefixes: [String]) -> String {
        var value = value

-        prefixes.forEach { prefix in
+        for prefix in prefixes {
            if value.hasPrefix(prefix) {
                value.removeFirst(prefix.count)
            }