From e0784b3cecb8347848849b1deca192b31cd2bc02 Mon Sep 17 00:00:00 2001 From: kingbri Date: Tue, 21 Mar 2023 13:53:41 -0400 Subject: [PATCH] Ferrite: Format Signed-off-by: kingbri --- Ferrite/Models/SettingsModels.swift | 2 +- Ferrite/Utils/CodableWrapper.swift | 2 +- Ferrite/ViewModels/PluginManager.swift | 2 +- Ferrite/Views/CommonViews/Modifiers/CustomScopeBar.swift | 1 + .../ComponentViews/Settings/DefaultActionPickerView.swift | 4 ++-- Ferrite/Views/SettingsView.swift | 5 ++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Ferrite/Models/SettingsModels.swift b/Ferrite/Models/SettingsModels.swift index 96320fc..6bdf375 100644 --- a/Ferrite/Models/SettingsModels.swift +++ b/Ferrite/Models/SettingsModels.swift @@ -11,7 +11,7 @@ enum DefaultAction: Codable, CaseIterable, Hashable { static var allCases: [DefaultAction] { [.none, .share, .kodi, .custom(name: "", listId: "")] } - + case none case share case kodi diff --git a/Ferrite/Utils/CodableWrapper.swift b/Ferrite/Utils/CodableWrapper.swift index 1b45754..13e00a7 100644 --- a/Ferrite/Utils/CodableWrapper.swift +++ b/Ferrite/Utils/CodableWrapper.swift @@ -23,7 +23,7 @@ extension CodableWrapper: RawRepresentable { } return string } - + init?(rawValue: String) { guard let data = rawValue.data(using: .utf8), diff --git a/Ferrite/ViewModels/PluginManager.swift b/Ferrite/ViewModels/PluginManager.swift index 201703a..269a65d 100644 --- a/Ferrite/ViewModels/PluginManager.swift +++ b/Ferrite/ViewModels/PluginManager.swift @@ -287,7 +287,7 @@ public class PluginManager: ObservableObject { case .kodi: navModel.kodiExpanded = true navModel.currentChoiceSheet = .action - case .custom(let name, let listId): + case let .custom(name, listId): let actionFetchRequest = Action.fetchRequest() actionFetchRequest.fetchLimit = 1 actionFetchRequest.predicate = NSPredicate(format: "name == %@ AND listId == %@", name, listId) diff --git a/Ferrite/Views/CommonViews/Modifiers/CustomScopeBar.swift b/Ferrite/Views/CommonViews/Modifiers/CustomScopeBar.swift index 65f14ef..51bf575 100644 --- a/Ferrite/Views/CommonViews/Modifiers/CustomScopeBar.swift +++ b/Ferrite/Views/CommonViews/Modifiers/CustomScopeBar.swift @@ -16,6 +16,7 @@ struct CustomScopeBarModifier: ViewModifier { if #available(iOS 15, *) { content .backport.introspectSearchController { searchController in + // MARK: One-time setup guard hostingController == nil else { return } diff --git a/Ferrite/Views/ComponentViews/Settings/DefaultActionPickerView.swift b/Ferrite/Views/ComponentViews/Settings/DefaultActionPickerView.swift index e4a59ca..71a7f17 100644 --- a/Ferrite/Views/ComponentViews/Settings/DefaultActionPickerView.swift +++ b/Ferrite/Views/ComponentViews/Settings/DefaultActionPickerView.swift @@ -34,7 +34,7 @@ struct DefaultActionPickerView: View { DefaultChoiceButton(defaultAction: $defaultAction, selectedOption: .none) DefaultChoiceButton(defaultAction: $defaultAction, selectedOption: .share) - if actionRequirement == .debrid && !kodiServers.isEmpty { + if actionRequirement == .debrid, !kodiServers.isEmpty { DefaultChoiceButton(defaultAction: $defaultAction, selectedOption: .kodi) } @@ -117,7 +117,7 @@ private struct DefaultChoiceButton: View { return "Share link" case .kodi: return "Open in Kodi" - case .custom(_, _): + case .custom: // This should not be called return "Custom button" } diff --git a/Ferrite/Views/SettingsView.swift b/Ferrite/Views/SettingsView.swift index e0ab6a9..00e1cd5 100644 --- a/Ferrite/Views/SettingsView.swift +++ b/Ferrite/Views/SettingsView.swift @@ -32,7 +32,6 @@ struct SettingsView: View { @AppStorage("Debug.ShowErrorToasts") var showErrorToasts = true - var body: some View { NavView { Form { @@ -98,7 +97,7 @@ struct SettingsView: View { Text("Share") case .kodi: Text("Kodi") - case .custom(let name, _): + case let .custom(name, _): Text(name) } } @@ -126,7 +125,7 @@ struct SettingsView: View { Text("Share") case .kodi: Text("Kodi") - case .custom(let name, _): + case let .custom(name, _): Text(name) } }