Skip to content

Commit

Permalink
Merge branch 'main' into finally-some-good-ish-collection-views
Browse files Browse the repository at this point in the history
  • Loading branch information
@LePips
LePips committed Jan 16, 2024
2 parents 7b4b185 + 3b59bed commit a0c16cf
Show file tree
Hide file tree
Showing 439 changed files with 612 additions and 708 deletions.
2 changes: 1 addition & 1 deletion PreferencesView/Sources/PreferencesView/KeyCommandAction.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import UIKit
Expand Down
2 changes: 1 addition & 1 deletion Shared/AppIcons/AppIcons.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/AppIcons/DarkAppIcon.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/AppIcons/InvertedDarkAppIcon.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/AppIcons/InvertedLightAppIcon.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/AppIcons/LightAppIcon.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/AppIcons/PrimaryAppIcon.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/BlurView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/Divider.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/ImageView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import BlurHashKit
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/InitialFailureView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/PlainNavigationLinkButton.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/PosterIndicators/FavoriteIndicator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/PosterIndicators/ProgressIndicator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Defaults
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/PosterIndicators/UnwatchedIndicator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Defaults
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/PosterIndicators/WatchedIndicator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/ProgressBar.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/RotateContentView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/SelectorView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Defaults
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/SeparatorHStack.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/TextPairView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/TruncatedText.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Defaults
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/Wrapped View.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/BasicAppSettingsCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import PulseUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/BasicLibraryCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/BasicNavigationCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Stinsen
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/CastAndCrewLibraryCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/ConnectToServerCoodinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/DownloadListCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

#if os(iOS)
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/DownloadTaskCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

#if os(iOS)
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/FilterCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/HomeCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/ItemCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/LibraryCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Defaults
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/LiveTVChannelsCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Defaults
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/LiveTVCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
4 changes: 2 additions & 2 deletions Shared/Coordinators/LiveTVProgramsCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Algorithms
Expand Down Expand Up @@ -49,7 +49,7 @@ final class LiveTVProgramsCoordinator: NavigationCoordinatable {

let channels = (1 ..< 20).map { _ in BaseItemDto.randomItem() }

channels.forEach { channel in
for channel in channels {
viewModel.channels[channel.id!] = channel
}

Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/LiveTVTabCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/MainCoordinator/iOSMainCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Combine
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/MainCoordinator/iOSMainTabCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/MainCoordinator/tvOSMainCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Factory
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/MainCoordinator/tvOSMainTabCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/Coordinators/MediaCoordinator.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// License, v2.0. If a copy of the MPL was not distributed with this
// file, you can obtain one at https://mozilla.org/MPL/2.0/.
//
// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
Loading

0 comments on commit a0c16cf

Please sign in to comment.