From 5585b842ae768e3b87e00d6d8d281066fe410cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rasmus=20Kr=C3=A4mer?= Date: Tue, 17 Sep 2024 10:47:54 +0200 Subject: [PATCH] Fix search (Closes #138) --- Multiplatform/Account/TintPicker.swift | 2 +- Multiplatform/Navigation/Sidebar/Sidebar+Links.swift | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- .../Sources/SPBase/HTTP/Types/AudiobookshelfClient+Util.swift | 2 -- ShelfPlayerKit/Sources/SPOffline/Defaults+Keys.swift | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Multiplatform/Account/TintPicker.swift b/Multiplatform/Account/TintPicker.swift index dac6864e..ab596c2b 100644 --- a/Multiplatform/Account/TintPicker.swift +++ b/Multiplatform/Account/TintPicker.swift @@ -45,7 +45,7 @@ struct TintPicker: View { } extension TintPicker { - enum TintColor: CaseIterable, Codable, _DefaultsSerializable { + enum TintColor: CaseIterable, Codable, Defaults.Serializable { case shelfPlayer case yellow diff --git a/Multiplatform/Navigation/Sidebar/Sidebar+Links.swift b/Multiplatform/Navigation/Sidebar/Sidebar+Links.swift index aa2332a8..cba256c6 100644 --- a/Multiplatform/Navigation/Sidebar/Sidebar+Links.swift +++ b/Multiplatform/Navigation/Sidebar/Sidebar+Links.swift @@ -11,12 +11,12 @@ import SwiftUI import SPBase extension Sidebar { - struct Selection: Codable, Hashable, _DefaultsSerializable { + struct Selection: Codable, Hashable, Defaults.Serializable { let libraryId: String let panel: Panel } - enum Panel: Codable, Hashable, _DefaultsSerializable { + enum Panel: Codable, Hashable, Defaults.Serializable { case audiobookListenNow case series case authors diff --git a/ShelfPlayer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ShelfPlayer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 0c121157..d681220b 100644 --- a/ShelfPlayer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ShelfPlayer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,7 +15,7 @@ "location" : "https://github.com/sindresorhus/Defaults", "state" : { "branch" : "main", - "revision" : "38925e3cfacf3fb89a81a35b1cd44fd5a5b7e0fa" + "revision" : "4c009d5c2496e7aa126e922c94dd3d6ae049efa2" } }, { diff --git a/ShelfPlayerKit/Sources/SPBase/HTTP/Types/AudiobookshelfClient+Util.swift b/ShelfPlayerKit/Sources/SPBase/HTTP/Types/AudiobookshelfClient+Util.swift index 8b61c825..f34d4415 100644 --- a/ShelfPlayerKit/Sources/SPBase/HTTP/Types/AudiobookshelfClient+Util.swift +++ b/ShelfPlayerKit/Sources/SPBase/HTTP/Types/AudiobookshelfClient+Util.swift @@ -27,8 +27,6 @@ extension AudiobookshelfClient { let authors: [AudiobookshelfItem]? struct SearchLibraryItem: Codable { - let matchKey: String - let matchText: String let libraryItem: AudiobookshelfItem } struct SearchSeries: Codable { diff --git a/ShelfPlayerKit/Sources/SPOffline/Defaults+Keys.swift b/ShelfPlayerKit/Sources/SPOffline/Defaults+Keys.swift index 3759d546..b2272bc1 100644 --- a/ShelfPlayerKit/Sources/SPOffline/Defaults+Keys.swift +++ b/ShelfPlayerKit/Sources/SPOffline/Defaults+Keys.swift @@ -10,7 +10,7 @@ import Defaults public extension Defaults.Keys { static let hideFromContinueListening = Key<[HideFromContinueListeningEntity]>("hideFromContinueListening", default: []) - struct HideFromContinueListeningEntity: Codable, _DefaultsSerializable { + struct HideFromContinueListeningEntity: Codable, Defaults.Serializable { public let itemId: String public let episodeId: String? }