From e0c6e03c3f1d3ff41eb08346404de52f45fac3a6 Mon Sep 17 00:00:00 2001 From: realdoomsboygaming <105606471+realdoomsboygaming@users.noreply.github.com> Date: Sun, 25 May 2025 23:19:17 -0500 Subject: [PATCH] Stagemanager Support & Cache Wording inconsistency fixes (#135) --- Sora/Views/LibraryView/LibraryView.swift | 16 ++++++++++++++-- .../SettingsSubViews/SettingsViewData.swift | 6 +++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Sora/Views/LibraryView/LibraryView.swift b/Sora/Views/LibraryView/LibraryView.swift index 5ee687a..dbde878 100644 --- a/Sora/Views/LibraryView/LibraryView.swift +++ b/Sora/Views/LibraryView/LibraryView.swift @@ -16,6 +16,7 @@ struct LibraryView: View { @AppStorage("mediaColumnsLandscape") private var mediaColumnsLandscape: Int = 4 @Environment(\.verticalSizeClass) var verticalSizeClass + @Environment(\.horizontalSizeClass) var horizontalSizeClass @State private var selectedBookmark: LibraryItem? = nil @State private var isDetailActive: Bool = false @@ -28,10 +29,15 @@ struct LibraryView: View { ] private var columnsCount: Int { - if UIDevice.current.userInterfaceIdiom == .pad { + // Stage Manager Detection + if UIDevice.current.userInterfaceIdiom == .pad && horizontalSizeClass == .compact { + return verticalSizeClass == .compact ? 3 : 2 + } else if UIDevice.current.userInterfaceIdiom == .pad { + // Normal iPad layout let isLandscape = UIScreen.main.bounds.width > UIScreen.main.bounds.height return isLandscape ? mediaColumnsLandscape : mediaColumnsPortrait } else { + // iPhone layout return verticalSizeClass == .compact ? mediaColumnsLandscape : mediaColumnsPortrait } } @@ -206,9 +212,15 @@ struct LibraryView: View { } private func determineColumns() -> Int { - if UIDevice.current.userInterfaceIdiom == .pad { + // Stage Manager Detection + if UIDevice.current.userInterfaceIdiom == .pad && horizontalSizeClass == .compact { + return verticalSizeClass == .compact ? 3 : 2 + } else if UIDevice.current.userInterfaceIdiom == .pad { + // Normal iPad layout + let isLandscape = UIScreen.main.bounds.width > UIScreen.main.bounds.height return isLandscape ? mediaColumnsLandscape : mediaColumnsPortrait } else { + // iPhone layout return verticalSizeClass == .compact ? mediaColumnsLandscape : mediaColumnsPortrait } } diff --git a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewData.swift b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewData.swift index 78be70f..977deae 100644 --- a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewData.swift +++ b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewData.swift @@ -61,7 +61,7 @@ struct SettingsViewData: View { } HStack { - Text("Current Cache Size") + Text("Current Metadata Cache Size") Spacer() if isCalculatingSize { ProgressView() @@ -73,7 +73,7 @@ struct SettingsViewData: View { } Button(action: clearAllCaches) { - Text("Clear All Caches") + Text("Clear All Metadata Caches") .foregroundColor(.red) } } @@ -101,7 +101,7 @@ struct SettingsViewData: View { .font(.subheadline) .foregroundColor(.secondary) } - + HStack { Button(action: { showRemoveMovPkgAlert = true