Skip to content

Commit

Permalink
Merge branch 'main' into iOSSettingsUpdate
Browse files Browse the repository at this point in the history
  • Loading branch information
@JPKribs
JPKribs authored Jan 10, 2025
2 parents 131e7e1 + f9ebebe commit fb4571d
Show file tree
Hide file tree
Showing 746 changed files with 3,083 additions and 904 deletions.
2 changes: 1 addition & 1 deletion PreferencesView/Sources/PreferencesView/Box.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

class Box {
Expand Down
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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import UIKit
Expand Down
2 changes: 1 addition & 1 deletion PreferencesView/Sources/PreferencesView/KeyCommandsBuilder.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion PreferencesView/Sources/PreferencesView/PreferenceKeys.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion PreferencesView/Sources/PreferencesView/PreferencesView.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion PreferencesView/Sources/PreferencesView/PressCommandAction.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion PreferencesView/Sources/PreferencesView/PressCommandBuilder.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion PreferencesView/Sources/PreferencesView/UIPreferencesHostingController.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion PreferencesView/Sources/PreferencesView/UIViewController+Swizzling.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwizzleSwift
Expand Down
2 changes: 1 addition & 1 deletion PreferencesView/Sources/PreferencesView/ViewExtensions.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion RedrawOnNotificationView.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Translations/AlphabetizeStrings.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Translations/PurgeUnusedStrings.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import Foundation
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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/AlternateLayoutView.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/AssertionFailureView.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwiftUI
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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/BulletedList.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/ChevronAlertButton.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/ChevronButton.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/FastSVGView.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SVGKit
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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import BlurHashKit
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/LetterPickerOrientation.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import Defaults
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/ListRowCheckbox.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import Defaults
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/MaxHeightText.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import Defaults
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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/RowDivider.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/SeparatorVStack.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import SwiftUI
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/SystemImageContentView.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import Defaults
Expand Down
2 changes: 1 addition & 1 deletion Shared/Components/UserProfileImage/UserProfileHeroImage.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) 2024 Jellyfin & Jellyfin Contributors
// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
//

import Defaults
Expand Down
Loading

0 comments on commit fb4571d

Please sign in to comment.