From d82a13ee64f377d70abec06840ee295712380ca1 Mon Sep 17 00:00:00 2001 From: Dominic Drees Date: Sat, 3 May 2025 12:58:13 +0200 Subject: [PATCH] fix double column count calculation !? --- .../CustomPlayer/Helpers/VTTSubtitlesLoader.swift | 1 - Sora/Views/ExploreView/ExploreView.swift | 9 --------- Sora/Views/LibraryView/LibraryView.swift | 10 ---------- Sora/Views/SearchView/SearchView.swift | 9 --------- 4 files changed, 29 deletions(-) diff --git a/Sora/Utils/MediaPlayer/CustomPlayer/Helpers/VTTSubtitlesLoader.swift b/Sora/Utils/MediaPlayer/CustomPlayer/Helpers/VTTSubtitlesLoader.swift index 3f67cb8..436db11 100644 --- a/Sora/Utils/MediaPlayer/CustomPlayer/Helpers/VTTSubtitlesLoader.swift +++ b/Sora/Utils/MediaPlayer/CustomPlayer/Helpers/VTTSubtitlesLoader.swift @@ -26,7 +26,6 @@ class VTTSubtitlesLoader: ObservableObject { func load(from urlString: String) { guard let url = URL(string: urlString) else { return } - let format = determineSubtitleFormat(from: url) URLSession.shared.dataTask(with: url) { data, _, error in diff --git a/Sora/Views/ExploreView/ExploreView.swift b/Sora/Views/ExploreView/ExploreView.swift index db0a111..d8ce87c 100644 --- a/Sora/Views/ExploreView/ExploreView.swift +++ b/Sora/Views/ExploreView/ExploreView.swift @@ -71,7 +71,6 @@ struct ExploreView: View { var body: some View { NavigationView { ScrollView { - let columnsCount = determineColumns() VStack(spacing: 0) { if !(hideEmptySections ?? false) && selectedModule == nil { VStack(spacing: 8) { @@ -322,14 +321,6 @@ struct ExploreView: View { } } - private func determineColumns() -> Int { - if UIDevice.current.userInterfaceIdiom == .pad { - return isLandscape ? mediaColumnsLandscape : mediaColumnsPortrait - } else { - return verticalSizeClass == .compact ? mediaColumnsLandscape : mediaColumnsPortrait - } - } - private func cleanLanguageName(_ language: String?) -> String { guard let language else { return "Unknown" } diff --git a/Sora/Views/LibraryView/LibraryView.swift b/Sora/Views/LibraryView/LibraryView.swift index c257d88..1825d7b 100644 --- a/Sora/Views/LibraryView/LibraryView.swift +++ b/Sora/Views/LibraryView/LibraryView.swift @@ -54,8 +54,6 @@ struct LibraryView: View { var body: some View { NavigationView { ScrollView { - let columnsCount = determineColumns() - VStack(alignment: .leading, spacing: 12) { if hideEmptySections != true || !continueWatchingManager.items.isEmpty { Text("Continue Watching") @@ -255,14 +253,6 @@ struct LibraryView: View { isLandscape = UIDevice.current.orientation.isLandscape } } - - private func determineColumns() -> Int { - if UIDevice.current.userInterfaceIdiom == .pad { - return isLandscape ? mediaColumnsLandscape : mediaColumnsPortrait - } else { - return verticalSizeClass == .compact ? mediaColumnsLandscape : mediaColumnsPortrait - } - } } struct ContinueWatchingSection: View { diff --git a/Sora/Views/SearchView/SearchView.swift b/Sora/Views/SearchView/SearchView.swift index eb22506..d256179 100644 --- a/Sora/Views/SearchView/SearchView.swift +++ b/Sora/Views/SearchView/SearchView.swift @@ -72,7 +72,6 @@ struct SearchView: View { var body: some View { NavigationView { ScrollView { - let columnsCount = determineColumns() VStack(spacing: 0) { HStack { SearchBar(text: $searchText, onSearchButtonClicked: performSearch) @@ -336,14 +335,6 @@ struct SearchView: View { } } - private func determineColumns() -> Int { - if UIDevice.current.userInterfaceIdiom == .pad { - return isLandscape ? mediaColumnsLandscape : mediaColumnsPortrait - } else { - return verticalSizeClass == .compact ? mediaColumnsLandscape : mediaColumnsPortrait - } - } - private func cleanLanguageName(_ language: String?) -> String { guard let language else { return "Unknown" }