Update build environment to macos-15-intel and Add necessary imports to Settings.xm (#679)

This commit is contained in:
RWC 2026-01-03 21:39:50 +08:00 committed by GitHub
parent b55ab6d370
commit 19ac69f476
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 11 additions and 5 deletions

1
.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
.gitmodules merge=ours

View file

@ -54,7 +54,7 @@ concurrency:
jobs: jobs:
build: build:
name: Build YTLitePlus name: Build YTLitePlus
runs-on: macos-13 runs-on: macos-15-intel
permissions: permissions:
contents: write contents: write

2
.gitmodules vendored
View file

@ -36,7 +36,7 @@
url = https://github.com/PoomSmart/YTABConfig url = https://github.com/PoomSmart/YTABConfig
[submodule "Tweaks/YTUHD"] [submodule "Tweaks/YTUHD"]
path = Tweaks/YTUHD path = Tweaks/YTUHD
url = https://github.com/aricloverALT/YTUHD url = https://github.com/splaser/YTUHD.git
[submodule "Tweaks/YouGroupSettings"] [submodule "Tweaks/YouGroupSettings"]
path = Tweaks/YouGroupSettings path = Tweaks/YouGroupSettings
url = https://github.com/PoomSmart/YouGroupSettings url = https://github.com/PoomSmart/YouGroupSettings

View file

@ -1,3 +1,7 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import <string.h>
#import "../YTLitePlus.h" #import "../YTLitePlus.h"
#import "../Tweaks/YouTubeHeader/YTSettingsViewController.h" #import "../Tweaks/YouTubeHeader/YTSettingsViewController.h"
#import "../Tweaks/YouTubeHeader/YTSearchableSettingsViewController.h" #import "../Tweaks/YouTubeHeader/YTSearchableSettingsViewController.h"
@ -8,6 +12,7 @@
#import "SettingsKeys.h" #import "SettingsKeys.h"
// #import "AppIconOptionsController.h" // #import "AppIconOptionsController.h"
// Basic switch item // Basic switch item
#define BASIC_SWITCH(title, description, key) \ #define BASIC_SWITCH(title, description, key) \
[YTSettingsSectionItemClass switchItemWithTitle:title \ [YTSettingsSectionItemClass switchItemWithTitle:title \
@ -247,7 +252,7 @@ static const NSInteger YTLiteSection = 789;
// Helper to generate checkmark setting items for selecting gesture modes // Helper to generate checkmark setting items for selecting gesture modes
static YTSettingsSectionItem* (^gestureCheckmarkSettingItem)(NSInteger, NSString *) = ^(NSInteger idx, NSString *key) { static YTSettingsSectionItem* (^gestureCheckmarkSettingItem)(NSInteger, NSString *) = ^(NSInteger idx, NSString *key) {
return [YTSettingsSectionItemClass return [YTSettingsSectionItemClass
checkmarkItemWithTitle:sectionGestureSelectedModeToString(idx) checkmarkItemWithTitle:sectionGestureSelectedModeToString((GestureMode)idx)
selectBlock:^BOOL (YTSettingsCell *cell, NSUInteger arg1) { selectBlock:^BOOL (YTSettingsCell *cell, NSUInteger arg1) {
[[NSUserDefaults standardUserDefaults] setInteger:idx forKey:key]; [[NSUserDefaults standardUserDefaults] setInteger:idx forKey:key];
[settingsViewController reloadData]; [settingsViewController reloadData];
@ -261,7 +266,7 @@ static const NSInteger YTLiteSection = 789;
return [YTSettingsSectionItemClass itemWithTitle:LOC(sectionLabel) return [YTSettingsSectionItemClass itemWithTitle:LOC(sectionLabel)
accessibilityIdentifier:nil accessibilityIdentifier:nil
detailTextBlock:^NSString *() { detailTextBlock:^NSString *() {
return sectionGestureSelectedModeToString(GetInteger(sectionKey)); return sectionGestureSelectedModeToString((GestureMode)GetInteger(sectionKey));
} }
selectBlock:^BOOL (YTSettingsCell *cell, NSUInteger arg1) { selectBlock:^BOOL (YTSettingsCell *cell, NSUInteger arg1) {
NSArray <YTSettingsSectionItem *> *rows = @[ NSArray <YTSettingsSectionItem *> *rows = @[

@ -1 +1 @@
Subproject commit 0f59b38817d554ab692a0053456319847a6ab1a1 Subproject commit 4bac4a50a640a6792b41cf053d4df6c94dc8550a