From afe49abcfa9fc59f99736806a5b03d2b96a7a315 Mon Sep 17 00:00:00 2001 From: Francesco <100066266+cranci1@users.noreply.github.com> Date: Sun, 1 Jun 2025 16:29:15 +0200 Subject: [PATCH] Revert "does ts work?" This reverts commit 1afd46f9a76dcadfd6b66574e3ccdc2741959446. --- .../SettingsSubViews/SettingsViewPlayer.swift | 39 ++++--------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewPlayer.swift b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewPlayer.swift index 3b19f7b..9be1246 100644 --- a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewPlayer.swift +++ b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewPlayer.swift @@ -206,6 +206,7 @@ struct SettingsViewPlayer: View { @AppStorage("pipButtonVisible") private var pipButtonVisible: Bool = true private let mediaPlayers = ["Default", "Sora", "VLC", "OutPlayer", "Infuse", "nPlayer", "SenPlayer", "IINA"] + private let inAppPlayers = ["Default", "Sora"] private let externalPlayers = ["VLC", "OutPlayer", "Infuse", "nPlayer", "SenPlayer", "IINA"] var body: some View { @@ -215,37 +216,13 @@ struct SettingsViewPlayer: View { title: "Media Player", footer: "Some features are limited to the Sora and Default player, such as ForceLandscape, holdSpeed and custom time skip increments." ) { - - VStack(spacing: 0) { - HStack { - Image(systemName: "play.circle") - .frame(width: 24, height: 24) - .foregroundStyle(.primary) - Text("Media Player") - .foregroundStyle(.primary) - Spacer() - Menu { - Button("In-app Players", action: {}).disabled(true) - ForEach(mediaPlayers.prefix(2), id: \.self) { option in - Button(action: { externalPlayer = option }) { - Label(option, systemImage: externalPlayer == option ? "checkmark" : "") - } - } - Button("External Players", action: {}).disabled(true) - ForEach(mediaPlayers.dropFirst(2), id: \.self) { option in - Button(action: { externalPlayer = option }) { - Label(option, systemImage: externalPlayer == option ? "checkmark" : "") - } - } - } label: { - Text(externalPlayer) - .foregroundStyle(.gray) - } - } - .padding(.horizontal, 16) - .padding(.vertical, 12) - Divider().padding(.horizontal, 16) - } + SettingsPickerRow( + icon: "play.circle", + title: "Media Player", + options: mediaPlayers, + optionToString: { $0 }, + selection: $externalPlayer + ) SettingsToggleRow( icon: "rotate.right",