From 2cc2757f53c108c5dac119f92d68bb734f2ed515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 16 Feb 2025 19:32:13 +0100
Subject: [PATCH 1/3] UIKeyCommand: remove hack now that the CI is updated
---
Sources/Playback/Player/PlayerViewController.swift | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/Sources/Playback/Player/PlayerViewController.swift b/Sources/Playback/Player/PlayerViewController.swift
index 721ca033b..c9fa9d1ac 100644
--- a/Sources/Playback/Player/PlayerViewController.swift
+++ b/Sources/Playback/Player/PlayerViewController.swift
@@ -1598,14 +1598,7 @@ extension PlayerViewController {
commands.forEach {
if $0.input == UIKeyCommand.inputRightArrow
|| $0.input == UIKeyCommand.inputLeftArrow {
- ///UIKeyCommand.wantsPriorityOverSystemBehavior is introduced in iOS 15 SDK
- ///but we actually still use Xcode 12.4 on CI. This old version only provides
- ///SDK for iOS 14.4 max. Hence we use ObjC apis to call the method and still
- ///have the ability to build with older Xcode versions.
- let selector = NSSelectorFromString("setWantsPriorityOverSystemBehavior:")
- if $0.responds(to: selector) {
- $0.perform(selector, with: true)
- }
+ $0.wantsPriorityOverSystemBehavior = true
}
}
}
--
GitLab
From 45b583ac19b15e2ab2ed36ef5be4789740eedb39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 16 Feb 2025 19:33:54 +0100
Subject: [PATCH 2/3] TitleSelectionView: remove hack now that the CI is
updated
---
.../Player/VideoPlayer-iOS/TitleSelectionView.swift | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/Sources/Playback/Player/VideoPlayer-iOS/TitleSelectionView.swift b/Sources/Playback/Player/VideoPlayer-iOS/TitleSelectionView.swift
index acfd9fc03..9b472fb89 100644
--- a/Sources/Playback/Player/VideoPlayer-iOS/TitleSelectionView.swift
+++ b/Sources/Playback/Player/VideoPlayer-iOS/TitleSelectionView.swift
@@ -205,14 +205,8 @@ private extension TitleSelectionView {
private func setupTableViews() {
if #available(iOS 15, *) {
- // Workaround in order to be able to compile with an older SDK
- let sectionHeaderTopPaddingSelector = NSSelectorFromString("setSectionHeaderTopPadding:")
- if audioTableView.responds(to: sectionHeaderTopPaddingSelector) {
- audioTableView.perform(sectionHeaderTopPaddingSelector, with: 0)
- }
- if subtitleTableView.responds(to: sectionHeaderTopPaddingSelector) {
- subtitleTableView.perform(sectionHeaderTopPaddingSelector, with: 0)
- }
+ audioTableView.sectionHeaderTopPadding = 0
+ subtitleTableView.sectionHeaderTopPadding = 0
}
audioTableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: audioTableView.frame.size.width, height: 1))
--
GitLab
From d4f95d1ba4c702e91360eef6977bdc1332da9222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 16 Feb 2025 19:35:07 +0100
Subject: [PATCH 3/3] VLCDonationInvoicesViewController: remove duplicated code
---
Sources/Donation/VLCDonationInvoicesViewController.m | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/Sources/Donation/VLCDonationInvoicesViewController.m b/Sources/Donation/VLCDonationInvoicesViewController.m
index 689653d64..845e8ce65 100644
--- a/Sources/Donation/VLCDonationInvoicesViewController.m
+++ b/Sources/Donation/VLCDonationInvoicesViewController.m
@@ -196,15 +196,6 @@ NSString * const VLCDonationInvoicesViewControllerReuseIdentifier = @"VLCDonatio
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
[tableView deselectRowAtIndexPath:indexPath animated:NO];
-#if TARGET_OS_IOS
- if (indexPath.section == 0) {
- VLCInvoice *invoice = _invoices[indexPath.row];
- [[UIApplication sharedApplication] openURL:invoice.hostedInvoiceURL options:@{} completionHandler:nil];
- } else {
- VLCCharge *charge = _charges[indexPath.row];
- [[UIApplication sharedApplication] openURL:charge.receiptURL options:@{} completionHandler:nil];
- }
-#else
if (indexPath.section == 0) {
VLCInvoice *invoice = _invoices[indexPath.row];
[[UIApplication sharedApplication] openURL:invoice.hostedInvoiceURL options:@{} completionHandler:nil];
@@ -212,7 +203,6 @@ NSString * const VLCDonationInvoicesViewControllerReuseIdentifier = @"VLCDonatio
VLCCharge *charge = _charges[indexPath.row];
[[UIApplication sharedApplication] openURL:charge.receiptURL options:@{} completionHandler:nil];
}
-#endif
}
@end
--
GitLab